@lcap/nasl 2.14.0 → 2.15.1

package/out/concepts/OqlQueryComponent__.js

@@ -0,0 +1,395 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var OqlQueryComponent_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OqlQueryComponent = void 0;
+const translator_1 = require("../translator");
+const utils_1 = require("../automate/engine/utils");
+const StructureProperty__1 = __importDefault(require("./StructureProperty__"));
+const Identifier__1 = __importDefault(require("./Identifier__"));
+const MemberExpression__1 = __importDefault(require("./MemberExpression__"));
+const decorators_1 = require("../decorators");
+const classMap_1 = __importDefault(require("../common/classMap"));
+const LogicItem__1 = __importDefault(require("./LogicItem__"));
+/**
+ * SQL 查询
+ */
+let OqlQueryComponent = OqlQueryComponent_1 = class OqlQueryComponent extends LogicItem__1.default {
+    /**
+     * 产品概念
+     */
+    concept = 'OqlQueryComponent';
+    /**
+     * SQL 查询标题
+     */
+    label = 'SQL 查询';
+    /**
+     * SQL 查询
+     */
+    code = undefined;
+    /**
+     * 相关类型
+     */
+    typeAnnotation = undefined;
+    /**
+     * 数据源
+     */
+    dataSource = undefined;
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source) {
+        source = Object.assign({}, OqlQueryComponent_1.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+    static from(source, parentNode, parentKey) {
+        return super.from(source, parentNode, parentKey);
+    }
+    /**
+     * 设置SQL 查询
+     */
+    setCode(code) {
+        this.codeSourceMap = null;
+        this.update({
+            code,
+        });
+    }
+    removeTypeAnnotation(options) {
+        let typeAnnotation;
+        if (typeof options === 'string') {
+            typeAnnotation = this.typeAnnotation;
+            if (!typeAnnotation) {
+                throw new Error('找不到类型标注 ' + options);
+            }
+        }
+        else {
+            typeAnnotation = options;
+        }
+        return typeAnnotation.delete();
+    }
+    __removeTypeAnnotation(typeAnnotation) {
+        const parentKey = typeAnnotation.parentKey;
+        const params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: typeAnnotation,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray(this[parentKey])) {
+                const index = this[parentKey].indexOf(typeAnnotation);
+                ~index && this[parentKey].splice(index, 1);
+                params.index = index;
+            }
+            else if (this[parentKey] === typeAnnotation) {
+                params.index = 0;
+                this[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+    /**
+     * APP数据源重命名时，同步OQL数据源；此方法仅提供给APP重命名时使用
+     */
+    renameDataSource(dataSource) {
+        // 此参数dataSource不带命名空间
+        // 考虑到扩展模块不允许重命名，所以拼接app.dataSources
+        this.setDataSource(`app.dataSources.${dataSource}`);
+    }
+    /**
+     * 设置OQL数据源
+     */
+    setDataSource(dataSource) {
+        this.codeSourceMap = null;
+        this.update({
+            dataSource,
+        });
+    }
+    // 获取内部的使用到的变量
+    getCodeContentVariable(sqlParser, state) {
+        const { columnList = [], tableList = [] } = sqlParser;
+        let code = '';
+        function formatVariable(item) {
+            if (item === 'select::null::(.*)')
+                return;
+            /**
+                "select::null::Student"
+                "select::null::school"
+                "select::null::(.*)"
+                "select::null::__NASL__SQL__variable12323_asdasdasd_asdasd_asdasd"
+                "select::null::variable2123213"
+                "select::student::age1"
+                "select::student::null"
+             */
+            let variableCode = item.replace('select::null::', '').replace('select::', '').replaceAll('::', '.');
+            // 处理内部变量
+            if (variableCode.startsWith('__NASL__SQL__')) {
+                variableCode = variableCode.replace('__NASL__SQL__', '').replaceAll('_', '.');
+            }
+            return variableCode;
+        }
+        code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'function SqlQueryComponent(';
+        tableList.forEach((item, index) => {
+            const tableVariable = formatVariable(item);
+            code += tableVariable + `: ${this.dataSource || 'app.dataSources.defaultDS'}.entities.${tableVariable}`;
+            if (index !== tableList.length - 1)
+                code += ', ';
+        });
+        code += ') {';
+        columnList.forEach((item) => {
+            code += (0, translator_1.indent)((state?.tabSize || 0) + 2);
+            code += formatVariable(item) + ';\n';
+        });
+        code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + '}';
+        return code;
+    }
+    getTextVariables() {
+        this._TsVariables = [];
+        const str = this.code;
+        const variables = new Set();
+        let temp;
+        const re = /\{(.+?)\}/g;
+        while (temp = re.exec(str)) {
+            let variable = temp[1];
+            variable = variable.replaceAll(' ', '');
+            variables.add(variable);
+        }
+        for (const variable of variables) { // 遍历Set
+            let newVariable;
+            if (variable.includes('.')) {
+                const arr = variable.split('.');
+                for (let i = 0; i < arr.length; i++) {
+                    if (!newVariable) {
+                        // value需要拼接生成
+                        newVariable = new Identifier__1.default({ name: arr[i] });
+                    }
+                    else {
+                        newVariable = new MemberExpression__1.default({
+                            object: newVariable,
+                            property: new Identifier__1.default({ name: arr[i] }),
+                        });
+                    }
+                }
+            }
+            else {
+                newVariable = new Identifier__1.default({ name: variable });
+            }
+            newVariable.parentNode = this;
+            newVariable.parentKey = '_TsVariables';
+            this._TsVariables.push(newVariable);
+        }
+    }
+    getTypeBanError() {
+        let sqlTypeBan = false;
+        if (this.typeAnnotation) {
+            const getSqlTypeBan = (typeAnnotation) => {
+                const ref = this.getSelectRef(typeAnnotation);
+                if (ref?.length) {
+                    ref.forEach((item) => {
+                        // 如果有类型但是类型不是基本类型，就需要打开开关，注入变量
+                        if (item?.typeAnnotation && item.typeAnnotation.typeNamespace !== 'nasl.core' && !(item.typeAnnotation.typeNamespace.endsWith('.enums'))) {
+                            sqlTypeBan = true;
+                        }
+                    });
+                }
+            };
+            if (this.typeAnnotation.typeArguments?.length) {
+                // list 就去校验一下内部的类型
+                if (this.typeAnnotation.typeName === 'List') {
+                    this.typeAnnotation.typeArguments.forEach((item) => {
+                        getSqlTypeBan(item);
+                    });
+                }
+                else {
+                    // 别的都不放开
+                    sqlTypeBan = true;
+                }
+            }
+            else {
+                getSqlTypeBan(this.typeAnnotation);
+            }
+        }
+        return sqlTypeBan;
+    }
+    getQueryComponentTsCode(state) {
+        let tsCode = '';
+        // let sqlParser: null | any = null;
+        // let sqlParserErr: null | any = null;
+        if (!this.code)
+            return tsCode;
+        /**
+             * 处理变量，因为解析code，因为sql中不支持
+             * #{变量}这种写法
+             * 而且不支持a.b.c这种写法保留前两个，翻译的时候补上去
+             * 如果是多个.链接的变量就转换成nasl变量，让他可以翻译，等后面在把值换回来
+             */
+        /**
+        try {
+            const newCode = this.code.replace(/\#|\$\{(.+?)\}/g, (value, content) => {
+                console.log(content)
+                const len = content.split('.').length;
+                console.log(len, content, content.split('.'), content, content.split('.').length)
+                if (len > 2) {
+                    return '__NASL__SQL__' + content.replaceAll('.', '_');
+                }
+                return content;
+            });
+            console.log(newCode);
+            // 生成对应的sqlts 和 产生sourceMap对应
+            sqlParser = SQLParser(newCode || '', 0, this.dataSource);
+        } catch (err) {
+            sqlParserErr = err;
+        }
+        console.log(sqlParser, sqlParserErr);
+        if (sqlParserErr) {
+            tsCode += '__SQL_GRAMMAR_ERROR__';
+        } else if (sqlParser) {
+            // 解析内部变量，先看是不是未知变量
+            // 使用 tableList 和 columnList
+            tsCode += this.getCodeContentVariable(sqlParser, state);
+        }
+         */
+        try {
+            tsCode += this.getVariableTs(state);
+        }
+        catch (err) {
+            console.log(err);
+        }
+        return tsCode;
+    }
+    getSelectRef(newTypeAnnotation) {
+        try {
+            const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
+            let completionChildren;
+            if (typeKind === 'reference') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
+                    const node = (0, utils_1.getNaslNodeByNodeCallee)(typeNamespace, typeName);
+                    const properties = node?.properties || [];
+                    completionChildren = properties;
+                }
+                else if (typeNamespace.endsWith('.enums')) {
+                    completionChildren = [];
+                }
+                else {
+                    const node = (0, utils_1.getNodeByNodeCallee)(this.app, typeNamespace + '.' + typeName);
+                    const properties = node?.properties || [];
+                    completionChildren = properties;
+                }
+            }
+            else if (typeKind === 'generic') {
+                // if (typeNamespace === 'nasl.collection' || typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.interface') {
+                // }
+                const node = (0, utils_1.getNaslNodeByNodeCallee)(typeNamespace, typeName);
+                const properties = (node?.properties && [...node?.properties]) || [];
+                for (let i = 0; i < properties.length; i++) {
+                    const item = properties[i];
+                    if (item?.typeAnnotation?.typeKind === 'typeParam') {
+                        const newItem = StructureProperty__1.default.from(item.toJSON());
+                        newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
+                        newItem.parentNode = this;
+                        properties[i] = newItem;
+                    }
+                }
+                completionChildren = properties;
+            }
+            else {
+                completionChildren = [];
+            }
+            return completionChildren;
+        }
+        catch (err) {
+            console.log(err);
+        }
+    }
+    toEmbeddedTS(state) {
+        let code;
+        code = `(function(): `;
+        code += `${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code)) : '__IDENTIFIER__'} {\n`;
+        // app.dataSources.defaultDS;
+        if (this.dataSource) {
+            code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
+            code += `const dataSource = ${this.dataSource || 'app.dataSources.defaultDS'};\n`;
+        }
+        // 生成内部的ts内容
+        // code += this.getQueryComponentTsCode(state);
+        if (this.codeSourceMap) {
+            code += this.codeSourceMap.typescript || '';
+            if (!this.code) {
+                // SQL 为空
+                code += '__OQL_EMPTY_ERROR__;';
+            }
+            else if (this.codeSourceMap.lexicalErrorCode === 1001) {
+                // SQL 语法错误
+                code += '__OQL_GRAMMAR_ERROR__;';
+            }
+        }
+        // 临时方案拼接字符串
+        this.getTextVariables();
+        // 翻译字段
+        code += '\n';
+        this._TsVariables.forEach((variable) => {
+            code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code));
+            code += ';\n';
+        });
+        code += '\n';
+        code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'return;\n';
+        code += (0, translator_1.indent)((state?.tabSize || 0)) + '})()';
+        return code;
+    }
+    /**
+     * 获取添加时的默认选项
+     * @returns
+     */
+    static getDefaultOptions() {
+        return {
+            dataSource: 'app.dataSources.defaultDS',
+        };
+    }
+    _TsVariables = [];
+    // 节点的sourcemap
+    codeSourceMap = undefined;
+};
+__decorate([
+    (0, decorators_1.property)()
+], OqlQueryComponent.prototype, "concept", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], OqlQueryComponent.prototype, "label", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], OqlQueryComponent.prototype, "code", void 0);
+__decorate([
+    (0, decorators_1.property)('TypeAnnotation')
+], OqlQueryComponent.prototype, "typeAnnotation", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], OqlQueryComponent.prototype, "dataSource", void 0);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], OqlQueryComponent.prototype, "toEmbeddedTS", null);
+OqlQueryComponent = OqlQueryComponent_1 = __decorate([
+    (0, decorators_1.concept)('SQL 查询')
+], OqlQueryComponent);
+exports.OqlQueryComponent = OqlQueryComponent;
+classMap_1.default.OqlQueryComponent = OqlQueryComponent;
+exports.default = OqlQueryComponent;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================
+//# sourceMappingURL=OqlQueryComponent__.js.map

package/out/concepts/OqlQueryComponent__.js.map

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

package/out/concepts/ProcessElement__.d.ts

@@ -634,11 +634,11 @@ export declare class ProcessElement extends BaseNode {
     removeBindAttribute(bindAttribute: BindAttribute): void;
     __removeBindAttribute(bindAttribute: BindAttribute): Params;
     getVarExistingNames(excludedList?: Array<Variable | Return | Constant>): string[];
+    get isUserTask(): boolean;
     get logics(): Logic[];
     get assigneeLogics(): Logic[];
     getNamespace(ns: string): string;
-    cancelBindDelete(): void;
-    cancelBind(view: View): Promise<void>;
+    cancelBindDelete(processDelete: boolean): Promise<void>;
     uniqueTaskId(view: View): string;
     toEmbeddedTS(state?: TranslatorState): string;
 }

package/out/concepts/ProcessElement__.js

@@ -891,8 +891,11 @@ let ProcessElement = ProcessElement_1 = class ProcessElement extends BaseNode_1.
         const excludedSet = new Set(excludedList);
         return [...this.variables, ...this.returns, ...this.constants].filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
+    get isUserTask() {
+        return this.type === 'UserTask' || this.type === 'ApprovalTask' || this.type === 'InitiateTask';
+    }
     get logics() {
-        return [(0, getProcesses_1.genUserTaskLogic)(this)];
+        return [...(0, getProcesses_1.genUserTaskLogic)(this)];
         // const ns = entity2LogicNamespace(this);
         // ns.path = this.getNamespace() + '.' + ns.name;
         // return ns;
@@ -919,19 +922,23 @@ let ProcessElement = ProcessElement_1 = class ProcessElement extends BaseNode_1.
         else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
-    cancelBindDelete() {
-        this.delete();
-        this.bindAttrs.forEach(({ destination }) => {
-            if (destination && destination.viewNode)
-                this.cancelBind(destination.viewNode);
-        });
-    }
-    async cancelBind(view) {
-        const name = this.uniqueTaskId(view);
-        const node = view.params.find((param) => param.name === name);
-        const UsageMap = await node.findUsage();
-        if (!UsageMap.size)
-            view.removeParam(name);
+    async cancelBindDelete(processDelete) {
+        if (!processDelete)
+            this.delete();
+        await Promise.all(this.bindAttrs.map(async ({ destination }) => {
+            if (destination && destination.viewNode) {
+                const view = destination.viewNode;
+                const name = this.uniqueTaskId(view);
+                const node = view.params.find((param) => param.name === name);
+                if (!node)
+                    return;
+                const UsageMap = await node.findUsage();
+                const usageNodes = UsageMap.get(this.process);
+                // console.log(UsageMap, usageNodes)
+                if (!UsageMap.size || (UsageMap.size === 1 && usageNodes && (!usageNodes.children || usageNodes.children.length === 1)))
+                    view.removeParam(name);
+            }
+        }));
     }
     //获取当前页面类型为String的taskId参数
     uniqueTaskId(view) {
@@ -973,7 +980,7 @@ let ProcessElement = ProcessElement_1 = class ProcessElement extends BaseNode_1.
         });
         const afterLinks = (0, getProcesses_1.getFlowAfterElements)(this);
         const beforeLinks = (0, getProcesses_1.getFlowBeforeElements)(this);
-        if (this.type === 'UserTask'
+        if (this.isUserTask
             || this.type === 'ExclusiveGateway'
             || this.type === 'AutoTask') {
             const prevTasks = (0, getProcesses_1.getPreviousTask)(this);
@@ -991,7 +998,7 @@ let ProcessElement = ProcessElement_1 = class ProcessElement extends BaseNode_1.
             // prevCode += `${tab4}elements: {\n`
             prevCode += prevTasks.map((t) => `${tab5}${t.name}: elements.${t.name},\n`).join(``);
             // prevCode += `${tab4}}\n`
-            if (this.type === 'UserTask') {
+            if (this.isUserTask) {
                 //任务完成时可以拿到输出参数，prevCodeClose包含输出参数
                 let prevCodeClose = prevCode + `\n${tab5}${this.name}: { \n${this.constants.map((c) => `${tab6}${c.toEmbeddedTSInProcess((0, translator_1.shiftState)(state, code, { inline: true }))},`).join('\n')}`;
                 prevCodeClose += ` \n${this.returns.map((c) => `${tab6}${c.toEmbeddedTSInProcess((0, translator_1.shiftState)(state, code, { inline: true }))},`).join('\n')} \n${tab5}}\n`;
@@ -1020,11 +1027,13 @@ let ProcessElement = ProcessElement_1 = class ProcessElement extends BaseNode_1.
                         code += `${tab3}},\n`;
                     }
                 });
-                const logic = (0, getProcesses_1.genUserTaskLogic)(this);
+                const logics = (0, getProcesses_1.genUserTaskLogic)(this);
                 // sourceMap 映射
-                logic.parentNode = this.process;
-                code += logic.toEmbeddedTSInProcess((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 3 }));
-                code += ',\n';
+                logics.forEach((logic) => {
+                    logic.parentNode = this.process;
+                    code += logic.toEmbeddedTSInProcess((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 3 }));
+                    code += ',\n';
+                });
                 code += `${tab1}},\n`;
             }
             if (this.type === 'ExclusiveGateway' || this.type === 'AutoTask') {
@@ -1034,7 +1043,7 @@ let ProcessElement = ProcessElement_1 = class ProcessElement extends BaseNode_1.
                 code += `${this.logic.toEmbeddedTSInProcess((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 3 }), prevCode, true)},\n`;
             }
         }
-        if (this.type === 'UserTask' || this.type === 'AutoTask' || this.type === 'StartNoneEvent') {
+        if (this.isUserTask || this.type === 'AutoTask' || this.type === 'StartNoneEvent') {
             code += '_constraints: function() {\n';
             code += `${tab1}nasl.process.oneOutcomeFlow(${afterLinks.map((l) => `'${l.name}'`).join(',')})\n`;
             code += '},\n';