@lcap/nasl 3.13.1-debug.4 → 3.13.1-debug.6

package/out/server/naslServer.js

@@ -45,8 +45,6 @@ const path = __importStar(require("path"));
 const worker_threads_1 = require("worker_threads");
 /// #endif
 const concepts_1 = require("../concepts");
-const validator_1 = require("../concepts/validator");
-const utils_1 = require("../utils");
 const asserts_1 = require("@lcap/nasl-concepts/asserts");
 const service_1 = require("@lcap/nasl-concepts/service");
 const Checker = __importStar(require("./checker"));
@@ -57,7 +55,7 @@ const translator_2 = require("./translator");
 const common_1 = require("../common");
 const diagnostic_1 = require("../manager/diagnostic");
 const naslStdlibMap_1 = __importDefault(require("./naslStdlibMap"));
-const utils_2 = require("../utils");
+const utils_1 = require("../utils");
 const decorators_1 = require("../decorators");
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const NEED_SYNC_BIND_ATTRIBUTE = [
@@ -112,41 +110,6 @@ function getBusinessComponentPos(fileNode) {
         }
     }
 }
-/**
- * 属于实体逻辑
- */
-function belongEntityLogic(node) {
-    const logic = (node.getAncestor('Logic') || node);
-    return concepts_1.asserts.isLogic(logic) && (0, utils_1.findConceptKeyWordIndexFromNodePath)(logic.nodePath, 'entities') !== -1;
-}
-/**
- * 属于虚拟入参
- * @param node
- * @returns
- */
-function belongVirtualParams(node) {
-    return (0, utils_1.findConceptKeyWordIndexFromNodePath)(node?.nodePath, 'virtualParams') !== -1;
-}
-/**
- * 是端事件下的参数
- * @param node
- * @returns
- */
-function isFrontendEvent(node) {
-    let flag = false;
-    if (node?.name === 'event') {
-        flag = true;
-        let target = node;
-        const conceptList = ['Param', 'Logic', 'BindEvent', 'Frontend'];
-        conceptList.forEach((concept) => {
-            if (target?.concept !== concept) {
-                flag = false;
-            }
-            target = target?.parentNode;
-        });
-    }
-    return flag;
-}
 // 联合类型切割取出类型
 function getDisplayString2Type(displayString) {
     const targetString = displayString.match(/value:\s(\S+)\)/)?.[1];
@@ -190,6 +153,18 @@ function isFunctionWithFixedTimeZoneParam(calleeName) {
     const fns = ['CurrDateTime', 'CurrDate', 'CurrTime', 'FormatDateTime'];
     return fns.includes(calleeName);
 }
+const createWorker = async (link, options) => {
+    const blob = await fetch(link).then((res) => res.blob());
+    const instance = globalThis.window;
+    const electron = instance.electron;
+    if (electron?.createWorker) {
+        return electron?.createWorker?.(await blob.arrayBuffer(), options);
+    }
+    const url = URL.createObjectURL(blob);
+    const worker = new worker_threads_1.Worker(url, options);
+    URL.revokeObjectURL(url);
+    return worker;
+};
 const allComponent = {};
 let NaslServer = NaslServer_1 = class NaslServer {
     constructor(opt) {
@@ -217,6 +192,17 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.isFirstScreen = true; // 优化首屏 getAncestor 热点代码
         // 检查共享数据是否有更新
         this._latestVersionsOfSharedApp = [];
+        this.promise = this.launch(opt);
+    }
+    async start() {
+        await this.promise;
+        return this.messager.requestCommand('start');
+    }
+    terminate() {
+        this.worker.terminate();
+        this.worker = null;
+    }
+    async launch(opt) {
         /// #if process.env.BUILD_TARGET === 'node'
         if (globalThis.process)
             // For TS build
@@ -226,10 +212,25 @@ let NaslServer = NaslServer_1 = class NaslServer {
         /// #if process.env.BUILD_TARGET !== 'node'
         if (globalThis.window) {
             // const source = require('!!raw-loader!@lcap/nasl-typescript-worker/dist/index.js').default;
-            const source = require('!!raw-loader!../../ts-worker/bundle.js').default;
-            const url = URL.createObjectURL(new Blob([source]));
-            this.worker = new window.Worker(url);
-            URL.revokeObjectURL(url);
+            this.worker = await (async () => {
+                if (process.env.NODE_ENV === 'development') {
+                    const source = require('!!raw-loader!../../ts-worker/bundle.js').default;
+                    const url = URL.createObjectURL(new Blob([source]));
+                    const worker = new window.Worker(url);
+                    URL.revokeObjectURL(url);
+                    return worker;
+                }
+                const instance = globalThis.window;
+                const baseIdePath = instance?.baseIdePath;
+                const hash = process.env.COMMIT_HASH || '';
+                const filename = instance?.electron
+                    ? 'tsserver.electron.js'
+                    : 'tsserver.js';
+                // @ts-ignore
+                const link = `${baseIdePath}/js/${filename}?${hash}`;
+                const options = { name: 'typescript-server' };
+                return createWorker(link, options);
+            })();
         }
         /// #endif
         this.http = opt.http;
@@ -329,13 +330,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
             });
         }
     }
-    start() {
-        return this.messager.requestCommand('start');
-    }
-    terminate() {
-        this.worker.terminate();
-        this.worker = null;
-    }
     async createUiTs(components, optinos) {
         const { standardUIComponents, // 标准组件（带有ts类型定义文件的组件）
          } = optinos;
@@ -1571,7 +1565,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
     // 是否包含组件逻辑
     hasComponentLogics(expression) {
         let flag = false;
-        (0, utils_2.traverse)((current) => {
+        (0, utils_1.traverse)((current) => {
             const { node } = current || {};
             const { concept } = node || {};
             if (concept === 'CallLogic') {
@@ -1687,6 +1681,19 @@ let NaslServer = NaslServer_1 = class NaslServer {
             errorFRefNames,
         };
     }
+    _getDuplicateNames(node, getItems, getName) {
+        const items = getItems(node);
+        const nameSet = new Set();
+        const res = new Set();
+        for (const item of items) {
+            const name = getName(item);
+            if (!nameSet.has(name))
+                nameSet.add(name);
+            else
+                res.add(name);
+        }
+        return Array.from(res);
+    }
     /**
      * 额外的诊断
      * @param fileNode 文件级别的节点
@@ -1979,6 +1986,21 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
                 else if (node instanceof concepts_1.Logic) {
+                    const duplicateVariables = self._getDuplicateNames(node, (logic) => [
+                        ...logic.variables,
+                        ...logic.params,
+                        ...logic.returns,
+                        ...likeComponent.variables,
+                        ...likeComponent.params,
+                    ], (item) => item.name);
+                    if (duplicateVariables.length) {
+                        const diagnostic = {
+                            node,
+                            severity: 'error',
+                            message: `逻辑${node.name}存在重名变量：${duplicateVariables.join(', ')}`,
+                        };
+                        diagnostics.push(diagnostic);
+                    }
                 }
                 else {
                     self.checkNodeError(node, diagnostics);
@@ -2052,6 +2074,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     });
                 }
             }
+            // 检查实体重名
+            const duplidateEntities = this._getDuplicateNames(fileNodeRaw, (dataSource) => dataSource.entities, (entity) => entity.name);
+            if (duplidateEntities.length) {
+                diagnostics.push({
+                    node: fileNode,
+                    severity: 'error',
+                    message: `数据源${fileNodeRaw.name}存在重名实体：${duplidateEntities.join(', ')}`,
+                });
+            }
         }
         // 加上对实体属性存储类型的校验规则
         else if (fileNodeRaw instanceof concepts_1.Entity) {
@@ -2394,6 +2425,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }
             }
             if (fileNodeRaw instanceof concepts_1.Logic && fileNodeRaw.calleewholeKey.startsWith('app.logics')) {
+                const duplicateLogics = this._getDuplicateNames(fileNodeRaw.rootNode, (app) => app.logics, (logic) => logic.name);
+                if (duplicateLogics.includes(fileNodeRaw.name)) {
+                    const diagnostic = {
+                        node: fileNode,
+                        severity: 'error',
+                        message: `存在重名服务端逻辑${fileNodeRaw.name}`,
+                    };
+                    diagnostics.push(diagnostic);
+                }
                 if (fileNodeRaw.sharedScope?.scope === 'specifiedRange' && !fileNodeRaw.sharedScope?.specifiedRange?.length) {
                     const diagnostic = {
                         node: fileNode,
@@ -2820,49 +2860,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 diagnostics.push(diagnostic);
             }
         }
-        // 校验节点名
-        function* validateNodeName(node) {
-            // 排除一些不需要校验的情况
-            if (isFrontendEvent(node) || belongEntityLogic(node) || belongVirtualParams(node)) {
-                return;
-            }
-            const { concept } = node || {};
-            const conceptValidator = validator_1.validator[concept];
-            if (conceptValidator) {
-                try {
-                    const vusionValidator = new validator_1.VusionValidator({}, {}, conceptValidator.rules(node), null) || {};
-                    let toBeVerifiedName = node;
-                    const map = {
-                        EnumItem: 'value',
-                    };
-                    const properties = (map[concept] || 'name').split('.');
-                    if (properties) {
-                        properties.forEach((property) => {
-                            toBeVerifiedName = toBeVerifiedName[property];
-                        });
-                    }
-                    const res = yield vusionValidator.validate(toBeVerifiedName, [], {
-                        label: (0, concepts_1.getConceptConstructor)(concept).nodeTitle,
-                        alwaysResolve: true,
-                    });
-                    if (res) {
-                        const diagnostic = {
-                            node,
-                            severity: 'error',
-                            message: `【${toBeVerifiedName}】命名非法：${res}`,
-                        };
-                        diagnostics.push(diagnostic);
-                        console.log(diagnostic);
-                    }
-                }
-                catch (err) {
-                    // console.log(err);
-                }
-            }
-        }
-        yield* utils.wrapIteratorToGenerator(fileNodeRaw.sourceMap.entries(), function* ([node]) {
-            yield* validateNodeName(node);
-        });
         return diagnostics;
     }
     timeoutCheck(fileNodeRaw, fileNode, diagnostics) {
@@ -6345,7 +6342,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.semData.recoverSlowGetters();
         this.semData.clearSemanticData();
         this.semData.isFirstScreen = false;
-        const isFrontendLogic = targetNodeRaw.getAncestorRaw('Logic') && (fileNodeRaw.concept === 'View' || fileNodeRaw.concept === 'BusinessComponent');
+        const isFrontendLogic = targetNodeRaw.getAncestorRaw('Logic') && Boolean(fileNodeRaw.concept === 'View' ?? fileNodeRaw.concept === 'BusinessComponent');
         // @ts-ignore
         !isFrontendLogic && this.semData.updateDirtyIndRetDeps(fileNodeRaw);
         this.logger.timeEnd('TS 文件变更');