wowok 1.6.83 → 1.6.85

package/dist/guard.d.ts

@@ -49,7 +49,7 @@ export declare class Guard {
     static BoolCmd: GuardQuery[];
     static IsBoolCmd: (cmd: number) => boolean;
     static CmdFilter: (retType: ValueType) => GuardQuery[];
-    static GetCmd: (cmd: number | undefined) => any;
+    static GetCmd: (cmd: number | undefined) => GuardQuery | undefined;
     static GetCmdOption: (cmd: number) => Guard_Options | undefined;
     static GetInputParams: (cmd: number) => ValueType[];
     static GetModuleName: (cmd: number) => string;
@@ -80,6 +80,7 @@ export declare class GuardMaker {
     add_constant(type: ValueType, value?: any, identifier?: number, bNeedSerialize?: boolean): number;
     add_param(type: ValueType | ContextType, param?: any): GuardMaker;
     add_query(module: MODULES, query_name: string, object_address_from: string | number): GuardMaker;
+    add_query2(query_id: number, object_address_from: string | number): GuardMaker;
     add_logic(type: OperatorType, logic_count?: number): GuardMaker;
     hasIdentifier(id: number): boolean;
     build(bNot?: boolean): GuardMaker;

package/dist/guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"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"}

package/dist/guard.js

@@ -312,25 +312,25 @@ export class Guard {
     static IsBoolCmd = (cmd) => { return Guard.BoolCmd.some((q) => { return q.query_id == cmd; }); };
     static CmdFilter = (retType) => { return GUARD_QUERIES.filter((q) => q.return === retType); };
     static GetCmd = (cmd) => {
-        return GUARD_QUERIES.find((q) => { return q[2] == cmd; });
+        return GUARD_QUERIES.find((q) => { return q.query_id == cmd; });
     };
     static GetCmdOption = (cmd) => {
         const r = Guard.GetCmd(cmd);
         if (!r)
             return r;
-        return { from: 'query', name: r[1], value: r[2], group: FirstLetterUppercase(r[0]), return: r[4] };
+        return { from: 'query', name: r.query_name, value: r.query_id, group: FirstLetterUppercase(r.module), return: r.return };
     };
     static GetInputParams = (cmd) => {
         const r = Guard.GetCmd(cmd);
         if (!r)
             return [];
-        return r[3];
+        return r.parameters;
     };
     static GetModuleName = (cmd) => {
         let r = Guard.GetCmd(cmd);
         if (!r)
             return '';
-        return FirstLetterUppercase(r[0]);
+        return FirstLetterUppercase(r.module);
     };
     static NumberOptions = () => {
         const r = [...Guard.CmdFilter(ValueType.TYPE_U8), ...Guard.CmdFilter(ValueType.TYPE_U64),
@@ -493,31 +493,40 @@ export class GuardMaker {
         ;
         return this;
     }
-    // object_address_from: string for static address; number as identifier  inconstant
     add_query(module, query_name, object_address_from) {
-        let query_index = GUARD_QUERIES.findIndex((q) => {
+        const query = GUARD_QUERIES.filter((q) => {
             return q.module == module && q.query_name == query_name;
         });
+        if (query.length !== 1) {
+            ERROR(Errors.InvalidParam, 'add_query2:' + query_name);
+        }
+        return this.add_query2(query[0].query_id, object_address_from);
+    }
+    // object_address_from: string for static address; number as identifier  inconstant
+    add_query2(query_id, object_address_from) {
+        const query_index = GUARD_QUERIES.findIndex((q) => {
+            return q.query_id == query_id;
+        });
         if (query_index == -1) {
-            ERROR(Errors.InvalidParam, 'query_name:' + query_name);
+            ERROR(Errors.InvalidParam, 'query_id:' + query_id);
         }
         if (typeof (object_address_from) == 'number') {
             if (!GuardMaker.IsValidIndentifier(object_address_from)) {
-                ERROR(Errors.InvalidParam, 'object_address_from:' + query_name);
+                ERROR(Errors.InvalidParam, 'object_address_from:' + query_id);
             }
         }
         else {
             if (!IsValidAddress(object_address_from)) {
-                ERROR(Errors.InvalidParam, 'object_address_from:' + query_name);
+                ERROR(Errors.InvalidParam, 'object_address_from:' + query_id);
             }
         }
         let offset = this.type_validator.length - GUARD_QUERIES[query_index].parameters.length;
         if (offset < 0) {
-            ERROR(Errors.InvalidParam, 'offset:' + query_name);
+            ERROR(Errors.InvalidParam, 'offset:' + query_id);
         }
         let types = this.type_validator.slice(offset);
         if (!array_equal(types, GUARD_QUERIES[query_index].parameters)) { // type validate 
-            ERROR(Errors.Fail, 'array_equal:' + query_name);
+            ERROR(Errors.Fail, 'array_equal:' + query_id);
         }
         this.data.push(Bcs.getInstance().ser(ValueType.TYPE_U8, OperatorType.TYPE_QUERY)); // QUERY TYPE
         if (typeof (object_address_from) == 'string') {
@@ -527,13 +536,13 @@ export class GuardMaker {
         else {
             let v = this.constant.get(object_address_from);
             if (!v)
-                ERROR(Errors.Fail, 'object_address_from not in constant:' + query_name);
+                ERROR(Errors.Fail, 'object_address_from not in constant:' + query_id);
             if (v?.type == ValueType.TYPE_ADDRESS) {
                 this.data.push(Bcs.getInstance().ser(ValueType.TYPE_U8, ContextType.TYPE_CONSTANT));
                 this.data.push(Bcs.getInstance().ser(ValueType.TYPE_U8, object_address_from)); // object identifer in constants
             }
             else {
-                ERROR(Errors.Fail, 'type bWitness not match:' + query_name);
+                ERROR(Errors.Fail, 'type bWitness not match:' + query_id);
             }
         }
         this.data.push(Bcs.getInstance().ser('u16', GUARD_QUERIES[query_index].query_id)); // cmd(u16)