@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.16

package/src/concepts/Destination__.ts

@@ -115,7 +115,7 @@ export class Destination extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument: Argument;
         if (options instanceof Argument) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         } else {
@@ -337,6 +337,38 @@ export class Destination extends LogicItem {
         });
     }
 
+    /**
+     * 设置view的argument
+     */
+    setViewArgument(view: View) {
+        const params = view.params;
+        const argument = this.arguments;
+        if (params.length > argument.length) {
+            params.forEach((item) => {
+                const arg = argument.find((arg) => arg.keyword === item.name);
+                if (!arg) {
+                    this.addArgument({
+                        keyword: item.name,
+                    });
+                }
+            });
+        } else {
+            argument.forEach((item) => {
+                const param = params.find((param) => param.name === item.keyword);
+                if (!param) {
+                    item.delete();
+                }
+            });
+        }
+    }
+    /**
+     * 设置Arguments的KeyWord
+     */
+    setArgumentsKeyWord(options: {findArgument: Argument, newKeyword: string}) {
+        const { findArgument, newKeyword } = options;
+        findArgument.setKeyword(newKeyword);
+    }
+
     get viewPath() {
         if (!this.viewNamespace) {
             return '';
@@ -355,20 +387,24 @@ export class Destination extends LogicItem {
     @withSourceMap()
     toEmbeddedTSInProcess(state: TranslatorState, prependCode: string): string {
         // const tab = indent(state.tabSize);
-        let code = `destination: function() {\n`;
-        code += prependCode;
-        code += '\n';
-        if (this.tsCalleeNamespace && this.viewName) {
-            code += `${this.tsCalleeNamespace}.${this.viewName}.$destination(`;
-            if (Array.isArray(this.arguments)) {
-                this.arguments.forEach((argument: Argument) => {
-                    code += argument.toEmbeddedTS(shiftState(state, code)) + ', ';
-                });
+        if (this.tsCalleeNamespace && this.tsName) {
+            let code = `destination: function() {\n`;
+            code += prependCode;
+            code += '\n';
+            if (this.tsCalleeNamespace && this.viewName) {
+                code += `${this.tsCalleeNamespace}.${this.viewName}.$destination({`;
+                if (Array.isArray(this.arguments)) {
+                    this.arguments.forEach((argument: Argument) => {
+                        code += argument.toEmbeddedTS(shiftState(state, code), false, true) + ', ';
+                    });
+                }
+                code += `});\n`;
             }
-            code += `);\n`;
+            code += indent(state.tabSize + 1) + `}\n`;
+            return code;
+        } else {
+            return '__IDENTIFIER__';
         }
-        code += indent(state.tabSize + 1) + `}\n`;
-        return code;
     }
 
     @withSourceMap()
@@ -379,25 +415,27 @@ export class Destination extends LogicItem {
             code = `${utils.firstLowerCase(this.concept)}: () => {\n`;
             code += indent(state.tabSize + 2);
             if (this.tsCalleeNamespace && this.tsName) {
-                code += `${this.tsCalleeNamespace}.${this.tsName}.$destination(`;
+                code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
                 if (Array.isArray(this.arguments)) {
                     this.arguments.forEach((argument: Argument) => {
-                        code += argument.toEmbeddedTS(shiftState(state, code)) + ', ';
+                        code += argument.toEmbeddedTS(shiftState(state, code), false, true) + ', ';
                     });
                 }
-                code += `);\n`;
+                code += `});\n`;
             }
             code += indent(state.tabSize + 1) + `},\n`;
             return code;
         } else {
             if (this.tsCalleeNamespace && this.tsName) {
-                code += `${this.tsCalleeNamespace}.${this.tsName}.$destination(`;
+                code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
                 if (Array.isArray(this.arguments)) {
                     this.arguments.forEach((argument: Argument) => {
-                        code += argument.toEmbeddedTS(shiftState(state, code)) + ', ';
+                        code += argument.toEmbeddedTS(shiftState(state, code), false, true) + ', ';
                     });
                 }
-                code += `);\n`;
+                code += `});\n`;
+            } else {
+                code += '__IDENTIFIER__';
             }
             return code;
         }

package/src/concepts/End__.ts

@@ -29,8 +29,6 @@ export class End extends LogicItem {
     @property()
     label: string = '结束';
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -44,19 +42,19 @@ export class End extends LogicItem {
         return super.from(source, parentNode, parentKey) as End;
     }
 
-    
-    
-
-    
-
-    
-
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
     toJS(state?: TranslatorState): string {
-        return '';
+        let code = '';
+        const ret = this.logic.returns[0];
+        if (ret) {
+            code += 'return ' + ret.name + ';';
+        } else {
+            code += 'return;';
+        }
+        return code;
     }
 
     toEmbeddedTS(state?: TranslatorState): string {
@@ -76,7 +74,7 @@ export class End extends LogicItem {
     //================================================================================
 }
 
-classMap['End'] = End;
+classMap.End = End;
 export default End;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/EntityProperty__.ts

@@ -1,5 +1,6 @@
 import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 type changeType = 'up' | 'down';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -331,6 +332,56 @@ export class EntityProperty extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+
+    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;
+    }
+
+    /**
+     * 是否展开
+     */
+    @property()
+    isLeaf: boolean = true;
+
+    getSelectRef() {
+        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;
+            }
+            return completionChildren;
+        } catch (err) {
+            console.log(err);
+        }
+    }
     /**
      * 设置是否必填
      */
@@ -399,7 +450,7 @@ export class EntityProperty 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);
         }
@@ -439,7 +490,8 @@ export class EntityProperty extends BaseNode {
      */
     moveUp() {
         const properties = [...(this.parentNode as Entity).properties];
-        const oldIndex = properties.indexOf(this);
+        const propertiesNameList = properties.map((item) => item.name);
+        const oldIndex = propertiesNameList.indexOf(this.name);
         this.changeSort(properties, oldIndex, 'up');
         this.parentNode.update({
             properties,
@@ -450,7 +502,8 @@ export class EntityProperty extends BaseNode {
      */
     moveDown() {
         const properties = [...(this.parentNode as Entity).properties];
-        const oldIndex = properties.indexOf(this);
+        const propertiesNameList = properties.map((item) => item.name);
+        const oldIndex = propertiesNameList.indexOf(this.name);
         this.changeSort(properties, oldIndex, 'down');
         this.parentNode.update({
             properties,

package/src/concepts/Entity__.ts

@@ -110,15 +110,15 @@ export class Entity extends BaseNode {
     /**
      * 设置实体名称
      */
-    setName(name: string) {
-        const object = {
-            name,
-        };
-        this.update({
-            ...object,
-            field: 'name',
-        });
-    }
+    // setName(name: string) {
+    //     const object = {
+    //         name,
+    //     };
+    //     this.update({
+    //         ...object,
+    //         field: 'name',
+    //     });
+    // }
 
     /**
      * 设置实体描述
@@ -132,7 +132,7 @@ export class Entity extends BaseNode {
         });
     }
 
-        getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
+    getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
         const excludedSet = new Set(excludedList);
         return (this.properties || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -176,7 +176,7 @@ export class Entity extends BaseNode {
                 name: options,
             }, this, 'properties');
         } else if (options instanceof EntityProperty) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             property = options;
             Object.assign(property, relationOptions);
         } else {
@@ -273,7 +273,6 @@ export class Entity extends BaseNode {
         return node;
     }
 
-
     getEntityIndexExistingNames(excludedList: Array<EntityIndex> = []) {
         const excludedSet = new Set(excludedList);
         return (this.indexes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -318,7 +317,7 @@ export class Entity extends BaseNode {
                 name: options,
             }, this, 'indexes');
         } else if (options instanceof EntityIndex) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             entityIndex = options;
             Object.assign(entityIndex, relationOptions);
         } else {
@@ -415,9 +414,6 @@ export class Entity extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除实体字段
     * @param name 实体字段名称
@@ -466,8 +462,6 @@ export class Entity extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除实体索引
     * @param name 实体索引名称
@@ -520,6 +514,22 @@ export class Entity extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+
+    /**
+     * 设置实体表名并修改表名
+     */
+    setName(name: string) {
+        const object: { name: string; tableName?: string } = {
+            name,
+        };
+        if (this.name === this.tableName && (this.origin === 'ide' || this.origin === 'sql')) {
+            object.tableName = name;
+        }
+        this.update({
+            ...object,
+            field: 'name',
+        });
+    }
     /**
      * 设置实体表名
      */
@@ -681,10 +691,13 @@ export class Entity extends BaseNode {
     }
 
     get ns() {
-        const ns = entity2LogicNamespace(this);
+        const ns: Namespace = entity2LogicNamespace(this);
         ns.path = this.getNamespace() + '.' + ns.name;
         return ns;
     }
+    // @excludedInJSON()
+    // nslogic: Namespace;
+
     get logics() {
         const ns = this.ns;
         return ns.logics;
@@ -715,7 +728,7 @@ export class Entity extends BaseNode {
     //================================================================================
 }
 
-classMap['Entity'] = Entity;
+classMap.Entity = Entity;
 export default Entity;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Enum__.ts

@@ -148,7 +148,7 @@ export class Enum extends BaseNode {
         const relationOptions = { parentNode: this, parentKey: 'enumItems' };
         let enumItem: EnumItem;
         if (options instanceof EnumItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             enumItem = options;
             Object.assign(enumItem, relationOptions);
         } else {
@@ -280,24 +280,25 @@ export class Enum extends BaseNode {
     @property()
     children: any;
 
+    /**
+     * 是否展开
+     */
+    @property()
+    isLeaf: boolean = true;
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = `export class ${this.name} extends nasl.core.Enums {\n`;
         // 增加一个单独的标签
         code += indent(state.tabSize + 1) + `__name: '${this.getNamespace()}.${this.name}';\n`;
-        let enumItemStr = '';
         this.enumItems.forEach((property) => {
             code += indent(state.tabSize + 1);
             code += property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
             code += ';\n';
-
-            enumItemStr += `${property.value}: ${this.name},\n`;
         });
         code += `
         static toList() {
-            let value: nasl.collection.List<{
-                ${enumItemStr}
-            }>
+            let value: nasl.collection.List<nasl.ui.EnumItem>
             return value;
         }
         static toString() {

package/src/concepts/Event__.ts

@@ -150,7 +150,7 @@ export class Event extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof Param) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             param = options;
             Object.assign(param, relationOptions);
         } else {

package/src/concepts/ForEachStatement__.ts

@@ -177,7 +177,7 @@ export class ForEachStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'body' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {
@@ -509,18 +509,13 @@ export class ForEachStatement extends LogicItem {
 
     toJS(state?: TranslatorState): string {
         let code = '';
-        code += this.each ? this.each.toJS(shiftState(state, code, {
+        const list = this.each ? this.each.toJS(shiftState(state, code, {
             tabSize: 0,
         })) : '';
-        code += '.slice(';
-        code += this.start && this.start.toJS() ? this.start.toJS() : '';
-        code += ', ';
-        code += this.end && this.end.toJS() ? this.end.toJS() : '';
-        code += ').forEach(async (';
-        code += this.item.name ? `${this.item.name}` : '';
-        code += ', ';
-        code += this.index.name ? `${this.index.name}` : '';
-        code += ') => {\n';
+        code += `if(Array.isArray(${list})) {\n`;
+        code += `for (let ${this.index.name} = ${this.start && this.start.toJS() ? this.start.toJS() : ''}; `;
+        code += `${this.index.name} < (${this.end && this.end.toJS() ? this.end.toJS() : ''}); ${this.index.name}++) {\n`;
+        code += `const ${this.item.name} = ${list}[${this.index.name}];\n`;
         if (Array.isArray(this.body)) {
             this.body.forEach((logicItem) => {
                 code
@@ -529,8 +524,8 @@ export class ForEachStatement extends LogicItem {
                     })) + '\n';
             });
         }
-        code += '})\n';
-
+        code += '}\n';
+        code += '}\n';
         return code;
     }
 

package/src/concepts/Function__.ts

@@ -170,7 +170,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'typeParams');
         } else if (options instanceof TypeParam) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeParam = options;
             Object.assign(typeParam, relationOptions);
         } else {
@@ -308,7 +308,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof Param) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             param = options;
             Object.assign(param, relationOptions);
         } else {
@@ -406,7 +406,7 @@ export class Function extends BaseNode {
     }
 
 
-    getReturnUniqueName(name = 'result1') {
+    getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames());
     }
 
@@ -446,7 +446,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'returns');
         } else if (options instanceof Return) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             ret = options;
             Object.assign(ret, relationOptions);
         } else {
@@ -584,7 +584,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'variables');
         } else if (options instanceof Variable) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
         } else {

package/src/concepts/Identifier__.ts

@@ -69,7 +69,7 @@ export class Identifier extends LogicItem {
     typeAnnotation: TypeAnnotation = undefined;
 
     globalDataMap: {
-        [name: string]: boolean
+        [name: string]: boolean;
     } = {
         $route: true,
         $global: true,
@@ -89,7 +89,7 @@ export class Identifier extends LogicItem {
                 if (last === 'enums') {
                     name = `$utils.EnumList("${this.name}")`;
                 }
-            } else if (this.namespace && this.namespace.endsWith('nasl.browser')) {
+            } else if (this.namespace && (this.namespace.endsWith('nasl.browser') || this.namespace.endsWith('nasl.auth') || this.namespace.endsWith('nasl.configuration'))) {
                 name = `$global.${this.name}`;
             }
         }
@@ -109,8 +109,8 @@ export class Identifier extends LogicItem {
                 if (last === 'enums') {
                     name = `$utils.EnumList("${this.name}")`;
                 }
-            } else if (namespace.endsWith('nasl.browser')) {
-                name = `$global.${this.name}`;
+            } else if (namespace.startsWith('nasl.')) {
+                name = `${namespace}.${this.name}`;
             }
         }
         return name;
@@ -118,26 +118,19 @@ export class Identifier extends LogicItem {
 
     toJS(): string {
         const dataMap: {
-            [name: string]: boolean
+            [name: string]: boolean;
         } = {};
-        if (this.view) {
-            const { params, variables } = this.view;
-            if (Array.isArray(params)) {
-                params.forEach((param) => {
-                    dataMap[param.name] = true;
-                });
-            }
-            if (Array.isArray(variables)) {
-                variables.forEach((variable) => {
-                    dataMap[variable.name] = true;
-                });
-            }
-        }
+
+        this.view?.params?.forEach((param) => {
+            dataMap[param.name] = true;
+        });
+        this.view?.variables?.forEach((variable) => {
+            dataMap[variable.name] = true;
+        });
         const parentNode = this.parentNode;
-        const grandParentNode = parentNode?.parentNode;
-        let isMemberExpression = false;
-        if (parentNode?.concept === 'MemberExpression' && (grandParentNode?.concept === 'MemberExpression' || this.parentKey === 'property')) {
-            isMemberExpression = true;
+        let isMemberExpressionProperty = false;
+        if (parentNode?.concept === 'MemberExpression' && this.parentKey === 'property') {
+            isMemberExpressionProperty = true;
         }
         let name = this.name;
         let last = '';
@@ -152,11 +145,17 @@ export class Identifier extends LogicItem {
                 if (last === 'enums') {
                     name = `$utils.EnumList("${this.name}")`;
                 }
-            } else if (namespace.endsWith('nasl.browser')) {
+            } else if (namespace.endsWith('nasl.browser') || namespace.endsWith('nasl.auth') || namespace.endsWith('nasl.configuration')) {
                 name = `$global.${this.name}`;
             }
         }
-        return (dataMap[name] || this.globalDataMap[name] || namespace?.endsWith('nasl.browser') || last === 'enums') && !isMemberExpression ? `this.${name}` : name;
+        return (dataMap[name]
+            || this.globalDataMap[name]
+            || namespace?.endsWith('nasl.browser')
+            || namespace?.endsWith('nasl.auth')
+            || namespace?.endsWith('nasl.configuration')
+            || last === 'enums')
+            && !isMemberExpressionProperty ? `this.${name}` : name;
     }
 
     @withSourceMap()
@@ -167,7 +166,7 @@ export class Identifier extends LogicItem {
             const viewLogics = view.logics;
             const findLogic = viewLogics.find((item) => item.name === this.name);
             if (findLogic) {
-                return 'logics.' + this.name;
+                return this.name;
             }
         }
         // 因为右侧枚举要赋值就赋值toList方法一下
@@ -175,7 +174,7 @@ export class Identifier extends LogicItem {
             // 绑定类型
             if (this.parentNode instanceof BindAttribute) {
                 // this.parentNode.name === 'data-source'
-                return ((this.namespace + '.') || '') + this.name + '.toList';
+                return (this.namespace + '.' || '') + this.name + '.toList';
             }
         }
 
@@ -190,6 +189,12 @@ export class Identifier extends LogicItem {
         //         return str.includes('.enums.') ? str : str + '.toString()';
         //     }
         // }
+
+        // having 下选择的变量不生成 namespace 前缀
+        if (this.namespace === 'inner' && this.getAncestor('CallQueryComponent')) {
+            return `__${this.name}` || '__IDENTIFIER__';
+        }
+
         return this.namespace ? this.namespace + '.' + this.name : this.name || '__IDENTIFIER__';
     }
 

package/src/concepts/IfStatement__.ts

@@ -96,7 +96,7 @@ export class IfStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'consequent' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {
@@ -200,7 +200,7 @@ export class IfStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'alternate' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {