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

package/out/concepts/DataSource__.js

@@ -77,7 +77,8 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, DataSource_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...DataSource_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -174,7 +175,7 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
         if (typeof options === 'string') {
             entity = this.entities.find((item) => item.name === options);
             if (!entity) {
-                throw new Error('找不到实体 ' + options);
+                throw new Error(`找不到实体 ${options}`);
             }
         }
         else {
@@ -183,7 +184,7 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
         return entity.delete();
     }
     __removeEntity(entity) {
-        const parentKey = entity.parentKey;
+        const { parentKey } = entity;
         const params = {
             parentNode: this,
             parentKey,
@@ -205,10 +206,10 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     findEntityByName(name) {
         return this.entities.find((entity) => entity.name === name);
     }
@@ -249,8 +250,7 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
             }
             return `${arr.join('.')}.dataSources`;
         }
-        else
-            throw new Error('无法获取命名空间，请设置 parentNode！');
+        throw new Error('无法获取命名空间，请设置 parentNode！');
     }
     getEntityExistingTableNames(excludedList = []) {
         const excludedSet = new Set(excludedList);
@@ -274,7 +274,16 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
         // LCAPUser 转下划线-> lcap_user  *提前处理成 Lcap
         // lcap_user 转驼峰-> LCAPUser  *转完处理成 LCAP
         // lcap_user 转下划线-> lcap_user
-        const builtinEntityNames = ['LCAPUser', 'LCAPRolePerMapping', 'LCAPLogicViewMapping', 'LCAPPerResMapping', 'LCAPUserRoleMapping', 'LCAPRole', 'LCAPPermission', 'LCAPResource'];
+        const builtinEntityNames = [
+            'LCAPUser',
+            'LCAPRolePerMapping',
+            'LCAPLogicViewMapping',
+            'LCAPPerResMapping',
+            'LCAPUserRoleMapping',
+            'LCAPRole',
+            'LCAPPermission',
+            'LCAPResource',
+        ];
         const isBuiltin = builtinEntityNames.some((name) => name === entity.name);
         let temTableName = entity.tableName || entity.name;
         if (isBuiltin && tableNameRule === 'snake_case' && temTableName.startsWith('LCAP')) {
@@ -303,7 +312,7 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
     toEmbeddedTS(state) {
         let code = `export namespace ${this.name} {\n`;
         code += 'const name = ';
-        code += '"' + this.name + '";\n';
+        code += `"${this.name}";\n`;
         code += '}\n';
         return code;
     }
@@ -327,36 +336,43 @@ let DataSource = DataSource_1 = class DataSource extends BaseNode_1.default {
     // 测试数据源连通性
     async pingDatabase(recordEnvConnectError) {
         const configProperty = this.app.configuration.getGroup('dataSource').getProperty(this.name);
-        configProperty && configProperty.values.forEach((prop) => {
-            // 未配置数据源时，不进行连接测试
-            if (!prop.value) {
-                return;
-            }
-            let isRecycled = false;
-            try {
-                const value = JSON.parse(prop.value);
-                // 被回收的数据库不需要 Ping
-                if (value.dataBaseMode === 'Platform_Generation' && value.status === 1) {
-                    isRecycled = true;
+        configProperty &&
+            configProperty.values.forEach((prop) => {
+                // 未配置数据源时，不进行连接测试
+                if (!prop.value) {
+                    return;
                 }
-            }
-            catch (e) { }
-            const env = prop.env;
-            return isRecycled ? Promise.resolve() : datasource_1.default.pingDatabase({
-                body: {
-                    category: 'sql',
-                    appId: this.app.id,
-                    dataSource: configProperty.name,
-                    env,
-                },
-            }).then(() => {
-                Object.assign(this, { [`__${env}ConnectError`]: false });
-            }).catch(() => {
-                Object.assign(this, { [`__${env}ConnectError`]: true });
-            }).then(() => {
-                recordEnvConnectError(env);
+                let isRecycled = false;
+                try {
+                    const value = JSON.parse(prop.value);
+                    // 被回收的数据库不需要 Ping
+                    if (value.dataBaseMode === 'Platform_Generation' && value.status === 1) {
+                        isRecycled = true;
+                    }
+                }
+                catch (e) { }
+                const { env } = prop;
+                return isRecycled
+                    ? Promise.resolve()
+                    : datasource_1.default
+                        .pingDatabase({
+                        body: {
+                            category: 'sql',
+                            appId: this.app.id,
+                            dataSource: configProperty.name,
+                            env,
+                        },
+                    })
+                        .then(() => {
+                        Object.assign(this, { [`__${env}ConnectError`]: false });
+                    })
+                        .catch(() => {
+                        Object.assign(this, { [`__${env}ConnectError`]: true });
+                    })
+                        .then(() => {
+                        recordEnvConnectError(env);
+                    });
             });
-        });
     }
     recordEnvConnectError(records, env) {
         const target = records?.find((item) => item.id === this.id);
@@ -434,8 +450,8 @@ DataSource = DataSource_1 = __decorate([
 exports.DataSource = DataSource;
 classMap_1.default.DataSource = DataSource;
 exports.default = DataSource;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=DataSource__.js.map

package/out/concepts/DataSource__.js.map

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

package/out/concepts/DatabaseTypeAnnotation__.js

@@ -34,7 +34,8 @@ let DatabaseTypeAnnotation = DatabaseTypeAnnotation_1 = class DatabaseTypeAnnota
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, DatabaseTypeAnnotation_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...DatabaseTypeAnnotation_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -71,8 +72,8 @@ DatabaseTypeAnnotation = DatabaseTypeAnnotation_1 = __decorate([
 exports.DatabaseTypeAnnotation = DatabaseTypeAnnotation;
 classMap_1.default.DatabaseTypeAnnotation = DatabaseTypeAnnotation;
 exports.default = DatabaseTypeAnnotation;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=DatabaseTypeAnnotation__.js.map

package/out/concepts/DatabaseTypeAnnotation__.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseTypeAnnotation__.js","sourceRoot":"","sources":["../../src/concepts/DatabaseTypeAnnotation__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAKA,8CAAkE;AAIlE,kEAA0C;AAC1C,kEAA0C;AAG1C;;GAEG;AAEH,IAAa,sBAAsB,8BAAnC,MAAa,sBAAuB,SAAQ,kBAAQ;IAChD;;OAEG;IAEH,OAAO,GAA6B,wBAAwB,CAAC;IAE7D;;OAEG;IAEH,QAAQ,GAAW,SAAS,CAAC;IAE7B;;OAEG;IAEH,SAAS,GAAwB,SAAS,CAAC;IAI3C;;OAEG;IACH,YAAY,MAAwC;QAChD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,wBAAsB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC/E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,YAAY;QACR,OAAO,wBAAwB,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAA2B,CAAC;IAC/E,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,8BAA8B,EAAE,CAAC,IAAI,CAAC,CAAC;SAC7E;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CAgBJ,CAAA;AA1DG;IADC,IAAA,qBAAQ,GAAE;uDACkD;AAM7D;IADC,IAAA,qBAAQ,GAAE;wDACkB;AAM7B;IADC,IAAA,qBAAQ,GAAE;yDACgC;AAjBlC,sBAAsB;IADlC,IAAA,oBAAO,EAAC,SAAS,CAAC;GACN,sBAAsB,CA+DlC;AA/DY,wDAAsB;AAiEnC,kBAAQ,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;AACzD,kBAAe,sBAAsB,CAAC;AACtC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"DatabaseTypeAnnotation__.js","sourceRoot":"","sources":["../../src/concepts/DatabaseTypeAnnotation__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,8CAAkE;AAGlE,kEAA0C;AAC1C,kEAA0C;AAE1C;;GAEG;AAEH,IAAa,sBAAsB,8BAAnC,MAAa,sBAAuB,SAAQ,kBAAQ;IAClD;;OAEG;IAEH,OAAO,GAA6B,wBAAwB,CAAC;IAE7D;;OAEG;IAEH,QAAQ,GAAW,SAAS,CAAC;IAE7B;;OAEG;IAEH,SAAS,GAAwB,SAAS,CAAC;IAE3C;;OAEG;IACH,YAAY,MAAwC;QAClD,aAAa;QACb,MAAM,GAAG,EAAE,GAAG,wBAAsB,CAAC,iBAAiB,EAAE,EAAE,GAAG,MAAM,EAAE,CAAC;QACtE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY;QACV,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAA2B,CAAC;IAC7E,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,8BAA8B,EAAE,CAAC,IAAI,CAAC,CAAC;SAC3E;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CAWF,CAAA;AArDC;IADC,IAAA,qBAAQ,GAAE;uDACkD;AAM7D;IADC,IAAA,qBAAQ,GAAE;wDACkB;AAM7B;IADC,IAAA,qBAAQ,GAAE;yDACgC;AAjBhC,sBAAsB;IADlC,IAAA,oBAAO,EAAC,SAAS,CAAC;GACN,sBAAsB,CA0DlC;AA1DY,wDAAsB;AA4DnC,kBAAQ,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;AACzD,kBAAe,sBAAsB,CAAC;AACtC,mFAAmF;AACnF,gEAAgE;AAChE,uBAAuB;AACvB,mFAAmF"}

package/out/concepts/Destination__.d.ts

@@ -60,16 +60,16 @@ export declare class Destination extends LogicItem {
      */
     setTarget(target: string): void;
     /**
-    * 插入实际参数
-    * @internal
-    * @param argumentOptions 实际参数参数
-    */
+     * 插入实际参数
+     * @internal
+     * @param argumentOptions 实际参数参数
+     */
     _insertArgumentAt(argumentOptions: Partial<Argument>, index: number): Argument;
     /**
-    * 插入实际参数
-    * @internal
-    * @param argument 已有的实际参数实例
-    */
+     * 插入实际参数
+     * @internal
+     * @param argument 已有的实际参数实例
+     */
     _insertArgumentAt(argument: Argument, index: number): Argument;
     /**
      * 插入实际参数
@@ -109,9 +109,9 @@ export declare class Destination extends LogicItem {
      */
     removeArgumentInArguments(argument: Argument): void;
     /**
-    * 删除锚点参数
-    * @param name 锚点参数名称
-    */
+     * 删除锚点参数
+     * @param name 锚点参数名称
+     */
     removeAnchor(name: string): void;
     /**
      * 删除锚点参数
@@ -147,6 +147,7 @@ export declare class Destination extends LogicItem {
     get viewPath(): string;
     toEmbeddedTSInProcess(state: TranslatorState, prependCode: string): string;
     toEmbeddedTS(state?: TranslatorState): string;
+    toNaturalTS(state?: TranslatorState): string;
     toBrief(): string;
     toEmbeddedTSNormalFunction(state?: TranslatorState): string;
     get viewNode(): any;

package/out/concepts/Destination__.js

@@ -78,7 +78,8 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, Destination_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...Destination_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -177,7 +178,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         return node;
     }
     removeArgumentInArguments(options) {
-        let argument = options;
+        const argument = options;
         return argument.delete();
     }
     removeAnchor(options) {
@@ -185,7 +186,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         if (typeof options === 'string') {
             anchor = this.anchor;
             if (!anchor) {
-                throw new Error('找不到锚点参数 ' + options);
+                throw new Error(`找不到锚点参数 ${options}`);
             }
         }
         else {
@@ -194,7 +195,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         return anchor.delete();
     }
     __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
+        const { parentKey } = logicItem;
         const params = {
             parentNode: this,
             parentKey,
@@ -216,10 +217,10 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     get tsCalleeNamespace() {
         if (this.viewNamespace) {
             let tsCalleeNamespace = this.viewNamespace;
@@ -235,7 +236,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
             // 匹配所有特殊字符都转为_
             tsName = tsName.replace(/\W/g, '_');
             if (/^\d/.test(tsName)) {
-                tsName = '$' + tsName;
+                tsName = `$${tsName}`;
             }
             return tsName;
         }
@@ -258,7 +259,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         const viewArr = this.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
             code += `let url = '${this.viewNode.frontend.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join('/')}';\n`;
-            const completeArguments = this.completeArguments;
+            const { completeArguments } = this;
             if (Array.isArray(completeArguments) && completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam = [];
@@ -280,7 +281,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                         }
                         paramAssign += '\n;';
                         paramAssigns.push(paramAssign);
-                        const constStr = '${' + arg.keyword + '}';
+                        const constStr = `\${${arg.keyword}}`;
                         args.push(`${arg.keyword}=${constStr}`);
                     }
                 });
@@ -312,7 +313,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         const viewArr = this.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
             url += `${this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join('/')}`;
-            const completeArguments = this.completeArguments;
+            const { completeArguments } = this;
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam = [];
@@ -320,7 +321,8 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
-                const args = completeArguments.map((arg, index) => {
+                const args = completeArguments
+                    .map((arg, index) => {
                     const value = arg?.toVue();
                     let argStr = '';
                     if (value && index < logicParamLength) {
@@ -334,7 +336,8 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                         argStr += '}';
                     }
                     return argStr;
-                }).filter((arg) => !!arg);
+                })
+                    .filter((arg) => !!arg);
                 url += `?${args.join('&')}`;
             }
             if (this.anchor) {
@@ -353,7 +356,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
             url += '`';
             // IDE内展示需要屏蔽掉“系统统一路径前缀”
             url += `${this.viewNode?.frontend?.basePath ? this.viewNode.frontend.basePath : ''}/${viewArr.join('/')}`;
-            const completeArguments = this.completeArguments;
+            const { completeArguments } = this;
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam = [];
@@ -361,7 +364,8 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
-                const args = completeArguments.map((arg, index) => {
+                const args = completeArguments
+                    .map((arg, index) => {
                     const value = arg?.toUI();
                     let argStr = '';
                     if (value && index < logicParamLength) {
@@ -375,7 +379,8 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                         argStr += '}';
                     }
                     return argStr;
-                }).filter((arg) => !!arg);
+                })
+                    .filter((arg) => !!arg);
                 url += `?${args.join('&')}`;
             }
             if (this.anchor) {
@@ -393,7 +398,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         if (Array.isArray(viewArr) && viewArr.length) {
             url += 'this.$destination(`';
             url += `${this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join('/')}`;
-            const completeArguments = this.completeArguments;
+            const { completeArguments } = this;
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam = [];
@@ -401,7 +406,8 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
-                const args = completeArguments.map((arg, index) => {
+                const args = completeArguments
+                    .map((arg, index) => {
                     const value = arg?.toJS();
                     let argStr = '';
                     if (value && index < logicParamLength) {
@@ -415,7 +421,8 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                         argStr += '}';
                     }
                     return argStr;
-                }).filter((arg) => !!arg);
+                })
+                    .filter((arg) => !!arg);
                 url += `?${args.join('&')}`;
             }
             if (this.anchor) {
@@ -573,18 +580,16 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                 code += `${this.tsCalleeNamespace}.${this.viewName}.$destination({`;
                 if (Array.isArray(this.arguments)) {
                     this.arguments.forEach((argument) => {
-                        code += argument.toEmbeddedTS((0, translator_1.shiftState)(state, code), false, true) + ', ';
+                        code += `${argument.toEmbeddedTS((0, translator_1.shiftState)(state, code), false, true)}, `;
                     });
                 }
                 code += this.anchor?.toEmbeddedTS((0, translator_1.shiftState)(state, code), true) || '';
                 code += `});\n`;
             }
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + `}\n`;
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}}\n`;
             return code;
         }
-        else {
-            return 'destinationEmpty(){ const __destinationEmpty__: any = null}';
-        }
+        return 'destinationEmpty(){ const __destinationEmpty__: any = null}';
     }
     toEmbeddedTS(state) {
         let code = '';
@@ -604,7 +609,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
                         if (index >= logicParamLength) {
                             argument.keyword = '__unknown__';
                         }
-                        code += argument.toEmbeddedTS((0, translator_1.shiftState)(state, code), false, true) + ', ';
+                        code += `${argument.toEmbeddedTS((0, translator_1.shiftState)(state, code), false, true)}, `;
                         argument.keyword = oldName;
                     });
                 }
@@ -613,34 +618,83 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
             }
             return code;
         }
+        if (this.tsCalleeNamespace && this.tsName) {
+            code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
+            if (Array.isArray(this.arguments)) {
+                this.arguments.forEach((argument, index) => {
+                    const oldName = argument.keyword;
+                    if (index >= logicParamLength) {
+                        argument.keyword = '__unknown__';
+                    }
+                    code += `${argument.toEmbeddedTS((0, translator_1.shiftState)(state, code), false, true)}, `;
+                    argument.keyword = oldName;
+                });
+            }
+            code += this.anchor?.toEmbeddedTS((0, translator_1.shiftState)(state, code), true) || '';
+            code += `});\n`;
+        }
         else {
+            code += '__IDENTIFIER__';
+        }
+        return code;
+    }
+    toNaturalTS(state) {
+        let code = '';
+        const node = this.viewNode;
+        let logicParam = [];
+        if (node) {
+            logicParam = node.params;
+        }
+        const logicParamLength = logicParam.length;
+        if (this.parentNode instanceof __1.BindAttribute) {
+            code += (0, translator_1.indent)(state.tabSize + 2);
             if (this.tsCalleeNamespace && this.tsName) {
                 code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
                 if (Array.isArray(this.arguments)) {
-                    this.arguments.forEach((argument, index) => {
+                    this.arguments.slice(0, logicParamLength).forEach((argument, index) => {
                         const oldName = argument.keyword;
                         if (index >= logicParamLength) {
                             argument.keyword = '__unknown__';
                         }
-                        code += argument.toEmbeddedTS((0, translator_1.shiftState)(state, code), false, true) + ', ';
+                        code += `${argument.toNaturalTS((0, translator_1.shiftState)(state, code), false, true)}, `;
                         argument.keyword = oldName;
                     });
                 }
-                code += this.anchor?.toEmbeddedTS((0, translator_1.shiftState)(state, code), true) || '';
+                code += this.anchor?.toNaturalTS((0, translator_1.shiftState)(state, code), true) || '';
                 code += `});\n`;
             }
-            else {
-                code += '__IDENTIFIER__';
-            }
             return code;
         }
+        if (this.tsCalleeNamespace && this.tsName) {
+            code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
+            if (Array.isArray(this.arguments)) {
+                this.arguments.slice(0, logicParamLength).forEach((argument, index) => {
+                    const oldName = argument.keyword;
+                    if (index >= logicParamLength) {
+                        argument.keyword = '__unknown__';
+                    }
+                    code += `${argument.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }), false, true)}, `;
+                    argument.keyword = oldName;
+                });
+            }
+            code += this.anchor?.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }), true) || '';
+            code += `, target: '${this.target}'`;
+            code += `});\n`;
+        }
+        else {
+            code += '__IDENTIFIER__';
+        }
+        return code;
     }
     toBrief() {
         const q = [];
         if (this.anchor?.expression) {
             q.push(this.anchor.toBrief());
         }
-        return this.arguments.map((a) => a.toBrief()).concat(q).join('<br />');
+        return this.arguments
+            .map((a) => a.toBrief())
+            .concat(q)
+            .join('<br />');
     }
     toEmbeddedTSNormalFunction(state) {
         let code = `let ${utils.firstLowerCase(this.concept)} = function() {\n`;
@@ -649,7 +703,7 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
             code += `${tab}${this.tsCalleeNamespace}.${this.tsName}.$destination(`;
             if (Array.isArray(this.arguments)) {
                 this.arguments.forEach((argument) => {
-                    code += argument.toEmbeddedTS((0, translator_1.shiftState)(state, code)) + ', ';
+                    code += `${argument.toEmbeddedTS((0, translator_1.shiftState)(state, code))}, `;
                 });
             }
             code += this.anchor?.toEmbeddedTS((0, translator_1.shiftState)(state, code)) || '';
@@ -664,11 +718,11 @@ let Destination = Destination_1 = class Destination extends LogicItem__1.default
         let nameSpace = this.viewNamespace;
         nameSpace = nameSpace.replaceAll('views', 'children');
         nameSpace = nameSpace.replace('children', 'views');
-        return (0, utils_1.getNodeByNodeCallee)(this.app, nameSpace + '.' + this.viewName);
+        return (0, utils_1.getNodeByNodeCallee)(this.app, `${nameSpace}.${this.viewName}`);
     }
     // 用于logic回填
     get calleewholeKey() {
-        return this.viewNamespace + '.' + this.viewName;
+        return `${this.viewNamespace}.${this.viewName}`;
     }
     get completeArguments() {
         const node = this.viewNode;
@@ -722,6 +776,9 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], Destination.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], Destination.prototype, "toNaturalTS", null);
 __decorate([
     (0, translator_1.withSourceMap)()
 ], Destination.prototype, "toEmbeddedTSNormalFunction", null);
@@ -731,8 +788,8 @@ Destination = Destination_1 = __decorate([
 exports.Destination = Destination;
 classMap_1.default.Destination = Destination;
 exports.default = Destination;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=Destination__.js.map