updated

Rundll86 · Dec 15, 2024 · 06dbee7 · 06dbee7
1 parent 571dc76
commit 06dbee7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/src/fs-context/internal.ts b/src/fs-context/internal.ts
@@ -41,7 +41,7 @@ export type ExtractField<A extends (string | ArgumentDefine)[]> = {
 export interface BlockConfigA<T extends (string | ArgumentDefine)[]> {
     method?: MethodFunction<ExtractField<T>>;
     type?: BlockTypePlain;
-    opcode?: string;
+    opcode: string;
 }
 export interface BlockConfigB<T extends ArgumentDefine[]> {
     arguments?: T;

diff --git a/src/fs-context/structs.ts b/src/fs-context/structs.ts
@@ -68,9 +68,9 @@ export class Block<O extends Extension = Extension> {
     method: (this: O, args: any) => any = () => { };
     arguments: ArgumentPart[] = [];
     type: BlockTypePlain = "command";
-    private _opcode: string | null = null;
+    private _opcode: string = "";
     get opcode(): string {
-        return this._opcode ? this._opcode : md5(JSON.stringify(this.arguments));
+        return this._opcode;
     }
     get text(): string {
         let result: string = "";
@@ -104,7 +104,7 @@ export class Block<O extends Extension = Extension> {
         return new Block<O>({
             method: realMethod,
             type: realConfig.type,
-            opcode: method?.name
+            opcode: method?.name || Unnecessary.internalUUID.next()
         }, ...textLoaded);
     }
     constructor(config?: BlockConfigA<[]>, ...args: any[]) {
@@ -123,15 +123,17 @@ export class Block<O extends Extension = Extension> {
             }
             this.arguments.push(currentPart);
         };
-        const data = config || {};
-        if (data.method) {
-            this.method = data.method;
-        };
-        if (data.type) {
-            this.type = data.type;
-        };
-        if (data.opcode) {
-            this._opcode = data.opcode;
+        if (config) {
+            const data = config;
+            if (data.method) {
+                this.method = data.method;
+            };
+            if (data.type) {
+                this.type = data.type;
+            };
+            if (data.opcode) {
+                this._opcode = data.opcode;
+            };
         };
     };
 }

diff --git a/src/fs-context/tools.ts b/src/fs-context/tools.ts
@@ -1,4 +1,3 @@
-import md5 from "md5";
 import {
     AcceptedInputType,
     ArgumentPart,
@@ -107,14 +106,15 @@ export namespace Unnecessary {
             const result = [];
             for (let i = 0; i < this.length; i++) {
                 this.last++;
-                result.push(md5(this.last + i.toString()).slice(0, 5));
+                result.push(this.last.toString(32).slice(0, 5));
             }
             return result.join('-');
         }
         constructor(length: number = 4) {
             this.length = length;
         }
     }
+    export const internalUUID = new UUIDAutoscalator();
     export function splitArgBoxPart(str: string, substrings: string[]) {
         const filteredSubstrings = [];
         for (let i = 0; i < str.length; i++) {