@lcap/nasl 1.0.0-alpha.7 → 1.0.0

package/src/concepts/Namespace__.ts

@@ -36,7 +36,7 @@ export class Namespace extends BaseNode {
      * 表示是从实体还是流程等概念产生的
      */
     @property()
-    originConcept: 'Namespace' = 'Namespace';
+    originConcept: string = undefined;
 
     /**
      * 命名空间名称
@@ -200,7 +200,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'children');
         } else if (options instanceof Namespace) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             namespace = options;
             Object.assign(namespace, relationOptions);
         } else {
@@ -288,7 +288,7 @@ export class Namespace extends BaseNode {
 
     addNamespace(options?: string | Partial<Namespace> | Namespace) {
         const node = this._addNamespace(options as any);
-        const index = this.children.length;
+        const index = this.children.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -342,7 +342,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'processes');
         } else if (options instanceof Process) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             process = options;
             Object.assign(process, relationOptions);
         } else {
@@ -430,7 +430,7 @@ export class Namespace extends BaseNode {
 
     addProcess(options?: string | Partial<Process> | Process) {
         const node = this._addProcess(options as any);
-        const index = 0;
+        const index = this.processes.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -484,7 +484,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'entities');
         } else if (options instanceof Entity) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             entity = options;
             Object.assign(entity, relationOptions);
         } else {
@@ -572,7 +572,7 @@ export class Namespace extends BaseNode {
 
     addEntity(options?: string | Partial<Entity> | Entity) {
         const node = this._addEntity(options as any);
-        const index = 0;
+        const index = this.entities.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -626,7 +626,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'structures');
         } else if (options instanceof Structure) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             structure = options;
             Object.assign(structure, relationOptions);
         } else {
@@ -714,7 +714,7 @@ export class Namespace extends BaseNode {
 
     addStructure(options?: string | Partial<Structure> | Structure) {
         const node = this._addStructure(options as any);
-        const index = 0;
+        const index = this.structures.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -768,7 +768,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'enums');
         } else if (options instanceof Enum) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             enumeration = options;
             Object.assign(enumeration, relationOptions);
         } else {
@@ -856,7 +856,7 @@ export class Namespace extends BaseNode {
 
     addEnum(options?: string | Partial<Enum> | Enum) {
         const node = this._addEnum(options as any);
-        const index = 0;
+        const index = this.enums.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -910,7 +910,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -998,7 +998,7 @@ export class Namespace extends BaseNode {
 
     addLogic(options?: string | Partial<Logic> | Logic) {
         const node = this._addLogic(options as any);
-        const index = 0;
+        const index = this.logics.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1052,7 +1052,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'functions');
         } else if (options instanceof Function) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             func = options;
             Object.assign(func, relationOptions);
         } else {
@@ -1140,7 +1140,7 @@ export class Namespace extends BaseNode {
 
     addFunction(options?: string | Partial<Function> | Function) {
         const node = this._addFunction(options as any);
-        const index = 0;
+        const index = this.functions.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1194,7 +1194,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'interfaces');
         } else if (options instanceof Interface) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             itface = options;
             Object.assign(itface, relationOptions);
         } else {
@@ -1282,7 +1282,7 @@ export class Namespace extends BaseNode {
 
     addInterface(options?: string | Partial<Interface> | Interface) {
         const node = this._addInterface(options as any);
-        const index = 0;
+        const index = this.interfaces.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1336,7 +1336,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'views');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -1424,7 +1424,7 @@ export class Namespace extends BaseNode {
 
     addView(options?: string | Partial<View> | View) {
         const node = this._addView(options as any);
-        const index = this.views.length;
+        const index = this.views.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1478,7 +1478,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'variables');
         } else if (options instanceof Variable) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
         } else {
@@ -1566,7 +1566,7 @@ export class Namespace extends BaseNode {
 
     addVariable(options?: string | Partial<Variable> | Variable) {
         const node = this._addVariable(options as any);
-        const index = this.variables.length;
+        const index = this.variables.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1620,7 +1620,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'viewComponents');
         } else if (options instanceof ViewComponent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewComponent = options;
             Object.assign(viewComponent, relationOptions);
         } else {
@@ -1708,7 +1708,7 @@ export class Namespace extends BaseNode {
 
     addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
         const node = this._addViewComponent(options as any);
-        const index = this.viewComponents.length;
+        const index = this.viewComponents.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1762,7 +1762,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'processComponents');
         } else if (options instanceof ProcessComponent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             processComponent = options;
             Object.assign(processComponent, relationOptions);
         } else {
@@ -1850,7 +1850,7 @@ export class Namespace extends BaseNode {
 
     addProcessComponent(options?: string | Partial<ProcessComponent> | ProcessComponent) {
         const node = this._addProcessComponent(options as any);
-        const index = this.processComponents.length;
+        const index = this.processComponents.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -2496,6 +2496,18 @@ export class Namespace extends BaseNode {
             throw new Error('无法获取命名空间，请设置 parentNode 或临时的 path！');
     }
 
+    /**
+     * 获取命名空间
+     */
+    getTsNamespace(): string {
+        if (this.path)
+            return this.path;
+        else if (this.parentNode && (this.parentNode as Namespace).getNamespace)
+            return `${(this.parentNode as Namespace).getNamespace()}.${this.tsName}`;
+        else
+            throw new Error('无法获取命名空间，请设置 parentNode 或临时的 path！');
+    }
+
     findChild(name: string) {
         return this.children.find((child) => child.name === name);
     }

package/src/concepts/NullLiteral__.ts

@@ -52,7 +52,7 @@ export class NullLiteral extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
     toVue(options?: ElementToVueOptions): string {
-        return 'null';
+        return 'undefined';
     }
 
     toUI(): string {
@@ -60,6 +60,13 @@ export class NullLiteral extends LogicItem {
     }
 
     toJS(): string {
+        return 'undefined';
+    }
+    @withSourceMap()
+    toEmbeddedTS(state?: TranslatorState) {
+        return 'null';
+    }
+    getValue() {
         return 'null';
     }
 

package/src/concepts/NumericLiteral__.ts

@@ -135,26 +135,37 @@ export class NumericLiteral extends LogicItem {
         return code;
     }
 
-    changeType() {
-        if (this.value.length > 8) {
-            this.typeAnnotation.typeName = 'Long';
+    changeType(value: string | number) {
+        const newValue = value.toString();
+        let typeName = 'Integer';
+        if (newValue.length > 8) {
+            typeName = 'Long';
         } else {
-            this.typeAnnotation.typeName = 'Integer';
+            typeName = 'Integer';
         }
-        if (this.value.includes('.')) {
-            this.typeAnnotation.typeName = 'Double';
+        if (newValue.includes('.')) {
+            typeName = 'Double';
         }
+        return typeName;
     }
     /**
      * 设置数组内容
      */
     setValue(value: string) {
+        const typeName = this.changeType(value);
+        const App = this.app;
+        App.emit('collect:start', {
+            actionMsg: '修改数字文本内容',
+        });
+        this.typeAnnotation.setTypeName(typeName);
         const object = {
             value,
         };
         this.update({
             ...object,
         });
+        // 结束修改 ，批量操作
+        App.emit('collect:end');
     }
 
     /**

package/src/concepts/Param__.ts

@@ -6,6 +6,7 @@ import Entity from './Entity__';
 import EntityProperty from './EntityProperty__';
 import Structure from './Structure__';
 import StructureProperty from './StructureProperty__';
+import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -243,7 +244,7 @@ export class Param extends BaseNode {
     @excludedInJSON()
     @property()
     useComponent: {
-        type: 's-member-identifier-select' | 's-enum-select' | 's-schema-select' | 's-datatype-select' | 's-options-select';
+        type: 's-member-identifier-select' | 's-enum-select' | 's-schema-select' | 's-datatype-select' | 's-config-select' | 's-options-select';
         attrs?: any;
     } = undefined;
 
@@ -254,15 +255,20 @@ export class Param extends BaseNode {
 
     toJS(state?: TranslatorState): string {
         if (this.view) {
-            return `${this.name} = ${this.name} !== undefined ? ${this.name} : this.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, this.$route.query.hasOwnProperty('${this.name}') ? this.$route.query.${this.name} : ${JSON.stringify(this.defaultValue)}, true)`;
+            return `${this.name} = ${this.name} !== undefined ? ${this.name} : this.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, this.$route.query.hasOwnProperty('${
+                this.name
+            }') ? this.$route.query.${this.name} : ${JSON.stringify(this.defaultValue)}, true)`;
         } else {
             return '';
         }
     }
 
     @withSourceMap()
-    toEmbeddedTS(state?: TranslatorState): string {
+    toEmbeddedTS(state?: TranslatorState, isOptionalParameter?: boolean): string {
         let code = this.name;
+        if (isOptionalParameter) {
+            code += '?';
+        }
         if (this.typeAnnotation) {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
@@ -291,15 +297,20 @@ export class Param extends BaseNode {
                 // eslint-disable-next-line prefer-rest-params
                 throw new Error('找不到类型：' + arguments[0]);
         } else {
-            typeAnnotation._delete();
+            typeAnnotation._delete?.();
             const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
             Object.assign(typeAnnotation, relationOptions);
         }
         const object = {
             typeAnnotation,
-            // 处理下拉属性
-            // completionChildren: this.getSelectRef(),
         };
+        try {
+            this.completionChildren = this.getSelectRef();
+        } catch (err) {
+            this.completionChildren = [];
+            console.log(err);
+        }
+        // 处理下拉属性
         return this.update({
             ...object,
         });
@@ -316,41 +327,58 @@ export class Param extends BaseNode {
         };
     }
 
+    _readonly: boolean = false;
     /**
      * 是否可编辑
      * */
     get readonly() {
-        return !!this.module;
+        return !!this.module || this._readonly;
     }
 
+    set readonly(val) {
+        this._readonly = val;
+    }
+    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/ProcessComponent__.ts

@@ -144,7 +144,7 @@ export class ProcessComponent extends BaseNode {
                 name: options,
             }, this, 'attrs');
         } else if (options instanceof Attribute) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             attribute = options;
             Object.assign(attribute, relationOptions);
         } else {
@@ -232,7 +232,7 @@ export class ProcessComponent 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,
@@ -286,7 +286,7 @@ export class ProcessComponent extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -374,7 +374,7 @@ export class ProcessComponent extends BaseNode {
 
     addLogic(options?: string | Partial<Logic> | Logic) {
         const node = this._addLogic(options as any);
-        const index = this.logics.length;
+        const index = this.logics.indexOf(node);
         node.create({
             index,
             parentNode: this,