@lcap/nasl 3.2.0-beta.4 → 3.3.0-alpha

package/out/concepts/CallConnector__.d.ts

@@ -1,5 +1,6 @@
-import Connector from './Connector__';
 import Logic from './Logic__';
+import Connection from './Connection__';
+import { TranslatorState } from '../translator';
 import CallLogic from './CallLogic__';
 /**
  * 连接器
@@ -10,9 +11,9 @@ export declare class CallConnector extends CallLogic {
      */
     concept: 'CallConnector';
     /**
-     * calleeConnectorName
+     * calleeConnectionName
      */
-    calleeConnectorName: string;
+    calleeConnectionName: string;
     /**
      * 连接器标题
      */
@@ -24,19 +25,20 @@ export declare class CallConnector extends CallLogic {
     getClassName(): string;
     static from(source: any, parentNode?: any, parentKey?: string): CallConnector;
     /**
-     * 设置calleeConnectorName
+     * 设置calleeConnectionName
      */
-    setCalleeConnectorName(calleeConnectorName: string): void;
-    setCallCtor(connector: Connector): void;
+    setCalleeConnectionName(calleeConnectionName: string): void;
+    setCallCtor(connection: Connection): void;
     /**
-     * 重置 argument、calleeConnectorName、calleeName、calleeNamespace
-     * @param connector
+     * 重置 argument、calleeConnectionName、calleeName、calleeNamespace
      */
     resetCallCtor(): void;
     get calleewholeKey(): string;
     get calleeKey(): string;
+    get calleeConnectionKey(): string;
+    get connection(): Connection;
     getCallNode(): any;
-    getConnectorNode(): import("./Module__").Module | Connector;
     setArgumentsAndTypeArguments(logic: Logic): void;
+    toEmbeddedTS(state?: TranslatorState): string;
 }
 export default CallConnector;

package/out/concepts/CallConnector__.js

@@ -15,6 +15,7 @@ const utils_1 = require("../automate/engine/utils");
 const Argument__1 = __importDefault(require("./Argument__"));
 const Identifier__1 = __importDefault(require("./Identifier__"));
 const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
+const translator_1 = require("../translator");
 const decorators_1 = require("../decorators");
 const classMap_1 = __importDefault(require("../common/classMap"));
 const CallLogic__1 = __importDefault(require("./CallLogic__"));
@@ -27,9 +28,9 @@ let CallConnector = CallConnector_1 = class CallConnector extends CallLogic__1.d
      */
     concept = 'CallConnector';
     /**
-     * calleeConnectorName
+     * calleeConnectionName
      */
-    calleeConnectorName = undefined;
+    calleeConnectionName = undefined;
     /**
      * 连接器标题
      */
@@ -38,7 +39,8 @@ let CallConnector = CallConnector_1 = class CallConnector extends CallLogic__1.d
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, CallConnector_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...CallConnector_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -49,44 +51,43 @@ let CallConnector = CallConnector_1 = class CallConnector extends CallLogic__1.d
         return super.from(source, parentNode, parentKey);
     }
     /**
-     * 设置calleeConnectorName
+     * 设置calleeConnectionName
      */
-    setCalleeConnectorName(calleeConnectorName) {
+    setCalleeConnectionName(calleeConnectionName) {
         const object = {
-            calleeConnectorName,
+            calleeConnectionName,
         };
         this.update({
             ...object,
         });
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-    setCallCtor(connector) {
-        const calleeConnectorName = connector.name;
+    //= ===============================================================================
+    setCallCtor(connection) {
+        const calleeConnectionName = connection.name;
         if (this.app) {
             this.app.emit('collect:start', {
                 actionMsg: `切换切换连接器`,
             });
             this.update({
-                calleeConnectorName,
+                calleeConnectionName,
             });
             this.app.emit('collect:end');
         }
         else {
             this.update({
-                calleeConnectorName,
+                calleeConnectionName,
             });
         }
     }
     /**
-     * 重置 argument、calleeConnectorName、calleeName、calleeNamespace
-     * @param connector
+     * 重置 argument、calleeConnectionName、calleeName、calleeNamespace
      */
     resetCallCtor() {
         const resetOptions = {
-            calleeConnectorName: '',
+            calleeConnectionName: '',
             calleeName: '',
             calleeNamespace: '',
         };
@@ -105,20 +106,22 @@ let CallConnector = CallConnector_1 = class CallConnector extends CallLogic__1.d
         }
     }
     get calleewholeKey() {
-        return `${this.calleeNamespace}.${this.calleeConnectorName}.logics.${this.calleeName}`;
+        return `${this.calleeNamespace}.logics.${this.calleeName}`;
     }
     get calleeKey() {
-        const tsCalleeNamespace = this.tsCalleeNamespace;
-        const calleeName = this.calleeName;
+        const { tsCalleeNamespace } = this;
+        const { calleeName } = this;
         if (!tsCalleeNamespace) {
             return calleeName ? `${calleeName}` : '__IDENTIFIER__';
         }
-        // elements单独处理相对路径，和后缀的问题
-        if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
-            const methodName = tsCalleeNamespace.substring(0, tsCalleeNamespace.length - '.logics'.length);
-            return '__' + methodName + `.${calleeName}`;
-        }
-        return calleeName ? `${this.calleeNamespace}.${this.calleeConnectorName}.logics.${this.calleeName}` : '__IDENTIFIER__';
+        return calleeName ? `${this.calleeNamespace}.logics.${this.calleeName}` : '__IDENTIFIER__';
+    }
+    get calleeConnectionKey() {
+        const { calleeConnectionName } = this;
+        return calleeConnectionName ? `app.connections.${calleeConnectionName}` : '__IDENTIFIER__';
+    }
+    get connection() {
+        return this.app.connections.find((connection) => connection.name === this.calleeConnectionName);
     }
     // 通过内容过去节点
     getCallNode() {
@@ -142,15 +145,6 @@ let CallConnector = CallConnector_1 = class CallConnector extends CallLogic__1.d
         catch (err) { }
         return node;
     }
-    // 获取connector
-    getConnectorNode() {
-        let node;
-        try {
-            node = this.app.dependencies.find((m) => m.concept === 'Connector' && this.calleeConnectorName === m.name);
-        }
-        catch (err) { }
-        return node;
-    }
     setArgumentsAndTypeArguments(logic) {
         const args = logic.params.map((param) => {
             const relationOptions = { parentNode: this, parentKey: 'arguments' };
@@ -175,24 +169,73 @@ let CallConnector = CallConnector_1 = class CallConnector extends CallLogic__1.d
             typeArguments: tArgs,
         });
     }
+    toEmbeddedTS(state) {
+        let code = '';
+        if (this.handleError) {
+            code += 'nasl.util.autoHandleError(';
+        }
+        code += this.calleeConnectionKey;
+        code += '(() => ';
+        code += this.calleeKey;
+        if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+            // 如果有内容
+            const typeAnnotation = this.typeArguments[0];
+            code += `<`;
+            code += `${typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }))}>`;
+        }
+        const { completeArguments } = this;
+        if (completeArguments.length) {
+            code += '(';
+            completeArguments.forEach((arg, index) => {
+                // 取到是不是必填放入参数中
+                code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code), arg?.paramRequired);
+                if (index !== this.arguments.length - 1)
+                    code += ', ';
+            });
+            code += ')';
+        }
+        else {
+            code += '()';
+        }
+        if (this.handleError) {
+            code += ')';
+        }
+        if (this.parentNode.concept !== 'Argument' &&
+            this.parentKey !== 'test' &&
+            this.parentKey !== 'patterns' &&
+            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' &&
+            !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
+            code += ');';
+        }
+        return code;
+    }
 };
 __decorate([
     (0, decorators_1.property)()
 ], CallConnector.prototype, "concept", void 0);
 __decorate([
     (0, decorators_1.property)()
-], CallConnector.prototype, "calleeConnectorName", void 0);
+], CallConnector.prototype, "calleeConnectionName", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], CallConnector.prototype, "label", void 0);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], CallConnector.prototype, "toEmbeddedTS", null);
 CallConnector = CallConnector_1 = __decorate([
     (0, decorators_1.concept)('连接器')
 ], CallConnector);
 exports.CallConnector = CallConnector;
 classMap_1.default.CallConnector = CallConnector;
 exports.default = CallConnector;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=CallConnector__.js.map

package/out/concepts/CallConnector__.js.map

@@ -1 +1 @@
-{"version":3,"file":"CallConnector__.js","sourceRoot":"","sources":["../../src/concepts/CallConnector__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CallConnector__.js","sourceRoot":"","sources":["../../src/concepts/CallConnector__.ts"],"names":[],"mappings":"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"}

package/out/concepts/CallFunction__.d.ts

@@ -44,16 +44,16 @@ export declare class CallFunction extends LogicItem {
     getClassName(): string;
     static from(source: any, parentNode?: any, parentKey?: string): CallFunction;
     /**
-    * 插入类型标注
-    * @internal
-    * @param typeAnnotationOptions 类型标注参数
-    */
+     * 插入类型标注
+     * @internal
+     * @param typeAnnotationOptions 类型标注参数
+     */
     _insertTypeAnnotationAt(typeAnnotationOptions: Partial<TypeAnnotation>, index: number): TypeAnnotation;
     /**
-    * 插入类型标注
-    * @internal
-    * @param typeAnnotation 已有的类型标注实例
-    */
+     * 插入类型标注
+     * @internal
+     * @param typeAnnotation 已有的类型标注实例
+     */
     _insertTypeAnnotationAt(typeAnnotation: TypeAnnotation, index: number): TypeAnnotation;
     /**
      * 插入类型标注
@@ -88,16 +88,16 @@ export declare class CallFunction extends LogicItem {
      */
     addTypeAnnotation(typeAnnotation: TypeAnnotation): TypeAnnotation;
     /**
-    * 插入实际参数
-    * @internal
-    * @param argumentOptions 实际参数参数
-    */
+     * 插入实际参数
+     * @internal
+     * @param argumentOptions 实际参数参数
+     */
     _insertArgumentAt(argumentOptions: Partial<Argument>, index: number): Argument;
     /**
-    * 插入实际参数
-    * @internal
-    * @param argument 已有的实际参数实例
-    */
+     * 插入实际参数
+     * @internal
+     * @param argument 已有的实际参数实例
+     */
     _insertArgumentAt(argument: Argument, index: number): Argument;
     /**
      * 插入实际参数
@@ -152,6 +152,7 @@ export declare class CallFunction extends LogicItem {
     setCallee(func: Function): void;
     detectArgs(obj?: any): void;
     toEmbeddedTS(state?: TranslatorState): string;
+    toNaturalTS(state?: TranslatorState): string;
     checkParamNameOfAnonymousFunction(): void;
 }
 export default CallFunction;

package/out/concepts/CallFunction__.js

@@ -59,7 +59,8 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, CallFunction_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...CallFunction_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -156,7 +157,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         return typeAnnotation.delete();
     }
     __removeTypeAnnotation(typeAnnotation) {
-        const parentKey = typeAnnotation.parentKey;
+        const { parentKey } = typeAnnotation;
         const params = {
             parentNode: this,
             parentKey,
@@ -183,7 +184,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         return argument.delete();
     }
     __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
+        const { parentKey } = logicItem;
         const params = {
             parentNode: this,
             parentKey,
@@ -205,42 +206,40 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     toVue(options) {
         if (options?.finalCode === false) {
             return this.toUI();
         }
-        else {
-            let code = `$utils['${this.calleeName}']`;
-            code += '(';
-            if (Array.isArray(this.arguments) && this.arguments.length) {
-                const needToString = ['Concat'].includes(this.calleeName);
-                this.arguments?.forEach((arg, index) => {
-                    let argStr = arg?.toVue(options);
-                    if (needToString) {
-                        const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
-                        argStr = `$utils['ToString'](${argStr}, '${argTypeAnnotation?.sortedTypeKey}')`;
-                    }
-                    code += argStr;
-                    if (index !== this.arguments?.length - 1)
-                        code += ', ';
-                });
-            }
-            if (this.typeArguments && this.typeArguments.length) {
-                if (this.arguments?.length)
+        let code = `$utils['${this.calleeName}']`;
+        code += '(';
+        if (Array.isArray(this.arguments) && this.arguments.length) {
+            const needToString = ['Concat'].includes(this.calleeName);
+            this.arguments?.forEach((arg, index) => {
+                let argStr = arg?.toVue(options);
+                if (needToString) {
+                    const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
+                    argStr = `$utils['ToString'](${argStr}, '${argTypeAnnotation?.sortedTypeKey}')`;
+                }
+                code += argStr;
+                if (index !== this.arguments?.length - 1)
                     code += ', ';
-                this.typeArguments?.forEach((arg, index) => {
-                    code += arg?.toJS().replace(/"/g, "'");
-                    if (index !== this.typeArguments?.length - 1)
-                        code += ', ';
-                });
-            }
-            code += ')';
-            return code;
+            });
+        }
+        if (this.typeArguments && this.typeArguments.length) {
+            if (this.arguments?.length)
+                code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.toJS().replace(/"/g, "'");
+                if (index !== this.typeArguments?.length - 1)
+                    code += ', ';
+            });
         }
+        code += ')';
+        return code;
     }
     toUI() {
         let code = this.calleeName;
@@ -305,21 +304,18 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         if (argTypeAnnotation) {
             code += `, '${argTypeAnnotation?.sortedTypeKey}'`;
         }
-        else {
-            if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
-                if (this.arguments?.length)
+        else if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+            if (this.arguments?.length)
+                code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.toJS((0, translator_1.shiftState)(state, code));
+                if (index !== this.typeArguments?.length - 1)
                     code += ', ';
-                this.typeArguments?.forEach((arg, index) => {
-                    code += arg?.toJS((0, translator_1.shiftState)(state, code));
-                    if (index !== this.typeArguments?.length - 1)
-                        code += ', ';
-                });
-            }
+            });
         }
         code += ')';
         const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind)
-            || typeAnnotation.typeName === 'DateTime');
+        const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
         if (needGenInitFromSchema) {
             code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
         }
@@ -329,7 +325,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
         return this.arguments.map((a) => a.toBrief()).join('<br />');
     }
     get calleeKey() {
-        return this.calleeName ? `${this.calleeNamespace ? this.calleeNamespace + '.' : ''}${this.calleeName}` : '__IDENTIFIER__';
+        return this.calleeName ? `${this.calleeNamespace ? `${this.calleeNamespace}.` : ''}${this.calleeName}` : '__IDENTIFIER__';
     }
     _setCallee(func) {
         this.calleeNamespace = func?.getNamespace();
@@ -370,7 +366,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
             this.app.emit('collect:start', {
                 actionMsg: `切换内置函数`,
             });
-            const parentNode = this.parentNode;
+            const { parentNode } = this;
             this.update({
                 calleeNamespace,
                 calleeName,
@@ -398,13 +394,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
     }
     detectArgs(obj) {
         const func = (0, getFunctions_1.getBuildInFunction)(this.calleeName);
-        const shouldJudge = !!func && [
-            'ListDistinctBy',
-            'MapDistinctBy',
-            'ListGroupBy',
-            'ListToMap',
-            'MapFilter',
-        ].includes(this.calleeName);
+        const shouldJudge = !!func && ['ListDistinctBy', 'MapDistinctBy', 'ListGroupBy', 'ListToMap', 'MapFilter'].includes(this.calleeName);
         if (shouldJudge && Array.isArray(this.arguments)) {
             const depParamIdx = func.params.findIndex((param) => ['list', 'map'].includes(param.name));
             if (depParamIdx !== -1) {
@@ -413,10 +403,8 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
                     if (depParamIdx !== index && !depArgExpression) {
                         arg.illegalTip = `请先添加${func.params[depParamIdx].name}`;
                     }
-                    else {
-                        if (arg.illegalTip) {
-                            delete arg.illegalTip;
-                        }
+                    else if (arg.illegalTip) {
+                        delete arg.illegalTip;
                     }
                 });
             }
@@ -424,7 +412,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
     }
     toEmbeddedTS(state) {
         let code = '';
-        const calleeKey = this.calleeKey;
+        const { calleeKey } = this;
         if (['nasl.util.Convert', 'nasl.util.FromString'].includes(calleeKey)) {
             // nasl.util.Convert(variable1)<nasl.core.String>();
             // 单独处理
@@ -450,18 +438,59 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
                 code += `${typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }))}>`;
             }
             code += '(';
-            Array.isArray(this.arguments) && this.arguments.forEach((arg, index) => {
-                code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
+            Array.isArray(this.arguments) &&
+                this.arguments.forEach((arg, index) => {
+                    code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
+                    if (index !== this.arguments.length - 1)
+                        code += ', ';
+                });
+            code += ')';
+        }
+        return code;
+    }
+    toNaturalTS(state) {
+        let code = '';
+        code = this.calleeKey;
+        if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+            // 如果有内容
+            const typeAnnotation = this.typeArguments[0];
+            code += `<`;
+            code += `${typeAnnotation.toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }))}>`;
+        }
+        if (this.arguments.length <= 3) {
+            code += '(';
+            this.arguments.forEach((arg, index) => {
+                code += arg.toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
                 if (index !== this.arguments.length - 1)
                     code += ', ';
             });
-            code += ')';
+            if (this?.typeArguments?.[0]?.typeKind === 'reference') {
+                if (this.arguments?.length > 0)
+                    code += ', ';
+                code += `{ typeNamespace: '${this.typeArguments[0].typeNamespace}' }`;
+            }
+            code += `)`;
+        }
+        else {
+            code += '(\n';
+            this.arguments.forEach((arg, index) => {
+                code += arg.toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: state.tabSize + 1 }));
+                if (index !== this.arguments.length - 1) {
+                    code += ',\n';
+                }
+                else if (this?.typeArguments?.[0]?.typeKind === 'reference') {
+                    code += `,\n{ typeNamespace: '${this.typeArguments[0].typeNamespace}' }`;
+                }
+                else {
+                    code += '\n';
+                }
+            });
+            code += `${(0, translator_1.indent)(state.tabSize)})`;
         }
         return code;
     }
     checkParamNameOfAnonymousFunction() {
-        const fns = this.arguments.map((arg) => arg.expression)
-            .filter((exp) => exp instanceof AnonymousFunction__1.default);
+        const fns = this.arguments.map((arg) => arg.expression).filter((exp) => exp instanceof AnonymousFunction__1.default);
         fns.forEach((fn) => {
             fn.checkParamName();
         });
@@ -491,14 +520,17 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], CallFunction.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], CallFunction.prototype, "toNaturalTS", null);
 CallFunction = CallFunction_1 = __decorate([
     (0, decorators_1.concept)('调用函数')
 ], CallFunction);
 exports.CallFunction = CallFunction;
 classMap_1.default.CallFunction = CallFunction;
 exports.default = CallFunction;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=CallFunction__.js.map