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

package/out/concepts/QueryJoinExpression__.js

@@ -34,6 +34,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var QueryJoinExpression_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryJoinExpression = void 0;
+const time_slicing_1 = require("../utils/time-slicing");
 const translator_1 = require("../translator");
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
@@ -242,9 +243,12 @@ class QueryJoinExpression extends LogicItem__1.default {
                 ~index && this[parentKey].splice(index, 1);
                 params.index = index;
             }
-            else if (t[parentKey] === n) {
-                params.index = 0;
-                this[parentKey] = undefined;
+            else {
+                const q = t[parentKey];
+                if ((q.__v_raw || q) === n) {
+                    params.index = 0;
+                    this[parentKey] = undefined;
+                }
             }
         }
         return params;
@@ -278,23 +282,24 @@ class QueryJoinExpression extends LogicItem__1.default {
             ...object,
         });
     }
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
         let code = '';
-        code += `.${this.joinType}_JOIN(new nasl.langUtil.Collection<[${this.entityKey}]>())\n`;
-        if (this.onExpressions.length > 0) {
+        code += `.${self.joinType}_JOIN(new nasl.langUtil.Collection<[${self.entityKey}]>())\n`;
+        if (self.onExpressions.length > 0) {
             code += `${(0, translator_1.indent)(state?.tabSize || 0)}.ON(() => `;
-            this.onExpressions.forEach((expression, index) => {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.onExpressions, function* warpForEachGenerator(expression, index) {
                 if (index > 0)
                     code += `\n${(0, translator_1.indent)((state?.tabSize || 0) + 1)}&& `;
-                code += expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
+                code += yield* expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
             });
-            if (this.onExpressions.length > 1)
+            if (self.onExpressions.length > 1)
                 code += `\n${(0, translator_1.indent)(state?.tabSize || 0)}`;
             code += ')\n';
         }
-        if (this.joinParts.length > 0) {
-            this.joinParts.forEach((joinPart) => {
-                code += joinPart.toEmbeddedTS((0, translator_1.shiftState)(state, code));
+        if (self.joinParts.length > 0) {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.joinParts, function* warpForEachGenerator(joinPart) {
+                code += yield* joinPart.toEmbeddedTS((0, translator_1.shiftState)(state, code));
             });
         }
         return code;
@@ -322,7 +327,7 @@ __decorate([
     (0, decorators_1.property)('QueryJoinExpression')
 ], QueryJoinExpression.prototype, "joinParts", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], QueryJoinExpression.prototype, "toEmbeddedTS", null);
 QueryJoinExpression = QueryJoinExpression_1 = __decorate([
     decorators_1.className,

package/out/concepts/QueryJoinExpression__.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryJoinExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryJoinExpression__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryJoinExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryJoinExpression__.ts"],"names":[],"mappings":"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"}

package/out/concepts/QueryLimitExpression__.d.ts

@@ -1,4 +1,4 @@
-import { TranslatorState } from '../translator';
+import { TranslatorState, TranslatorGenerator } from '../translator';
 import { Params } from '../common/EventEmitter';
 import LogicItem from './LogicItem__';
 /**
@@ -53,6 +53,6 @@ export declare class QueryLimitExpression extends LogicItem {
      */
     removePageSizeElement(pageSizeElement: LogicItem): void;
     __removeLogicItem(logicItem: LogicItem): Params;
-    toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState): TranslatorGenerator;
 }
 export default QueryLimitExpression;

package/out/concepts/QueryLimitExpression__.js

@@ -122,9 +122,12 @@ class QueryLimitExpression extends LogicItem__1.default {
                 ~index && this[parentKey].splice(index, 1);
                 params.index = index;
             }
-            else if (t[parentKey] === n) {
-                params.index = 0;
-                this[parentKey] = undefined;
+            else {
+                const q = t[parentKey];
+                if ((q.__v_raw || q) === n) {
+                    params.index = 0;
+                    this[parentKey] = undefined;
+                }
             }
         }
         return params;
@@ -133,11 +136,12 @@ class QueryLimitExpression extends LogicItem__1.default {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
-        const { pageElement, pageSizeElement } = this;
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
+        const { pageElement, pageSizeElement } = self;
         let code = '[';
-        code += `${pageElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}, `;
-        code += `${pageSizeElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}]`;
+        code += `${yield* pageElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}, `;
+        code += `${yield* pageSizeElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}]`;
         return code;
     }
 };
@@ -151,7 +155,7 @@ __decorate([
     (0, decorators_1.property)('LogicItem')
 ], QueryLimitExpression.prototype, "pageSizeElement", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], QueryLimitExpression.prototype, "toEmbeddedTS", null);
 QueryLimitExpression = QueryLimitExpression_1 = __decorate([
     decorators_1.className,

package/out/concepts/QueryLimitExpression__.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryLimitExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryLimitExpression__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAAgG;AAMhG,8CAA6E;AAK7E,+DAAsC;AAEtC;;GAEG;AAIH,IAAa,oBAAoB;AADjC,aAAa;AACb,MAAa,oBAAqB,SAAQ,oBAAS;IACjD,SAAS;IACT,MAAM,CAAU,WAAW,GAAG,sBAAsB,CAAC;IAErD;;OAEG;IAGM,OAAO,CAA0B;IAE1C;;OAEG;IAGH,AADA,aAAa;IACb,WAAW,CAAa;IAExB;;OAEG;IAGH,AADA,aAAa;IACb,eAAe,CAAa;IAE5B;;OAEG;IACH,YAAY,MAAsC;QAChD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,sBAAoB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAyB,CAAC;IAC3E,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,WAAsB;QACnC,WAAW,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG;YACb,WAAW;SACZ,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,eAA0B;QAC3C,eAAe,CAAC,OAAO,EAAE,CAAC;QAC1B,MAAM,eAAe,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG;YACb,eAAe;SAChB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAcD,iBAAiB,CAAC,OAA2B;QAC3C,IAAI,WAAsB,CAAC;QAC3B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC;aACtC;SACF;aAAM;YACL,WAAW,GAAG,OAAO,CAAC;SACvB;QACD,OAAO,WAAW,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAcD,qBAAqB,CAAC,OAA2B;QAC/C,IAAI,eAA0B,CAAC;QAC/B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;YACvC,IAAI,CAAC,eAAe,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC;aACtC;SACF;aAAM;YACL,eAAe,GAAG,OAAO,CAAC;SAC3B;QACD,OAAO,eAAe,CAAC,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,iBAAiB,CAAC,SAAoB;QACpC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QACtC,MAAM,MAAM,GAAW;YACrB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,SAAS;SACrB,CAAC;QACF,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,aAAa;YACb,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC;YAC/B,aAAa;YACb,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC;YACzC,IAAI,KAAK,CAAC,OAAO,CAAE,CAAS,CAAC,SAAS,CAAC,CAAC,EAAE;gBACxC,aAAa;gBACb,MAAM,KAAK,GAAI,CAAS,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;gBAChF,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACtB;iBAAM,IAAK,CAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;gBACtC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACtC;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAGlF,YAAY,CAAC,KAAK,GAAG,IAAA,gCAAmB,GAAE;QACxC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAC9C,IAAI,IAAI,GAAG,GAAG,CAAC;QACf,IAAI,IAAI,GAAG,WAAW,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC;QACjE,IAAI,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC;CAMF,CAAA;AA3JC;IAFC,IAAA,qBAAQ,EAAC,SAAS,CAAC;qDAEsB;AAO1C;IAFC,IAAA,qBAAQ,EAAC,WAAW,CAAC;yDAEE;AAOxB;IAFC,IAAA,qBAAQ,EAAC,WAAW,CAAC;6DAEM;AAiI5B;IADC,IAAA,0BAAa,GAAE;wDAOf;AA9JU,oBAAoB;IAHhC,sBAAS;IACT,IAAA,oBAAO,EAAC,QAAQ,CAAC;IAClB,aAAa;GACA,oBAAoB,CAoKhC;AApKY,oDAAoB;AAsKjC,kBAAe,oBAAoB,CAAC;AACpC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"QueryLimitExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryLimitExpression__.ts"],"names":[],"mappings":"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"}

package/out/concepts/QueryOrderByExpression__.d.ts

@@ -1,4 +1,4 @@
-import { TranslatorState } from '../translator';
+import { TranslatorState, TranslatorGenerator } from '../translator';
 import { Params } from '../common/EventEmitter';
 import LogicItem from './LogicItem__';
 /**
@@ -64,6 +64,6 @@ export declare class QueryOrderByExpression extends LogicItem {
             value: string;
         };
     };
-    toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState): TranslatorGenerator;
 }
 export default QueryOrderByExpression;

package/out/concepts/QueryOrderByExpression__.js

@@ -122,9 +122,12 @@ class QueryOrderByExpression extends LogicItem__1.default {
                 ~index && this[parentKey].splice(index, 1);
                 params.index = index;
             }
-            else if (t[parentKey] === n) {
-                params.index = 0;
-                this[parentKey] = undefined;
+            else {
+                const q = t[parentKey];
+                if ((q.__v_raw || q) === n) {
+                    params.index = 0;
+                    this[parentKey] = undefined;
+                }
             }
         }
         return params;
@@ -146,11 +149,12 @@ class QueryOrderByExpression extends LogicItem__1.default {
             },
         };
     }
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
-        const { orderElement, order } = this;
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
+        const { orderElement, order } = self;
         let code = '[';
-        code += `${orderElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}, `;
-        code += `${order.toEmbeddedTS((0, translator_1.shiftState)(state, code))}]`;
+        code += `${yield* orderElement.toEmbeddedTS((0, translator_1.shiftState)(state, code))}, `;
+        code += `${yield* order.toEmbeddedTS((0, translator_1.shiftState)(state, code))}]`;
         return code;
     }
 };
@@ -164,7 +168,7 @@ __decorate([
     (0, decorators_1.property)('LogicItem')
 ], QueryOrderByExpression.prototype, "order", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], QueryOrderByExpression.prototype, "toEmbeddedTS", null);
 QueryOrderByExpression = QueryOrderByExpression_1 = __decorate([
     decorators_1.className,

package/out/concepts/QueryOrderByExpression__.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryOrderByExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryOrderByExpression__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryOrderByExpression__.js","sourceRoot":"","sources":["../../src/concepts/QueryOrderByExpression__.ts"],"names":[],"mappings":"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"}

package/out/concepts/QuerySelectExpression__.js

@@ -247,9 +247,12 @@ class QuerySelectExpression extends LogicItem__1.default {
                 ~index && this[parentKey].splice(index, 1);
                 params.index = index;
             }
-            else if (t[parentKey] === n) {
-                params.index = 0;
-                this[parentKey] = undefined;
+            else {
+                const q = t[parentKey];
+                if ((q.__v_raw || q) === n) {
+                    params.index = 0;
+                    this[parentKey] = undefined;
+                }
             }
         }
         return params;

package/out/concepts/QuerySelectExpression__.js.map

@@ -1 +1 @@
-{"version":3,"file":"QuerySelectExpression__.js","sourceRoot":"","sources":["../../src/concepts/QuerySelectExpression__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QuerySelectExpression__.js","sourceRoot":"","sources":["../../src/concepts/QuerySelectExpression__.ts"],"names":[],"mappings":"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"}

package/out/concepts/Return__.d.ts

@@ -1,4 +1,4 @@
-import { TranslatorState } from '../translator';
+import { TranslatorState, TranslatorGenerator } from '../translator';
 import EntityProperty from './EntityProperty__';
 import StructureProperty from './StructureProperty__';
 import { Params } from '../common/EventEmitter';
@@ -112,10 +112,10 @@ export declare class Return extends BaseNode {
      */
     completionChildren: Array<EntityProperty | StructureProperty>;
     toJS(state?: TranslatorState): string;
-    toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState): TranslatorGenerator;
     toNaturalTS(state?: TranslatorState): string;
     isEnum(): boolean;
-    toEmbeddedTSInProcess(state?: TranslatorState): string;
+    toEmbeddedTSInProcess(state?: TranslatorState): TranslatorGenerator;
     /**
      * 设置数据类型
      * @param typeAnnotation 类型标注对象

package/out/concepts/Return__.js

@@ -193,9 +193,12 @@ class Return extends BaseNode_1.default {
                 ~index && this[parentKey].splice(index, 1);
                 params.index = index;
             }
-            else if (t[parentKey] === n) {
-                params.index = 0;
-                this[parentKey] = undefined;
+            else {
+                const q = t[parentKey];
+                if ((q.__v_raw || q) === n) {
+                    params.index = 0;
+                    this[parentKey] = undefined;
+                }
             }
         }
         return params;
@@ -264,17 +267,18 @@ class Return extends BaseNode_1.default {
         }
         return code;
     }
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
-        let code = this.name || '__return';
-        if (this.typeAnnotation) {
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
+        let code = self.name || '__return';
+        if (self.typeAnnotation) {
             code += ': ';
-            code += this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
+            code += yield* self.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
             // toTS暂时只需要翻译引用数据类型的，因为值都是字符串
             // 就不在这里赋值了，这里单纯就为了快速查找
             // 并且屏蔽了一些异常的错误
-            if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
-                if (this.isEnum()) {
-                    code += `= ${this.typeAnnotation.typeKey}['${this.defaultValue}']`;
+            if (self.typeAnnotation?.typeKind !== 'primitive' && self.defaultValue) {
+                if (self.isEnum()) {
+                    code += `= ${self.typeAnnotation.typeKey}['${self.defaultValue}']`;
                 }
             }
         }
@@ -302,11 +306,12 @@ class Return extends BaseNode_1.default {
     isEnum() {
         return this.typeAnnotation?.typeNamespace?.endsWith('.enums');
     }
-    toEmbeddedTSInProcess(state) {
-        let code = this.name;
-        if (this.typeAnnotation) {
+    *toEmbeddedTSInProcess(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
+        let code = self.name;
+        if (self.typeAnnotation) {
             code += ': undefined as ';
-            code += this.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
+            code += yield* self.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
         }
         // if (this.defaultValue) {
         //     code += `: ${this.defaultValue}`;
@@ -377,13 +382,13 @@ __decorate([
     (0, decorators_1.excludedInJSON)()
 ], Return.prototype, "useComponent", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], Return.prototype, "toEmbeddedTS", null);
 __decorate([
     (0, translator_1.withSourceMap)()
 ], Return.prototype, "toNaturalTS", null);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], Return.prototype, "toEmbeddedTSInProcess", null);
 Return = Return_1 = __decorate([
     decorators_1.className,

package/out/concepts/Return__.js.map

@@ -1 +1 @@
-{"version":3,"file":"Return__.js","sourceRoot":"","sources":["../../src/concepts/Return__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Return__.js","sourceRoot":"","sources":["../../src/concepts/Return__.ts"],"names":[],"mappings":"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"}

package/out/concepts/Role__.d.ts

@@ -1,4 +1,5 @@
-import { TranslatorState } from '../translator';
+import type { EmbeddedTSFileGenerator } from '../utils';
+import { TranslatorState, TranslatorGenerator } from '../translator';
 import { Params } from '../common/EventEmitter';
 import BaseNode from '../common/BaseNode';
 import App from './App__';
@@ -46,7 +47,7 @@ export declare class Role extends BaseNode {
      * 设置角色名称
      */
     setName(name: string): void;
-    toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState): TranslatorGenerator;
     get tsName(): string;
     getNamespace(): string;
     /**
@@ -54,10 +55,6 @@ export declare class Role extends BaseNode {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name?: string): string;
-    toEmbeddedTSFile(): {
-        code: string;
-        filePath: string;
-        sourceMap: import("../translator").SourceMap;
-    };
+    toEmbeddedTSFile(): EmbeddedTSFileGenerator;
 }
 export default Role;

package/out/concepts/Role__.js

@@ -90,9 +90,10 @@ class Role extends BaseNode_1.default {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
-        let code = `export enum ${this.tsName} {\n`;
-        code += `      ${this.tsName}='${this.tsName}'\n`;
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
+        let code = `export enum ${self.tsName} {\n`;
+        code += `      ${self.tsName}='${self.tsName}'\n`;
         code += `${(0, translator_1.indent)(state?.tabSize || 0)}}\n`;
         return code;
     }
@@ -121,11 +122,11 @@ class Role extends BaseNode_1.default {
     getEmbeddedFilePath(name = this.name) {
         return `/embedded/${this.app.name}/roles/${name}.ts`;
     }
-    toEmbeddedTSFile() {
+    *toEmbeddedTSFile() {
         let code = `namespace ${this.getNamespace()} {\n`;
         const state = (0, translator_1.createCompilerState)(code, { tabSize: 1 });
         try {
-            code += this.toEmbeddedTS(state);
+            code += yield* this.toEmbeddedTS(state);
         }
         catch (err) {
             code += '';
@@ -155,7 +156,7 @@ __decorate([
     (0, decorators_1.property)()
 ], Role.prototype, "description", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], Role.prototype, "toEmbeddedTS", null);
 Role = Role_1 = __decorate([
     decorators_1.className,

package/out/concepts/Role__.js.map

@@ -1 +1 @@
-{"version":3,"file":"Role__.js","sourceRoot":"","sources":["../../src/concepts/Role__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Role__.js","sourceRoot":"","sources":["../../src/concepts/Role__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,8CAQuB;AAOvB,8CAA6E;AAG7E,+BAAoC;AACpC,kEAA0C;AAG1C;;GAEG;AAIH,IAAa,IAAI;AADjB,aAAa;AACb,MAAa,IAAK,SAAQ,kBAAQ;IAChC,SAAS;IACT,MAAM,CAAU,WAAW,GAAG,MAAM,CAAC;IAErC;;OAEG;IAGM,OAAO,CAAU;IAE1B;;OAEG;IAGH,AADA,aAAa;IACb,IAAI,CAAU;IAEd;;OAEG;IAEH,IAAI,GAAW,IAAA,SAAM,GAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAE1C;;OAEG;IAGH,AADA,aAAa;IACb,WAAW,CAAU;IAErB;;OAEG;IAGH,AADA,aAAa;IACb,WAAW,CAAU;IAErB;;OAEG;IACH,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAQ,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,YAAY,MAAsB;QAChC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAS,CAAC;IAC3D,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;SACzD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD;;OAEG;IACH,OAAO,CAAC,IAAY;QAClB,MAAM,MAAM,GAAG;YACb,IAAI;SACL,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;YACT,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;IACL,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,CAAC,YAAY,CAAC,KAAK,GAAG,IAAA,gCAAmB,GAAE;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,IAAI,IAAI,GAAG,eAAe,IAAI,CAAC,MAAM,MAAM,CAAC;QAC5C,IAAI,IAAI,SAAS,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,KAAK,CAAC;QAClD,IAAI,IAAI,GAAG,IAAA,mBAAM,EAAC,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,MAAM;QACR,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,eAAe;QACf,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY;QACV,IAAI,IAAI,CAAC,UAAU,IAAK,IAAI,CAAC,UAAwB,CAAC,YAAY,EAAE;YAClE,MAAM,eAAe,GAAI,IAAI,CAAC,UAAwB,CAAC,YAAY,EAAE,CAAC;YACtE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACxC,MAAM,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,KAAK,KAAK,IAAI,UAAU,EAAE;gBACnD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACtB;YACD,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;SACjC;QACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI;QAClC,OAAO,aAAa,IAAI,CAAC,GAAG,CAAC,IAAI,UAAU,IAAI,KAAK,CAAC;IACvD,CAAC;IAED,CAAC,gBAAgB;QACf,IAAI,IAAI,GAAG,aAAa,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC;QAElD,MAAM,KAAK,GAAG,IAAA,gCAAmB,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI;YACF,IAAI,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SACzC;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,IAAI,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAClB;QACD,IAAI,IAAI,KAAK,CAAC;QAEd,OAAO;YACL,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,mBAAmB,EAAE;YACpC,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAC;IACJ,CAAC;CAMF,CAAA;AAzIC;IAFC,IAAA,qBAAQ,EAAC,SAAS,CAAC;qCAEM;AAO1B;IAFC,IAAA,qBAAQ,GAAE;kCAEG;AAMd;IADC,IAAA,qBAAQ,GAAE;kCAC+B;AAO1C;IAFC,IAAA,qBAAQ,GAAE;yCAEU;AAOrB;IAFC,IAAA,qBAAQ,GAAE;yCAEU;AAmDrB;IADC,mCAAsB;wCAOtB;AA7FU,IAAI;IAHhB,sBAAS;IACT,IAAA,oBAAO,EAAC,IAAI,CAAC;IACd,aAAa;GACA,IAAI,CAkJhB;AAlJY,oBAAI;AAoJjB,kBAAe,IAAI,CAAC;AACpB,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/SelectMembers__.d.ts

@@ -1,4 +1,4 @@
-import { TranslatorState } from '../translator';
+import { TranslatorState, TranslatorGenerator } from '../translator';
 import { Params } from '../common/EventEmitter';
 import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
@@ -138,6 +138,6 @@ export declare class SelectMembers extends BaseNode {
     __removeLogicItem(logicItem: LogicItem): Params;
     get lines(): number;
     get error(): boolean;
-    toEmbeddedTS(state?: TranslatorState): string;
+    toEmbeddedTS(state?: TranslatorState): TranslatorGenerator;
 }
 export default SelectMembers;

package/out/concepts/SelectMembers__.js

@@ -229,9 +229,12 @@ class SelectMembers extends BaseNode_1.default {
                 ~index && this[parentKey].splice(index, 1);
                 params.index = index;
             }
-            else if (t[parentKey] === n) {
-                params.index = 0;
-                this[parentKey] = undefined;
+            else {
+                const q = t[parentKey];
+                if ((q.__v_raw || q) === n) {
+                    params.index = 0;
+                    this[parentKey] = undefined;
+                }
             }
         }
         return params;
@@ -266,7 +269,8 @@ class SelectMembers extends BaseNode_1.default {
         }
         return !!this.members.find((member) => member.tsErrorDetail);
     }
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
         const code = '';
         return code;
     }
@@ -284,7 +288,7 @@ __decorate([
     (0, decorators_1.property)('LogicItem')
 ], SelectMembers.prototype, "members", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], SelectMembers.prototype, "toEmbeddedTS", null);
 SelectMembers = SelectMembers_1 = __decorate([
     decorators_1.className,