@lcap/nasl 2.20.1-beta.1 → 2.20.1-beta.3

package/src/automate/upgrader/2.20.js

@@ -21,6 +21,7 @@ const excludedKeySet = new Set([
 export function replace(script) {
     script = script.replace('execTemplate = function(app,', 'execTemplate = function(app, frontend, ');
     script = script.replace('_uniqueName.initAppUniqueNames(app);', '_uniqueName.initAppUniqueNames(app, frontend);');
+    script = script.replace('_addModule(app', '_addModule(app, frontend');
     return script;
 }
 

package/src/bak/translator.js

@@ -76,9 +76,9 @@ export default function (definition) {
 
     let viewExpressionMethods;
     if (hasViewExpressions) {
-        viewExpressions.forEach((viewExpression) => {
-            viewVariablesData.push(`${safeCodeAsKey(viewExpression.expressionNameInView)}: undefined`);
-        });
+        //viewExpressions.forEach((viewExpression) => {
+        //    viewVariablesData.push(`${safeCodeAsKey(viewExpression.expressionNameInView)}: undefined`);
+        //});
         viewExpressionMethods = (viewExpressions).map((viewExpression) =>
             viewExpression.getInViewMethod({
                 tabSize: 1,

package/src/concepts/BindAttribute__.ts

@@ -815,12 +815,13 @@ export class BindAttribute extends BaseNode {
                 let memberExpressionNode = node?.parentNode;
                 while (memberExpressionNode?.concept === 'MemberExpression') {
                     expressionNode = memberExpressionNode;
+                    // 为了处理MemberExpression里面存在CallLogic、CallFunction等的情况
                     const { concept: objConcept } = memberExpressionNode.object || {};
                     if (!['MemberExpression', 'Identifier'].includes(objConcept)) {
                         memberExpressionNode = null;
                         expressionNode = null;
                     } else {
-                        memberExpressionNode = memberExpressionNode.object;
+                        memberExpressionNode = memberExpressionNode.parentNode;
                     }
                 }
                 if (expressionNode) {
@@ -926,10 +927,11 @@ export class BindAttribute extends BaseNode {
         let value = this.value;
         if (this.type === 'dynamic' || (this.name === 'rules' && this.rules)) {
             // 需要用标识符替换
-            if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
-                const argsList = this.getArgsList();
-                value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
-            } else if (this.name === 'rules' && this.rules) {
+            //if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
+            //    const argsList = this.getArgsList();
+            //    value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
+            //} else 
+            if (this.name === 'rules' && this.rules) {
                 const ruleStrs = this.rules.map((rule) => rule.toVue(options));
                 value = `[${ruleStrs.join(' , ')}]`;
             } else if (['destination', 'externalDestination'].includes(this.name)) {

package/src/concepts/BindDirective__.ts

@@ -416,12 +416,13 @@ export class BindDirective extends BaseNode {
                 let memberExpressionNode = node?.parentNode;
                 while (memberExpressionNode?.concept === 'MemberExpression') {
                     expressionNode = memberExpressionNode;
+                    // 为了处理MemberExpression里面存在CallLogic、CallFunction等的情况
                     const { concept: objConcept } = memberExpressionNode.object || {};
                     if (!['MemberExpression', 'Identifier'].includes(objConcept)) {
                         memberExpressionNode = null;
                         expressionNode = null;
                     } else {
-                        memberExpressionNode = memberExpressionNode.object;
+                        memberExpressionNode = memberExpressionNode.parentNode;
                     }
                 }
                 if (expressionNode) {
@@ -518,10 +519,11 @@ export class BindDirective extends BaseNode {
         // eslint-disable-next-line no-nested-ternary
         let value = (this.type ?? 'string') !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
         // 需要用标识符替换
-        if (options.finalCode !== false && this.needReplaceWithIdentifier) {
-            const argsList = this.getArgsList();
-            value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
-        } else if (this.expression) {
+        //if (options.finalCode !== false && this.needReplaceWithIdentifier) {
+        //    const argsList = this.getArgsList();
+        //    value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
+        //} else 
+        if (this.expression) {
             value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {
                 value = `${value}`;

package/src/concepts/BindStyle__.ts

@@ -372,12 +372,13 @@ export class BindStyle extends BaseNode {
                 let memberExpressionNode = node?.parentNode;
                 while (memberExpressionNode?.concept === 'MemberExpression') {
                     expressionNode = memberExpressionNode;
+                    // 为了处理MemberExpression里面存在CallLogic、CallFunction等的情况
                     const { concept: objConcept } = memberExpressionNode.object || {};
                     if (!['MemberExpression', 'Identifier'].includes(objConcept)) {
                         memberExpressionNode = null;
                         expressionNode = null;
                     } else {
-                        memberExpressionNode = memberExpressionNode.object;
+                        memberExpressionNode = memberExpressionNode.parentNode;
                     }
                 }
                 if (expressionNode) {
@@ -472,14 +473,14 @@ export class BindStyle extends BaseNode {
     toVue(options?: ElementToVueOptions) {
         let value: string;
         // 需要用标识符替换
-        if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
-            const argsList = this.getArgsList();
-            value = `${this.expressionBuilderName} (${argsList.join(', ')})`;
-        } else {
+        //if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
+        //    const argsList = this.getArgsList();
+        //    value = `${this.expressionBuilderName} (${argsList.join(', ')})`;
+        //} else {
             value = this.expression?.toVue(options);
             if (this.name?.endsWith('background-image') && value)
                 value = `\`url(\${${value}})\``;
-        }
+        //}
         return value && `'${this.name}': ${value}`;
     }
 

package/src/concepts/CallInterface__.ts

@@ -61,8 +61,6 @@ export class CallInterface extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -76,13 +74,6 @@ export class CallInterface extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallInterface;
     }
 
-    
-    
-
-    
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -115,8 +106,6 @@ export class CallInterface extends LogicItem {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -139,8 +128,6 @@ export class CallInterface extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -160,8 +147,6 @@ export class CallInterface extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -185,9 +170,6 @@ export class CallInterface extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -195,7 +177,7 @@ export class CallInterface extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
@@ -227,6 +209,38 @@ export class CallInterface extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    async deleteCallNode() {
+        // 计算之前选择的接口的引用次数
+        if (this.calleeKey !== '__IDENTIFIER__') {
+            const oldItf = this.getCallNode();
+            if (oldItf) {
+                let refCount = 0;
+                let isSelfRef = false;
+                // 选择无变化时
+
+                const refs = await oldItf.findUsage();
+                refs.forEach((val: any) => {
+                    const loopFindNode = (item: any) => {
+                        if (item.children) {
+                            item.children.forEach((child: any) => loopFindNode(child));
+                        } else {
+                            refCount++;
+                            if (item.node === this) {
+                                isSelfRef = true;
+                            }
+                        }
+                    };
+                    loopFindNode(val);
+                });
+
+                // 仅被自己引用则删除
+                if (isSelfRef && refCount === 1) {
+                    oldItf.delete();
+                }
+            }
+        }
+    }
+
     get tsCalleeNamespace() {
         if (this.calleeNamespace) {
             let tsCalleeNamespace = this.calleeNamespace;
@@ -550,7 +564,7 @@ export class CallInterface extends LogicItem {
         const node = this.getCallNode();
         let logicParam: InterfaceParam[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/CallLogic__.ts

@@ -534,7 +534,7 @@ export class CallLogic extends LogicItem {
         if (typeof argIndex === 'number') {
             if (!this.arguments[argIndex]?.expression) {
                 // 如果本身没有值就直接删除
-                return this.arguments[argIndex].delete();
+                return this.arguments[argIndex]?.delete();
             }
             if (argIndex !== this.arguments.length - 1) {
                 this.arguments[argIndex]?.moveNode({
@@ -567,7 +567,7 @@ export class CallLogic extends LogicItem {
 
         const node = this.getCallNode();
         let logicParam: Param[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {
@@ -1041,7 +1041,7 @@ export class CallLogic extends LogicItem {
         const node = this.getCallNode();
         let logicParam: Param[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/ConfigGroup__.ts

@@ -1,3 +1,5 @@
+import Namespace from './Namespace__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -11,8 +13,6 @@ import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import ConfigProperty from './ConfigProperty__';
 import App from './App__';
-import Namespace from './Namespace__';
-import Configuration from './Configuration__';
 
 /**
  * 配置组

package/src/concepts/DataSource__.ts

@@ -94,7 +94,7 @@ export class DataSource extends BaseNode {
         });
     }
 
-        getEntityExistingNames(excludedList: Array<Entity> = []) {
+    getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.entities as Entity[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -235,9 +235,6 @@ export class DataSource extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除实体
     * @param name 实体名称
@@ -422,13 +419,20 @@ export class DataSource extends BaseNode {
             if (!prop.value) {
                 return;
             }
-            const dataSource = configProperty.name;
+            let isRecycled = false;
+            try {
+                const value = JSON.parse(prop.value);
+                // 被回收的数据库不需要 Ping
+                if (value.dataBaseMode === 'Platform_Generation' && value.status === 1) {
+                    isRecycled = true;
+                }
+            } catch (e) {}
             const env = prop.env;
-            return datasourceService.pingDatabase({
+            return isRecycled ? Promise.resolve() : datasourceService.pingDatabase({
                 body: {
                     category: 'sql',
                     appId: this.app.id,
-                    dataSource,
+                    dataSource: configProperty.name,
                     env,
                 },
             }).then(() => {

package/src/concepts/Destination__.ts

@@ -353,7 +353,7 @@ export class Destination extends LogicItem {
             if (Array.isArray(completeArguments) && completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLen = logicParam.length;
@@ -407,7 +407,7 @@ export class Destination extends LogicItem {
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -447,7 +447,7 @@ export class Destination extends LogicItem {
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -488,7 +488,7 @@ export class Destination extends LogicItem {
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -599,7 +599,7 @@ export class Destination extends LogicItem {
          */
         if (typeof argIndex === 'number') {
             if (!this.arguments[argIndex]?.expression) {
-                return this.arguments[argIndex].delete();
+                return this.arguments[argIndex]?.delete();
             }
             if (argIndex !== this.arguments.length - 1) {
                 // 如果本身没有值就直接删除
@@ -668,7 +668,7 @@ export class Destination extends LogicItem {
 
         const node = this.viewNode;
         let logicParam: Param[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         const logicParamLength = logicParam.length;
@@ -759,7 +759,7 @@ export class Destination extends LogicItem {
         const node = this.viewNode;
         let logicParam: Param[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/Interface__.ts

@@ -2,6 +2,7 @@ import { TranslatorState, shiftState, withSourceMap, createCompilerState } from
 import Namespace from './Namespace__';
 import TypeAnnotation from './TypeAnnotation__';
 import Structure from './Structure__';
+import Param from './Param__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -133,7 +134,7 @@ export class Interface extends BaseNode {
         });
     }
 
-        getInterfaceParamUniqueName(name = 'interfaceParam1') {
+    getInterfaceParamUniqueName(name = 'interfaceParam1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
@@ -270,7 +271,6 @@ export class Interface extends BaseNode {
         return node;
     }
 
-
     getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -408,9 +408,6 @@ export class Interface extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除接口参数
     * @param name 接口参数名称
@@ -459,8 +456,6 @@ export class Interface extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -514,6 +509,18 @@ export class Interface extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    /**
+     * 协议
+     */
+    // @property()
+    // protocol: string = undefined;
+
+    /**
+     * 协议参数列表
+     */
+    // @property('Param')
+    // protocolParams: Array<Param> = [];
+
     /**
      * 是否可编辑
      * */
@@ -545,6 +552,21 @@ export class Interface extends BaseNode {
         });
     }
 
+    // 更新所有调用接口
+    async updateAllRefCallInterface() {
+        const refs = await this.findUsage();
+        refs.forEach((val: any) => {
+            const loopFindNode = (item: any) => {
+                if (item.children) {
+                    item.children.forEach((i: any) => loopFindNode(i));
+                } else {
+                    item.node.setCallee(this);
+                }
+            };
+            loopFindNode(val);
+        });
+    }
+
     /* 删除空数据模块 */
     deleteLogincAndModule() {
         this.rootNode.emit('collect:start', {
@@ -823,6 +845,36 @@ export class Interface extends BaseNode {
         return [...this.params, ...this.returns].filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
 
+    // 递归找出 response/request 的 Body/Returns 引用的数据结构
+    getRefStructures(structures: Structure[] = []): Set<Structure> {
+        const structuresSet: Set<Structure> = new Set();
+        const loopSaveStructure = (typeAnnotation: TypeAnnotation) => {
+            if (!typeAnnotation)
+                return;
+            if (typeAnnotation.typeKind === 'reference') {
+                const targetStructure = structures.find((s) => s.name === typeAnnotation.typeName);
+                if (targetStructure && !structuresSet.has(targetStructure)) {
+                    structuresSet.add(targetStructure);
+                    targetStructure?.properties.forEach((prop) => {
+                        loopSaveStructure(prop.typeAnnotation);
+                    });
+                }
+            } else if (typeAnnotation.typeKind === 'generic') {
+                typeAnnotation.typeArguments.forEach(loopSaveStructure);
+            }
+        };
+
+        const { params = [], returns = [] } = this;
+        [...params, ...returns].forEach((p) => {
+            if ('in' in p && p.in === 'cookie') {
+                p.in = 'header';
+                return;
+            }
+            loopSaveStructure(p?.typeAnnotation);
+        });
+        return structuresSet;
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Logic__.ts

@@ -1712,11 +1712,11 @@ export class Logic extends BaseNode {
                         }
                     }
                 });
-            } else if (['NewList', 'NewMap'].includes(assignment.right.concept) && !(assignment.right as any).typeAnnotation) {
+            } else if (['NewList', 'NewMap'].includes(assignment.right?.concept) && !(assignment.right as any)?.typeAnnotation) {
                 const rightNode: any = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode(shiftState(state, code, { inline: true }));
-            } else if (assignment.right.concept === 'NewComposite' && (assignment.right as any).typeAnnotation?.typeKind === 'anonymousStructure') {
+            } else if (assignment.right?.concept === 'NewComposite' && (assignment.right as any)?.typeAnnotation?.typeKind === 'anonymousStructure') {
                 const rightNode: any = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode(shiftState(state, code, { inline: true }));

package/src/concepts/Match__.ts

@@ -438,10 +438,69 @@ export class Match extends LogicItem {
         this.emit('change', $event);
     }
 
+
+    // 获取在页面中的名字
+    get expressionNameInView() {
+        const nameList: string[] = [];
+        let node: BaseNode = this;
+        while (node) {
+            if (node === this) {
+                nameList.unshift('viewMatchExpression');
+            } else {
+                nameList.unshift(node.name);
+            }
+            if (node.concept === 'ViewElement') {
+                node = null;
+            } else {
+                nameList.unshift(node.parentKey);
+                node = node.parentNode;
+            }
+        }
+        return nameList.join('_').replace(/-/g, '_');
+    }
+
+    getViewMatchExpressionBuilder() {
+        return `gen${this.expressionNameInView}`;
+    }
+
+    getInViewMethod(state?: TranslatorState) {
+        const viewElement = this?.getAncestor('ViewElement');
+        const argsList = [];
+        let parent = viewElement?.parentNode;
+        let index = 0;
+        while (parent && parent.concept !== 'View') {
+            if ((parent as ViewElement).slotScope) {
+                argsList.unshift(index === 0 ? 'current' : 'current' + index);
+                index++;
+            }
+            parent = parent.parentNode;
+        }
+
+        let code = '';
+        code += `${this.getViewMatchExpressionBuilder()} (${argsList.join(', ')}) {\n`;
+        code += `return ${this.toJS()}`;
+        code += `;\n`;
+        code += '}';
+        return code;
+    }
+
     toVue(state?: TranslatorState): string {
         if (state?.finalCode === false) {
             return this.toUI();
         } else {
+            const viewElement = this?.getAncestor('ViewElement');
+            const argsList = [];
+            let parent = viewElement?.parentNode;
+            let index = 0;
+            while (parent && parent.concept !== 'View') {
+                if ((parent as ViewElement).slotScope) {
+                    argsList.unshift(index === 0 ? 'current' : 'current' + index);
+                    index++;
+                }
+                parent = parent.parentNode;
+            }
+            return `${this.getViewMatchExpressionBuilder()}(${argsList.join(', ')})`;
+
             //        let code = 'await (async () => {\n';
             //        if (this.expression && Array.isArray(this.cases)) {
             //            this.cases.forEach((item, index) => {
@@ -469,13 +528,29 @@ export class Match extends LogicItem {
     }
 
     toJS(state?: TranslatorState): string {
-        let code = 'await (async () => {\n';
+        //let code = 'await (async () => {\n';
+        //if (this.expression && Array.isArray(this.cases)) {
+        //    this.cases.forEach((item, index) => {
+        //        code += item?.toJS?.(this.expression, index, this.cases.length);
+        //    });
+        //}
+        //code += `})()`;
+        //return code;
+
+        let code = '';
+        // 祖先逻辑
+        const ancestorLogic = this.getAncestor('Logic');
+        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 += `})()`;
+        code += '})()';
         return code;
     }