@lcap/nasl 2.16.1 → 2.17.1

package/src/concepts/QueryFieldExpression__.ts

@@ -14,9 +14,9 @@ import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
 
 /**
- * 查询字段
+ * 查询属性
  */
-@concept('查询字段')
+@concept('查询属性')
 export class QueryFieldExpression extends LogicItem {
     /**
      * 产品概念
@@ -48,7 +48,7 @@ export class QueryFieldExpression extends LogicItem {
     @property()
     propertyName: string = undefined;
 
-    
+
 
     /**
      * @param source 需要合并的部分参数
@@ -63,7 +63,7 @@ export class QueryFieldExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as QueryFieldExpression;
     }
 
-    
+
     /**
      * 设置entityAsName
      */
@@ -88,9 +88,9 @@ export class QueryFieldExpression extends LogicItem {
         });
     }
 
-    
 
-    
+
+
 
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
@@ -135,7 +135,7 @@ export class QueryFieldExpression extends LogicItem {
         return '__QueryFieldExpression__';
     }
 
-    toBrief(): string { 
+    toBrief(): string {
         return this.getValue();
     }
 

package/src/concepts/QueryFromExpression__.ts

@@ -48,7 +48,7 @@ export class QueryFromExpression extends LogicItem {
     @property('QueryJoinExpression')
     joinParts: Array<QueryJoinExpression> = [];
 
-    
+
 
     /**
      * @param source 需要合并的部分参数
@@ -63,7 +63,7 @@ export class QueryFromExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as QueryFromExpression;
     }
 
-    
+
     /**
      * 设置实体名称
      */
@@ -76,9 +76,9 @@ export class QueryFromExpression extends LogicItem {
         });
     }
 
-    
 
-    
+
+
 
     /**
     * 插入查询 Join 子句
@@ -112,7 +112,7 @@ export class QueryFromExpression extends LogicItem {
         return queryJoinExpression;
     }
 
-    
+
 
     /**
      * 插入查询 Join 子句
@@ -136,7 +136,7 @@ export class QueryFromExpression extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加查询 Join 子句
@@ -157,7 +157,7 @@ export class QueryFromExpression extends LogicItem {
         return this._insertJoinPartAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加查询 Join 子句
@@ -183,7 +183,7 @@ export class QueryFromExpression extends LogicItem {
     }
 
 
-    
+
 
     /**
      * 删除查询 Join 子句
@@ -225,7 +225,7 @@ export class QueryFromExpression extends LogicItem {
     //================================================================================
 
     /**
-     * 设置实体namespace字段
+     * 设置实体namespace属性
      */
     setEntityNamespace(entityNamespace: string) {
         const object = {

package/src/concepts/QueryJoinExpression__.ts

@@ -60,7 +60,7 @@ export class QueryJoinExpression extends LogicItem {
     @property('QueryJoinExpression')
     joinParts: Array<QueryJoinExpression> = [];
 
-    
+
 
     /**
      * @param source 需要合并的部分参数
@@ -75,7 +75,7 @@ export class QueryJoinExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as QueryJoinExpression;
     }
 
-    
+
     /**
      * 设置实体名称
      */
@@ -229,7 +229,7 @@ export class QueryJoinExpression extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
     * 插入查询 Join 子句
@@ -263,7 +263,7 @@ export class QueryJoinExpression extends LogicItem {
         return queryJoinExpression;
     }
 
-    
+
 
     /**
      * 插入查询 Join 子句
@@ -287,7 +287,7 @@ export class QueryJoinExpression extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加查询 Join 子句
@@ -308,7 +308,7 @@ export class QueryJoinExpression extends LogicItem {
         return this._insertJoinPartInJoinPartsAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加查询 Join 子句
@@ -334,7 +334,7 @@ export class QueryJoinExpression extends LogicItem {
     }
 
 
-    
+
 
     /**
     * 删除二元表达式
@@ -361,7 +361,7 @@ export class QueryJoinExpression extends LogicItem {
         return binaryExpression.delete();
     }
 
-    
+
 
     /**
      * 删除查询 Join 子句
@@ -407,7 +407,7 @@ export class QueryJoinExpression extends LogicItem {
     }
 
     /**
-     * 设置实体namespace字段
+     * 设置实体namespace属性
      */
     setEntityNamespace(entityNamespace: string) {
         const object = {

package/src/concepts/Return__.ts

@@ -1,8 +1,8 @@
 import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import EntityProperty from './EntityProperty__';
-import Structure from './Structure__';
 import StructureProperty from './StructureProperty__';
+import Structure from './Structure__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 //================================================================================
@@ -18,7 +18,6 @@ import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 import Logic from './Logic__';
-import Interface from './Interface__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
@@ -66,12 +65,6 @@ export class Return extends BaseNode {
     get logic() {
         return this.getAncestor('Logic') as Logic;
     }
-    /**
-     * 祖先 Interface
-     */
-    get interface() {
-        return this.getAncestor('Interface') as Interface;
-    }
     /**
      * 祖先 Module
      */
@@ -164,10 +157,14 @@ export class Return extends BaseNode {
         });
     }
 
+
+
+
+
     /**
-     * 删除类型标注
-     * @param name 类型标注名称
-     */
+    * 删除类型标注
+    * @param name 类型标注名称
+    */
     removeTypeAnnotation(name: string): void;
 
     /**
@@ -224,13 +221,13 @@ export class Return extends BaseNode {
     } = undefined;
 
     /**
-     * 自动补全的字段列表
+     * 自动补全的属性列表
      */
     completionChildren: Array<EntityProperty | StructureProperty> = undefined;
 
     toJS(state?: TranslatorState): string {
-        const scope = this.view ? 'this' : 'Vue.prototype';
-        return `${this.name} = ${scope}.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, ${JSON.stringify(this.defaultValue)})`;
+        const context = this.view ? 'this' : 'Vue.prototype';
+        return `${this.name} = ${context}.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, ${JSON.stringify(this.defaultValue)})`;
     }
 
     @withSourceMap()
@@ -280,28 +277,26 @@ export class Return extends BaseNode {
      */
     async setDataType(typeKey: string): Promise<void>;
     async setDataType(typeAnnotation: TypeAnnotation | string) {
-        const path = this.getNodePath(false);
-        const oldObject = {
-            typeAnnotation: this.typeAnnotation,
-        };
-        if (typeof typeAnnotation === 'string') {
-            typeAnnotation = dataTypesMap[typeAnnotation];
-            if (!typeAnnotation)
-                throw new Error('找不到类型：' + typeAnnotation);
-        } else {
-            typeAnnotation._delete?.();
-            const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
-            Object.assign(typeAnnotation, relationOptions);
-        }
-        // 处理下拉属性
-        try {
-            this.completionChildren = this.getSelectRef(typeAnnotation);
-        } catch (err) {
-            this.completionChildren = [];
-            console.log(err);
+        if (typeAnnotation) {
+            if (typeof typeAnnotation === 'string') {
+                typeAnnotation = dataTypesMap[typeAnnotation];
+                if (!typeAnnotation)
+                    throw new Error('找不到类型：' + typeAnnotation);
+            } else {
+                typeAnnotation._delete?.();
+                const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
+                Object.assign(typeAnnotation, relationOptions);
+            }
+            // 处理下拉属性
+            try {
+                this.completionChildren = this.getSelectRef(typeAnnotation);
+            } catch (err) {
+                this.completionChildren = [];
+                console.log(err);
+            }
         }
         const object: any = {
-            typeAnnotation,
+            typeAnnotation: typeAnnotation || null,
         };
 
         // 切换类型的时候如果有默认值就清除掉
@@ -314,14 +309,7 @@ export class Return extends BaseNode {
     }
 
     public static getDefaultOptions() {
-        return {
-            typeAnnotation: {
-                concept: 'TypeAnnotation',
-                typeKind: 'primitive',
-                typeNamespace: 'nasl.core',
-                typeName: 'String',
-            },
-        };
+        return {};
     }
 
     /**
@@ -331,6 +319,8 @@ export class Return extends BaseNode {
         return !!this.module;
     }
     get hasChildren() {
+        if (!this.typeAnnotation)
+            return null;
         const { typeKind, typeNamespace } = this.typeAnnotation;
         if (typeKind === 'reference' || typeKind === 'generic') {
             if (typeNamespace.endsWith('.enums'))
@@ -345,22 +335,22 @@ export class Return extends BaseNode {
     getSelectRef(newTypeAnnotation: TypeAnnotation) {
         try {
             const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
-            let completionChildren: StructureProperty[];
+            let completionChildren;
             if (typeKind === 'reference') {
                 if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process' || typeNamespace === 'nasl.auth') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName) as Structure;
-                    const properties = node?.properties || [];
+                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                    const properties = (node as Structure)?.properties || [];
                     completionChildren = properties;
                 } else if (typeNamespace.endsWith('.enums')) {
                     completionChildren = [];
                 } else {
-                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName) as Structure;
+                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
                     const properties = node?.properties || [];
                     completionChildren = properties;
                 }
             } else if (typeKind === 'generic') {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName) as Structure;
-                const properties = (node?.properties && [...node?.properties]) || [];
+                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
                 for (let i = 0; i < properties.length; i++) {
                     const item = properties[i];
                     if (item?.typeAnnotation?.typeKind === 'typeParam') {