@lcap/nasl 1.0.0 → 1.0.1

package/out/utils/string.js

@@ -32,15 +32,44 @@ exports.firstLowerCase = firstLowerCase;
  * @param set 数据集合，Array | Map | Set
  * @param start 数字起始
  */
-function unique(key, set, start = 1) {
-    const has = (_key) => {
-        if (set instanceof Set || set instanceof Map)
-            return set.has(_key);
-        else if (Array.isArray(set))
-            return set.includes(_key);
-        else
-            return set[_key];
-    };
+function unique(key, set, start = 1, insensitive = false) {
+    let has;
+    if (insensitive) {
+        has = (_key) => {
+            const lkey = _key.toLowerCase();
+            if (set instanceof Set || set instanceof Map) {
+                // return set.has(_key);
+                const iterator = set.keys();
+                let i = iterator.next();
+                while (!i.done) {
+                    const name = i.value;
+                    if (name.toLowerCase() === lkey) {
+                        return true;
+                    }
+                    i = iterator.next();
+                }
+                return false;
+            }
+            else if (Array.isArray(set))
+                // return set.includes(_key);
+                return set.some((s) => s.toLowerCase() === lkey);
+            else {
+                // return set[_key];
+                const keys = Object.keys(set);
+                return keys.some((k) => k.toLowerCase() === lkey);
+            }
+        };
+    }
+    else {
+        has = (_key) => {
+            if (set instanceof Set || set instanceof Map)
+                return set.has(_key);
+            else if (Array.isArray(set))
+                return set.includes(_key);
+            else
+                return set[_key];
+        };
+    }
     while (has(key))
         key = key.replace(/\d*$/, (m) => String(m === '' ? start : +m + 1));
     return key;

package/out/utils/string.js.map

@@ -1 +1 @@
-{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAAnG,QAAA,WAAW,eAAwF;AAEhH;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAA3H,QAAA,WAAW,eAAgH;AACxI;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AAA3F,QAAA,cAAc,kBAA6E;AACxG;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AAA3F,QAAA,cAAc,kBAA6E;AAExG;;;;GAIG;AACH,SAAgB,MAAM,CAAC,GAAW,EAAE,GAAgF,EAAE,QAAgB,CAAC;IACnI,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE;QACzB,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;YACxC,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACpB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;YACvB,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;;YAE1B,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,OAAO,GAAG,CAAC,GAAG,CAAC;QACX,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,GAAG,CAAC;AACf,CAAC;AAbD,wBAaC;AAEM,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;IAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB;AAEF;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,QAAgB,EAAE,EAAE,EAAE;IAC/E,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,sBAAsB,GAAG,GAAG,CAAC,CAAC;IACvF,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}
+{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/automate/engine/index.js

@@ -2,6 +2,10 @@ import { uniq, omit } from 'lodash';
 import { BaseNode } from '../../common/BaseNode';
 import { tracking, TRACK_TYPE, IGNORE_PROPERTY } from './utils';
 import { getConceptConstructor, getConceptMeta } from '../../decorators/index';
+// import { unique, firstUpperCase } from '../../utils/string';
+import uniqueNameModule from './uniqueName';
+import operatorModule from './operators';
+
 let id = 0;
 class TemplateMeta {
     constructor(node) {
@@ -168,7 +172,7 @@ class TemplateMeta {
         // return `_set(${this.name}, "name", getGenUniqNameFunctionName(${this.name}, "${this.node.concept}"));`;
         // _setTableName(${this.name}, ${this.name}.name + '_' + app.id.slice(0,6));`;
         // }
-        return `_set(${this.name}, "name", getGenUniqNameFunctionName(${this.name}, "${this.node.concept}", app),  (updatedObj) => { ${this.name} = updatedObj; })`;
+        return `_set(${this.name}, "name", _uniqueName.getGenUniqNameFunctionName(${this.name}, "${this.node.concept}", app),  (updatedObj) => { ${this.name} = updatedObj; })`;
     }
 
     genRoleBind() {
@@ -245,126 +249,7 @@ function autoScript(stack) {
 
     return `
 (function () {
-    function unique(key, set, start = 1) {
-        const has = (_key) => {
-            if (set instanceof Set || set instanceof Map)
-                return set.has(_key);
-            else if (Array.isArray(set))
-                return set.includes(_key);
-            else
-                return set[_key];
-        };
-    
-        while (has(key))
-            key = key.replace(/\\d*$/, (m) => String(m === '' ? start : (+m) + 1));
-        return key;
-    }
-
-    function alphaUpper(name) {
-        if (!name) {
-            return '';
-        }
-        return name[0].toUpperCase() + name.substring(1);
-    }
-
-    const NamesWeakMap = new Map();
-
-    function initAppUniqueNames(app) {
-        NamesWeakMap.set('Entity', new Set(app.getEntityExistingNames()));
-        NamesWeakMap.set('Structure', new Set(app.getStructureExistingNames()));
-        NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
-        NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));
-        NamesWeakMap.set('Interface', new Set(app.getInterfaceExistingNames()));
-        NamesWeakMap.set('View', new Set(app.getViewExistingNames()));
-        NamesWeakMap.set('Process', new Set(app.getProcessExistingNames()));
-        NamesWeakMap.set('Role', new Set(app.getRoleExistingNames()));
-    }
-
-    function getGenUniqNameFunctionName(item, concept, app) {
-        const p = item.parentNode;
-        if(!p) {
-            const nameSet = NamesWeakMap.get(concept);
-            const n = unique(item.name, nameSet);
-            nameSet.add(n);
-            return n;
-        }
-        const f1 = p["get" + concept + "UniqueName"];
-        const f2 = p["get" + concept + "ExistingNames"]
-        if(f1 && f2) {
-            const names = f2.call(p);
-            const t = names.filter(n => n === item.name);
-            if(t.length > 1) {     
-                return f1.call(p, item.name);
-            }
-        }
-        return item.name;
-    }
-
-    let BaseNodeConstructor;
-    let getConceptConstructor;
-    let getConceptMeta;
-
-    function instanceOfBaseNode(item) {
-        return (item instanceof BaseNodeConstructor);
-    }
-
-    function _set(item, propertyName, value, callback) {
-        if(instanceOfBaseNode(value)) {
-            value.parentNode = item;
-            value.parentKey = propertyName;
-        }
-        if(item[propertyName] !== value) {
-            item.update({
-                [propertyName]: value,
-            });
-            
-            if(instanceOfBaseNode(value) && callback) {
-                callback(item[propertyName]);
-            }
-        }
-    }
-
-    function _push(item, propertyName, value) {
-        if(!item[propertyName]){
-            item[propertyName] = [];
-        }
-        value.parentNode = item;
-        value.parentKey = propertyName;
-        item[propertyName].push(value);
-        const index = item[propertyName].length;
-        value.create({
-            index,
-            parentNode: item,
-            parentKey: propertyName,
-        });
-    }
-
-    function _create(concept) {
-        const _ctor = getConceptConstructor(concept);
-        const item = new _ctor();
-        const { propertyMap } = getConceptMeta(concept);
-        for(const p of propertyMap) {
-            const [propertyName] = p;
-            const t = item[propertyName];
-            if(Array.isArray(t)) {
-                _set(item, propertyName, []);
-            }
-        }
-        return item;
-    }
-
-    function _addModule(app, name, belongs, data) {
-        const ms = app[belongs];
-        const exist = ms.find(m => m.name === name);
-        if(!exist) {
-            app["addModuleIn" + alphaUpper(belongs)](data);
-        }
-    }
-    
-    function _bindRoles(){ 
-        return Array.prototype.map.call(arguments, r => r.name); 
-    }
-    // let _tempConstructor;
+    const injectModule = {};
     
     const exportRoles = function() {
         return ${JSON.stringify(roleNASL)};
@@ -372,11 +257,17 @@ function autoScript(stack) {
 
     const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback, finalCallback) {
         let _templateObjects = [];
-        BaseNodeConstructor = base;
-        getConceptConstructor = getCtor;
-        getConceptMeta = getCMeta;
+        const {
+            _set,
+            _push,
+            _create,
+            _addModule,
+            _bindRoles 
+        } = injectModule.operators;
 
-        initAppUniqueNames(app);
+        const _uniqueName = new injectModule.uniqueName();
+
+        _uniqueName.initAppUniqueNames(app);
 
         app.emit('collect:start', {
             actionMsg: '导入页面模板'
@@ -420,7 +311,10 @@ function autoScript(stack) {
 
     return {
         execTemplate,
-        exportRoles
+        exportRoles,
+        importModule(key, m) {
+            injectModule[key] = m;
+        },
     }
 })();`;
 }
@@ -527,6 +421,11 @@ export function getRoles(script) {
     return exportRoles();
 }
 export function applyTemplate(script, app, rootBindCallback, roleCallback, finalCallback) {
-    const { execTemplate } = eval(script);
+    const { execTemplate, importModule } = eval(script);
+    // 为了兼容 2.11 老模板
+    if(importModule) {
+        importModule('operators', operatorModule);
+        importModule('uniqueName', uniqueNameModule);
+    }
     execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
 }

package/src/automate/engine/operators.js

@@ -0,0 +1,63 @@
+import { BaseNode } from '../../common/BaseNode';
+import { getConceptConstructor, getConceptMeta } from '../../decorators/index';
+import { firstUpperCase } from '../../utils/string';
+
+function instanceOfBaseNode(item) {
+    return (item instanceof BaseNode);
+}
+const ops = {
+    _set(item, propertyName, value, callback) {
+        if(instanceOfBaseNode(value)) {
+            value.parentNode = item;
+            value.parentKey = propertyName;
+        }
+        if(item[propertyName] !== value) {
+            item.update({
+                [propertyName]: value,
+            });
+            
+            if(instanceOfBaseNode(value) && callback) {
+                callback(item[propertyName]);
+            }
+        }
+    },
+    _push(item, propertyName, value) {
+        if(!item[propertyName]){
+            item[propertyName] = [];
+        }
+        value.parentNode = item;
+        value.parentKey = propertyName;
+        item[propertyName].push(value);
+        const index = item[propertyName].length;
+        value.create({
+            index,
+            parentNode: item,
+            parentKey: propertyName,
+        });
+    },
+    _create(concept) {
+        const _ctor = getConceptConstructor(concept);
+        const item = new _ctor();
+        const { propertyMap } = getConceptMeta(concept);
+        for(const p of propertyMap) {
+            const [propertyName] = p;
+            const t = item[propertyName];
+            if(Array.isArray(t)) {
+                ops._set(item, propertyName, []);
+            }
+        }
+        return item;
+    },
+    _addModule(app, name, belongs, data) {
+        const ms = app[belongs];
+        const exist = ms.find(m => m.name === name);
+        if(!exist) {
+            app["addModuleIn" + firstUpperCase(belongs)](data);
+        }
+    },
+    _bindRoles(){ 
+        return Array.prototype.map.call(arguments, r => r.name); 
+    }
+}
+
+export default ops;

package/src/automate/engine/uniqueName.js

@@ -0,0 +1,36 @@
+import { unique } from '../../utils/string';
+class uniqueName {
+    NamesWeakMap = new Map();
+    initAppUniqueNames(app) {
+        const NamesWeakMap = this.NamesWeakMap;
+        NamesWeakMap.set('Entity', new Set(app.getEntityExistingNames()));
+        NamesWeakMap.set('Structure', new Set(app.getStructureExistingNames()));
+        NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
+        NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));
+        NamesWeakMap.set('Interface', new Set(app.getInterfaceExistingNames()));
+        NamesWeakMap.set('View', new Set(app.getViewExistingNames()));
+        NamesWeakMap.set('Process', new Set(app.getProcessExistingNames()));
+        NamesWeakMap.set('Role', new Set(app.getRoleExistingNames()));
+    }
+    getGenUniqNameFunctionName(item, concept) {
+        const p = item.parentNode;
+        const NamesWeakMap = this.NamesWeakMap;
+        if(!p) {
+            const nameSet = NamesWeakMap.get(concept);
+            const n = unique(item.name, nameSet, 1, true);
+            nameSet.add(n);
+            return n;
+        }
+        const f1 = p["get" + concept + "UniqueName"];
+        const f2 = p["get" + concept + "ExistingNames"]
+        if(f1 && f2) {
+            const names = f2.call(p);
+            const t = names.filter(n => n === item.name);
+            if(t.length > 1) {     
+                return f1.call(p, item.name);
+            }
+        }
+        return item.name;
+    }
+}
+export default uniqueName;

package/src/concepts/App__.ts

@@ -242,7 +242,7 @@ export class App extends BaseNode {
         return (this.entities || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEntityUniqueName(name = 'Entity1') {
-        return utils.unique(name, this.getEntityExistingNames());
+        return utils.unique(name, this.getEntityExistingNames(), undefined, true);
     }
 
     /**
@@ -384,7 +384,7 @@ export class App extends BaseNode {
         return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getStructureUniqueName(name = 'Structure1') {
-        return utils.unique(name, this.getStructureExistingNames());
+        return utils.unique(name, this.getStructureExistingNames(), undefined, true);
     }
 
     /**
@@ -526,7 +526,7 @@ export class App extends BaseNode {
         return (this.enums || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEnumUniqueName(name = 'Enum1') {
-        return utils.unique(name, this.getEnumExistingNames());
+        return utils.unique(name, this.getEnumExistingNames(), undefined, true);
     }
 
     /**
@@ -668,7 +668,7 @@ export class App extends BaseNode {
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getLogicUniqueName(name = 'logic1') {
-        return utils.unique(name, this.getLogicExistingNames());
+        return utils.unique(name, this.getLogicExistingNames(), undefined, true);
     }
 
     /**
@@ -810,7 +810,7 @@ export class App extends BaseNode {
         return (this.interfaces || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getInterfaceUniqueName(name = 'Interface1') {
-        return utils.unique(name, this.getInterfaceExistingNames());
+        return utils.unique(name, this.getInterfaceExistingNames(), undefined, true);
     }
 
     /**
@@ -952,7 +952,7 @@ export class App extends BaseNode {
         return (this.views || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewUniqueName(name = 'view1') {
-        return utils.unique(name, this.getViewExistingNames());
+        return utils.unique(name, this.getViewExistingNames(), undefined, true);
     }
 
     /**
@@ -1094,7 +1094,7 @@ export class App extends BaseNode {
         return (this.processes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getProcessUniqueName(name = 'Process1') {
-        return utils.unique(name, this.getProcessExistingNames());
+        return utils.unique(name, this.getProcessExistingNames(), undefined, true);
     }
 
     /**
@@ -1236,7 +1236,7 @@ export class App extends BaseNode {
         return (this.roles || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getRoleUniqueName(name = 'role1') {
-        return utils.unique(name, this.getRoleExistingNames());
+        return utils.unique(name, this.getRoleExistingNames(), undefined, true);
     }
 
     /**
@@ -1378,7 +1378,7 @@ export class App extends BaseNode {
         return (this.dependencies || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getModuleUniqueName(name = 'module1') {
-        return utils.unique(name, this.getModuleExistingNames());
+        return utils.unique(name, this.getModuleExistingNames(), undefined, false);
     }
 
     /**

package/src/concepts/Assignee__.ts

@@ -71,7 +71,7 @@ export class Assignee extends LogicItem {
         return (this.dynamicUsers || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getLogicItemUniqueName(name = 'logicItem1') {
-        return utils.unique(name, this.getLogicItemExistingNames());
+        return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
     }
 
     /**

package/src/concepts/BindAttribute__.ts

@@ -223,7 +223,7 @@ export class BindAttribute extends BaseNode {
         return (this.rules || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getValidationRuleUniqueName(name = 'validationRule1') {
-        return utils.unique(name, this.getValidationRuleExistingNames());
+        return utils.unique(name, this.getValidationRuleExistingNames(), undefined, false);
     }
 
     /**

package/src/concepts/BindDirective__.ts

@@ -218,7 +218,7 @@ export class BindDirective extends BaseNode {
         if (this.expression) {
             value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {
-                value = `'${value}'`;
+                value = `${value}`;
             }
             value = value?.replace(/"/g, "'");
         }

package/src/concepts/CallFunction__.ts

@@ -380,6 +380,14 @@ export class CallFunction extends LogicItem {
             if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
+        if (this.typeArguments && this.typeArguments.length) {
+            code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.toJS();
+                if (index !== this.arguments?.length - 1)
+                    code += ', ';
+            });
+        }
         code += ')';
         return code;
     }
@@ -392,6 +400,14 @@ export class CallFunction extends LogicItem {
             if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
+        if (this.typeArguments && this.typeArguments.length) {
+            code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.typeName;
+                if (index !== this.arguments?.length - 1)
+                    code += ', ';
+            });
+        }
         code += ')';
         return code;
     }

package/src/concepts/CallLogic__.ts

@@ -66,6 +66,8 @@ export class CallLogic extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -79,6 +81,13 @@ export class CallLogic extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -111,6 +120,8 @@ export class CallLogic extends LogicItem {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -133,6 +144,8 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -152,6 +165,8 @@ export class CallLogic extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -175,6 +190,11 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -207,6 +227,8 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -229,6 +251,8 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -248,6 +272,8 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -271,6 +297,9 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -278,7 +307,7 @@ export class CallLogic extends LogicItem {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -305,6 +334,8 @@ export class CallLogic extends LogicItem {
         return params;
     }
 
+
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -312,7 +343,7 @@ export class CallLogic extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
@@ -705,7 +736,7 @@ export class CallLogic extends LogicItem {
     //================================================================================
 }
 
-classMap.CallLogic = CallLogic;
+classMap['CallLogic'] = CallLogic;
 export default CallLogic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallQueryComponent__.ts

@@ -208,7 +208,7 @@ export class CallQueryComponent extends LogicItem {
         return (this.groupBy || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getQueryGroupByExpressionUniqueName(name = 'queryGroupByExpression1') {
-        return utils.unique(name, this.getQueryGroupByExpressionExistingNames());
+        return utils.unique(name, this.getQueryGroupByExpressionExistingNames(), undefined, false);
     }
 
     /**

package/src/concepts/ConfigGroup__.ts

@@ -84,7 +84,7 @@ export class ConfigGroup extends BaseNode {
         return (this.properties || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getConfigPropertyUniqueName(name = 'configProperty1') {
-        return utils.unique(name, this.getConfigPropertyExistingNames());
+        return utils.unique(name, this.getConfigPropertyExistingNames(), undefined, false);
     }
 
     /**

package/src/concepts/ConfigProperty__.ts

@@ -90,7 +90,7 @@ export class ConfigProperty extends BaseNode {
         return (this.values || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getConfigPropertyValueUniqueName(name = 'configPropertyValue1') {
-        return utils.unique(name, this.getConfigPropertyValueExistingNames());
+        return utils.unique(name, this.getConfigPropertyValueExistingNames(), undefined, false);
     }
 
     /**

package/src/concepts/Configuration__.ts

@@ -68,7 +68,7 @@ export class Configuration extends BaseNode {
         return (this.groups || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getConfigGroupUniqueName(name = 'configGroup1') {
-        return utils.unique(name, this.getConfigGroupExistingNames());
+        return utils.unique(name, this.getConfigGroupExistingNames(), undefined, false);
     }
 
     /**