@lcap/nasl 1.0.0-alpha.8 → 1.0.1

package/src/concepts/Variable__.ts

@@ -3,6 +3,10 @@ import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Entity from './Entity__';
 import Structure from './Structure__';
 import { ElementToVueOptions } from './ViewElement__';
+import EntityProperty from './EntityProperty__';
+import StructureProperty from './StructureProperty__';
+import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -211,6 +215,11 @@ export class Variable extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    /**
+     * 自动补全的字段列表
+     */
+    completionChildren: Array<EntityProperty | StructureProperty> = undefined;
+
     toVue(options?: ElementToVueOptions): string {
         return this.name;
     }
@@ -231,8 +240,21 @@ export class Variable extends BaseNode {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
         }
+        // if (this.defaultValue) {
+        //     code += ` = ${this.defaultValue}`;
+        // }
+        return code;
+    }
+
+    @withSourceMap()
+    toEmbeddedTSInProcess(state?: TranslatorState): string {
+        let code = this.name;
+        if (this.typeAnnotation) {
+            code += ': undefined as ';
+            code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
+        }
         if (this.defaultValue) {
-            code += ` = ${this.defaultValue}`;
+            code += `: ${this.defaultValue}`;
         }
         return code;
     }
@@ -253,10 +275,17 @@ export class Variable extends BaseNode {
             if (!typeAnnotation)
                 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,
         };
@@ -283,34 +312,47 @@ export class Variable extends BaseNode {
     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: 'entities' | 'structures';
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
-            } else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
-            }
-            // 内置模块
-            // if (typeNamespace.startsWith('nasl.')) {
-            // } else {
-            const data = this.app[type] as Array<Entity | Structure>;
-            if (data) {
-                const properties = data.find((item) => item.name === typeName)?.properties;
-                completionChildren = properties;
+        try {
+            const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
+            let completionChildren;
+            if (typeKind === 'reference') {
+                if (typeNamespace === 'nasl.ui') {
+                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                } else if (typeNamespace.endsWith('.enums')) {
+                    completionChildren = undefined;
+                } else {
+                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                }
+            } else if (typeKind === 'generic') {
+                if (typeNamespace === 'nasl.collection') {
+                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                }
             } else {
                 completionChildren = undefined;
             }
-            // }
-        } else {
-            completionChildren = undefined;
+            return completionChildren;
+        } catch (err) {
+            console.log(err);
         }
-        return completionChildren;
     }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/ViewComponent__.ts

@@ -125,7 +125,7 @@ export class ViewComponent extends BaseNode {
         return (this.attrs || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getAttributeUniqueName(name = 'attribute1') {
-        return utils.unique(name, this.getAttributeExistingNames());
+        return utils.unique(name, this.getAttributeExistingNames(), undefined, false);
     }
 
     /**
@@ -164,7 +164,7 @@ export class ViewComponent extends BaseNode {
                 name: options,
             }, this, 'attrs');
         } else if (options instanceof Attribute) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             attribute = options;
             Object.assign(attribute, relationOptions);
         } else {
@@ -252,7 +252,7 @@ export class ViewComponent extends BaseNode {
 
     addAttribute(options?: string | Partial<Attribute> | Attribute) {
         const node = this._addAttribute(options as any);
-        const index = this.attrs.length;
+        const index = this.attrs.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -267,7 +267,7 @@ export class ViewComponent extends BaseNode {
         return (this.events || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEventUniqueName(name = 'event1') {
-        return utils.unique(name, this.getEventExistingNames());
+        return utils.unique(name, this.getEventExistingNames(), undefined, false);
     }
 
     /**
@@ -306,7 +306,7 @@ export class ViewComponent extends BaseNode {
                 name: options,
             }, this, 'events');
         } else if (options instanceof Event) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             event = options;
             Object.assign(event, relationOptions);
         } else {
@@ -394,7 +394,7 @@ export class ViewComponent extends BaseNode {
 
     addEvent(options?: string | Partial<Event> | Event) {
         const node = this._addEvent(options as any);
-        const index = this.events.length;
+        const index = this.events.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -409,7 +409,7 @@ export class ViewComponent extends BaseNode {
         return (this.slots || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getSlotUniqueName(name = 'slot1') {
-        return utils.unique(name, this.getSlotExistingNames());
+        return utils.unique(name, this.getSlotExistingNames(), undefined, false);
     }
 
     /**
@@ -448,7 +448,7 @@ export class ViewComponent extends BaseNode {
                 name: options,
             }, this, 'slots');
         } else if (options instanceof Slot) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             slot = options;
             Object.assign(slot, relationOptions);
         } else {
@@ -536,7 +536,7 @@ export class ViewComponent extends BaseNode {
 
     addSlot(options?: string | Partial<Slot> | Slot) {
         const node = this._addSlot(options as any);
-        const index = this.slots.length;
+        const index = this.slots.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -551,7 +551,7 @@ export class ViewComponent extends BaseNode {
         return (this.methods || []).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, false);
     }
 
     /**
@@ -590,7 +590,7 @@ export class ViewComponent extends BaseNode {
                 name: options,
             }, this, 'methods');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -678,7 +678,7 @@ export class ViewComponent extends BaseNode {
 
     addLogic(options?: string | Partial<Logic> | Logic) {
         const node = this._addLogic(options as any);
-        const index = this.methods.length;
+        const index = this.methods.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -693,7 +693,7 @@ export class ViewComponent extends BaseNode {
         return (this.children || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewComponentUniqueName(name = 'viewComponent1') {
-        return utils.unique(name, this.getViewComponentExistingNames());
+        return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
     }
 
     /**
@@ -732,7 +732,7 @@ export class ViewComponent extends BaseNode {
                 name: options,
             }, this, 'children');
         } else if (options instanceof ViewComponent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewComponent = options;
             Object.assign(viewComponent, relationOptions);
         } else {
@@ -820,7 +820,7 @@ export class ViewComponent extends BaseNode {
 
     addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
         const node = this._addViewComponent(options as any);
-        const index = this.children.length;
+        const index = this.children.indexOf(node);
         node.create({
             index,
             parentNode: this,