@lcap/nasl 1.0.0-alpha.9 → 1.0.2

package/out/concepts/QueryFromExpression__.js

@@ -67,7 +67,7 @@ let QueryFromExpression = QueryFromExpression_1 = class QueryFromExpression exte
         const relationOptions = { parentNode: this, parentKey: 'joinParts' };
         let queryJoinExpression;
         if (options instanceof QueryJoinExpression__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             queryJoinExpression = options;
             Object.assign(queryJoinExpression, relationOptions);
         }
@@ -95,7 +95,7 @@ let QueryFromExpression = QueryFromExpression_1 = class QueryFromExpression exte
     }
     addJoinPart(options) {
         const node = this._addJoinPart(options);
-        const index = this.joinParts.length;
+        const index = this.joinParts.indexOf(node);
         node.create({
             index,
             parentNode: this,

package/out/concepts/QueryFromExpression__.js.map

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

package/out/concepts/QueryGroupByExpression__.d.ts

@@ -38,5 +38,8 @@ export declare class QueryGroupByExpression extends LogicItem {
             concept: string;
         };
     };
+    setEntityAsName(name: string): void;
+    setPropertyName(name: string): void;
+    toEmbeddedTS(): string;
 }
 export default QueryGroupByExpression;

package/out/concepts/QueryGroupByExpression__.js

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var QueryGroupByExpression_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryGroupByExpression = void 0;
+const translator_1 = require("../translator");
 const decorators_1 = require("../decorators");
 const classMap_1 = __importDefault(require("../common/classMap"));
 const LogicItem__1 = __importDefault(require("./LogicItem__"));
@@ -99,6 +100,22 @@ let QueryGroupByExpression = QueryGroupByExpression_1 = class QueryGroupByExpres
             },
         };
     }
+    setEntityAsName(name) {
+        this.groupElement.setEntityAsName(name);
+    }
+    setPropertyName(name) {
+        this.groupElement.setPropertyName(name);
+    }
+    toEmbeddedTS() {
+        // 判断老应用
+        if (this.parentNode.isAutoInfer()) {
+            // 2.11版本后 分组使用别名
+            return `__${this.groupElement.asName || 'EMPTY_GROUP_BY_ALIAS__'}`;
+        }
+        else {
+            return this.groupElement.toEmbeddedTS();
+        }
+    }
 };
 __decorate([
     (0, decorators_1.property)()
@@ -106,6 +123,9 @@ __decorate([
 __decorate([
     (0, decorators_1.property)('LogicItem')
 ], QueryGroupByExpression.prototype, "groupElement", void 0);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], QueryGroupByExpression.prototype, "toEmbeddedTS", null);
 QueryGroupByExpression = QueryGroupByExpression_1 = __decorate([
     (0, decorators_1.concept)('查询分组')
 ], QueryGroupByExpression);

package/out/concepts/QueryGroupByExpression__.js.map

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

package/out/concepts/QueryJoinExpression__.js

@@ -99,7 +99,7 @@ let QueryJoinExpression = QueryJoinExpression_1 = class QueryJoinExpression exte
         return (this.onExpressions || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getBinaryExpressionUniqueName(name = 'binaryExpression1') {
-        return utils.unique(name, this.getBinaryExpressionExistingNames());
+        return utils.unique(name, this.getBinaryExpressionExistingNames(), undefined, false);
     }
     _insertBinaryExpressionInOnExpressionsAt(options, index) {
         const binaryExpressionOptions = {};
@@ -118,7 +118,7 @@ let QueryJoinExpression = QueryJoinExpression_1 = class QueryJoinExpression exte
             }, this, 'onExpressions');
         }
         else if (options instanceof BinaryExpression__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             binaryExpression = options;
             Object.assign(binaryExpression, relationOptions);
         }
@@ -146,7 +146,7 @@ let QueryJoinExpression = QueryJoinExpression_1 = class QueryJoinExpression exte
     }
     addBinaryExpressionInOnExpressions(options) {
         const node = this._addBinaryExpressionInOnExpressions(options);
-        const index = this.onExpressions.length;
+        const index = this.onExpressions.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -159,7 +159,7 @@ let QueryJoinExpression = QueryJoinExpression_1 = class QueryJoinExpression exte
         const relationOptions = { parentNode: this, parentKey: 'joinParts' };
         let queryJoinExpression;
         if (options instanceof QueryJoinExpression_1) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             queryJoinExpression = options;
             Object.assign(queryJoinExpression, relationOptions);
         }
@@ -187,7 +187,7 @@ let QueryJoinExpression = QueryJoinExpression_1 = class QueryJoinExpression exte
     }
     addJoinPartInJoinParts(options) {
         const node = this._addJoinPartInJoinParts(options);
-        const index = this.joinParts.length;
+        const index = this.joinParts.indexOf(node);
         node.create({
             index,
             parentNode: this,

package/out/concepts/QueryJoinExpression__.js.map

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

package/out/concepts/QueryLimitExpression__.js

@@ -125,8 +125,8 @@ let QueryLimitExpression = QueryLimitExpression_1 = class QueryLimitExpression e
     //================================================================================
     toEmbeddedTS(state) {
         const { pageElement, pageSizeElement } = this;
-        let code = '';
-        code += `[${pageElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}, `;
+        let code = '[';
+        code += `${pageElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}, `;
         code += `${pageSizeElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}]`;
         return code;
     }

package/out/concepts/QueryLimitExpression__.js.map

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

package/out/concepts/QuerySelectExpression__.js

@@ -86,7 +86,7 @@ let QuerySelectExpression = QuerySelectExpression_1 = class QuerySelectExpressio
         return (this.selectElements || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getQueryAggregateExpressionUniqueName(name = 'queryAggregateExpression1') {
-        return utils.unique(name, this.getQueryAggregateExpressionExistingNames());
+        return utils.unique(name, this.getQueryAggregateExpressionExistingNames(), undefined, false);
     }
     _insertQueryAggregateExpressionAt(options, index) {
         const queryAggregateExpressionOptions = {};
@@ -105,7 +105,7 @@ let QuerySelectExpression = QuerySelectExpression_1 = class QuerySelectExpressio
             }, this, 'selectElements');
         }
         else if (options instanceof QueryAggregateExpression__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             queryAggregateExpression = options;
             Object.assign(queryAggregateExpression, relationOptions);
         }
@@ -133,7 +133,7 @@ let QuerySelectExpression = QuerySelectExpression_1 = class QuerySelectExpressio
     }
     addQueryAggregateExpression(options) {
         const node = this._addQueryAggregateExpression(options);
-        const index = this.selectElements.length;
+        const index = this.selectElements.indexOf(node);
         node.create({
             index,
             parentNode: this,

package/out/concepts/QuerySelectExpression__.js.map

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

package/out/concepts/Return__.d.ts

@@ -101,6 +101,7 @@ export declare class Return extends BaseNode {
     completionChildren: Array<EntityProperty | StructureProperty>;
     toJS(state?: TranslatorState): string;
     toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTSInProcess(state?: TranslatorState): string;
     /**
      * 设置数据类型
      * @param typeAnnotation 类型标注对象
@@ -123,6 +124,8 @@ export declare class Return extends BaseNode {
      * 是否可编辑
      * */
     get readonly(): boolean;
-    getSelectRef(): EntityProperty[] | StructureProperty[];
+    get hasChildren(): {}[];
+    get isTreeLeaf(): boolean;
+    getSelectRef(newTypeAnnotation: TypeAnnotation): any;
 }
 export default Return;

package/out/concepts/Return__.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Return = void 0;
 const types_1 = require("./basics/types");
 const translator_1 = require("../translator");
+const utils_1 = require("../automate/engine/utils");
 const decorators_1 = require("../decorators");
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 const classMap_1 = __importDefault(require("../common/classMap"));
@@ -182,14 +183,25 @@ let Return = Return_1 = class Return extends BaseNode_1.default {
         return `${this.name} = ${scope}.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, ${JSON.stringify(this.defaultValue)})`;
     }
     toEmbeddedTS(state) {
-        let code = this.name;
+        let code = this.name || '__return';
         if (this.typeAnnotation) {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
         }
-        if (this.defaultValue) {
-            code += ` = ${this.defaultValue}`;
+        // if (this.defaultValue) {
+        //     code += ` = ${this.defaultValue}`;
+        // }
+        return code;
+    }
+    toEmbeddedTSInProcess(state) {
+        let code = this.name;
+        if (this.typeAnnotation) {
+            code += ': undefined as ';
+            code += this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
         }
+        // if (this.defaultValue) {
+        //     code += `: ${this.defaultValue}`;
+        // }
         return code;
     }
     async setDataType(typeAnnotation) {
@@ -203,14 +215,20 @@ let Return = Return_1 = class Return extends BaseNode_1.default {
                 throw new Error('找不到类型：' + typeAnnotation);
         }
         else {
-            typeAnnotation._delete();
+            typeAnnotation._delete?.();
             const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
             Object.assign(typeAnnotation, relationOptions);
         }
+        // 处理下拉属性
+        try {
+            this.completionChildren = this.getSelectRef(typeAnnotation);
+        }
+        catch (err) {
+            this.completionChildren = [];
+            console.log(err);
+        }
         const object = {
             typeAnnotation,
-            // 处理下拉属性
-            // completionChildren: this.getSelectRef(),
         };
         return this.update({
             ...object,
@@ -232,27 +250,57 @@ let Return = Return_1 = class Return extends BaseNode_1.default {
     get readonly() {
         return !!this.module;
     }
-    getSelectRef() {
-        const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
-        let completionChildren;
-        if (typeKind === 'reference') {
-            let type;
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
+    get hasChildren() {
+        const { typeKind, typeNamespace } = this.typeAnnotation;
+        if (typeKind === 'reference' || typeKind === 'generic') {
+            if (typeNamespace.endsWith('.enums'))
+                return null;
+            return [{}];
+        }
+        return null;
+    }
+    get isTreeLeaf() {
+        return !this.hasChildren;
+    }
+    getSelectRef(newTypeAnnotation) {
+        try {
+            const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
+            let completionChildren;
+            if (typeKind === 'reference') {
+                if (typeNamespace === 'nasl.ui') {
+                    const node = (0, utils_1.getNaslNodeByNodeCallee)(typeNamespace, typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                }
+                else if (typeNamespace.endsWith('.enums')) {
+                    completionChildren = undefined;
+                }
+                else {
+                    const node = (0, utils_1.getNodeByNodeCallee)(this.app, typeNamespace + '.' + typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                }
+            }
+            else if (typeKind === 'generic') {
+                const node = (0, utils_1.getNaslNodeByNodeCallee)(typeNamespace, typeName);
+                const properties = node.properties || [];
+                for (let i = 0; i < properties.length; i++) {
+                    const item = properties[i];
+                    if (item?.typeAnnotation?.typeKind === 'typeParam') {
+                        properties[i].typeAnnotation = this?.typeAnnotation?.typeArguments[0];
+                        properties[i].parentNode = this;
+                    }
+                }
+                completionChildren = properties;
             }
-            else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
+            else {
+                completionChildren = undefined;
             }
-            const data = this.app.dependencies.find((item) => item.name === moduleNames[2]);
-            const properties = data[type].find((item) => item.name === typeName)?.properties;
-            completionChildren = properties;
+            return completionChildren;
         }
-        else {
-            completionChildren = undefined;
+        catch (err) {
+            console.log(err);
         }
-        return completionChildren;
     }
 };
 __decorate([
@@ -276,6 +324,9 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], Return.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], Return.prototype, "toEmbeddedTSInProcess", null);
 Return = Return_1 = __decorate([
     (0, decorators_1.concept)('输出参数')
 ], Return);

package/out/concepts/Return__.js.map

@@ -1 +1 @@
-{"version":3,"file":"Return__.js","sourceRoot":"","sources":["../../src/concepts/Return__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Return__.js","sourceRoot":"","sources":["../../src/concepts/Return__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,0CAA8C;AAC9C,8CAA2E;AAM3E,oDAAwF;AAOxF,8CAAkE;AAIlE,kEAA0C;AAC1C,kEAA0C;AAS1C;;GAEG;AAEH,IAAa,MAAM,cAAnB,MAAa,MAAO,SAAQ,kBAAQ;IAChC;;OAEG;IAEH,OAAO,GAAa,QAAQ,CAAC;IAE7B;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,WAAW,GAAW,SAAS,CAAC;IAEhC;;OAEG;IAEH,cAAc,GAAmB,SAAS,CAAC;IAE3C;;OAEG;IAEH,YAAY,GAAW,SAAS,CAAC;IAEjC;;OAEG;IACH,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAU,CAAC;IAC9C,CAAC;IACD;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAW,CAAC;IAChD,CAAC;IACD;;OAEG;IACH,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAQ,CAAC;IAC1C,CAAC;IACD;;OAEG;IACH,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAS,CAAC;IAC5C,CAAC;IACD;;OAEG;IACH,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAmB,CAAC;IAChE,CAAC;IACD;;OAEG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAY,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,YAAY,MAAwB;QAChC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAM,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC/D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAW,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC;SAC7D;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IACD;;OAEG;IACH,OAAO,CAAC,IAAY;QAChB,MAAM,MAAM,GAAG;YACX,IAAI;SACP,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;YACT,KAAK,EAAE,MAAM;SAChB,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,WAAmB;QAC9B,MAAM,MAAM,GAAG;YACX,WAAW;SACd,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,eAAe,CAAC,YAAoB;QAChC,MAAM,MAAM,GAAG;YACX,YAAY;SACf,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAkBD,oBAAoB,CAAC,OAAgC;QACjD,IAAI,cAA8B,CAAC;QACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;YACrC,IAAI,CAAC,cAAc,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,cAAc,GAAG,OAAO,CAAC;SAC5B;QACD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,sBAAsB,CAAC,cAA8B;QACjD,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;QAC3C,MAAM,MAAM,GAAW;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,cAAc;SAC5B,CAAC;QACF,IAAI,SAAS,EAAE;YACX,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC/D,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACxB;iBAAM,IAAK,IAAY,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE;gBACpD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACxC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAGlF,YAAY,GAGR,SAAS,CAAC;IAEd;;OAEG;IACH,kBAAkB,GAA8C,SAAS,CAAC;IAE1E,IAAI,CAAC,KAAuB;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC;QACnD,OAAO,GAAG,IAAI,CAAC,IAAI,MAAM,KAAK,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;IACtI,CAAC;IAGD,YAAY,CAAC,KAAuB;QAChC,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC;QACnC,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,IAAI,IAAI,CAAC;YACb,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;SACrE;QACD,2BAA2B;QAC3B,yCAAyC;QACzC,IAAI;QACJ,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,qBAAqB,CAAC,KAAuB;QACzC,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,IAAI,iBAAiB,CAAC;YAC1B,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;SACrE;QACD,2BAA2B;QAC3B,wCAAwC;QACxC,IAAI;QACJ,OAAO,IAAI,CAAC;IAChB,CAAC;IAYD,KAAK,CAAC,WAAW,CAAC,cAAuC;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG;YACd,cAAc,EAAE,IAAI,CAAC,cAAc;SACtC,CAAC;QACF,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACpC,cAAc,GAAG,oBAAY,CAAC,cAAc,CAAC,CAAC;YAC9C,IAAI,CAAC,cAAc;gBACf,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,cAAc,CAAC,CAAC;SAClD;aAAM;YACH,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3B,MAAM,eAAe,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC7F,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;SAClD;QACD,SAAS;QACT,IAAI;YACA,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;SAC/D;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,MAAM,GAAG;YACX,cAAc;SACjB,CAAC;QAEF,OAAO,IAAI,CAAC,MAAM,CAAC;YACf,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC3B,OAAO;YACH,cAAc,EAAE;gBACZ,OAAO,EAAE,gBAAgB;gBACzB,QAAQ,EAAE,WAAW;gBACrB,aAAa,EAAE,WAAW;gBAC1B,QAAQ,EAAE,QAAQ;aACrB;SACJ,CAAC;IACN,CAAC;IAED;;SAEK;IACL,IAAI,QAAQ;QACR,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACzB,CAAC;IACD,IAAI,WAAW;QACX,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC;QACxD,IAAI,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,SAAS,EAAE;YACpD,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAChC,OAAO,IAAI,CAAC;YAChB,OAAO,CAAC,EAAE,CAAC,CAAC;SACf;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,UAAU;QACV,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;IAC7B,CAAC;IACD,YAAY,CAAC,iBAAiC;QAC1C,IAAI;YACA,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,iBAAiB,IAAI,IAAI,CAAC,cAAc,CAAC;YACvF,IAAI,kBAAkB,CAAC;YACvB,IAAI,QAAQ,KAAK,WAAW,EAAE;gBAC1B,IAAI,aAAa,KAAK,SAAS,EAAE;oBAC7B,MAAM,IAAI,GAAG,IAAA,+BAAuB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;oBAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;oBACzC,kBAAkB,GAAG,UAAU,CAAC;iBACnC;qBAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACzC,kBAAkB,GAAG,SAAS,CAAC;iBAClC;qBAAM;oBACH,MAAM,IAAI,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,GAAG,EAAE,aAAa,GAAG,GAAG,GAAG,QAAQ,CAAC,CAAC;oBAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;oBACzC,kBAAkB,GAAG,UAAU,CAAC;iBACnC;aACJ;iBAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC/B,MAAM,IAAI,GAAG,IAAA,+BAAuB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;gBAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;gBACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACxC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBAC3B,IAAI,IAAI,EAAE,cAAc,EAAE,QAAQ,KAAK,WAAW,EAAE;wBAChD,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;wBACtE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;qBACnC;iBACJ;gBACD,kBAAkB,GAAG,UAAU,CAAC;aACnC;iBAAM;gBACH,kBAAkB,GAAG,SAAS,CAAC;aAClC;YACD,OAAO,kBAAkB,CAAC;SAC7B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACpB;IACL,CAAC;CAKJ,CAAA;AA3UG;IADC,IAAA,qBAAQ,GAAE;uCACkB;AAM7B;IADC,IAAA,qBAAQ,GAAE;oCACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;2CACqB;AAMhC;IADC,IAAA,qBAAQ,EAAC,gBAAgB,CAAC;8CACgB;AAM3C;IADC,IAAA,qBAAQ,GAAE;4CACsB;AA8JjC;IADC,IAAA,2BAAc,GAAE;4CAIH;AAad;IADC,IAAA,0BAAa,GAAE;0CAWf;AAGD;IADC,IAAA,0BAAa,GAAE;mDAWf;AAlOQ,MAAM;IADlB,IAAA,oBAAO,EAAC,MAAM,CAAC;GACH,MAAM,CAgVlB;AAhVY,wBAAM;AAkVnB,kBAAQ,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;AAC5B,kBAAe,MAAM,CAAC;AACtB,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/Role__.d.ts

@@ -18,6 +18,10 @@ export declare class Role extends BaseNode {
      * 唯一标识
      */
     uuid: string;
+    /**
+     * 创建时间
+     */
+    createdTime: string;
     /**
      * 角色描述
      */

package/out/concepts/Role__.js

@@ -32,6 +32,10 @@ let Role = Role_1 = class Role extends BaseNode_1.default {
      * 唯一标识
      */
     uuid = (0, uuid_1.v4)().replace(/-/g, '');
+    /**
+     * 创建时间
+     */
+    createdTime = undefined;
     /**
      * 角色描述
      */
@@ -88,9 +92,6 @@ let Role = Role_1 = class Role extends BaseNode_1.default {
     }
     get tsName() {
         let tsName = this.name;
-        if (/^\d/.test(tsName)) {
-            tsName = '$' + tsName;
-        }
         // 匹配所有特殊字符都转为_
         tsName = tsName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '_');
         return tsName;
@@ -111,7 +112,12 @@ let Role = Role_1 = class Role extends BaseNode_1.default {
     toEmbeddedTSFile() {
         let code = `namespace ${this.getNamespace()} {\n`;
         const state = (0, translator_1.createCompilerState)(code, { tabSize: 1 });
-        code += this.toEmbeddedTS(state);
+        try {
+            code += this.toEmbeddedTS(state);
+        }
+        catch (err) {
+            code += '';
+        }
         code += '}\n';
         return {
             code,
@@ -129,6 +135,9 @@ __decorate([
 __decorate([
     (0, decorators_1.property)()
 ], Role.prototype, "uuid", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], Role.prototype, "createdTime", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], Role.prototype, "description", void 0);

package/out/concepts/Role__.js.map

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

package/out/concepts/SqlQueryComponent__.js

@@ -98,8 +98,8 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
     toEmbeddedTS(state) {
-        let code = `(function(): nasl.collection.PageOf<`;
-        code += `${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code)) : 'unknown'}> {\n`;
+        let code = `(function(): nasl.collection.List<`;
+        code += `${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code)) : '__IDENTIFIER__'}> {\n`;
         code += '\n';
         code += (0, translator_1.indent)(state.tabSize + 1) + 'return;\n';
         code += (0, translator_1.indent)(state.tabSize) + '})();\n';

package/out/concepts/SqlQueryComponent__.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlQueryComponent__.js","sourceRoot":"","sources":["../../src/concepts/SqlQueryComponent__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqlQueryComponent__.js","sourceRoot":"","sources":["../../src/concepts/SqlQueryComponent__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAAmF;AAMnF,8CAAkE;AAKlE,kEAA0C;AAE1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,iBAAiB,yBAA9B,MAAa,iBAAkB,SAAQ,oBAAS;IAC5C;;OAEG;IAEH,OAAO,GAAwB,mBAAmB,CAAC;IAEnD;;OAEG;IAEH,KAAK,GAAW,QAAQ,CAAC;IAEzB;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,cAAc,GAAmB,SAAS,CAAC;IAI3C;;OAEG;IACH,YAAY,MAAmC;QAC3C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,mBAAiB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC1E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAsB,CAAC;IAC1E,CAAC;IAGD;;OAEG;IACH,OAAO,CAAC,IAAY;QAChB,MAAM,MAAM,GAAG;YACX,IAAI;SACP,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAkBD,oBAAoB,CAAC,OAAgC;QACjD,IAAI,cAA8B,CAAC;QACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;YACrC,IAAI,CAAC,cAAc,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,cAAc,GAAG,OAAO,CAAC;SAC5B;QACD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,sBAAsB,CAAC,cAA8B;QACjD,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;QAC3C,MAAM,MAAM,GAAW;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,cAAc;SAC5B,CAAC;QACF,IAAI,SAAS,EAAE;YACX,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC/D,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACxB;iBAAM,IAAK,IAAY,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE;gBACpD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACxC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,YAAY,CAAC,KAAuB;QAChC,IAAI,IAAI,GAAG,oCAAoC,CAAA;QAC/C,IAAI,IAAG,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA,CAAC,CAAC,gBAAgB,OAAO,CAAC;QACnH,IAAI,IAAI,IAAI,CAAC;QACb,IAAI,IAAI,IAAA,mBAAM,EAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC;QAChD,IAAI,IAAI,IAAA,mBAAM,EAAC,KAAK,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;QAC1C,OAAO,IAAI,CAAC;IAChB,CAAC;CAKJ,CAAA;AArHG;IADC,IAAA,qBAAQ,GAAE;kDACwC;AAMnD;IADC,IAAA,qBAAQ,GAAE;gDACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;+CACc;AAMzB;IADC,IAAA,qBAAQ,EAAC,gBAAgB,CAAC;yDACgB;AAuF3C;IADC,IAAA,0BAAa,GAAE;qDAQf;AArHQ,iBAAiB;IAD7B,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,iBAAiB,CA0H7B;AA1HY,8CAAiB;AA4H9B,kBAAQ,CAAC,mBAAmB,CAAC,GAAG,iBAAiB,CAAC;AAClD,kBAAe,iBAAiB,CAAC;AACjC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/StringLiteral__.d.ts

@@ -21,7 +21,7 @@ export declare class StringLiteral extends LogicItem {
     toVue(options?: ElementToVueOptions): string;
     toUI(): string;
     toJS(): string;
-    toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState, isRequired?: boolean): string;
     /**
      * 设置数组内容
      */