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

package/out/utils/time-slicing/utils.d.ts

@@ -0,0 +1,62 @@
+export interface TaskDataInDebug {
+    count: number;
+    time: number;
+    avg: number;
+    frameId: number;
+}
+export interface GroupData {
+    /** 任务组编号 */
+    id: number;
+    /** 所属帧编号 */
+    frameId: number;
+    /** 任务组耗时 */
+    time: number;
+    /** 任务组数量 */
+    limit: number;
+    /** 任务组标签 */
+    mark: ReturnType<typeof getGroupMark>;
+}
+export interface FrameData {
+    /** 帧编号 */
+    id: number;
+    /** 帧耗时 */
+    time: number;
+    /** 任务组在当前帧的耗时 */
+    groupTime: number;
+    /** 帧标签 */
+    mark: ReturnType<typeof getFrameMark>;
+}
+export interface AsyncData {
+    /** 异步等待编号 */
+    id: number;
+    /** 异步等待耗时 */
+    time: number;
+    /** 异步结果 */
+    result: any;
+    /** 异步标签 */
+    mark: ReturnType<typeof getAsyncMark>;
+}
+export declare function getId(): number;
+/** 延迟 */
+export declare function delay(time?: number): Promise<void>;
+export declare function getAsyncMark(id: number): {
+    AsyncStart: string;
+    AsyncEnd: string;
+    AsyncMeasure: string;
+};
+export declare function getGroupMark(id: number): {
+    GroupStart: string;
+    GroupEnd: string;
+    GroupMeasure: string;
+};
+export declare function getFrameMark(id: number): {
+    FrameStart: string;
+    FrameEnd: string;
+    FrameMeasure: string;
+};
+export declare function isGenerator(value: unknown): value is Generator<any, any, any>;
+/**
+ * 空生成器
+ */
+export declare function returnOrigin(): Generator<any, void, any>;
+export declare function returnOrigin<T>(defaultVal: T): Generator<any, T, any>;

package/out/utils/time-slicing/utils.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.returnOrigin = exports.isGenerator = exports.getFrameMark = exports.getGroupMark = exports.getAsyncMark = exports.delay = exports.getId = void 0;
+/** 编号 */
+let id = 0;
+function getId() {
+    return id++;
+}
+exports.getId = getId;
+/** 延迟 */
+function delay(time = 10) {
+    return new Promise((resolve) => setTimeout(resolve, time));
+}
+exports.delay = delay;
+function getAsyncMark(id) {
+    return {
+        AsyncStart: `AsyncStart-${id}`,
+        AsyncEnd: `AsyncEnd-${id}`,
+        AsyncMeasure: `AsyncMeasure-${id}`,
+    };
+}
+exports.getAsyncMark = getAsyncMark;
+function getGroupMark(id) {
+    return {
+        GroupStart: `GroupStart-${id}`,
+        GroupEnd: `GroupEnd-${id}`,
+        GroupMeasure: `GroupMeasure-${id}`,
+    };
+}
+exports.getGroupMark = getGroupMark;
+function getFrameMark(id) {
+    return {
+        FrameStart: `FrameStart-${id}`,
+        FrameEnd: `FrameEnd-${id}`,
+        FrameMeasure: `FrameMeasure-${id}`,
+    };
+}
+exports.getFrameMark = getFrameMark;
+function isGenerator(value) {
+    return value && typeof value[Symbol.iterator] === 'function';
+}
+exports.isGenerator = isGenerator;
+function* returnOrigin(defaultVal) {
+    return defaultVal;
+}
+exports.returnOrigin = returnOrigin;
+//# sourceMappingURL=utils.js.map

package/out/utils/time-slicing/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/utils.ts"],"names":[],"mappings":";;;AA0CA,SAAS;AACT,IAAI,EAAE,GAAG,CAAC,CAAC;AAEX,SAAgB,KAAK;IACnB,OAAO,EAAE,EAAE,CAAC;AACd,CAAC;AAFD,sBAEC;AAED,SAAS;AACT,SAAgB,KAAK,CAAC,OAAe,EAAE;IACrC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;AACnE,CAAC;AAFD,sBAEC;AAED,SAAgB,YAAY,CAAC,EAAU;IACrC,OAAO;QACL,UAAU,EAAE,cAAc,EAAE,EAAE;QAC9B,QAAQ,EAAE,YAAY,EAAE,EAAE;QAC1B,YAAY,EAAE,gBAAgB,EAAE,EAAE;KACnC,CAAC;AACJ,CAAC;AAND,oCAMC;AAED,SAAgB,YAAY,CAAC,EAAU;IACrC,OAAO;QACL,UAAU,EAAE,cAAc,EAAE,EAAE;QAC9B,QAAQ,EAAE,YAAY,EAAE,EAAE;QAC1B,YAAY,EAAE,gBAAgB,EAAE,EAAE;KACnC,CAAC;AACJ,CAAC;AAND,oCAMC;AAED,SAAgB,YAAY,CAAC,EAAU;IACrC,OAAO;QACL,UAAU,EAAE,cAAc,EAAE,EAAE;QAC9B,QAAQ,EAAE,YAAY,EAAE,EAAE;QAC1B,YAAY,EAAE,gBAAgB,EAAE,EAAE;KACnC,CAAC;AACJ,CAAC;AAND,oCAMC;AAED,SAAgB,WAAW,CAAC,KAAc;IACxC,OAAO,KAAK,IAAI,OAAQ,KAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,UAAU,CAAC;AACxE,CAAC;AAFD,kCAEC;AAOD,QAAe,CAAC,CAAC,YAAY,CAAI,UAAc;IAC7C,OAAO,UAAU,CAAC;AACpB,CAAC;AAFD,oCAEC"}

package/out/utils/time-slicing/wrapper.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 迭代器包装为生成器
+ *
+ * @description 回调中允许使用生成器
+ */
+export declare function wrapIteratorToGenerator<T>(list: IterableIterator<T>, forEach: (item: T, index: number, arr: T[]) => (any | Generator<any, any, any>)): Generator<any, any, any>;
+/**
+ * 数组 forEach 回调包装为生成器
+ *
+ * @description 回调中允许使用生成器
+ */
+export declare function wrapForEachToGenerator<T>(list: T[], forEach: (item: T, index: number, arr: T[]) => (any | Generator<any, any, any>)): Generator<any, any, any>;
+/**
+ * 数组 map 回调包装为生成器
+ *
+ * @description 回调中允许使用生成器
+ */
+export declare function wrapMapToGenerator<T, U>(list: T[], map: (item: T, index: number, arr: T[]) => (U | Generator<any, U, any>)): Generator<any, U[], any>;

package/out/utils/time-slicing/wrapper.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapMapToGenerator = exports.wrapForEachToGenerator = exports.wrapIteratorToGenerator = void 0;
+const utils_1 = require("./utils");
+/**
+ * 迭代器包装为生成器
+ *
+ * @description 回调中允许使用生成器
+ */
+function wrapIteratorToGenerator(list, forEach) {
+    return wrapForEachToGenerator(Array.from(list), forEach);
+}
+exports.wrapIteratorToGenerator = wrapIteratorToGenerator;
+/**
+ * 数组 forEach 回调包装为生成器
+ *
+ * @description 回调中允许使用生成器
+ */
+function wrapForEachToGenerator(list, forEach) {
+    const len = list.length;
+    return (function* transformListToGenerator() {
+        for (let i = 0; i < len; i++) {
+            const result = forEach(list[i], i, list);
+            if ((0, utils_1.isGenerator)(result)) {
+                yield* result;
+            }
+            yield;
+        }
+    })();
+}
+exports.wrapForEachToGenerator = wrapForEachToGenerator;
+/**
+ * 数组 map 回调包装为生成器
+ *
+ * @description 回调中允许使用生成器
+ */
+function wrapMapToGenerator(list, map) {
+    const len = list.length;
+    const resultArr = Array(len);
+    return (function* transformListToGenerator() {
+        for (let i = 0; i < len; i++) {
+            const result = map(list[i], i, list);
+            if ((0, utils_1.isGenerator)(result)) {
+                resultArr[i] = yield* result;
+            }
+            else {
+                resultArr[i] = result;
+            }
+            yield;
+        }
+        return resultArr;
+    })();
+}
+exports.wrapMapToGenerator = wrapMapToGenerator;
+//# sourceMappingURL=wrapper.js.map

package/out/utils/time-slicing/wrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/wrapper.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC;;;;GAIG;AACH,SAAgB,uBAAuB,CAAI,IAAyB,EAAE,OAA+E;IACnJ,OAAO,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAFD,0DAEC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAI,IAAS,EAAE,OAA+E;IAClI,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IAExB,OAAO,CAAC,QAAQ,CAAC,CAAC,wBAAwB;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAEzC,IAAI,IAAA,mBAAW,EAAC,MAAM,CAAC,EAAE;gBACvB,KAAK,CAAC,CAAC,MAAM,CAAC;aACf;YAED,KAAK,CAAC;SACP;IACH,CAAC,CAAC,EAAE,CAAC;AACP,CAAC;AAdD,wDAcC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAO,IAAS,EAAE,GAAuE;IACzH,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IACxB,MAAM,SAAS,GAAQ,KAAK,CAAC,GAAG,CAAC,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,CAAC,wBAAwB;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAErC,IAAI,IAAA,mBAAW,EAAC,MAAM,CAAC,EAAE;gBACvB,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;aAC9B;iBACI;gBACH,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;aACvB;YAED,KAAK,CAAC;SACP;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,EAAE,CAAC;AACP,CAAC;AApBD,gDAoBC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.22.12-beta.1",
+  "version": "2.22.12-beta.2",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",
@@ -37,10 +37,10 @@
     "@types/axios": "^0.14.0",
     "@types/faker": "^5.1.7",
     "@types/json-stringify-safe": "^5.0.0",
-    "axios": "^0.21.1",
+    "axios": "^1.6.2",
     "compare-versions": "^4.1.3",
-    "decimal.js": "^10.4.3",
     "date-fns": "^2.6.0",
+    "decimal.js": "^10.4.3",
     "faker": "^5.4.0",
     "fs-extra": "^10.1.0",
     "json-stringify-safe": "^5.0.1",

package/src/common/BaseNode.ts

@@ -1130,7 +1130,7 @@ export class BaseNode extends EventEmitter {
     }
     get isTreeLeaf() {
         if (this.concept === 'EntityProperty' || this.concept === 'InterfaceParam' || this.concept === 'Param'
-            || this.concept === 'Return' || this.concept === 'StructureProperty' || this.concept === 'Variable') {
+            || this.concept === 'Return' || this.concept === 'StructureProperty' || this.concept === 'Variable' || this.concept === 'FrontendVariable') {
             if ((this as any).typeAnnotation || (this.__TypeAnnotation && this.parentKey === 'virtualParams')) {
                 return !this.hasChildren;
             } else {

package/ts-worker/package.json

@@ -21,7 +21,7 @@
     "dependencies": {
         "@types/fs-extra": "^9.0.13",
         "@typescript/vfs": "^1.3.5",
-        "axios": "^0.24.0",
+        "axios": "^1.6.2",
         "browserfs": "^1.4.3",
         "chai": "^4.3.6",
         "create-hash": "^1.2.0",

package/coverage/base.css

@@ -1,224 +0,0 @@
-body, html {
-  margin:0; padding: 0;
-  height: 100%;
-}
-body {
-    font-family: Helvetica Neue, Helvetica, Arial;
-    font-size: 14px;
-    color:#333;
-}
-.small { font-size: 12px; }
-*, *:after, *:before {
-  -webkit-box-sizing:border-box;
-     -moz-box-sizing:border-box;
-          box-sizing:border-box;
-  }
-h1 { font-size: 20px; margin: 0;}
-h2 { font-size: 14px; }
-pre {
-    font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
-    margin: 0;
-    padding: 0;
-    -moz-tab-size: 2;
-    -o-tab-size:  2;
-    tab-size: 2;
-}
-a { color:#0074D9; text-decoration:none; }
-a:hover { text-decoration:underline; }
-.strong { font-weight: bold; }
-.space-top1 { padding: 10px 0 0 0; }
-.pad2y { padding: 20px 0; }
-.pad1y { padding: 10px 0; }
-.pad2x { padding: 0 20px; }
-.pad2 { padding: 20px; }
-.pad1 { padding: 10px; }
-.space-left2 { padding-left:55px; }
-.space-right2 { padding-right:20px; }
-.center { text-align:center; }
-.clearfix { display:block; }
-.clearfix:after {
-  content:'';
-  display:block;
-  height:0;
-  clear:both;
-  visibility:hidden;
-  }
-.fl { float: left; }
-@media only screen and (max-width:640px) {
-  .col3 { width:100%; max-width:100%; }
-  .hide-mobile { display:none!important; }
-}
-
-.quiet {
-  color: #7f7f7f;
-  color: rgba(0,0,0,0.5);
-}
-.quiet a { opacity: 0.7; }
-
-.fraction {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-  font-size: 10px;
-  color: #555;
-  background: #E8E8E8;
-  padding: 4px 5px;
-  border-radius: 3px;
-  vertical-align: middle;
-}
-
-div.path a:link, div.path a:visited { color: #333; }
-table.coverage {
-  border-collapse: collapse;
-  margin: 10px 0 0 0;
-  padding: 0;
-}
-
-table.coverage td {
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-}
-table.coverage td.line-count {
-    text-align: right;
-    padding: 0 5px 0 20px;
-}
-table.coverage td.line-coverage {
-    text-align: right;
-    padding-right: 10px;
-    min-width:20px;
-}
-
-table.coverage td span.cline-any {
-    display: inline-block;
-    padding: 0 5px;
-    width: 100%;
-}
-.missing-if-branch {
-    display: inline-block;
-    margin-right: 5px;
-    border-radius: 3px;
-    position: relative;
-    padding: 0 4px;
-    background: #333;
-    color: yellow;
-}
-
-.skip-if-branch {
-    display: none;
-    margin-right: 10px;
-    position: relative;
-    padding: 0 4px;
-    background: #ccc;
-    color: white;
-}
-.missing-if-branch .typ, .skip-if-branch .typ {
-    color: inherit !important;
-}
-.coverage-summary {
-  border-collapse: collapse;
-  width: 100%;
-}
-.coverage-summary tr { border-bottom: 1px solid #bbb; }
-.keyline-all { border: 1px solid #ddd; }
-.coverage-summary td, .coverage-summary th { padding: 10px; }
-.coverage-summary tbody { border: 1px solid #bbb; }
-.coverage-summary td { border-right: 1px solid #bbb; }
-.coverage-summary td:last-child { border-right: none; }
-.coverage-summary th {
-  text-align: left;
-  font-weight: normal;
-  white-space: nowrap;
-}
-.coverage-summary th.file { border-right: none !important; }
-.coverage-summary th.pct { }
-.coverage-summary th.pic,
-.coverage-summary th.abs,
-.coverage-summary td.pct,
-.coverage-summary td.abs { text-align: right; }
-.coverage-summary td.file { white-space: nowrap;  }
-.coverage-summary td.pic { min-width: 120px !important;  }
-.coverage-summary tfoot td { }
-
-.coverage-summary .sorter {
-    height: 10px;
-    width: 7px;
-    display: inline-block;
-    margin-left: 0.5em;
-    background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
-}
-.coverage-summary .sorted .sorter {
-    background-position: 0 -20px;
-}
-.coverage-summary .sorted-desc .sorter {
-    background-position: 0 -10px;
-}
-.status-line {  height: 10px; }
-/* yellow */
-.cbranch-no { background: yellow !important; color: #111; }
-/* dark red */
-.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
-.low .chart { border:1px solid #C21F39 }
-.highlighted,
-.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{
-  background: #C21F39 !important;
-}
-/* medium red */
-.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
-/* light red */
-.low, .cline-no { background:#FCE1E5 }
-/* light green */
-.high, .cline-yes { background:rgb(230,245,208) }
-/* medium green */
-.cstat-yes { background:rgb(161,215,106) }
-/* dark green */
-.status-line.high, .high .cover-fill { background:rgb(77,146,33) }
-.high .chart { border:1px solid rgb(77,146,33) }
-/* dark yellow (gold) */
-.status-line.medium, .medium .cover-fill { background: #f9cd0b; }
-.medium .chart { border:1px solid #f9cd0b; }
-/* light yellow */
-.medium { background: #fff4c2; }
-
-.cstat-skip { background: #ddd; color: #111; }
-.fstat-skip { background: #ddd; color: #111 !important; }
-.cbranch-skip { background: #ddd !important; color: #111; }
-
-span.cline-neutral { background: #eaeaea; }
-
-.coverage-summary td.empty {
-    opacity: .5;
-    padding-top: 4px;
-    padding-bottom: 4px;
-    line-height: 1;
-    color: #888;
-}
-
-.cover-fill, .cover-empty {
-  display:inline-block;
-  height: 12px;
-}
-.chart {
-  line-height: 0;
-}
-.cover-empty {
-    background: white;
-}
-.cover-full {
-    border-right: none !important;
-}
-pre.prettyprint {
-    border: none !important;
-    padding: 0 !important;
-    margin: 0 !important;
-}
-.com { color: #999 !important; }
-.ignore-none { color: #999; font-weight: normal; }
-
-.wrapper {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -48px;
-}
-.footer, .push {
-  height: 48px;
-}

package/coverage/block-navigation.js

@@ -1,87 +0,0 @@
-/* eslint-disable */
-var jumpToCode = (function init() {
-    // Classes of code we would like to highlight in the file view
-    var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no'];
-
-    // Elements to highlight in the file listing view
-    var fileListingElements = ['td.pct.low'];
-
-    // We don't want to select elements that are direct descendants of another match
-    var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > `
-
-    // Selecter that finds elements on the page to which we can jump
-    var selector =
-        fileListingElements.join(', ') +
-        ', ' +
-        notSelector +
-        missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b`
-
-    // The NodeList of matching elements
-    var missingCoverageElements = document.querySelectorAll(selector);
-
-    var currentIndex;
-
-    function toggleClass(index) {
-        missingCoverageElements
-            .item(currentIndex)
-            .classList.remove('highlighted');
-        missingCoverageElements.item(index).classList.add('highlighted');
-    }
-
-    function makeCurrent(index) {
-        toggleClass(index);
-        currentIndex = index;
-        missingCoverageElements.item(index).scrollIntoView({
-            behavior: 'smooth',
-            block: 'center',
-            inline: 'center'
-        });
-    }
-
-    function goToPrevious() {
-        var nextIndex = 0;
-        if (typeof currentIndex !== 'number' || currentIndex === 0) {
-            nextIndex = missingCoverageElements.length - 1;
-        } else if (missingCoverageElements.length > 1) {
-            nextIndex = currentIndex - 1;
-        }
-
-        makeCurrent(nextIndex);
-    }
-
-    function goToNext() {
-        var nextIndex = 0;
-
-        if (
-            typeof currentIndex === 'number' &&
-            currentIndex < missingCoverageElements.length - 1
-        ) {
-            nextIndex = currentIndex + 1;
-        }
-
-        makeCurrent(nextIndex);
-    }
-
-    return function jump(event) {
-        if (
-            document.getElementById('fileSearch') === document.activeElement &&
-            document.activeElement != null
-        ) {
-            // if we're currently focused on the search input, we don't want to navigate
-            return;
-        }
-
-        switch (event.which) {
-            case 78: // n
-            case 74: // j
-                goToNext();
-                break;
-            case 66: // b
-            case 75: // k
-            case 80: // p
-                goToPrevious();
-                break;
-        }
-    };
-})();
-window.addEventListener('keydown', jumpToCode);