@lcap/nasl 2.14.0-beta.5 → 2.15.1

package/out/concepts/SelectMembers__.d.ts

@@ -0,0 +1,141 @@
+import { TranslatorState } from '../translator';
+import { Params } from '../common/EventEmitter';
+import BaseNode from '../common/BaseNode';
+import LogicItem from './LogicItem__';
+/**
+ * 调用逻辑
+ */
+export declare class SelectMembers extends BaseNode {
+    /**
+     * 产品概念
+     */
+    concept: 'SelectMembers';
+    /**
+     * hideMembers
+     */
+    hideMembers: boolean;
+    /**
+     * 根表达式
+     */
+    expression: LogicItem;
+    /**
+     * 成员表达式
+     */
+    members: Array<LogicItem>;
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<SelectMembers>);
+    static from(source: any, parentNode?: any, parentKey?: string): SelectMembers;
+    /**
+     * 从父级删除该节点
+     * @internal
+     */
+    _delete(): Params;
+    /**
+     * 设置hideMembers
+     */
+    setHideMembers(hideMembers: boolean): void;
+    /**
+     * 设置根表达式
+     */
+    setExpression(expression: LogicItem): void;
+    /**
+     * 设置成员表达式
+     */
+    setMembers(members: Array<LogicItem>): void;
+    getLogicItemExistingNames(excludedList?: Array<LogicItem>): string[];
+    getLogicItemUniqueName(name?: string): string;
+    /**
+    * 插入逻辑项
+    * @internal
+    * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
+    */
+    _insertLogicItemAt(name: string, index: number): LogicItem;
+    /**
+    * 插入逻辑项
+    * @internal
+    * @param logicItemOptions 逻辑项参数
+    */
+    _insertLogicItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
+    /**
+    * 插入逻辑项
+    * @internal
+    * @param logicItem 已有的逻辑项实例
+    */
+    _insertLogicItemAt(logicItem: LogicItem, index: number): LogicItem;
+    /**
+     * 插入逻辑项
+     * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
+     */
+    insertLogicItemAt(name: string, index: number): LogicItem;
+    /**
+     * 插入逻辑项
+     * @param logicItemOptions 逻辑项参数
+     */
+    insertLogicItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
+    /**
+     * 插入逻辑项
+     * @param logicItem 已有的逻辑项实例
+     */
+    insertLogicItemAt(logicItem: LogicItem, index: number): LogicItem;
+    /**
+     * 添加逻辑项
+     * @internal
+     * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
+     */
+    _addLogicItem(name?: string): LogicItem;
+    /**
+     * 添加逻辑项
+     * @internal
+     * @param logicItemOptions 逻辑项参数
+     */
+    _addLogicItem(logicItemOptions: Partial<LogicItem>): LogicItem;
+    /**
+     * 添加逻辑项
+     * @internal
+     * @param logicItem 已有的逻辑项实例
+     */
+    _addLogicItem(logicItem: LogicItem): LogicItem;
+    /**
+     * 添加逻辑项
+     * @internal
+     * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
+     */
+    addLogicItem(name?: string): LogicItem;
+    /**
+     * 添加逻辑项
+     * @param logicItemOptions 逻辑项参数
+     */
+    addLogicItem(logicItemOptions: Partial<LogicItem>): LogicItem;
+    /**
+     * 添加逻辑项
+     * @param logicItem 已有的逻辑项实例
+     */
+    addLogicItem(logicItem: LogicItem): LogicItem;
+    /**
+    * 删除逻辑项
+    * @param name 逻辑项名称
+    */
+    removeExpression(name: string): void;
+    /**
+     * 删除逻辑项
+     * @param expression 已有的逻辑项实例
+     */
+    removeExpression(expression: LogicItem): void;
+    /**
+    * 删除逻辑项
+    * @param name 逻辑项名称
+    */
+    removeLogicItemInMembers(name: string): void;
+    /**
+     * 删除逻辑项
+     * @param logicItem 已有的逻辑项实例
+     */
+    removeLogicItemInMembers(logicItem: LogicItem): void;
+    __removeLogicItem(logicItem: LogicItem): Params;
+    get lines(): number;
+    get error(): boolean;
+    toEmbeddedTS(state?: TranslatorState): string;
+}
+export default SelectMembers;

package/out/concepts/SelectMembers__.js

@@ -0,0 +1,290 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var SelectMembers_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectMembers = void 0;
+const translator_1 = require("../translator");
+const decorators_1 = require("../decorators");
+const utils = __importStar(require("../utils"));
+const BaseNode_1 = __importDefault(require("../common/BaseNode"));
+const classMap_1 = __importDefault(require("../common/classMap"));
+const LogicItem__1 = __importDefault(require("./LogicItem__"));
+/**
+ * 调用逻辑
+ */
+let SelectMembers = SelectMembers_1 = class SelectMembers extends BaseNode_1.default {
+    /**
+     * 产品概念
+     */
+    concept = 'SelectMembers';
+    /**
+     * hideMembers
+     */
+    hideMembers = false;
+    /**
+     * 根表达式
+     */
+    expression = undefined;
+    /**
+     * 成员表达式
+     */
+    members = [];
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source) {
+        source = Object.assign({}, SelectMembers_1.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+    static from(source, parentNode, parentKey) {
+        return super.from(source, parentNode, parentKey);
+    }
+    /**
+     * 从父级删除该节点
+     * @internal
+     */
+    _delete() {
+        let params = null;
+        if (this.parentNode) {
+            params = this.parentNode?.__removeSelectMembers?.(this);
+        }
+        return params;
+    }
+    /**
+     * 设置hideMembers
+     */
+    setHideMembers(hideMembers) {
+        const object = {
+            hideMembers,
+        };
+        this.update({
+            ...object,
+        });
+    }
+    /**
+     * 设置根表达式
+     */
+    setExpression(expression) {
+        expression._delete();
+        const relationOptions = { parentNode: this, parentKey: 'expression' };
+        Object.assign(expression, relationOptions);
+        const object = {
+            expression,
+        };
+        this.update({
+            ...object,
+        });
+    }
+    /**
+     * 设置成员表达式
+     */
+    setMembers(members) {
+        const object = {
+            members,
+        };
+        this.update({
+            ...object,
+        });
+    }
+    getLogicItemExistingNames(excludedList = []) {
+        const excludedSet = new Set(excludedList);
+        return (this.members || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    }
+    getLogicItemUniqueName(name = 'logicItem1') {
+        return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
+    }
+    _insertLogicItemAt(options, index) {
+        const logicItemOptions = {};
+        const relationOptions = { parentNode: this, parentKey: 'members' };
+        let logicItem;
+        if (!options) {
+            logicItem = LogicItem__1.default.from({
+                ...logicItemOptions,
+                name: this.getLogicItemUniqueName(),
+            }, this, 'members');
+        }
+        else if (typeof options === 'string') {
+            logicItem = LogicItem__1.default.from({
+                ...logicItemOptions,
+                name: options,
+            }, this, 'members');
+        }
+        else if (options instanceof LogicItem__1.default) {
+            options.ensureDelete(); // 同一实例不支持多处存在
+            logicItem = options;
+            Object.assign(logicItem, relationOptions);
+        }
+        else {
+            logicItem = LogicItem__1.default.from({
+                ...logicItemOptions,
+                ...options,
+            }, this, 'members');
+        }
+        this.members.splice(index, 0, logicItem);
+        return logicItem;
+    }
+    insertLogicItemAt(options, index) {
+        const node = this._insertLogicItemAt(options, index);
+        node.create({
+            index,
+            parentNode: this,
+            parentKey: 'members',
+        });
+        return node;
+    }
+    _addLogicItem(options) {
+        const index = this.members.length;
+        return this._insertLogicItemAt(options, index);
+    }
+    addLogicItem(options) {
+        const node = this._addLogicItem(options);
+        const index = this.members.indexOf(node);
+        node.create({
+            index,
+            parentNode: this,
+            parentKey: 'members',
+        });
+        return node;
+    }
+    removeExpression(options) {
+        let expression;
+        if (typeof options === 'string') {
+            expression = this.expression;
+            if (!expression) {
+                throw new Error('找不到逻辑项 ' + options);
+            }
+        }
+        else {
+            expression = options;
+        }
+        return expression.delete();
+    }
+    removeLogicItemInMembers(options) {
+        let logicItem;
+        if (typeof options === 'string') {
+            logicItem = this.members.find((item) => item.name === options);
+            if (!logicItem) {
+                throw new Error('找不到逻辑项 ' + options);
+            }
+        }
+        else {
+            logicItem = options;
+        }
+        return logicItem.delete();
+    }
+    __removeLogicItem(logicItem) {
+        const parentKey = logicItem.parentKey;
+        const params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: logicItem,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray(this[parentKey])) {
+                const index = this[parentKey].indexOf(logicItem);
+                ~index && this[parentKey].splice(index, 1);
+                params.index = index;
+            }
+            else if (this[parentKey] === logicItem) {
+                params.index = 0;
+                this[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+    get lines() {
+        const batchAssignment = this.getAncestor('BatchAssignment');
+        const parentKey = this.parentKey;
+        const firstIndex = parentKey === 'left' ? 0 : batchAssignment.rights.findIndex((selectMember) => selectMember === this);
+        let count = 0;
+        batchAssignment.assignmentLines.forEach((line) => {
+            const lineIndex = parentKey === 'left' ? line.leftIndex[0] : line.rightIndex[0];
+            if (lineIndex === firstIndex)
+                count++;
+        });
+        return count;
+    }
+    get error() {
+        let error = false;
+        const batch = this.parentNode;
+        if (this.parentKey === 'rights') {
+            const firstIndex = batch.rights.findIndex((right) => right === this);
+            batch.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+                if (rightIndex[0] === firstIndex && batch.left?.members[leftIndex[1]].tsErrorDetail) {
+                    error = true;
+                }
+            });
+            return error;
+        }
+        return !!this.members.find((member) => member.tsErrorDetail);
+    }
+    toEmbeddedTS(state) {
+        const code = '';
+        return code;
+    }
+};
+__decorate([
+    (0, decorators_1.property)()
+], SelectMembers.prototype, "concept", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], SelectMembers.prototype, "hideMembers", void 0);
+__decorate([
+    (0, decorators_1.property)('LogicItem')
+], SelectMembers.prototype, "expression", void 0);
+__decorate([
+    (0, decorators_1.property)('LogicItem')
+], SelectMembers.prototype, "members", void 0);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], SelectMembers.prototype, "toEmbeddedTS", null);
+SelectMembers = SelectMembers_1 = __decorate([
+    (0, decorators_1.concept)('调用逻辑')
+], SelectMembers);
+exports.SelectMembers = SelectMembers;
+classMap_1.default.SelectMembers = SelectMembers;
+exports.default = SelectMembers;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================
+//# sourceMappingURL=SelectMembers__.js.map

package/out/concepts/SelectMembers__.js.map

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

package/out/concepts/SqlQueryComponent__.d.ts

@@ -54,6 +54,10 @@ export declare class SqlQueryComponent extends LogicItem {
      * 设置SQL 查询
      */
     setDataSource(dataSource: string): void;
+    getVariableTs(state?: TranslatorState): string;
+    getTypeBanError(): boolean;
+    getQueryComponentTsCode(state?: TranslatorState): string;
+    getSelectRef(newTypeAnnotation: TypeAnnotation): any;
     toEmbeddedTS(state?: TranslatorState): string;
     /**
      * 获取添加时的默认选项

package/out/concepts/SqlQueryComponent__.js

@@ -12,6 +12,8 @@ var SqlQueryComponent_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlQueryComponent = void 0;
 const translator_1 = require("../translator");
+const utils_1 = require("../automate/engine/utils");
+const StructureProperty__1 = __importDefault(require("./StructureProperty__"));
 const decorators_1 = require("../decorators");
 const classMap_1 = __importDefault(require("../common/classMap"));
 const LogicItem__1 = __importDefault(require("./LogicItem__"));
@@ -116,6 +118,144 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
             ...object,
         });
     }
+    getVariableTs(state) {
+        const str = this.code;
+        const variables = [];
+        let code = '';
+        let temp;
+        const re = /(\#|\$)\{(.+?)\}/g;
+        while (temp = re.exec(str)) {
+            variables.push(temp[2]);
+        }
+        variables.forEach((variable) => {
+            const content = variable.replaceAll(' ', '');
+            code += (0, translator_1.indent)((state?.tabSize || 0) + 2);
+            code += content + ';\n';
+        });
+        return code;
+    }
+    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.getContentVariable(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 = undefined;
+                }
+                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] || [];
+                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 = undefined;
+            }
+            return completionChildren;
+        }
+        catch (err) {
+            console.log(err);
+        }
+    }
     toEmbeddedTS(state) {
         let code;
         if (this.ideVersion === '2.11') {
@@ -129,11 +269,13 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
         // app.dataSources.defaultDS;
         if (this.dataSource) {
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
-            code += `const dataSource = app.dataSources.${this.dataSource};`;
+            code += `const dataSource = app.dataSources.${this.dataSource};\n`;
         }
+        // 生成内部的ts内容
+        code += this.getQueryComponentTsCode(state);
         code += '\n';
         code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'return;\n';
-        code += (0, translator_1.indent)((state?.tabSize || 0)) + '})();\n';
+        code += (0, translator_1.indent)((state?.tabSize || 0)) + '})()';
         return code;
     }
     /**

package/out/concepts/SqlQueryComponent__.js.map

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

package/out/concepts/Variable__.js

@@ -194,7 +194,6 @@ let Variable = Variable_1 = class Variable extends BaseNode_1.default {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
         }
-        code += ';';
         return code;
     }
     getNamespace() {