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

package/src/concepts/CallLogic__.ts

@@ -2,6 +2,8 @@ import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Logic from './Logic__';
 import Param from './Param__';
 import { ElementToVueOptions } from './ViewElement__';
+import { getNaslNodeByNodeCallee } from '../automate/engine/utils';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -64,8 +66,6 @@ export class CallLogic extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -79,13 +79,6 @@ export class CallLogic extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
-    
-    
-
-    
-
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -105,7 +98,7 @@ export class CallLogic extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
         let typeAnnotation: TypeAnnotation;
         if (options instanceof TypeAnnotation) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeAnnotation = options;
             Object.assign(typeAnnotation, relationOptions);
         } else {
@@ -118,8 +111,6 @@ export class CallLogic extends LogicItem {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -142,8 +133,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -163,8 +152,6 @@ export class CallLogic extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -188,11 +175,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -212,7 +194,7 @@ export class CallLogic 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 {
@@ -225,8 +207,6 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -249,8 +229,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -270,8 +248,6 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -295,9 +271,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -305,7 +278,7 @@ export class CallLogic extends LogicItem {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -332,8 +305,6 @@ export class CallLogic extends LogicItem {
         return params;
     }
 
-
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -341,7 +312,7 @@ export class CallLogic extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
@@ -382,6 +353,11 @@ export class CallLogic extends LogicItem {
         }
         return '';
     }
+
+    // 用于logic回填
+    get calleewholeKey(): string {
+        return this.calleeNamespace + '.' + this.calleeName;
+    }
     get calleeKey(): string {
         const tsCalleeNamespace = this.tsCalleeNamespace;
         const calleeName = this.calleeName;
@@ -399,7 +375,7 @@ export class CallLogic extends LogicItem {
     /**
      * 设置argment 触发别的地方的更新
      */
-    setArgumentName({ argument }: { argument: Argument[]}) {
+    setArgumentName({ argument }: { argument: Argument[] }) {
         // argument.setKeyword(newKeyword);
         // this.arguments = argument;
     }
@@ -521,7 +497,7 @@ export class CallLogic extends LogicItem {
 
     toVue(options?: ElementToVueOptions): string {
         let code = '';
-        if (this.calleeNamespace === 'nasl.browser') {
+        if (this.calleeNamespace === 'nasl.browser' || this.calleeNamespace === 'nasl.auth' || this.calleeNamespace === 'nasl.configuration') {
             code += '$global.';
         }
         code += this.calleeName;
@@ -660,7 +636,7 @@ export class CallLogic extends LogicItem {
                         code += `JSON.parse`;
                         break;
                 }
-            } else if (calleeNamespace === 'nasl.browser') {
+            } else if (calleeNamespace === 'nasl.browser' || calleeNamespace === 'nasl.auth' || calleeNamespace === 'nasl.configuration') {
                 code += `this.$global.${this.calleeName}`;
             } else {
                 code += `this.${this.calleeName}`;
@@ -681,6 +657,12 @@ export class CallLogic extends LogicItem {
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = this.calleeKey;
+        if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+            // 如果有内容
+            const typeAnnotation = this.typeArguments[0];
+            code += `<`;
+            code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
+        }
         code += '(';
         this.arguments.forEach((arg, index) => {
             const tsCalleeNamespace = this.tsCalleeNamespace;
@@ -694,7 +676,6 @@ export class CallLogic extends LogicItem {
                 code += ', ';
         });
         code += ');\n';
-
         return code;
     }
 
@@ -704,7 +685,7 @@ export class CallLogic extends LogicItem {
     //================================================================================
 }
 
-classMap['CallLogic'] = CallLogic;
+classMap.CallLogic = CallLogic;
 export default CallLogic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallQueryComponent__.ts

@@ -241,7 +241,7 @@ export class CallQueryComponent extends LogicItem {
                 name: options,
             }, this, 'groupBy');
         } else if (options instanceof QueryGroupByExpression) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             queryGroupByExpression = options;
             Object.assign(queryGroupByExpression, relationOptions);
         } else {
@@ -359,7 +359,7 @@ export class CallQueryComponent extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'orderBy' };
         let queryOrderByExpression: QueryOrderByExpression;
         if (options instanceof QueryOrderByExpression) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             queryOrderByExpression = options;
             Object.assign(queryOrderByExpression, relationOptions);
         } else {
@@ -901,13 +901,14 @@ export class CallQueryComponent extends LogicItem {
         return Structure.from({
             concept: 'Structure',
             name: structureName,
+            origin: 'CallQueryComponent',
             properties: [...genPropertyListOfFrom(this.from), ...genPropertyListOfAggregate(this)],
         });
     }
 
     saveStructure() {
         const source = this.genStructure();
-        console.log(source);
+        // console.log(source);
         if (this.typeAnnotation) {
             const structure = this.app.structures.find((item) => item.name === this.typeAnnotation.typeName);
             if (structure) {
@@ -938,11 +939,6 @@ export class CallQueryComponent extends LogicItem {
         } catch {}
     }
 
-    delete() {
-        this.removeStructure();
-        super.delete();
-    }
-
     getEntityNames(node: QueryFromExpression | QueryJoinExpression, set = new Set()) {
         if (node?.entityName)
             set.add(node.entityName);
@@ -1008,11 +1004,11 @@ export class CallQueryComponent extends LogicItem {
                 }));
         if (!children || children.length === 0)
             return;
-        
+
         children.forEach((item) => {
             item.icon = 'variable';
         });
-        return { name: '聚合属性别名', icon: "category", children };
+        return { name: '聚合属性别名', icon: 'category', children };
     }
 
     //================================================================================

package/src/concepts/Comment__.ts

@@ -67,7 +67,7 @@ export class Comment extends LogicItem {
     //================================================================================
 
     toJS(state?: TranslatorState): string {
-        return `\n${indent(state.tabSize)}// ${this.value}\n`;
+        return `/* ${this.value} */`;
     }
 
     public static getDefaultOptions() {
@@ -79,7 +79,11 @@ export class Comment extends LogicItem {
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
-        code += `\n${indent(state.tabSize)}// ${this.value}\n`;
+        code += `\n${indent(state.tabSize)}
+        /**
+         * 注释不用翻译
+         */
+        \n`;
         return code;
     }
     //================================================================================

package/src/concepts/ConfigGroup__.ts

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

package/src/concepts/ConfigProperty__.ts

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

package/src/concepts/Configuration__.ts

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

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 {
@@ -359,13 +359,13 @@ export class Destination extends LogicItem {
         code += prependCode;
         code += '\n';
         if (this.tsCalleeNamespace && this.viewName) {
-            code += `${this.tsCalleeNamespace}.${this.viewName}.$destination(`;
+            code += `${this.tsCalleeNamespace}.${this.viewName}.$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;
@@ -379,13 +379,13 @@ 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;
@@ -398,6 +398,8 @@ export class Destination extends LogicItem {
                     });
                 }
                 code += `);\n`;
+            } else {
+                code += '__IDENTIFIER__';
             }
             return code;
         }

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,41 @@ export class EntityProperty extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+
+    get hasChildren() {
+        const { typeKind } = this.typeAnnotation;
+        if (typeKind === 'reference' || typeKind === 'generic') {
+            return [{}];
+        }
+        return null;
+    }
+    get isTreeLeaf() {
+        return !this.hasChildren;
+    }
+    getSelectRef() {
+        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 {
+                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;
+    }
     /**
      * 设置是否必填
      */

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);
     }
@@ -141,24 +141,24 @@ export class Entity extends BaseNode {
     }
 
     /**
-    * 插入实体字段
-    * @internal
-    * @param name 实体字段名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入实体字段
+     * @internal
+     * @param name 实体字段名称，如果不填会自动生成一个唯一名称
+     */
     _insertPropertyAt(name: string, index: number): EntityProperty;
 
     /**
-    * 插入实体字段
-    * @internal
-    * @param propertyOptions 实体字段参数
-    */
+     * 插入实体字段
+     * @internal
+     * @param propertyOptions 实体字段参数
+     */
     _insertPropertyAt(propertyOptions: Partial<EntityProperty>, index: number): EntityProperty;
 
     /**
-    * 插入实体字段
-    * @internal
-    * @param property 已有的实体字段实例
-    */
+     * 插入实体字段
+     * @internal
+     * @param property 已有的实体字段实例
+     */
     _insertPropertyAt(property: EntityProperty, index: number): EntityProperty;
 
     _insertPropertyAt(options: string | Partial<EntityProperty> | EntityProperty, index: number) {
@@ -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);
@@ -283,24 +282,24 @@ export class Entity extends BaseNode {
     }
 
     /**
-    * 插入实体索引
-    * @internal
-    * @param name 实体索引名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入实体索引
+     * @internal
+     * @param name 实体索引名称，如果不填会自动生成一个唯一名称
+     */
     _insertEntityIndexAt(name: string, index: number): EntityIndex;
 
     /**
-    * 插入实体索引
-    * @internal
-    * @param entityIndexOptions 实体索引参数
-    */
+     * 插入实体索引
+     * @internal
+     * @param entityIndexOptions 实体索引参数
+     */
     _insertEntityIndexAt(entityIndexOptions: Partial<EntityIndex>, index: number): EntityIndex;
 
     /**
-    * 插入实体索引
-    * @internal
-    * @param entityIndex 已有的实体索引实例
-    */
+     * 插入实体索引
+     * @internal
+     * @param entityIndex 已有的实体索引实例
+     */
     _insertEntityIndexAt(entityIndex: EntityIndex, index: number): EntityIndex;
 
     _insertEntityIndexAt(options: string | Partial<EntityIndex> | EntityIndex, index: number) {
@@ -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,13 +414,10 @@ export class Entity extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
-    * 删除实体字段
-    * @param name 实体字段名称
-    */
+     * 删除实体字段
+     * @param name 实体字段名称
+     */
     removeProperty(name: string): void;
 
     /**
@@ -466,12 +462,10 @@ export class Entity extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除实体索引
-    * @param name 实体索引名称
-    */
+     * 删除实体索引
+     * @param name 实体索引名称
+     */
     removeEntityIndex(name: string): void;
 
     /**
@@ -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 {

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 {