@lcap/nasl 1.0.0-alpha.8 → 1.0.1

package/out/concepts/TypeAnnotation__.js

@@ -10,7 +10,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var TypeAnnotation_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeAnnotation = exports.PRIMITIVE_TYPE = void 0;
+exports.TypeAnnotation = exports.PRIMITIVE_TITLE = exports.PRIMITIVE_TYPE = void 0;
 const translator_1 = require("../translator");
 var PRIMITIVE_TYPE;
 (function (PRIMITIVE_TYPE) {
@@ -26,6 +26,19 @@ var PRIMITIVE_TYPE;
     PRIMITIVE_TYPE["DateTime"] = "DateTime";
     PRIMITIVE_TYPE["Email"] = "Email";
 })(PRIMITIVE_TYPE = exports.PRIMITIVE_TYPE || (exports.PRIMITIVE_TYPE = {}));
+exports.PRIMITIVE_TITLE = {
+    Boolean: '布尔值',
+    Integer: '整数',
+    Long: '长整数',
+    Double: '小数',
+    String: '字符串',
+    Text: '长文本',
+    Binary: '二进制流',
+    Date: '日期',
+    Time: '时间',
+    DateTime: '日期时间',
+    Email: '电子邮箱',
+};
 const decorators_1 = require("../decorators");
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 const classMap_1 = __importDefault(require("../common/classMap"));
@@ -53,10 +66,6 @@ let TypeAnnotation = TypeAnnotation_1 = class TypeAnnotation extends BaseNode_1.
      * 类型参数
      */
     typeArguments = null;
-    /**
-     * 显示文本
-     */
-    text = undefined;
     /**
      * 是否是推断出来的
      */
@@ -77,7 +86,7 @@ let TypeAnnotation = TypeAnnotation_1 = class TypeAnnotation extends BaseNode_1.
         const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
         let typeAnnotation;
         if (options instanceof TypeAnnotation_1) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeAnnotation = options;
             Object.assign(typeAnnotation, relationOptions);
         }
@@ -105,7 +114,7 @@ let TypeAnnotation = TypeAnnotation_1 = class TypeAnnotation extends BaseNode_1.
     }
     addTypeAnnotation(options) {
         const node = this._addTypeAnnotation(options);
-        const index = this.typeArguments.length;
+        const index = this.typeArguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -156,14 +165,20 @@ let TypeAnnotation = TypeAnnotation_1 = class TypeAnnotation extends BaseNode_1.
         }
     }
     /**
-     * 临时展示 type 标题
+     * 用于展示的 type 标题
      */
     get typeTitle() {
-        if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
+        if (this.typeKind === 'primitive') {
+            return `${this.typeName} ${exports.PRIMITIVE_TITLE[this.typeName]}`;
+        }
+        else if (this.typeKind === 'reference') {
             return `${this.typeName}`;
         }
         else if (this.typeKind === 'generic') {
-            return `${this.typeName}<${(this.typeArguments || []).map((arg) => arg.typeTitle)}>`;
+            if (this.typeArguments && this.typeArguments.length)
+                return `${this.typeName}<${(this.typeArguments || []).map((arg) => arg.typeName || 'T')}>`;
+            else
+                return this.typeName;
         }
         else {
             return this.typeName;
@@ -209,20 +224,63 @@ let TypeAnnotation = TypeAnnotation_1 = class TypeAnnotation extends BaseNode_1.
             ...object,
         });
     }
+    get tsCalleeNamespace() {
+        if (this.typeNamespace) {
+            let tsCalleeNamespace = this.typeNamespace;
+            tsCalleeNamespace = tsCalleeNamespace.replace(/\.[0-9]/g, (m) => m.replace('.', '.$'));
+            tsCalleeNamespace = tsCalleeNamespace.replace(/-/g, '_');
+            return tsCalleeNamespace;
+        }
+        return '';
+    }
+    toJS(state) {
+        return JSON.stringify(this);
+    }
     toEmbeddedTS(state) {
         if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
-            if (this.typeKind === 'reference' && this.typeNamespace.endsWith('enums')) {
-                return `ReturnType<typeof ${this.typeNamespace}.${this.typeName}.toList>`;
+            if (this.typeKind === 'reference' && this.typeNamespace && this.typeNamespace.endsWith('enums')) {
+                return `${this.tsCalleeNamespace}.${this.typeName}`;
             }
-            return `${this.typeNamespace}.${this.typeName}`;
+            return `${this.tsCalleeNamespace}.${this.typeName}`;
         }
         else if (this.typeKind === 'generic') {
-            let code = `${this.typeNamespace}.${this.typeName}<`;
-            return code += `${(this.typeArguments || []).map((arg) => arg.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })))}>`;
+            let code = `${this.tsCalleeNamespace}.${this.typeName}<`;
+            return (code += `${(this.typeArguments || []).map((arg) => arg.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })))}>`);
         }
         else {
-            return this.typeName;
+            if (this.tsCalleeNamespace && this.typeName) {
+                return `${this.tsCalleeNamespace}.${this.typeName}`;
+            }
+            else if (this.typeName) {
+                return this.typeName;
+            }
+            else {
+                return '__IDENTIFIER__';
+            }
+        }
+    }
+    getDefaultValue(value) {
+        let code = '';
+        if (this.typeKind === 'primitive') {
+            if (this.typeName === 'String') {
+                code = `   "${value}" `;
+            }
+            else {
+                if (['Long', 'Text'].includes(this.typeName)) {
+                    code = `  new ${this.typeNamespace}.${this.typeName}("${value}")`;
+                }
+                else if (['Boolean'].includes(this.typeName)) {
+                    code = value;
+                }
+                else {
+                    code = ` new ${this.typeNamespace}.${this.typeName}(${value})`;
+                }
+            }
+        }
+        else {
+            code = ` ${this.typeNamespace}.${this.typeName}['${value}']`;
         }
+        return code;
     }
     /**
      *
@@ -285,10 +343,6 @@ __decorate([
 __decorate([
     (0, decorators_1.property)('TypeAnnotation')
 ], TypeAnnotation.prototype, "typeArguments", void 0);
-__decorate([
-    (0, decorators_1.excludedInJSON)(),
-    (0, decorators_1.property)()
-], TypeAnnotation.prototype, "text", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], TypeAnnotation.prototype, "inferred", void 0);

package/out/concepts/TypeAnnotation__.js.map

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

package/out/concepts/UnaryExpression__.js

@@ -98,26 +98,26 @@ let UnaryExpression = UnaryExpression_1 = class UnaryExpression extends LogicIte
     //================================================================================
     toVue(options) {
         if (this.operator === 'isNull') {
-            return this.argument.toVue(options);
+            return this.argument?.toVue(options);
         }
         else {
-            return '!' + this.argument.toVue(options);
+            return '!(' + this.argument?.toVue(options) + ')';
         }
     }
     toUI(state) {
         if (this.operator === 'isNull') {
-            return this.argument.toUI(state);
+            return this.argument?.toUI(state);
         }
         else {
-            return '!' + this.argument.toUI(state);
+            return '!(' + this.argument?.toUI(state) + ')';
         }
     }
     toJS(state) {
         if (this.operator === 'isNull') {
-            return this.argument.toJS(state);
+            return this.argument?.toJS(state);
         }
         else {
-            return '!' + this.argument.toJS(state);
+            return '!(' + this.argument?.toJS(state) + ')';
         }
     }
     toEmbeddedTS(state) {
@@ -131,10 +131,12 @@ let UnaryExpression = UnaryExpression_1 = class UnaryExpression extends LogicIte
         }
         let code = '';
         if (this.argument) {
-            code += `${this.operator}${this.argument}`;
+            code += `${this.operator}(`;
+            code += `${this.argument.toEmbeddedTS((0, translator_1.shiftState)(state, code))}`;
+            code += `)`;
         }
         else {
-            code += `${this.operator}__IDENTIFIER__`;
+            code += `${this.operator}(__IDENTIFIER__)`;
         }
         return code;
     }

package/out/concepts/UnaryExpression__.js.map

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

package/out/concepts/Unparsed__.js

@@ -63,7 +63,7 @@ let Unparsed = Unparsed_1 = class Unparsed extends LogicItem__1.default {
         return this.code ? ` ${this.code} ` : '';
     }
     toEmbeddedTS() {
-        return this.code ? ` ${this.code} ` : '__IDENTIFIER__';
+        return 'nasl.core.universalVariable';
     }
 };
 __decorate([

package/out/concepts/Unparsed__.js.map

@@ -1 +1 @@
-{"version":3,"file":"Unparsed__.js","sourceRoot":"","sources":["../../src/concepts/Unparsed__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2E;AAO3E,8CAAkE;AAKlE,kEAA0C;AAC1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,QAAQ,gBAArB,MAAa,QAAS,SAAQ,oBAAS;IACnC;;OAEG;IAEH,OAAO,GAAe,UAAU,CAAC;IAEjC;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAIzB;;OAEG;IACH,YAAY,MAA0B;QAClC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAQ,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACjE,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,CAAa,CAAC;IACjE,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;IAMD,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,KAAK,CAAC,OAA6B;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAGD,YAAY;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAC3D,CAAC;CAMJ,CAAA;AAlEG;IADC,IAAA,qBAAQ,GAAE;yCACsB;AAMjC;IADC,IAAA,qBAAQ,GAAE;sCACc;AAoDzB;IADC,IAAA,0BAAa,GAAE;4CAGf;AAjEQ,QAAQ;IADpB,IAAA,oBAAO,EAAC,MAAM,CAAC;GACH,QAAQ,CAuEpB;AAvEY,4BAAQ;AAyErB,kBAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;AAChC,kBAAe,QAAQ,CAAC;AACxB,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"Unparsed__.js","sourceRoot":"","sources":["../../src/concepts/Unparsed__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2E;AAO3E,8CAAkE;AAKlE,kEAA0C;AAC1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,QAAQ,gBAArB,MAAa,QAAS,SAAQ,oBAAS;IACnC;;OAEG;IAEH,OAAO,GAAe,UAAU,CAAC;IAEjC;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAIzB;;OAEG;IACH,YAAY,MAA0B;QAClC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAQ,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACjE,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,CAAa,CAAC;IACjE,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;IAMD,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,KAAK,CAAC,OAA6B;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAGD,YAAY;QACR,OAAO,6BAA6B,CAAC;IACzC,CAAC;CAMJ,CAAA;AAlEG;IADC,IAAA,qBAAQ,GAAE;yCACsB;AAMjC;IADC,IAAA,qBAAQ,GAAE;sCACc;AAoDzB;IADC,IAAA,0BAAa,GAAE;4CAGf;AAjEQ,QAAQ;IADpB,IAAA,oBAAO,EAAC,MAAM,CAAC;GACH,QAAQ,CAuEpB;AAvEY,4BAAQ;AAyErB,kBAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;AAChC,kBAAe,QAAQ,CAAC;AACxB,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/ValidationRule__.d.ts

@@ -86,6 +86,7 @@ export declare class ValidationRule extends LogicItem {
     toVue(options?: ElementToVueOptions): string;
     toUI(state?: TranslatorState): string;
     toJS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState): string;
     get calleeKey(): string;
     _setCallee(func: Function): void;
     setCallee(func: Function): void;

package/out/concepts/ValidationRule__.js

@@ -12,6 +12,7 @@ var ValidationRule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidationRule = void 0;
 const translator_1 = require("../translator");
+const getFunctions_1 = require("../server/getFunctions");
 const decorators_1 = require("../decorators");
 const classMap_1 = __importDefault(require("../common/classMap"));
 const Argument__1 = __importDefault(require("./Argument__"));
@@ -56,7 +57,7 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument;
         if (options instanceof Argument__1.default) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         }
@@ -84,7 +85,7 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
     }
     addArgument(options) {
         const node = this._addArgument(options);
-        const index = this.arguments.length;
+        const index = this.arguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -127,9 +128,9 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
         let code = this.calleeName;
         if (this.arguments.length) {
             code += '(';
-            this.arguments.forEach((arg, index) => {
-                code += arg.toVue(options);
-                if (index !== this.arguments.length - 1)
+            this.arguments?.forEach((arg, index) => {
+                code += arg?.toVue(options);
+                if (index !== this.arguments?.length - 1)
                     code += ', ';
             });
             code += ')';
@@ -138,11 +139,11 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
     }
     toUI(state) {
         let code = this.calleeName;
-        if (this.arguments.length) {
+        if (this.arguments?.length) {
             code += '(';
-            this.arguments.forEach((arg, index) => {
-                code += arg.toUI((0, translator_1.shiftState)(state, code));
-                if (index !== this.arguments.length - 1)
+            this.arguments?.forEach((arg, index) => {
+                code += arg?.toUI((0, translator_1.shiftState)(state, code));
+                if (index !== this.arguments?.length - 1)
                     code += ', ';
             });
             code += ')';
@@ -151,17 +152,48 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
     }
     toJS(state) {
         let code = this.calleeName;
-        if (this.arguments.length) {
+        if (this.arguments?.length) {
             code += '(';
-            this.arguments.forEach((arg, index) => {
-                code += arg.toJS((0, translator_1.shiftState)(state, code));
-                if (index !== this.arguments.length - 1)
+            this.arguments?.forEach((arg, index) => {
+                code += arg?.toJS((0, translator_1.shiftState)(state, code));
+                if (index !== this.arguments?.length - 1)
                     code += ', ';
             });
             code += ')';
         }
         return code;
     }
+    toEmbeddedTS(state) {
+        let code = '';
+        if (this.calleeName) {
+            if (this.arguments.length) {
+                const validationInFunction = (0, getFunctions_1.getValidationInFunction)(this.calleeName);
+                code += this.calleeKey;
+                code += '(';
+                this.arguments.forEach((arg, index) => {
+                    // 如果找到函数而且有参数，就用参数的必填非必填
+                    if (validationInFunction && validationInFunction.params[index]) {
+                        code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code), validationInFunction.params[index].required, false);
+                    }
+                    else {
+                        // 如果没有就默认不必填
+                        code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code), false, false);
+                    }
+                    if (index !== this.arguments.length - 1)
+                        code += ', ';
+                });
+                code += ')';
+            }
+            else {
+                // 没有入参数的不需要校验
+                return 'null';
+            }
+        }
+        else {
+            code += '__IDENTIFIER__';
+        }
+        return code;
+    }
     get calleeKey() {
         return `${this.calleeNamespace}.${this.calleeName}`;
     }
@@ -206,6 +238,9 @@ __decorate([
 __decorate([
     (0, decorators_1.property)('Argument')
 ], ValidationRule.prototype, "arguments", void 0);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], ValidationRule.prototype, "toEmbeddedTS", null);
 ValidationRule = ValidationRule_1 = __decorate([
     (0, decorators_1.concept)('验证规则')
 ], ValidationRule);

package/out/concepts/ValidationRule__.js.map

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

package/out/concepts/Variable__.d.ts

@@ -1,5 +1,7 @@
 import { TranslatorState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
+import EntityProperty from './EntityProperty__';
+import StructureProperty from './StructureProperty__';
 import { Params } from '../common/EventEmitter';
 import BaseNode from '../common/BaseNode';
 import TypeAnnotation from './TypeAnnotation__';
@@ -90,10 +92,15 @@ export declare class Variable extends BaseNode {
      */
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
     __removeTypeAnnotation(typeAnnotation: TypeAnnotation): Params;
+    /**
+     * 自动补全的字段列表
+     */
+    completionChildren: Array<EntityProperty | StructureProperty>;
     toVue(options?: ElementToVueOptions): string;
     toUI(): string;
     toJS(state?: TranslatorState): string;
     toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTSInProcess(state?: TranslatorState): string;
     /**
      * 设置数据类型
      * @param typeAnnotation 类型标注对象
@@ -116,6 +123,8 @@ export declare class Variable extends BaseNode {
      * 是否可编辑
      * */
     get readonly(): boolean;
-    getSelectRef(): import("./EntityProperty__").EntityProperty[] | import("./StructureProperty__").StructureProperty[];
+    get hasChildren(): {}[];
+    get isTreeLeaf(): boolean;
+    getSelectRef(): any;
 }
 export default Variable;

package/out/concepts/Variable__.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Variable = 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"));
@@ -172,6 +173,10 @@ let Variable = Variable_1 = class Variable extends BaseNode_1.default {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    /**
+     * 自动补全的字段列表
+     */
+    completionChildren = undefined;
     toVue(options) {
         return this.name;
     }
@@ -188,8 +193,19 @@ let Variable = Variable_1 = class Variable extends BaseNode_1.default {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
         }
+        // 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}`;
+            code += `: ${this.defaultValue}`;
         }
         return code;
     }
@@ -200,10 +216,18 @@ let Variable = Variable_1 = class Variable extends BaseNode_1.default {
                 throw new Error('找不到类型：' + arguments[0]);
         }
         else {
-            typeAnnotation._delete();
+            typeAnnotation._delete?.();
             const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
             Object.assign(typeAnnotation, relationOptions);
         }
+        // 处理下拉属性
+        try {
+            this.completionChildren = this.getSelectRef();
+        }
+        catch (err) {
+            this.completionChildren = [];
+            console.log(err);
+        }
         const object = {
             typeAnnotation,
         };
@@ -227,27 +251,52 @@ let Variable = Variable_1 = class Variable extends BaseNode_1.default {
     get readonly() {
         return !!this.module;
     }
+    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() {
-        const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
-        let completionChildren;
-        if (typeKind === 'reference') {
-            let type;
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
+        try {
+            const { typeName, typeKind, typeNamespace } = 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 (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
+            else if (typeKind === 'generic') {
+                if (typeNamespace === 'nasl.collection') {
+                    const node = (0, utils_1.getNaslNodeByNodeCallee)(typeNamespace, typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                }
             }
-            const data = this.app.dependencies.find((item) => item.name === moduleNames[2]);
-            const properties = data[type].find((item) => item.name === typeName)?.properties;
-            completionChildren = properties;
+            else {
+                completionChildren = undefined;
+            }
+            return completionChildren;
         }
-        else {
-            completionChildren = undefined;
+        catch (err) {
+            console.log(err);
         }
-        return completionChildren;
     }
 };
 __decorate([
@@ -268,6 +317,9 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], Variable.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], Variable.prototype, "toEmbeddedTSInProcess", null);
 Variable = Variable_1 = __decorate([
     (0, decorators_1.concept)('局部变量')
 ], Variable);