@lcap/nasl 2.22.0-beta.0 → 2.22.0-beta.1

package/src/concepts/Logic__.ts

@@ -249,7 +249,7 @@ export class Logic extends BaseNode {
         });
     }
 
-        getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
+    getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -390,7 +390,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -528,7 +527,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -666,7 +664,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -804,11 +801,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -841,8 +833,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -865,8 +855,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -886,8 +874,6 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -911,8 +897,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -945,8 +929,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -969,8 +951,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -990,8 +970,6 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -1015,9 +993,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除事务
     * @param name 事务名称
@@ -1066,8 +1041,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除类型参数
     * @param name 类型参数名称
@@ -1116,8 +1089,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1166,8 +1137,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1216,8 +1185,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1266,8 +1233,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1275,12 +1240,10 @@ export class Logic extends BaseNode {
     removeItemInBody(logicItem: LogicItem): void;
 
     removeItemInBody(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
-    
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1288,7 +1251,7 @@ export class Logic extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -1477,7 +1440,7 @@ export class Logic extends BaseNode {
         const logicName = this.name;
         let serviceType = 'micro';
         let method = 'POST';
-        let path = `/api/${logicName}`;
+        let path = `/api/lcplogics/${logicName}`;
         if (concept === 'Module') {
             path = `/api/${entityName.replace('-', '_')}/${logicName}`;
         } else if (concept === 'Namespace') {
@@ -1740,7 +1703,7 @@ export class Logic extends BaseNode {
                     if (leftCode === node.name) {
                         const rightNode: any = rightIndex.length === 1 ? assignment.rights[rightIndex[0]]?.expression : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
                         // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
-                        if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent && rightNode.ideVersion !== '2.11')) {
+                        if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent && !rightNode.isAutoInfer())) {
                             code += ': ';
                             code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';
                         } else {
@@ -1761,7 +1724,7 @@ export class Logic extends BaseNode {
             } else {
                 const rightNode: any = assignment.right;
                 // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
-                if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent && rightNode.ideVersion !== '2.11')) {
+                if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent && !rightNode.isAutoInfer())) {
                     code += ': ';
                     code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';
                 } else {
@@ -1783,8 +1746,12 @@ export class Logic extends BaseNode {
         } else {
             // 如果长度小于2 并且不是虚拟节点就 加 报错，
             if (this.body.length <= 2 && !(this.parentNode instanceof Namespace)) {
-                code += indent((state?.tabSize || 0) + 1);
-                code += 'const __LogicEmpty: any = null;';
+                if (this.body.length && this.body[0].concept === 'JavaLogic') {
+                    code += '';
+                } else {
+                    code += indent((state?.tabSize || 0) + 1);
+                    code += 'const __LogicEmpty: any = null;';
+                }
             }
             this.body.forEach((item) => {
                 code += item.toEmbeddedTS && item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));

package/src/concepts/Match__.ts

@@ -615,17 +615,21 @@ export class Match extends LogicItem {
         let code = '';
         // 祖先逻辑
         const ancestorLogic = this.getAncestor('Logic');
-        if (ancestorLogic) {
-            code += 'await (async () => {\n';
-        } else {
-            code += '(() => {\n';
+        if (this.isExpression || !ancestorLogic) {
+            if (ancestorLogic) {
+                code += 'await (async () => {\n';
+            } else {
+                code += '(() => {\n';
+            }
         }
         if (this.expression && Array.isArray(this.cases)) {
             this.cases.forEach((item, index) => {
                 code += item?.toJS?.(this.expression, index, this.cases.length);
             });
         }
-        code += '})()';
+        if (this.isExpression || !ancestorLogic) {
+            code += '})()';
+        }
         return code;
     }
 
@@ -674,6 +678,7 @@ export class Match extends LogicItem {
             && this.parentNode.concept !== 'Assignment'
             && this.parentNode.concept !== 'ForEachStatement'
             && this.parentNode.concept !== 'SelectMembers'
+            && this.parentNode.concept !== 'UnaryExpression'
             && this.parentNode.concept !== 'BinaryExpression'
             && this.parentNode.concept !== 'StringInterpolation'
             && this.parentNode.concept !== 'MemberExpression'

package/src/concepts/MemberExpression__.ts

@@ -348,7 +348,7 @@ export class MemberExpression extends LogicItem {
     }
     firstMemberExpressionNode() {
         let tempNode: any = this;
-        while (tempNode.parentNode.concept === 'MemberExpression') {
+        while (tempNode.parentNode?.concept === 'MemberExpression') {
             tempNode = tempNode.parentNode;
         }
         return tempNode;

package/src/concepts/MicroApp__.ts

@@ -0,0 +1,118 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
+
+
+/**
+ * 微应用
+ */
+@concept('微应用')
+export class MicroApp extends BaseNode {
+    /**
+     * 产品概念
+     */
+    @property()
+    concept: 'MicroApp' = 'MicroApp';
+
+    /**
+     * 微前端框架
+     */
+    @property()
+    framework: 'qiankun' | 'icestark' = undefined;
+
+    /**
+     * 微应用名称
+     */
+    @property()
+    name: string = undefined;
+
+    /**
+     * 页面路径前缀
+     */
+    @property()
+    routePrefix: string = undefined;
+
+    /**
+     * 接口和静态资源前缀
+     */
+    @property()
+    proxyPrefix: string = undefined;
+
+    /**
+     * 登录页面地址
+     */
+    @property()
+    loginUrl: string = undefined;
+
+    /**
+     * 无权限页面地址
+     */
+    @property()
+    noAuthUrl: string = undefined;
+
+    /**
+     * 404页面地址
+     */
+    @property()
+    notFoundUrl: string = undefined;
+
+    
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<MicroApp>) {
+        source = Object.assign({}, MicroApp.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+    getClassName() {
+        return 'MicroApp';
+    }
+
+    static from(source: any, parentNode?: any, parentKey?: string): MicroApp {
+        return super.from(source, parentNode, parentKey) as MicroApp;
+    }
+
+    /**
+     * 从父级删除该节点
+     * @internal
+     */
+    _delete() {
+        let params: Params = null;
+        if (this.parentNode) {
+            params = (this.parentNode as any)?.__removeMicroApp?.(this);
+        }
+        return params;
+    }
+    
+
+    
+
+    
+
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+
+    //================================================================================
+    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+    //================================================================================
+}
+
+classMap.MicroApp = MicroApp;
+export default MicroApp;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================