@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/out/server/naslServer.js

@@ -46,7 +46,7 @@ const getMemberIdentifier_1 = require("./getMemberIdentifier");
 const concepts_1 = require("../concepts");
 const utils = __importStar(require("../utils"));
 const jsoner = __importStar(require("../service/storage/jsoner"));
-const createUiTs_1 = __importDefault(require("./createUiTs"));
+const createUiTs_1 = __importStar(require("./createUiTs"));
 const storage_1 = __importDefault(require("../service/storage"));
 const translator_1 = require("../translator");
 const translator_2 = require("./translator");
@@ -59,6 +59,7 @@ const EventEmitter_1 = require("../common/EventEmitter");
 const utils_1 = require("../utils");
 const decorators_1 = require("../decorators");
 const utils_2 = require("../automate/engine/utils");
+const asserts_1 = require("../concepts/utils/asserts");
 const EmbeddedTSFileLineMap = {
     Entity: 3,
 };
@@ -75,6 +76,21 @@ let actionArr = []; //用于导入接口收集更改的节点
 let timer = null; //超时器用于收集导入接口相关
 // naslStdlib文件缓存；作为全局变量给多实例用复用
 const __naslStdlibFileCacheMap = new Map();
+/**
+ * 业务组件先特殊处理一下
+ * 获取业务组件的位置信息
+ */
+function getBusinessComponentPos(fileNode) {
+    if (fileNode.concept === 'BusinessComponent') {
+        const sourceMap = fileNode?.sourceMap?.get(fileNode);
+        if (sourceMap) {
+            const { start } = sourceMap;
+            return {
+                ...start,
+            };
+        }
+    }
+}
 // 联合类型切割取出类型
 function getDisplayString2Type(displayString) {
     const targetString = displayString.match(/value:\s(\S+)\)/)?.[1];
@@ -128,6 +144,7 @@ const timeZoneArgumentIndexMap = new Map([
     ['GetDateCount', 2],
     ['GetSpecificDaysOfWeek', 3]
 ]);
+const allComponent = {};
 let NaslServer = NaslServer_1 = class NaslServer {
     constructor() {
         /** naslStdlib文件缓存 */
@@ -245,13 +262,28 @@ let NaslServer = NaslServer_1 = class NaslServer {
     terminate() {
         this.worker.terminate();
     }
-    async createUiTs(allComponent) {
+    async createUiTs(components, optinos) {
+        const { tsCode, baseComponnets } = optinos;
+        // console.log('baseComponnets', baseComponnets);
+        Object.assign(allComponent, components);
         const { code, elementsLogic } = await (0, createUiTs_1.default)(allComponent);
-        // 放入生產的uits文件
         await this.addFile({
             file: 'nasl.ui.definition.ts',
+            // eslint-disable-next-line import/no-webpack-loader-syntax, global-require, import/extensions
+            fileContent: require('!!raw-loader!../../sandbox/stdlib/nasl.ui.definition.ts').default,
+        }, { cache: true });
+        // 放入生產的uits文件
+        await this.addFile({
+            file: 'nasl.ui.extra.ts',
             fileContent: code,
         }, { cache: true });
+        // 添加基础组件的方法到elementsLogic
+        Object.assign(elementsLogic, (0, createUiTs_1.createEleLogins)(baseComponnets));
+        // 基础组件
+        await this.addFile({
+            file: 'nasl.ui.component.ts',
+            fileContent: tsCode,
+        }, { cache: true });
         Object.keys(naslStdlibMap_1.default).forEach(async (libFileName) => {
             await this.addFile({
                 file: `/${libFileName}`,
@@ -452,7 +484,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         /// #if process.env.NODE_ENV === 'development'
         // 首次尝试请求
-        await storage_1.default.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+        await storage_1.default.post(`/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
         if (this.openDebugEmbedded && globalThis.window) {
             // For TS build
             try {
@@ -589,6 +621,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
             const flag = displayString.includes('<') && displayString.includes('>');
             const types = /<([^()]+)>/g.exec(displayString);
             let typeStr = types && types[1];
+            // 从 {entity1:Entity1(defaultDS);},unknown,unknown,unknown 取出{entity1:Entity1(defaultDS);}
+            typeStr = typeStr?.split(',')[0];
             if (flag) {
                 // 自定义结构的展示
                 if (typeStr.includes('__name: "AStructure_')) {
@@ -1349,10 +1383,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * 是否符合 触发器规则
      * 规则：
      * 1. 入参仅有一个，且必须为string类型
+     * 2. 不允许有返回值
      */
     isTriggerRule(fileNode) {
         const { sourceMap } = fileNode;
         let paramsLength = 0;
+        let returnLength = 0;
         let flag = true;
         sourceMap.forEach((_, k) => {
             if (k instanceof concepts_1.Param) {
@@ -1364,8 +1400,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     flag = false;
                 }
             }
+            if (k instanceof concepts_1.Return) {
+                returnLength++;
+            }
         });
-        return paramsLength === 1 && flag;
+        return paramsLength === 1 && flag && returnLength === 0;
     }
     /**
      * 额外的诊断
@@ -1496,7 +1535,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation);
                         if (isDuplicate) {
                             const diagnostic = {
-                                node: node,
+                                node,
                                 severity: 'error',
                                 message: `变量 ${node.name} 类型定义包含相同的数据类型`,
                             };
@@ -1873,58 +1912,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         else if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.OverriddenLogic) {
             const { isRefedByTrigger, fRefName } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
-            if (fileNode instanceof concepts_1.Logic && fileNode?.exportInterface) {
-                let isSame = true;
-                const itf = fileNode.exportInterface;
-                const { params: logicParams, returns: logicReturns } = fileNode;
-                const { params: itfParams, returns: itfReturns } = itf;
-                if (logicParams?.length !== itfParams?.length || logicReturns?.length !== itfReturns?.length) {
-                    isSame = false;
-                }
-                if (isSame && logicParams?.length === itfParams?.length) {
-                    const logicParamMap = logicParams?.reduce((acc, param) => {
-                        acc[param.name] = param.typeAnnotation;
-                        return acc;
-                    }, {});
-                    itfParams.forEach((param) => {
-                        const logicParam = logicParamMap?.[param.name];
-                        if (!logicParam) {
-                            isSame = false;
-                            return;
-                        }
-                        else if (!logicParam.isSame(param.typeAnnotation)) {
-                            isSame = false;
-                            return;
-                        }
-                    });
-                }
-                if (isSame && logicReturns?.length === itfReturns?.length && logicReturns?.length > 0) {
-                    if (logicReturns[0].name !== itfReturns[0].name) {
-                        isSame = false;
-                    }
-                    else if (!logicReturns[0]?.typeAnnotation.isSame(itfReturns[0]?.typeAnnotation)) {
-                        isSame = false;
-                    }
-                }
-                if (!isSame) {
-                    const diagnostic = {
-                        node: fileNode,
-                        severity: 'error',
-                        message: `逻辑已变更，请确认请求类型无误后重新导出${'${event}'}`,
-                        events: [{
-                                key: 'exportInterface',
-                                label: '接口配置',
-                                params: fileNode,
-                            }]
-                    };
-                    diagnostics.push(diagnostic);
-                }
-            }
             if (isRefedByTrigger && !this.isTriggerRule(fileNode)) {
                 const diagnostic = {
                     node: fileNode,
                     severity: 'error',
-                    message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用，该逻辑入参只有一个入参，且入参类型为string，否则会导致无法接收Kafka消息`,
+                    message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用：该逻辑入参只有一个入参，入参类型为string；且不允许存在返回值。否则会导致无法接收Kafka消息`,
                 };
                 diagnostics.push(diagnostic);
             }
@@ -1993,7 +1985,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation);
                         if (isDuplicate) {
                             const diagnostic = {
-                                node: node,
+                                node,
                                 severity: 'error',
                                 message: `${nodeTypeName} ${node.name} 类型定义包含相同的数据类型`,
                             };
@@ -2009,7 +2001,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation);
                         if (isDuplicate) {
                             const diagnostic = {
-                                node: node,
+                                node,
                                 severity: 'error',
                                 message: `输入参数 ${node.name} 类型定义包含相同的数据类型`,
                             };
@@ -2088,7 +2080,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         if (new decimal_js_1.Decimal(maxVal).lessThan(minVal)) {
                             const errorMsg = '最小值不得大于最大值';
                             const diag = {
-                                node: node,
+                                node,
                                 severity: 'warning',
                                 message: errorMsg,
                             };
@@ -2292,12 +2284,21 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 const diagnostic = {
                     node,
                     severity: 'error',
-                    message: `ForEac1：循环列表：参数类型不匹配！结束值自动推导失败。`,
+                    message: `ForEach：循环列表：参数类型不匹配！结束值自动推导失败。`,
                 };
                 node.tsErrorDetail = diagnostic;
                 diagnostics.push(diagnostic);
             }
         }
+        if ((node instanceof concepts_1.OqlQueryComponent || node instanceof concepts_1.SqlQueryComponent) && node.parentNode instanceof concepts_1.Paginate && node.parentKey === 'list' && node.codeSourceMap && node.codeSourceMap.containsLimit) {
+            const diagnostic = {
+                node,
+                severity: 'error',
+                message: `SQL 查询已包含分页，请去除 SQL 查询中的 LIMIT 语句。`,
+            };
+            node.tsErrorDetail = diagnostic;
+            diagnostics.push(diagnostic);
+        }
         /**
          * 如果节点是内置函数
          * 穷举在线上的情况，不在线上就void报错， callinterface 因为原来有报错，所以就忽略掉
@@ -2536,10 +2537,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
                             if (diagnostic.start.offset - item.start.character <= diagnostic.start.offset - minRange.item.start.character) {
                                 minRange = { node, item };
                             }
-                            else {
-                                if (diagnostic.start.offset < (0, translator_1.lsp2tspNumber)(minRange.item.start.character)) {
-                                    minRange = { node, item };
-                                }
+                            else if (diagnostic.start.offset < (0, translator_1.lsp2tspNumber)(minRange.item.start.character)) {
+                                minRange = { node, item };
                             }
                         }
                         else if (item.end.line - item.start.line <= minRange.item.end.line - minRange.item.start.line) {
@@ -2752,7 +2751,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         if (node instanceof concepts_1.Return) {
             // 过滤一下最后出去的值
-            refsList = refsList.filter((item) => !item.lineText.includes('return '));
+            refsList = refsList.filter((item) => !item.lineText.includes(`return ${node.name};`));
         }
         // 如果是参数, 就需要把logic的引用 都查找出来就需要把他的父级的引用全部查找出来
         if (node instanceof concepts_1.Param && node.parentNode instanceof concepts_1.Logic && node.parentKey !== 'virtualParams') {
@@ -3896,6 +3895,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 'QueryFieldExpression',
                 'QueryGroupByExpression',
                 'Param',
+                'Paginate',
                 'BackendVariable',
                 'CallAuthInterface',
             ].includes(node.concept))
@@ -3927,7 +3927,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     const lastLen = codeArr?.[codeArr.length - 1]?.length;
                     // MemberExpression取最后一位当做类型
                     const indexOf = code.length - lastLen;
-                    fileDetail.offset = fileDetail.offset + indexOf;
+                    fileDetail.offset += indexOf;
                 }
             }
             else if (node.concept === 'Match') {
@@ -4162,8 +4162,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 if (matchExpression?.__TypeAnnotation?.typeKind === 'union' &&
                     (matchExpression instanceof concepts_1.Identifier || matchExpression instanceof concepts_1.MemberExpression)) {
                     const { currentSource, fileNode } = matchExpression?.getCurrentSource();
+                    const currentCode = this.getNodeCode(fileNode, currentSource);
                     fileNode.sourceMap.forEach((item, itemNode) => {
-                        if (itemNode.concept === matchExpression.concept && (0, translator_1.isSameRange)(item, currentSource)) {
+                        const itemCode = this.getNodeCode(fileNode, item);
+                        if (itemNode.concept === matchExpression.concept && itemCode === currentCode) {
                             const jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
                             jsonNode.typeAnnotation = matchExpression.__TypeAnnotation;
                         }
@@ -4314,6 +4316,30 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const result = await this._getTypeStrFull(args);
         return result;
     }
+    /**
+     * 满足一些条件，不去查找依赖去check
+     * @param fileNode 当前删除节点的文件级别节点
+     * @param targetNode 当前操作的节点
+     */
+    noFileRefCheck(fileNode, targetNode, action) {
+        // true 标示不check， false标示要check
+        // 页面下的内容大部分都不用check，其余节点都check
+        let flag = false;
+        if (fileNode instanceof concepts_1.View) {
+            // 页面下大部分节点都不用去check
+            flag = true;
+            if (targetNode instanceof concepts_1.Param && targetNode.parentNode instanceof concepts_1.View) {
+                // 如果变换的是参数而且是页面参数，就去check别的
+                flag = false;
+            }
+            else if (targetNode === fileNode && action !== 'update') {
+                // 如果是页面本身在修改，但是不是更新自身属性（比如添加删除页面）
+                flag = false;
+            }
+        }
+        console.log(flag, 111);
+        return flag;
+    }
     /**
      * 处理删除节点
      * @param fileNode 当前删除节点的文件级别节点
@@ -4327,11 +4353,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
          * 删除节点中的一个内容,删除了以后，就查一下引用的地方一起查一下异常
          */
         let outputFiles = [];
+        // 先特殊处理业务组件
+        const pos = getBusinessComponentPos(fileNode);
         // 删除之前先查一下内容的依赖
         const newRefs = await this.references({
             file: result.filePath,
-            line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-            offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+            line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+            offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
         });
         // 如果是要删除的内容，就是当前的file节点，要关闭当前文件，就把内容置为空
         if (fileNode === targetNode) {
@@ -4350,6 +4378,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         // 更新文件之后
         await this.updateFiles({ outputFiles });
+        if (this.noFileRefCheck(fileNode, targetNode, 'delete')) {
+            this.filesToCheck.add(result.filePath);
+            return;
+        }
+        ;
         newRefs.refs.forEach((ref) => this.filesToCheck.add(ref.file));
     }
     /**
@@ -4363,11 +4396,17 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const outputFiles = [{ file: result.filePath, fileContent: result.code }];
         // 创建和更新都用update，内部会做判断
         await this.updateFiles({ outputFiles });
+        // 先特殊处理业务组件
+        const pos = getBusinessComponentPos(fileNode);
+        if (this.noFileRefCheck(fileNode, targetNode, action)) {
+            this.filesToCheck.add(result.filePath);
+            return;
+        }
         // 查一下新函数名的依赖
         const newRefs = await this.references({
             file: result.filePath,
-            line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-            offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+            line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+            offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
         });
         const files = new Set();
         newRefs.refs.forEach((ref) => {
@@ -4409,11 +4448,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
             this.file2NodeMap.set(result.filePath, fileNode);
             // 修改名字新的添加进去，旧的置为空
             outputFiles.unshift({ file: oldFilePath, fileContent: '' });
+            // 先特殊处理业务组件
+            const pos = getBusinessComponentPos(fileNode);
             // 查一下旧文件名的依赖
             const oldRefs = await this.references({
                 file: oldFilePath,
-                line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-                offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+                line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+                offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
             });
             oldRefs.refs.forEach((ref) => this.filesToCheck.add(ref.file));
             this.filesToCheck.delete(oldFilePath);
@@ -4599,14 +4640,14 @@ let NaslServer = NaslServer_1 = class NaslServer {
             if (object.i18nKey && !oldObject.i18nKey) {
                 return;
             }
-            else if (object.i18nInfo && !oldObject.i18nInfo) {
+            if (object.i18nInfo && !oldObject.i18nInfo) {
                 return;
             }
-            else if (!object.i18nKey && oldObject.i18nKey) {
+            if (!object.i18nKey && oldObject.i18nKey) {
                 // 撤销重做 也跳过更新
                 return;
             }
-            else if (!object.i18nInfo && oldObject.i18nInfo) {
+            if (!object.i18nInfo && oldObject.i18nInfo) {
                 // 撤销重做 也跳过更新
                 return;
             }
@@ -4705,6 +4746,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
      */
     static getPropertyNames(fileNode) {
         const names = [];
+        if (!(0, asserts_1.isConnection)(fileNode) && !(0, asserts_1.isConnector)(fileNode)) {
+            return names;
+        }
         // TODO 如果不存在对应的 Connector 时，应该提示错误
         if (fileNode) {
             fileNode.properties.forEach((property) => {