@lcap/nasl 3.2.0-beta.4 → 3.3.0-alpha

package/out/concepts/SelectMembers__.d.ts

@@ -48,22 +48,22 @@ export declare class SelectMembers extends BaseNode {
     getLogicItemExistingNames(excludedList?: Array<LogicItem>): string[];
     getLogicItemUniqueName(name?: string): string;
     /**
-    * 插入逻辑项
-    * @internal
-    * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入逻辑项
+     * @internal
+     * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
+     */
     _insertLogicItemAt(name: string, index: number): LogicItem;
     /**
-    * 插入逻辑项
-    * @internal
-    * @param logicItemOptions 逻辑项参数
-    */
+     * 插入逻辑项
+     * @internal
+     * @param logicItemOptions 逻辑项参数
+     */
     _insertLogicItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
     /**
-    * 插入逻辑项
-    * @internal
-    * @param logicItem 已有的逻辑项实例
-    */
+     * 插入逻辑项
+     * @internal
+     * @param logicItem 已有的逻辑项实例
+     */
     _insertLogicItemAt(logicItem: LogicItem, index: number): LogicItem;
     /**
      * 插入逻辑项
@@ -115,9 +115,9 @@ export declare class SelectMembers extends BaseNode {
      */
     addLogicItem(logicItem: LogicItem): LogicItem;
     /**
-    * 删除逻辑项
-    * @param name 逻辑项名称
-    */
+     * 删除逻辑项
+     * @param name 逻辑项名称
+     */
     removeExpression(name: string): void;
     /**
      * 删除逻辑项
@@ -125,9 +125,9 @@ export declare class SelectMembers extends BaseNode {
      */
     removeExpression(expression: LogicItem): void;
     /**
-    * 删除逻辑项
-    * @param name 逻辑项名称
-    */
+     * 删除逻辑项
+     * @param name 逻辑项名称
+     */
     removeLogicItemInMembers(name: string): void;
     /**
      * 删除逻辑项

package/out/concepts/SelectMembers__.js

@@ -64,7 +64,8 @@ let SelectMembers = SelectMembers_1 = class SelectMembers extends BaseNode_1.def
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, SelectMembers_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...SelectMembers_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -186,7 +187,7 @@ let SelectMembers = SelectMembers_1 = class SelectMembers extends BaseNode_1.def
         if (typeof options === 'string') {
             expression = this.expression;
             if (!expression) {
-                throw new Error('找不到逻辑项 ' + options);
+                throw new Error(`找不到逻辑项 ${options}`);
             }
         }
         else {
@@ -199,7 +200,7 @@ let SelectMembers = SelectMembers_1 = class SelectMembers extends BaseNode_1.def
         if (typeof options === 'string') {
             logicItem = this.members.find((item) => item.name === options);
             if (!logicItem) {
-                throw new Error('找不到逻辑项 ' + options);
+                throw new Error(`找不到逻辑项 ${options}`);
             }
         }
         else {
@@ -208,7 +209,7 @@ let SelectMembers = SelectMembers_1 = class SelectMembers extends BaseNode_1.def
         return logicItem.delete();
     }
     __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
+        const { parentKey } = logicItem;
         const params = {
             parentNode: this,
             parentKey,
@@ -230,13 +231,13 @@ let SelectMembers = SelectMembers_1 = class SelectMembers extends BaseNode_1.def
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     get lines() {
         const rootNode = this.getAncestor('NewComposite') || this.getAncestor('BatchAssignment');
-        const parentKey = this.parentKey;
+        const { parentKey } = this;
         const firstIndex = parentKey === 'left' ? 0 : rootNode.rights.findIndex((selectMember) => selectMember === this);
         let count = 0;
         rootNode.assignmentLines.forEach((line) => {
@@ -286,8 +287,8 @@ SelectMembers = SelectMembers_1 = __decorate([
 exports.SelectMembers = SelectMembers;
 classMap_1.default.SelectMembers = SelectMembers;
 exports.default = SelectMembers;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=SelectMembers__.js.map

package/out/concepts/SelectMembers__.js.map

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

package/out/concepts/Slot__.d.ts

@@ -60,9 +60,9 @@ export declare class Slot extends BaseNode {
      */
     _delete(): Params;
     /**
-    * 删除输入参数
-    * @param name 输入参数名称
-    */
+     * 删除输入参数
+     * @param name 输入参数名称
+     */
     removeSlotProps(name: string): void;
     /**
      * 删除输入参数

package/out/concepts/Slot__.js

@@ -68,7 +68,8 @@ let Slot = Slot_1 = class Slot extends BaseNode_1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, Slot_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...Slot_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -94,7 +95,7 @@ let Slot = Slot_1 = class Slot extends BaseNode_1.default {
         if (typeof options === 'string') {
             slotProps = this.slotProps;
             if (!slotProps) {
-                throw new Error('找不到输入参数 ' + options);
+                throw new Error(`找不到输入参数 ${options}`);
             }
         }
         else {
@@ -103,7 +104,7 @@ let Slot = Slot_1 = class Slot extends BaseNode_1.default {
         return slotProps.delete();
     }
     __removeParam(param) {
-        const parentKey = param.parentKey;
+        const { parentKey } = param;
         const params = {
             parentNode: this,
             parentKey,
@@ -153,8 +154,8 @@ Slot = Slot_1 = __decorate([
 exports.Slot = Slot;
 classMap_1.default.Slot = Slot;
 exports.default = Slot;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=Slot__.js.map

package/out/concepts/Slot__.js.map

@@ -1 +1 @@
-{"version":3,"file":"Slot__.js","sourceRoot":"","sources":["../../src/concepts/Slot__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAKA,8CAAkE;AAIlE,kEAA0C;AAC1C,kEAA0C;AAM1C;;GAEG;AAEH,IAAa,IAAI,YAAjB,MAAa,IAAK,SAAQ,kBAAQ;IAC9B;;OAEG;IAEH,OAAO,GAAW,MAAM,CAAC;IAEzB;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,KAAK,GAAW,SAAS,CAAC;IAE1B;;OAEG;IAEH,WAAW,GAAW,SAAS,CAAC;IAEhC;;OAEG;IAEH,eAAe,GAAuB,SAAS,CAAC;IAEhD;;OAEG;IAEH,QAAQ,GAAY,SAAS,CAAC;IAE9B;;OAEG;IAEH,SAAS,GAAU,SAAS,CAAC;IAE7B;;OAEG;IACH,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAkB,CAAC;IAC9D,CAAC;IACD;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAW,CAAC;IAChD,CAAC;IACD;;OAEG;IACH,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAQ,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,YAAY,MAAsB;QAC9B,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;IACjC,CAAC;IACD,YAAY;QACR,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAS,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;SAC3D;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAmBD,eAAe,CAAC,OAAuB;QACnC,IAAI,SAAgB,CAAC;QACrB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAC3B,IAAI,CAAC,SAAS,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,SAAS,GAAG,OAAO,CAAC;SACvB;QACD,OAAO,SAAS,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,aAAa,CAAC,KAAY;QACtB,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QAClC,MAAM,MAAM,GAAW;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,KAAK;SACnB,CAAC;QACF,IAAI,SAAS,EAAE;YACX,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACtD,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACxB;iBAAM,IAAK,IAAY,CAAC,SAAS,CAAC,KAAK,KAAK,EAAE;gBAC3C,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACxC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CAWJ,CAAA;AAnJG;IADC,IAAA,qBAAQ,GAAE;qCACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;kCACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;mCACe;AAM1B;IADC,IAAA,qBAAQ,GAAE;yCACqB;AAMhC;IADC,IAAA,qBAAQ,GAAE;6CACqC;AAMhD;IADC,IAAA,qBAAQ,GAAE;sCACmB;AAM9B;IADC,IAAA,qBAAQ,EAAC,OAAO,CAAC;uCACW;AAzCpB,IAAI;IADhB,IAAA,oBAAO,EAAC,IAAI,CAAC;GACD,IAAI,CAwJhB;AAxJY,oBAAI;AA0JjB,kBAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACrB,kBAAe,IAAI,CAAC;AACpB,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"Slot__.js","sourceRoot":"","sources":["../../src/concepts/Slot__.ts"],"names":[],"mappings":"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"}

package/out/concepts/SqlQueryComponent__.d.ts

@@ -43,9 +43,9 @@ export declare class SqlQueryComponent extends LogicItem {
      */
     setCode(code: string): void;
     /**
-    * 删除类型标注
-    * @param name 类型标注名称
-    */
+     * 删除类型标注
+     * @param name 类型标注名称
+     */
     removeTypeAnnotation(name: string): void;
     /**
      * 删除类型标注
@@ -60,6 +60,7 @@ export declare class SqlQueryComponent extends LogicItem {
     getTextVariables(): void;
     getTypeBanError(): boolean;
     toEmbeddedTS(state?: TranslatorState): string;
+    toNaturalTS(state?: TranslatorState): string;
     /**
      * 获取添加时的默认选项
      * @returns

package/out/concepts/SqlQueryComponent__.js

@@ -49,7 +49,8 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, SqlQueryComponent_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...SqlQueryComponent_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -75,7 +76,7 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
         if (typeof options === 'string') {
             typeAnnotation = this.typeAnnotation;
             if (!typeAnnotation) {
-                throw new Error('找不到类型标注 ' + options);
+                throw new Error(`找不到类型标注 ${options}`);
             }
         }
         else {
@@ -84,7 +85,7 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
         return typeAnnotation.delete();
     }
     __removeTypeAnnotation(typeAnnotation) {
-        const parentKey = typeAnnotation.parentKey;
+        const { parentKey } = typeAnnotation;
         const params = {
             parentNode: this,
             parentKey,
@@ -106,10 +107,10 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     /**
      * APP数据源重命名时，同步SQL数据源；此方法仅提供给APP重命名时使用
      */
@@ -128,12 +129,13 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
         const variables = new Set();
         let temp;
         const re = /\{(.+?)\}/g;
-        while (temp = re.exec(str)) {
+        while ((temp = re.exec(str))) {
             let variable = temp[1];
             variable = variable.replaceAll(' ', '');
             variables.add(variable);
         }
-        for (const variable of variables) { // 遍历Set
+        for (const variable of variables) {
+            // 遍历Set
             let newVariable;
             if (variable.includes('.')) {
                 const arr = variable.split('.');
@@ -171,7 +173,7 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
                 if (ref?.length) {
                     ref.forEach((item) => {
                         // 如果有类型但是类型不是基本类型，就需要打开开关，注入变量
-                        if (item?.typeAnnotation && item.typeAnnotation.typeNamespace !== 'nasl.core' && !(item.typeAnnotation.typeNamespace.endsWith('.enums'))) {
+                        if (item?.typeAnnotation && item.typeAnnotation.typeNamespace !== 'nasl.core' && !item.typeAnnotation.typeNamespace.endsWith('.enums')) {
                             sqlTypeBan = true;
                         }
                     });
@@ -219,8 +221,12 @@ let SqlQueryComponent = SqlQueryComponent_1 = class SqlQueryComponent extends Lo
             code += ';\n';
         });
         code += '\n';
-        code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'return;\n';
-        code += (0, translator_1.indent)((state?.tabSize || 0)) + '})()';
+        code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}return;\n`;
+        code += `${(0, translator_1.indent)(state?.tabSize || 0)}})()`;
+        return code;
+    }
+    toNaturalTS(state) {
+        const code = `nasl.oql.query(\`${this.code}\`)`;
         return code;
     }
     /**
@@ -255,14 +261,17 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], SqlQueryComponent.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], SqlQueryComponent.prototype, "toNaturalTS", null);
 SqlQueryComponent = SqlQueryComponent_1 = __decorate([
     (0, decorators_1.concept)('SQL 查询')
 ], SqlQueryComponent);
 exports.SqlQueryComponent = SqlQueryComponent;
 classMap_1.default.SqlQueryComponent = SqlQueryComponent;
 exports.default = SqlQueryComponent;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=SqlQueryComponent__.js.map

package/out/concepts/SqlQueryComponent__.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlQueryComponent__.js","sourceRoot":"","sources":["../../src/concepts/SqlQueryComponent__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAAmF;AAInF,iEAAwC;AACxC,6EAAoD;AAOpD,8CAAkE;AAKlE,kEAA0C;AAE1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,iBAAiB,yBAA9B,MAAa,iBAAkB,SAAQ,oBAAS;IAC5C;;OAEG;IAEH,OAAO,GAAwB,mBAAmB,CAAC;IAEnD;;OAEG;IAEH,KAAK,GAAW,QAAQ,CAAC;IAEzB;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,cAAc,GAAmB,SAAS,CAAC;IAE3C;;OAEG;IAEH,UAAU,GAAW,SAAS,CAAC;IAE/B;;OAEG;IAEH,UAAU,GAAW,SAAS,CAAC;IAI/B;;OAEG;IACH,YAAY,MAAmC;QAC3C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,mBAAiB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC1E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,YAAY;QACR,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAsB,CAAC;IAC1E,CAAC;IAGD;;OAEG;IACH,OAAO,CAAC,IAAY;QAChB,MAAM,MAAM,GAAG;YACX,IAAI;SACP,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAkBD,oBAAoB,CAAC,OAAgC;QACjD,IAAI,cAA8B,CAAC;QACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;YACrC,IAAI,CAAC,cAAc,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,cAAc,GAAG,OAAO,CAAC;SAC5B;QACD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,sBAAsB,CAAC,cAA8B;QACjD,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;QAC3C,MAAM,MAAM,GAAW;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,cAAc;SAC5B,CAAC;QACF,IAAI,SAAS,EAAE;YACX,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC/D,CAAC,KAAK,IAAK,IAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;aACxB;iBAAM,IAAK,IAAY,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE;gBACpD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACxC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF;;OAEG;IACH,gBAAgB,CAAC,UAAkB;QAC/B,sBAAsB;QACtB,MAAM,MAAM,GAAG;YACX,UAAU;SACb,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB;QACZ,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,MAAM,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAC;QACzC,IAAI,IAAS,CAAC;QACd,MAAM,EAAE,GAAG,YAAY,CAAC;QACxB,OAAO,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACxB,IAAI,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACvB,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACxC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC3B;QACD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,EAAE,QAAQ;YACxC,IAAI,WAA0C,CAAC;YAC/C,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACxB,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjC,IAAI,CAAC,WAAW,EAAE;wBACd,cAAc;wBACd,WAAW,GAAG,IAAI,qBAAU,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;wBAC9C,WAAmB,CAAC,UAAU,GAAG,IAAI,CAAC;qBAC1C;yBAAM;wBACH,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;wBACjD,QAAgB,CAAC,UAAU,GAAG,IAAI,CAAC;wBACpC,WAAW,GAAG,IAAI,2BAAgB,CAAC;4BAC/B,MAAM,EAAE,WAAW;4BACnB,QAAQ;yBACX,CAAC,CAAC;wBACF,WAAmB,CAAC,UAAU,GAAG,IAAI,CAAC;qBAC1C;iBACJ;aACJ;iBAAM;gBACH,WAAW,GAAG,IAAI,qBAAU,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAChD,WAAmB,CAAC,UAAU,GAAG,IAAI,CAAC;aAC1C;YACD,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC;YAC9B,WAAW,CAAC,SAAS,GAAG,cAAc,CAAC;YACvC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACvC;IACL,CAAC;IAED,eAAe;QACX,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,MAAM,aAAa,GAAG,CAAC,cAA8B,EAAE,EAAE;gBACrD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC9C,IAAI,GAAG,EAAE,MAAM,EAAE;oBACb,GAAG,CAAC,OAAO,CAAC,CAAC,IAAuB,EAAE,EAAE;wBACpC,+BAA+B;wBAC/B,IAAI,IAAI,EAAE,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,aAAa,KAAK,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;4BACtI,UAAU,GAAG,IAAI,CAAC;yBACrB;oBACL,CAAC,CAAC,CAAC;iBACN;YACL,CAAC,CAAC;YACF,IAAI,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE;gBAC3C,mBAAmB;gBACnB,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,KAAK,MAAM,EAAE;oBACzC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBAC/C,aAAa,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;iBACN;qBAAM;oBACH,SAAS;oBACT,UAAU,GAAG,IAAI,CAAC;iBACrB;aACJ;iBAAM;gBACH,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACtC;SACJ;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;IAGD,YAAY,CAAC,KAAuB;QAChC,IAAI,IAAY,CAAC;QACjB,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,EAAE;YAC5B,IAAI,GAAG,eAAe,CAAC;YACvB,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,MAAM,CAAC;SACvH;aAAM;YACH,IAAI,GAAG,oCAAoC,CAAC;YAC5C,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,OAAO,CAAC;SACxH;QACD,6BAA6B;QAC7B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,IAAI,IAAA,mBAAM,EAAC,CAAC,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1C,IAAI,IAAI,sCAAsC,IAAI,CAAC,UAAU,KAAK,CAAC;SACtE;QACD,YAAY;QACZ,YAAY;QACZ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO;QACP,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnC,IAAI,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACvD,IAAI,IAAI,KAAK,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,IAAI,CAAC;QACb,IAAI,IAAI,IAAA,mBAAM,EAAC,CAAC,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC;QACxD,IAAI,IAAI,IAAA,mBAAM,EAAC,CAAC,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,iBAAiB;QAC3B,OAAO;YACH,UAAU,EAAE,WAAW;SAC1B,CAAC;IACN,CAAC;IAED,YAAY,GAAwC,EAAE,CAAC;CAM1D,CAAA;AAzPG;IADC,IAAA,qBAAQ,GAAE;kDACwC;AAMnD;IADC,IAAA,qBAAQ,GAAE;gDACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;+CACc;AAMzB;IADC,IAAA,qBAAQ,EAAC,gBAAgB,CAAC;yDACgB;AAM3C;IADC,IAAA,qBAAQ,GAAE;qDACoB;AAM/B;IADC,IAAA,qBAAQ,GAAE;qDACoB;AA+K/B;IADC,IAAA,0BAAa,GAAE;qDA2Bf;AA5OQ,iBAAiB;IAD7B,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,iBAAiB,CA8P7B;AA9PY,8CAAiB;AAgQ9B,kBAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;AAC/C,kBAAe,iBAAiB,CAAC;AACjC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"SqlQueryComponent__.js","sourceRoot":"","sources":["../../src/concepts/SqlQueryComponent__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,8CAAmF;AAInF,iEAAwC;AACxC,6EAAoD;AAOpD,8CAAkE;AAIlE,kEAA0C;AAE1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,iBAAiB,yBAA9B,MAAa,iBAAkB,SAAQ,oBAAS;IAC9C;;OAEG;IAEH,OAAO,GAAwB,mBAAmB,CAAC;IAEnD;;OAEG;IAEH,KAAK,GAAW,QAAQ,CAAC;IAEzB;;OAEG;IAEH,IAAI,GAAW,SAAS,CAAC;IAEzB;;OAEG;IAEH,cAAc,GAAmB,SAAS,CAAC;IAE3C;;OAEG;IAEH,UAAU,GAAW,SAAS,CAAC;IAE/B;;OAEG;IAEH,UAAU,GAAW,SAAS,CAAC;IAE/B;;OAEG;IACH,YAAY,MAAmC;QAC7C,aAAa;QACb,MAAM,GAAG,EAAE,GAAG,mBAAiB,CAAC,iBAAiB,EAAE,EAAE,GAAG,MAAM,EAAE,CAAC;QACjE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY;QACV,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAsB,CAAC;IACxE,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAY;QAClB,MAAM,MAAM,GAAG;YACb,IAAI;SACL,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAcD,oBAAoB,CAAC,OAAgC;QACnD,IAAI,cAA8B,CAAC;QACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;YACrC,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;aACvC;SACF;aAAM;YACL,cAAc,GAAG,OAAO,CAAC;SAC1B;QACD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,sBAAsB,CAAC,cAA8B;QACnD,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC;QACrC,MAAM,MAAM,GAAW;YACrB,UAAU,EAAE,IAAI;YAChB,SAAS;YACT,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,cAAc;SAC1B,CAAC;QACF,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAE,IAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBAC3C,MAAM,KAAK,GAAI,IAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC/D,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,IAAY,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE;gBACtD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChB,IAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;aACtC;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,mFAAmF;IACnF,gEAAgE;IAChE,uBAAuB;IACvB,mFAAmF;IAEnF;;OAEG;IACH,gBAAgB,CAAC,UAAkB;QACjC,sBAAsB;QACtB,MAAM,MAAM,GAAG;YACb,UAAU;SACX,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,MAAM,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAC;QACzC,IAAI,IAAS,CAAC;QACd,MAAM,EAAE,GAAG,YAAY,CAAC;QACxB,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;YAC5B,IAAI,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACvB,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACxC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SACzB;QACD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,QAAQ;YACR,IAAI,WAA0C,CAAC;YAC/C,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC1B,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACnC,IAAI,CAAC,WAAW,EAAE;wBAChB,cAAc;wBACd,WAAW,GAAG,IAAI,qBAAU,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;wBAC9C,WAAmB,CAAC,UAAU,GAAG,IAAI,CAAC;qBACxC;yBAAM;wBACL,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;wBACjD,QAAgB,CAAC,UAAU,GAAG,IAAI,CAAC;wBACpC,WAAW,GAAG,IAAI,2BAAgB,CAAC;4BACjC,MAAM,EAAE,WAAW;4BACnB,QAAQ;yBACT,CAAC,CAAC;wBACF,WAAmB,CAAC,UAAU,GAAG,IAAI,CAAC;qBACxC;iBACF;aACF;iBAAM;gBACL,WAAW,GAAG,IAAI,qBAAU,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAChD,WAAmB,CAAC,UAAU,GAAG,IAAI,CAAC;aACxC;YACD,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC;YAC9B,WAAW,CAAC,SAAS,GAAG,cAAc,CAAC;YACvC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACrC;IACH,CAAC;IAED,eAAe;QACb,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,MAAM,aAAa,GAAG,CAAC,cAA8B,EAAE,EAAE;gBACvD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC9C,IAAI,GAAG,EAAE,MAAM,EAAE;oBACf,GAAG,CAAC,OAAO,CAAC,CAAC,IAAuB,EAAE,EAAE;wBACtC,+BAA+B;wBAC/B,IAAI,IAAI,EAAE,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,aAAa,KAAK,WAAW,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;4BACtI,UAAU,GAAG,IAAI,CAAC;yBACnB;oBACH,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC;YACF,IAAI,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE;gBAC7C,mBAAmB;gBACnB,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,KAAK,MAAM,EAAE;oBAC3C,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBACjD,aAAa,CAAC,IAAI,CAAC,CAAC;oBACtB,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,SAAS;oBACT,UAAU,GAAG,IAAI,CAAC;iBACnB;aACF;iBAAM;gBACL,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACpC;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAGD,YAAY,CAAC,KAAuB;QAClC,IAAI,IAAY,CAAC;QACjB,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,EAAE;YAC9B,IAAI,GAAG,eAAe,CAAC;YACvB,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,MAAM,CAAC;SACrH;aAAM;YACL,IAAI,GAAG,oCAAoC,CAAC;YAC5C,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,OAAO,CAAC;SACtH;QACD,6BAA6B;QAC7B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,IAAI,IAAA,mBAAM,EAAC,CAAC,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1C,IAAI,IAAI,sCAAsC,IAAI,CAAC,UAAU,KAAK,CAAC;SACpE;QACD,YAAY;QACZ,YAAY;QACZ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO;QACP,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACrC,IAAI,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACvD,IAAI,IAAI,KAAK,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,IAAI,CAAC;QACb,IAAI,IAAI,GAAG,IAAA,mBAAM,EAAC,CAAC,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;QACxD,IAAI,IAAI,GAAG,IAAA,mBAAM,EAAC,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,WAAW,CAAC,KAAuB;QACjC,MAAM,IAAI,GAAW,oBAAoB,IAAI,CAAC,IAAI,KAAK,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,iBAAiB;QAC7B,OAAO;YACL,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;IAED,YAAY,GAAyC,EAAE,CAAC;CAMzD,CAAA;AA3PC;IADC,IAAA,qBAAQ,GAAE;kDACwC;AAMnD;IADC,IAAA,qBAAQ,GAAE;gDACc;AAMzB;IADC,IAAA,qBAAQ,GAAE;+CACc;AAMzB;IADC,IAAA,qBAAQ,EAAC,gBAAgB,CAAC;yDACgB;AAM3C;IADC,IAAA,qBAAQ,GAAE;qDACoB;AAM/B;IADC,IAAA,qBAAQ,GAAE;qDACoB;AA2K/B;IADC,IAAA,0BAAa,GAAE;qDA2Bf;AAGD;IADC,IAAA,0BAAa,GAAE;oDAIf;AA9OU,iBAAiB;IAD7B,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,iBAAiB,CAgQ7B;AAhQY,8CAAiB;AAkQ9B,kBAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;AAC/C,kBAAe,iBAAiB,CAAC;AACjC,mFAAmF;AACnF,gEAAgE;AAChE,uBAAuB;AACvB,mFAAmF"}

package/out/concepts/Start__.js

@@ -31,7 +31,8 @@ let Start = Start_1 = class Start extends LogicItem__1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, Start_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...Start_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -41,10 +42,10 @@ let Start = Start_1 = class Start extends LogicItem__1.default {
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     toJS(state) {
         return '';
     }
@@ -67,8 +68,8 @@ Start = Start_1 = __decorate([
 exports.Start = Start;
 classMap_1.default.Start = Start;
 exports.default = Start;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=Start__.js.map

package/out/concepts/Start__.js.map

@@ -1 +1 @@
-{"version":3,"file":"Start__.js","sourceRoot":"","sources":["../../src/concepts/Start__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA+D;AAM/D,8CAAkE;AAKlE,kEAA0C;AAC1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,KAAK,aAAlB,MAAa,KAAM,SAAQ,oBAAS;IAChC;;OAEG;IAEH,OAAO,GAAY,OAAO,CAAC;IAE3B;;OAEG;IAEH,KAAK,GAAW,IAAI,CAAC;IAIrB;;OAEG;IACH,YAAY,MAAuB;QAC/B,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAK,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAU,CAAC;IAC9D,CAAC;IASD,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,IAAI,CAAC,KAAuB;QACxB,OAAO,EAAE,CAAC;IACd,CAAC;IAGD,YAAY,CAAC,KAAuB;QAChC,OAAO,EAAE,CAAC;IACd,CAAC;CAMJ,CAAA;AAnDG;IADC,IAAA,qBAAQ,GAAE;sCACgB;AAM3B;IADC,IAAA,qBAAQ,GAAE;oCACU;AAqCrB;IADC,IAAA,0BAAa,GAAE;yCAGf;AAlDQ,KAAK;IADjB,IAAA,oBAAO,EAAC,MAAM,CAAC;GACH,KAAK,CAwDjB;AAxDY,sBAAK;AA0DlB,kBAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;AACvB,kBAAe,KAAK,CAAC;AACrB,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"Start__.js","sourceRoot":"","sources":["../../src/concepts/Start__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,8CAA+D;AAM/D,8CAAkE;AAIlE,kEAA0C;AAC1C,+DAAsC;AAEtC;;GAEG;AAEH,IAAa,KAAK,aAAlB,MAAa,KAAM,SAAQ,oBAAS;IAClC;;OAEG;IAEH,OAAO,GAAY,OAAO,CAAC;IAE3B;;OAEG;IAEH,KAAK,GAAW,IAAI,CAAC;IAErB;;OAEG;IACH,YAAY,MAAuB;QACjC,aAAa;QACb,MAAM,GAAG,EAAE,GAAG,OAAK,CAAC,iBAAiB,EAAE,EAAE,GAAG,MAAM,EAAE,CAAC;QACrD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY;QACV,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAU,CAAC;IAC5D,CAAC;IAED,mFAAmF;IACnF,gEAAgE;IAChE,uBAAuB;IACvB,mFAAmF;IAEnF,IAAI,CAAC,KAAuB;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAGD,YAAY,CAAC,KAAuB;QAClC,OAAO,EAAE,CAAC;IACZ,CAAC;CAMF,CAAA;AA5CC;IADC,IAAA,qBAAQ,GAAE;sCACgB;AAM3B;IADC,IAAA,qBAAQ,GAAE;oCACU;AA8BrB;IADC,IAAA,0BAAa,GAAE;yCAGf;AA3CU,KAAK;IADjB,IAAA,oBAAO,EAAC,MAAM,CAAC;GACH,KAAK,CAiDjB;AAjDY,sBAAK;AAmDlB,kBAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;AACvB,kBAAe,KAAK,CAAC;AACrB,mFAAmF;AACnF,gEAAgE;AAChE,uBAAuB;AACvB,mFAAmF"}

package/out/concepts/StringInterpolation__.d.ts

@@ -27,22 +27,22 @@ export declare class StringInterpolation extends LogicItem {
     getItemExistingNames(excludedList?: Array<LogicItem>): string[];
     getItemUniqueName(name?: string): string;
     /**
-    * 插入逻辑项
-    * @internal
-    * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入逻辑项
+     * @internal
+     * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
+     */
     _insertItemAt(name: string, index: number): LogicItem;
     /**
-    * 插入逻辑项
-    * @internal
-    * @param logicItemOptions 逻辑项参数
-    */
+     * 插入逻辑项
+     * @internal
+     * @param logicItemOptions 逻辑项参数
+     */
     _insertItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
     /**
-    * 插入逻辑项
-    * @internal
-    * @param logicItem 已有的逻辑项实例
-    */
+     * 插入逻辑项
+     * @internal
+     * @param logicItem 已有的逻辑项实例
+     */
     _insertItemAt(logicItem: LogicItem, index: number): LogicItem;
     /**
      * 插入逻辑项
@@ -94,9 +94,9 @@ export declare class StringInterpolation extends LogicItem {
      */
     addItem(logicItem: LogicItem): LogicItem;
     /**
-    * 删除逻辑项
-    * @param name 逻辑项名称
-    */
+     * 删除逻辑项
+     * @param name 逻辑项名称
+     */
     removeItem(name: string): void;
     /**
      * 删除逻辑项
@@ -110,5 +110,6 @@ export declare class StringInterpolation extends LogicItem {
     toJS(): string;
     toBrief(): string;
     toEmbeddedTS(state?: TranslatorState): string;
+    toNaturalTS(state?: TranslatorState): string;
 }
 export default StringInterpolation;

package/out/concepts/StringInterpolation__.js

@@ -55,7 +55,8 @@ let StringInterpolation = StringInterpolation_1 = class StringInterpolation exte
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, StringInterpolation_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...StringInterpolation_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -141,7 +142,7 @@ let StringInterpolation = StringInterpolation_1 = class StringInterpolation exte
         if (typeof options === 'string') {
             logicItem = this.expressions.find((item) => item.name === options);
             if (!logicItem) {
-                throw new Error('找不到逻辑项 ' + options);
+                throw new Error(`找不到逻辑项 ${options}`);
             }
         }
         else {
@@ -150,7 +151,7 @@ let StringInterpolation = StringInterpolation_1 = class StringInterpolation exte
         return logicItem.delete();
     }
     __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
+        const { parentKey } = logicItem;
         const params = {
             parentNode: this,
             parentKey,
@@ -172,12 +173,12 @@ let StringInterpolation = StringInterpolation_1 = class StringInterpolation exte
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     exchangeLogicItem(target, logicitem) {
-        const idx = this.expressions.findIndex(exp => exp === target);
+        const idx = this.expressions.findIndex((exp) => exp === target);
         if (idx !== -1) {
             const exps = this.expressions.slice();
             exps.splice(idx, 1, logicitem);
@@ -185,28 +186,32 @@ let StringInterpolation = StringInterpolation_1 = class StringInterpolation exte
         }
     }
     toVue(options) {
-        return this.expressions.map((exp) => {
+        return this.expressions
+            .map((exp) => {
             let expCode = exp.toVue();
             if (options?.finalCode !== false) {
                 const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
                 expCode = `$utils['ToString'](${expCode}, '${expTypeAnnotation?.sortedTypeKey}')`;
             }
             return expCode;
-        }).join(' + ');
+        })
+            .join(' + ');
     }
     toUI() {
-        return this.expressions.map(exp => exp.toUI()).join(' + ');
+        return this.expressions.map((exp) => exp.toUI()).join(' + ');
     }
     toJS() {
         if (!this.expressions.length)
             return `''`;
-        return this.expressions.map((exp) => {
+        return this.expressions
+            .map((exp) => {
             const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
             return `this.$utils['ToString'](${exp.toJS()}, '${expTypeAnnotation?.sortedTypeKey}')`;
-        }).join(' + ');
+        })
+            .join(' + ');
     }
     toBrief() {
-        return this.expressions.map(exp => exp.toJS()).join(' + ');
+        return this.expressions.map((exp) => exp.toJS()).join(' + ');
     }
     toEmbeddedTS(state) {
         let code = 'nasl.util.stringInterpolation(';
@@ -219,6 +224,21 @@ let StringInterpolation = StringInterpolation_1 = class StringInterpolation exte
         code += ')\n';
         return code;
     }
+    toNaturalTS(state) {
+        let code = '`';
+        this.expressions.forEach((exp) => {
+            if (exp.concept === 'StringLiteral') {
+                code += exp.value;
+            }
+            else {
+                code += '${';
+                code += exp.toNaturalTS((0, translator_1.shiftState)(state, code));
+                code += '}';
+            }
+        });
+        code += '`\n';
+        return code;
+    }
 };
 __decorate([
     (0, decorators_1.property)()
@@ -229,14 +249,17 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], StringInterpolation.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], StringInterpolation.prototype, "toNaturalTS", null);
 StringInterpolation = StringInterpolation_1 = __decorate([
     (0, decorators_1.concept)('字符串插值')
 ], StringInterpolation);
 exports.StringInterpolation = StringInterpolation;
 classMap_1.default.StringInterpolation = StringInterpolation;
 exports.default = StringInterpolation;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=StringInterpolation__.js.map