@lcap/nasl 4.5.0-beta.6 → 4.5.0-beta.7

package/out/server/naslServer.js

@@ -37,7 +37,7 @@ const config_1 = require("../config");
 const Messager_1 = __importDefault(require("../common/Messager"));
 const oql_cache_1 = require("./OQL/oql-cache");
 const initial_1 = require("../service/initial");
-const set_1 = require("mnemonist/set");
+const mnemonist_1 = require("mnemonist");
 const sqlFunctions_json_1 = __importDefault(require("./OQL/sqlFunctions.json"));
 const sqlCategory_json_1 = __importDefault(require("./OQL/sqlCategory.json"));
 /// #if process.env.BUILD_TARGET === 'node'
@@ -643,34 +643,43 @@ class NaslServer {
         }
         // 根据特性开关控制是否创建TypeScript Worker
         if (this.flags.tssEnabled) {
-            /// #if process.env.BUILD_TARGET === 'node'
-            if (globalThis.process)
-                // For TS build
-                // this.worker = new Worker(require.resolve('@lcap/nasl-typescript-worker/src/index.js'));
-                this.worker = new worker_threads_1.Worker(require.resolve('../../ts-worker/src/index.js'));
+            /// #if process.env.BUILD_TYPE === 'bundler'
+            if (process.env.BUILD_TYPE === 'bundler') {
+                this.worker = new worker_threads_1.Worker(path.join(__dirname, './ts-worker/bundle.electron.js'));
+            }
             /// #endif
-            /// #if process.env.BUILD_TARGET !== 'node'
-            if (globalThis.window) {
-                // const source = require('!!raw-loader!@lcap/nasl-typescript-worker/dist/index.js').default;
-                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?.createWorker
-                        ? 'tsserver.electron.js'
-                        : 'tsserver.js';
-                    // @ts-ignore
-                    const link = `${baseIdePath}/js/${filename}?${hash}`;
-                    const options = { name: 'typescript-server' };
-                    return createWorker(link, options);
-                })();
+            /// #if process.env.BUILD_TYPE !== 'bundler'
+            if (process.env.BUILD_TYPE !== 'bundler') {
+                /// #if process.env.BUILD_TARGET === 'node'
+                if (globalThis.process)
+                    // For TS build
+                    // this.worker = new Worker(require.resolve('@lcap/nasl-typescript-worker/src/index.js'));
+                    this.worker = new worker_threads_1.Worker(require.resolve('../../ts-worker/src/index.js'));
+                /// #endif
+                /// #if process.env.BUILD_TARGET !== 'node'
+                if (globalThis.window) {
+                    // const source = require('!!raw-loader!@lcap/nasl-typescript-worker/dist/index.js').default;
+                    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?.createWorker
+                            ? 'tsserver.electron.js'
+                            : 'tsserver.js';
+                        // @ts-ignore
+                        const link = `${baseIdePath}/js/${filename}?${hash}`;
+                        const options = { name: 'typescript-server' };
+                        return createWorker(link, options);
+                    })();
+                }
+                /// #endif
             }
             /// #endif
         }
@@ -3857,7 +3866,7 @@ class NaslServer {
                 const diagRecs = await (0, nasl_language_server_core_1.checkUpdateRefsDiag)({
                     env: this.semEnv,
                     diagMgr: this.diagnosticManager,
-                    chkFiles: (0, set_1.union)(this.typerCheckFiles, oqlCheckFiles, originLogicCheckFiles, exportInterfacesCheckFiles),
+                    chkFiles: mnemonist_1.set.union(this.typerCheckFiles, oqlCheckFiles, originLogicCheckFiles, exportInterfacesCheckFiles),
                     removeNodes: this.typerRemoveNodes,
                     createNodes: this.typerCreateNodes,
                     tsDiagnostics,