@lcap/nasl 3.12.0-rc.6 → 3.13.0-alpha.microapp-1

package/ts-worker/lib/Messager.js

@@ -97,11 +97,26 @@ class Messager {
         }
         this.sendMessage(message);
         return new Promise((res, rej) => {
-            this.requests.set(message.id, Object.assign({ res, rej }, message));
-            setTimeout(() => {
-                this.requests.delete(message.id);
-                rej(Object.assign({ error: 'Timeout' }, message));
+            const timeoutTimer = setTimeout(() => {
+              this.requests.delete(message.id);
+              rej(Object.assign({ error: 'Timeout' }, message));
             }, this.options.timeout || 2000);
+
+            const resolve = (data) => {
+              // 需要主动把定时器卸载掉，避免内存泄露
+              this.requests.delete(message.id);
+              clearTimeout(timeoutTimer);
+              res(data);
+            };
+
+            const reject = (e) => {
+              // 需要主动把定时器卸载掉，避免内存泄露
+              this.requests.delete(message.id);
+              clearTimeout(timeoutTimer);
+              rej(e);
+            };
+
+            this.requests.set(message.id, Object.assign({ res: resolve, rej: reject }, message));
         });
     }
     /**

package/ts-worker/src/index.js

@@ -349,6 +349,37 @@ const context = {
         }
         return result;
     },
+    getSlotCurrentCompletion({ file, range }) {
+        let result = [];
+        // 获取当前这个位置的可选内容并且只查当前这层
+        const completionList = this.getCompletionInfo({ file, range });
+        result = this.formatSlotCurrentCompletion(completionList, { file, range }, { noDown: true });
+        return result;
+    },
+    formatSlotCurrentCompletion(completions, { file, range }, methodConfig) {
+        const { noDown } = methodConfig;
+        const completionList = completions.filter((item) => item.sortText === '11' && item.name.startsWith('current'));
+
+        const entryNames = [];
+        const valueList = [];
+        // 遍历取出所有的名称
+        completionList.forEach((item) => {
+            entryNames.push(item.name);
+            valueList.push({
+                text: item.name,
+            });
+        });
+        // 找到有子集的对象
+        const details = this.completionEntryDetails({ file, range, entryNames }, noDown);
+        valueList.forEach((item) => {
+            if (details[item.text]) {
+                item.children = details[item.text].children;
+                item.completionDetail = details[item.text].completionDetail;
+            }
+        });
+        return valueList;
+
+    },
     /**
      * @param {*} completions 查到的依赖
      * @param {*} { file, range } 文件和位置信息
@@ -356,8 +387,8 @@ const context = {
      * @param {*} values 继续向下查的数组
      * @returns
      */
-    formatCompletions(completions, { file, range }, mothodConfig) {
-        const { noDown, values, noFilterList } = mothodConfig;
+    formatCompletions(completions, { file, range }, methodConfig) {
+        const { noDown, values, noFilterList } = methodConfig;
         const completionList = completions.filter((item) => {
             // 过滤别的文件的， 而且过滤arguments 和 导出的，和不要函数
             // 先过滤掉app
@@ -484,7 +515,6 @@ const context = {
         });
         return detailsMap;
     },
-    // 增加当前的属性然后·出下面的属性
     changeValueAndGet({ file, range, value }, noDown, values) {
         let result;
         if (value) {