@lcap/nasl 3.5.0-beta.1 → 3.5.0-beta.2

package/out/server/naslServer.js

@@ -129,35 +129,28 @@ const timeZoneArgumentIndexMap = new Map([
     ['GetSpecificDaysOfWeek', 3]
 ]);
 let NaslServer = NaslServer_1 = class NaslServer {
-    /** naslStdlib文件缓存 */
-    naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
-    messager;
-    worker;
-    /**
-     * 按道理 fileSourceMap: new Map<string, SourceMap>() 比较合理，
-     * 但是要多维护一层 vertex 增删 -> file 增删的关系问题，
-     * 先用挂在点上面，简单的方法实现，后期再考虑解耦
-     */
-    file2NodeMap = new Map();
-    /** TS 翻译的源码 */
-    tsFiles = new Map();
-    /// #if process.env.NODE_ENV === 'development'
-    /**
-     * 调试时是否储存 ts 文件
-     */
-    openDebugEmbedded = true;
-    /// #endif
-    elementsLogic = {};
-    // 错误日志收集
-    diagnosticManager;
-    embeddedTSEmitter;
-    // 需要执行修改的文件
-    changeStackList = [];
-    filesToCheck;
-    singleFileChangeIng;
-    // 包含组件逻辑调用的逻辑map
-    logicSetWithComponentLogic = new Set();
     constructor() {
+        /** naslStdlib文件缓存 */
+        this.naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
+        /**
+         * 按道理 fileSourceMap: new Map<string, SourceMap>() 比较合理，
+         * 但是要多维护一层 vertex 增删 -> file 增删的关系问题，
+         * 先用挂在点上面，简单的方法实现，后期再考虑解耦
+         */
+        this.file2NodeMap = new Map();
+        /** TS 翻译的源码 */
+        this.tsFiles = new Map();
+        /// #if process.env.NODE_ENV === 'development'
+        /**
+         * 调试时是否储存 ts 文件
+         */
+        this.openDebugEmbedded = true;
+        /// #endif
+        this.elementsLogic = {};
+        // 需要执行修改的文件
+        this.changeStackList = [];
+        // 包含组件逻辑调用的逻辑map
+        this.logicSetWithComponentLogic = new Set();
         /// #if process.env.BUILD_TARGET === 'node'
         if (globalThis.process)
             // For TS build
@@ -179,6 +172,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             protocol: 'ts-worker',
             sender: 'ide',
             context: this,
+            timeout: 120000,
             getReceiver: () => this.worker,
             getSender: () => this.worker,
             handleMessage: async ({ data }) => {
@@ -314,26 +308,33 @@ let NaslServer = NaslServer_1 = class NaslServer {
         if (module instanceof concepts_1.Module && module.type === 'extension' && module.enable === false) {
             return [];
         }
-        const { structures = [], metadataTypes = [], frontends = [], interfaces = [], enums = [], logics = [], authLogics = [], authLogicsForCallInterface = [], processes = [], dataSources = [], triggerLaunchers = [], connections = [], roles = [], overriddenLogics = [], backend, configuration, } = module;
+        const { structures = [], metadataTypes = [], frontendTypes = [], interfaces = [], enums = [], logics = [], authLogics = [], authLogicsForCallInterface = [], processes = [], dataSources = [], triggerLaunchers = [], connections = [], roles = [], overriddenLogics = [], backend, configuration, } = module;
         const { namespaces = [], } = module;
+        const { frontends = [] } = module;
         yield* getTsFiles(structures, 'structure');
         yield* getTsFiles(metadataTypes, 'metadataType');
         if (module instanceof concepts_1.App) {
             yield* getTsFiles(overriddenLogics, 'overriddenLogic', concepts_1.OverriddenLogic);
             yield* getTsFiles(backend?.variables ?? [], 'backend_variable');
-            for (const frontend of frontends) {
-                yield* getTsFile(frontend, 'frontend');
-                yield* getTsFiles(frontend.variables, 'frontend_variable');
-                yield* getTsFiles(concat(frontend.bindEvents, 'logics'), 'frontend_bindEvent_logic');
-                if (!config_1.config.closeViews) {
-                    yield* view2TSFile(frontend.views);
-                }
-                for (const dep of frontend.componentDependencies) {
+            for (const frontendType of frontendTypes) {
+                yield* getTsFile(frontendType, 'frontendType');
+                for (const dep of frontendType.componentDependencies) {
                     results.push(...(yield* self.contentToFile(dep)));
                 }
+                for (const frontend of frontendType.frontends) {
+                    yield* getTsFile(frontend, 'frontend');
+                    yield* getTsFiles(frontend.variables, 'frontend_variable');
+                    yield* getTsFiles(concat(frontend.bindEvents, 'logics'), 'frontend_bindEvent_logic');
+                    if (!config_1.config.closeViews) {
+                        yield* view2TSFile(frontend.views);
+                    }
+                }
+                // 业务组件
+                yield* getTsFiles(frontendType.businessComponents, 'businessComponents');
             }
         }
         else {
+            // 依赖库
             yield* getTsFiles(concat(frontends, 'logics'), 'frontend_logic');
         }
         yield* getTsFiles(dataSources, 'dataSource');
@@ -650,7 +651,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 return;
             const types = /<([^()]+)>/g.exec(displayString);
             const typeStr = types && types[1];
-            const { app } = node;
+            const app = node.getAncestor('App');
             if (typeStr.includes('__name: "AStructure_')) {
                 const properties = [];
                 typeStr.replace(/([^:\s]+):\s+([^;]+);/g, ($1, name, typeKey) => {
@@ -813,7 +814,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         record.suggestionDiagnostics.push(diagnostic);
                         return null;
                     }
-                    if (concepts_1.Assert.isStrictOqlQueryComponent(currentNode)) {
+                    if (concepts_1.asserts.isStrictOqlQueryComponent(currentNode)) {
                         // OQL别名错误降级为警告
                         if (diagnostic.originalDiagnostic && diagnostic.originalDiagnostic?.text.includes('__OQL_ALIAS_WARNING__')) {
                             // 重置 图标和错误等级
@@ -869,14 +870,14 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     // 局部变量和输入变量未使用的警告
                     const fromModule = record.node.parentNode.concept === 'Module';
                     const fromConnector = record.node.parentNode.concept === 'Connector';
-                    if ((concepts_1.Assert.isStrictView(record.node) || concepts_1.Assert.isStrictLogic(record.node)) && !(fromModule || fromConnector)) {
+                    if ((concepts_1.asserts.isStrictView(record.node) || concepts_1.asserts.isStrictLogic(record.node)) && !(fromModule || fromConnector)) {
                         /**
                          * javalogic不用提示
                          */
-                        if (concepts_1.Assert.isStrictLogic(record.node) && self._isJavalogic(record.node)) {
+                        if (concepts_1.asserts.isStrictLogic(record.node) && self._isJavalogic(record.node)) {
                             return null;
                         }
-                        concepts_1.Assert.assertFileNode(record.node);
+                        concepts_1.asserts.assertFileNode(record.node);
                         const minRange = yield* self._findMinRangeWithGenerator(diag, record.node);
                         if (minRange) {
                             /**
@@ -1982,7 +1983,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             const diagnostic = {
                 node: fileNode,
                 severity: 'error',
-                message: `连接器 ${fileNode.name} 参数配置缺失`,
+                message: `连接器 ${fileNode.name} 参数配置有更新`,
                 // 保留原来的内容方便查询一些问题
                 originalDiagnostic: {
                     fileName: '',
@@ -2243,21 +2244,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 const diagnostic = {
                     node,
                     severity: 'error',
-                    message: `ForEach：循环列表：参数类型不匹配！结束值自动推导失败。`,
+                    message: `ForEac1：循环列表：参数类型不匹配！结束值自动推导失败。`,
                 };
                 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 因为原来有报错，所以就忽略掉
@@ -2277,6 +2269,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             node.parentKey !== 'playground' &&
             node.parentKey !== 'consequent' &&
             node.parentNode?.parentNode?.concept !== 'CallInterface' &&
+            node.parentNode.concept !== 'Block' &&
             !node.__TypeAnnotation) {
             let showErr = false;
             if (node.parentNode?.parentNode?.concept === 'CallLogic') {
@@ -3350,6 +3343,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
                             return null;
                         }
                     }
+                    else if (node instanceof concepts_1.BusinessComponent) {
+                        minRange.setTypeMethods = 'setTag';
+                        minRange.newValue = `bs-${newValue}`;
+                    }
                     else if (!(node instanceof concepts_1.Role)) {
                         /**
                          * 无论是逻辑还是实体中的key，修改都不应该触发
@@ -3639,6 +3636,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             !(fileNode.parentNode instanceof concepts_1.Backend) &&
             !isConnectorLogic &&
             !(fileNode instanceof concepts_1.View) &&
+            !(fileNode instanceof concepts_1.BusinessComponent) &&
             !(fileNode instanceof concepts_1.ConfigProperty)) {
             fileNode = fileNode.parentNode;
             sourceMap = fileNode?.sourceMap;
@@ -3843,7 +3841,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 'QueryFieldExpression',
                 'QueryGroupByExpression',
                 'Param',
-                'Paginate',
                 'BackendVariable',
                 'CallAuthInterface',
             ].includes(node.concept))
@@ -3860,38 +3857,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
             };
             // 位置计算偏移
             if ('getQuickInfoOffset' in node) {
-                Object.assign(fileDetail, node.getQuickInfoOffset(fileDetail, getCode(item)));
+                Object.assign(fileDetail, node.getQuickInfoOffset(item, () => getCode(item)));
             }
             yield;
             // 位置计算偏移2
             // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
-            if (node.concept === 'Paginate' ||
-                node.concept === 'BinaryExpression' ||
-                node.concept === 'CallFunction' ||
-                node.concept === 'CallInterface') {
-                const code = getCode(item);
-                // 如果没有括号 ，括号就在外面，就 -1
-                // 有括号就找到括号的位置 然后 -1
-                let indexOf = 0;
-                if (!code.includes('(')) {
-                    indexOf = -1;
-                }
-                else {
-                    // 如果有泛型先往前找一找
-                    if (code.includes('<')) {
-                        indexOf = Math.min(code.indexOf('<'), code.indexOf('('));
-                    }
-                    else {
-                        indexOf = code.indexOf('(');
-                    }
-                    const subStr = code.substring(0, indexOf);
-                    const codeArr = subStr?.split('.');
-                    const lastLen = codeArr?.[codeArr.length - 1]?.length;
-                    indexOf = subStr.length - lastLen;
-                }
-                fileDetail.offset += indexOf;
-            }
-            else if (node.concept === 'MemberExpression' ||
+            if (node.concept === 'MemberExpression' ||
                 node.concept === 'Identifier' ||
                 node.concept === 'QueryFieldExpression' ||
                 node.concept === 'QueryGroupByExpression') {
@@ -3918,27 +3889,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
                 fileDetail.offset = newCode.length + 'return '.length;
             }
-            else if (['NewComposite', 'NewList', 'NewMap'].includes(node.concept)) {
-                let type;
-                switch (node.concept) {
-                    case 'NewComposite':
-                        type = '__newComposite';
-                        break;
-                    case 'NewList':
-                        type = '__newList';
-                        break;
-                    case 'NewMap':
-                        type = '__newMap';
-                        break;
-                    default:
-                }
-                const code = getCode(item);
-                fileDetail.line = item.end.line;
-                const indexOf = code.indexOf(`return ${type}`);
-                let newCode = code.substring(0, indexOf);
-                newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
-                fileDetail.offset = newCode.length + 'return '.length;
-            }
             else if (['OqlQueryComponent'].includes(node.concept)) {
                 fileDetail.offset += 10;
             }