@lcap/nasl-concepts 3.11.1-alpha.0 → 3.11.1-beta.1

package/out/concepts/BindAttribute__.js

@@ -568,14 +568,14 @@ let BindAttribute = class BindAttribute extends BaseNode_1.default {
         let ftCode = '';
         if (hasArgs) {
             argsList.forEach((arg) => {
-                ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
-                    this.${this.expressionNameInView}${argStr} = {};
+                ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
+                    this.${this.expressionNameInView}${argStr} = {};
                 }\n`;
                 argStr += `[${arg}.hasOwnProperty('__nodeKey') ? ${arg}.__nodeKey : ${arg}.index]`;
             });
         }
-        ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
-            this.${this.expressionNameInView}${argStr} = {};
+        ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
+            this.${this.expressionNameInView}${argStr} = {};
         }`;
         // 新的参数
         const paramList = Object.keys(this.watchedVariableMap);
@@ -600,29 +600,29 @@ let BindAttribute = class BindAttribute extends BaseNode_1.default {
             expressionStr = `[${ruleStrs.join(' , ')}]`;
         }
         // 变量重新设置，为了触发重新调用
-        let setVarStr = `this.${this.expressionNameInView}${argStr} = {
-            ...(this.${this.expressionNameInView}${argStr} || {}),
-            value: value,
+        let setVarStr = `this.${this.expressionNameInView}${argStr} = {
+            ...(this.${this.expressionNameInView}${argStr} || {}),
+            value: value,
         };`;
         if (Array.isArray(argsList) && argsList.length) {
             setVarStr += `this.${this.expressionNameInView} = {...this.${this.expressionNameInView}};\n`;
         }
-        const code = `${this.expressionBuilderName} (${argsList.join(', ')}) {
-            // 容错代码
-            ${ftCode}
-            (async () => {
-                // 旧的参数
-                const oldParams = this.${this.expressionNameInView}${argStr}.params;
-                // 新的参数
-                ${newParams}
-                const isLooseEqual = this.$isLooseEqualFn(oldParams, newParams);
-                if (!isLooseEqual) {
-                    this.${this.expressionNameInView}${argStr}.params = newParams;
-                    const value = ${expressionStr};
-                    ${setVarStr}
-                }
-            })();
-            return this.${this.expressionNameInView}${argStr}.value;
+        const code = `${this.expressionBuilderName} (${argsList.join(', ')}) {
+            // 容错代码
+            ${ftCode}
+            (async () => {
+                // 旧的参数
+                const oldParams = this.${this.expressionNameInView}${argStr}.params;
+                // 新的参数
+                ${newParams}
+                const isLooseEqual = this.$isLooseEqualFn(oldParams, newParams);
+                if (!isLooseEqual) {
+                    this.${this.expressionNameInView}${argStr}.params = newParams;
+                    const value = ${expressionStr};
+                    ${setVarStr}
+                }
+            })();
+            return this.${this.expressionNameInView}${argStr}.value;
         }`;
         return code;
     }

package/out/concepts/BindDirective__.js

@@ -289,14 +289,14 @@ let BindDirective = class BindDirective extends BaseNode_1.default {
         let ftCode = '';
         if (hasArgs) {
             argsList.forEach((arg) => {
-                ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
-                    this.${this.expressionNameInView}${argStr} = {};
+                ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
+                    this.${this.expressionNameInView}${argStr} = {};
                 }\n`;
                 argStr += `[${arg}.hasOwnProperty('__nodeKey') ? ${arg}.__nodeKey : ${arg}.index]`;
             });
         }
-        ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
-            this.${this.expressionNameInView}${argStr} = {};
+        ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
+            this.${this.expressionNameInView}${argStr} = {};
         }`;
         // 新的参数
         const paramList = Object.keys(this.watchedVariableMap);
@@ -312,29 +312,29 @@ let BindDirective = class BindDirective extends BaseNode_1.default {
             expressionStr = this.expression?.toJS() || '';
         }
         // 变量重新设置，为了触发重新调用
-        let setVarStr = `this.${this.expressionNameInView}${argStr} = {
-            ...(this.${this.expressionNameInView}${argStr} || {}),
-            value: value,
+        let setVarStr = `this.${this.expressionNameInView}${argStr} = {
+            ...(this.${this.expressionNameInView}${argStr} || {}),
+            value: value,
         };`;
         if (Array.isArray(argsList) && argsList.length) {
             setVarStr += `this.${this.expressionNameInView} = {...this.${this.expressionNameInView}};\n`;
         }
-        const code = `${this.expressionBuilderName} (${argsList.join(', ')}) {
-        // 容错代码
-        ${ftCode}
-        (async () => {
-            // 旧的参数
-            const oldParams = this.${this.expressionNameInView}${argStr}.params;
-            // 新的参数
-            ${newParams}
-            const isLooseEqual = this.$isLooseEqualFn(oldParams, newParams);
-            if (!isLooseEqual) {
-                this.${this.expressionNameInView}${argStr}.params = newParams;
-                const value = ${expressionStr};
-                ${setVarStr}
-            }
-        })();
-        return this.${this.expressionNameInView}${argStr}.value;
+        const code = `${this.expressionBuilderName} (${argsList.join(', ')}) {
+        // 容错代码
+        ${ftCode}
+        (async () => {
+            // 旧的参数
+            const oldParams = this.${this.expressionNameInView}${argStr}.params;
+            // 新的参数
+            ${newParams}
+            const isLooseEqual = this.$isLooseEqualFn(oldParams, newParams);
+            if (!isLooseEqual) {
+                this.${this.expressionNameInView}${argStr}.params = newParams;
+                const value = ${expressionStr};
+                ${setVarStr}
+            }
+        })();
+        return this.${this.expressionNameInView}${argStr}.value;
     }`;
         return code;
     }

package/out/concepts/BindStyle__.js

@@ -272,14 +272,14 @@ let BindStyle = class BindStyle extends BaseNode_1.default {
         let ftCode = '';
         if (hasArgs) {
             argsList.forEach((arg) => {
-                ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
-                    this.${this.expressionNameInView}${argStr} = {};
+                ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
+                    this.${this.expressionNameInView}${argStr} = {};
                 }\n`;
                 argStr += `[${arg}.hasOwnProperty('__nodeKey') ? ${arg}.__nodeKey : ${arg}.index]`;
             });
         }
-        ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
-            this.${this.expressionNameInView}${argStr} = {};
+        ftCode += `if (!this.${this.expressionNameInView}${argStr}) {
+            this.${this.expressionNameInView}${argStr} = {};
         }`;
         // 新的参数
         const paramList = Object.keys(this.watchedVariableMap);
@@ -294,29 +294,29 @@ let BindStyle = class BindStyle extends BaseNode_1.default {
         if (this.name?.endsWith('background-image') && expressionStr)
             expressionStr = `\`url(\${${expressionStr}})\``;
         // 变量重新设置，为了触发重新调用
-        let setVarStr = `this.${this.expressionNameInView}${argStr} = {
-            ...(this.${this.expressionNameInView}${argStr} || {}),
-            value: value,
+        let setVarStr = `this.${this.expressionNameInView}${argStr} = {
+            ...(this.${this.expressionNameInView}${argStr} || {}),
+            value: value,
         };`;
         if (Array.isArray(argsList) && argsList.length) {
             setVarStr += `this.${this.expressionNameInView} = {...this.${this.expressionNameInView}};\n`;
         }
-        const code = `${this.expressionBuilderName} (${argsList.join(', ')}) {
-        // 容错代码
-        ${ftCode}
-        (async () => {
-            // 旧的参数
-            const oldParams = this.${this.expressionNameInView}${argStr}.params;
-            // 新的参数
-            ${newParams}
-            const isLooseEqual = this.$isLooseEqualFn(oldParams, newParams);
-            if (!isLooseEqual) {
-                this.${this.expressionNameInView}${argStr}.params = newParams;
-                const value = ${expressionStr};
-                ${setVarStr}
-            }
-        })();
-        return this.${this.expressionNameInView}${argStr}.value;
+        const code = `${this.expressionBuilderName} (${argsList.join(', ')}) {
+        // 容错代码
+        ${ftCode}
+        (async () => {
+            // 旧的参数
+            const oldParams = this.${this.expressionNameInView}${argStr}.params;
+            // 新的参数
+            ${newParams}
+            const isLooseEqual = this.$isLooseEqualFn(oldParams, newParams);
+            if (!isLooseEqual) {
+                this.${this.expressionNameInView}${argStr}.params = newParams;
+                const value = ${expressionStr};
+                ${setVarStr}
+            }
+        })();
+        return this.${this.expressionNameInView}${argStr}.value;
     }`;
         return code;
     }

package/out/concepts/BusinessComponent__.js

@@ -1433,7 +1433,7 @@ let BusinessComponent = class BusinessComponent extends BaseNode_1.default {
         yield* setPlaygroundCode(self.params, 'params');
         code += `${(0, nasl_translator_1.indent)(state?.tabSize || 0)}}\n`;
         code += `export class ${self.tsName} extends nasl.ui.ViewComponent {\n`;
-        code += `constructor(options?: Partial<${self.tsName}BSOptions>) {
+        code += `constructor(options?: Partial<${self.tsName}BSOptions>) {
         super();\n`;
         // 绑定事件
         if (Array.isArray(self.bindEvents)) {
@@ -1526,11 +1526,11 @@ let BusinessComponent = class BusinessComponent extends BaseNode_1.default {
         const self = this;
         let code = `export declare class ${self.tsName} extends nasl.ui.ViewComponent {\n`;
         // 需要类型推导的局部变量/返回值需要调整申明顺序
-        code += `constructor(
-      options?: {
-        [propName: string]: any,
-        bindAttr?: {
-          __NASLIF?: nasl.core.Boolean,
+        code += `constructor(
+      options?: {
+        [propName: string]: any,
+        bindAttr?: {
+          __NASLIF?: nasl.core.Boolean,
     `;
         if (Array.isArray(self.params)) {
             yield* (0, utils_1.wrapForEachToGenerator)(self.params, function* (param, index) {
@@ -1539,9 +1539,9 @@ let BusinessComponent = class BusinessComponent extends BaseNode_1.default {
                 code += ',\n';
             });
         }
-        code += `
-        },
-        slotDefault?: () => Array<any>,
+        code += `
+        },
+        slotDefault?: () => Array<any>,
       });\n`;
         // 自定义逻辑
         if (Array.isArray(self.logics) && self.logics.length > 0) {
@@ -1686,29 +1686,29 @@ let BusinessComponent = class BusinessComponent extends BaseNode_1.default {
             elementProperties: this.viewElementPropertyUsage,
         };
         let code = '';
-        const keyboardEventMixinCode = `const keyboardEventMixin = {
-            mounted() {
-                document.addEventListener('keydown', this.onKeyDown);
-                document.addEventListener('keyup', this.onKeyUp);
-            },
-            beforeDestory() {
-                document.removeEventListener('keydown', this.onKeyDown);
-                document.removeEventListener('keyup', this.onKeyUp);
-            },
-            methods: {
-                async onKeyDown(e) {
+        const keyboardEventMixinCode = `const keyboardEventMixin = {
+            mounted() {
+                document.addEventListener('keydown', this.onKeyDown);
+                document.addEventListener('keyup', this.onKeyUp);
+            },
+            beforeDestory() {
+                document.removeEventListener('keydown', this.onKeyDown);
+                document.removeEventListener('keyup', this.onKeyUp);
+            },
+            methods: {
+                async onKeyDown(e) {
                     ${this.bindEvents
             .filter((event) => ['keydown'].includes(event.name))
             .map((event) => `await this.${event.view.name}_${event.name}(e);`)
-            .join('\n')}
-                },
-                async onKeyUp(e) {
+            .join('\n')}
+                },
+                async onKeyUp(e) {
                     ${this.bindEvents
             .filter((event) => ['keyup'].includes(event.name))
             .map((event) => `await this.${event.view.name}_${event.name}(e);`)
-            .join('\n')}
-                }
-            }
+            .join('\n')}
+                }
+            }
         };\n`;
         code += keyboardEventMixinCode;
         code += 'export default {\n';
@@ -1724,15 +1724,15 @@ let BusinessComponent = class BusinessComponent extends BaseNode_1.default {
     }
     // 生成预览的模板
     genPreviewTemplate() {
-        return `<template>
-              <bs-${this.name}>
+        return `<template>
+              <bs-${this.name}>
                 ${this.slotElems
             .map((slotElem) => {
             const slotName = slotElem.name;
             return `<template #${slotName}></template>`;
         })
-            .join('')}
-              </bs-${this.name}>
+            .join('')}
+              </bs-${this.name}>
             </template>`;
     }
     getAllViewElementNames(excludeName) {

package/out/concepts/CallLogic__.js

@@ -628,15 +628,15 @@ let CallLogic = class CallLogic extends LogicItem__1.default {
         // 调用新流程逻辑
         if (this.isProcessV2Logic) {
             code += `this.$systemProcessV2['${this.calleeName}']`;
-            code += `({
-        body: {
+            code += `({
+        body: {
       `;
             const argsStr = (this?.arguments || [])
                 .filter((obj) => obj?.expression)
                 .map((obj) => `\n${obj.keyword}: ${obj.expression?.toJS(state)}`)
                 .join(', ');
             code += argsStr;
-            code += `}
+            code += `}
         })`;
         }
         else if (!isViewLogic) {
@@ -651,11 +651,11 @@ let CallLogic = class CallLogic extends LogicItem__1.default {
             const connectionNameCode = connectionName
                 ? `connectionName: ${JSON.stringify(connectionName)},`
                 : '';
-            code += `({
-                config: {
-                    download: false,
-                    ${connectionNameCode}
-                },
+            code += `({
+                config: {
+                    download: false,
+                    ${connectionNameCode}
+                },
                 query: {`;
             if (isProcessLogic) {
                 const argsStr = args
@@ -672,10 +672,10 @@ let CallLogic = class CallLogic extends LogicItem__1.default {
                 code += argsStr;
             }
             const lcapOrigin = (0, service_2.getCallLogicHeader)(this.uuid);
-            code += `},
-                headers: {
-                    ${lcapOrigin ? `"lcap-calllogic-uuid": "${lcapOrigin}",` : ''}
-                },
+            code += `},
+                headers: {
+                    ${lcapOrigin ? `"lcap-calllogic-uuid": "${lcapOrigin}",` : ''}
+                },
             `;
             if (keywordEntitiesIndex !== -1) {
                 let logicArgs = this.arguments;
@@ -723,10 +723,10 @@ let CallLogic = class CallLogic extends LogicItem__1.default {
                             // filter回调函数
                             if (arg.expression.returnExpression) {
                                 const argsStr = JSON.stringify(handleMember(arg.expression.returnExpression)).replace(/"__@@(.*?)@@__"/g, '$1');
-                                return `${name}: {
-                                        concept: 'Function',
-                                        name: 'filter',
-                                        returnExpression: this.$resolveRequestData(${argsStr})
+                                return `${name}: {
+                                        concept: 'Function',
+                                        name: 'filter',
+                                        returnExpression: this.$resolveRequestData(${argsStr})
                                     }`;
                             }
                             return `${name}: ${arg.expression.toJS(state)}`;
@@ -741,10 +741,10 @@ let CallLogic = class CallLogic extends LogicItem__1.default {
                     case 'deleteBy': {
                         code += `body: `;
                         const argsStr = JSON.stringify(handleMember(logicArgs[0].expression.returnExpression)).replace(/"__@@(.*?)@@__"/g, '$1');
-                        code += `{
-                            concept: 'Function',
-                            name: 'filter',
-                            returnExpression: this.$resolveRequestData(${argsStr})
+                        code += `{
+                            concept: 'Function',
+                            name: 'filter',
+                            returnExpression: this.$resolveRequestData(${argsStr})
                         }`;
                         code += `,\n`;
                         logicArgs = [];
@@ -765,7 +765,7 @@ let CallLogic = class CallLogic extends LogicItem__1.default {
                 }
             }
             else {
-                code += `path: {},
+                code += `path: {},
                 body: {`;
                 if (!isProcessLogic) {
                     const formatArgs = [...args];

package/out/concepts/CallQueryComponent__.js

@@ -463,8 +463,8 @@ let CallQueryComponent = class CallQueryComponent extends LogicItem__1.default {
         const self = this;
         if (!self.typeAnnotation) {
             if (!self.isAutoInfer()) {
-                return `(function () {
-                  return;
+                return `(function () {
+                  return;
               })()`;
             }
             self.typeAnnotation = self.computeStructure();

package/out/concepts/Comment__.js

@@ -65,10 +65,10 @@ let Comment = class Comment extends LogicItem__1.default {
     *toEmbeddedTS(state = (0, nasl_translator_1.createCompilerState)()) {
         const self = this;
         let code = '';
-        code += `\n${(0, nasl_translator_1.indent)(state.tabSize)}
-        /**
-         * 注释不用翻译
-         */
+        code += `\n${(0, nasl_translator_1.indent)(state.tabSize)}
+        /**
+         * 注释不用翻译
+         */
         \n`;
         return code;
     }

package/out/concepts/ConfigProperty__.js

@@ -228,9 +228,9 @@ let ConfigProperty = class ConfigProperty extends BaseNode_1.default {
             code += `};`;
             return code;
         }
-        let code = `class Custom${self.name} {
-            ${modifier} static FrontEnd${self.name}: nasl.core.String
-            static BackEnd${self.name}: nasl.core.String
+        let code = `class Custom${self.name} {
+            ${modifier} static FrontEnd${self.name}: nasl.core.String
+            static BackEnd${self.name}: nasl.core.String
         };`;
         if (self.parentNode.name === 'custom') {
             yield* (0, utils_1.wrapForEachToGenerator)(self.values, function* warpForEachGenerator(value) {

package/out/concepts/DataSource__.d.ts

@@ -145,7 +145,7 @@ export declare class DataSource extends BaseNode {
     /**
      * 根据全局设置中的数据库命名规则，生成 实体表名
      */
-    genFormatEntityTableName(entity: Entity): any;
+    genFormatEntityTableName(entity: Entity, useEntityName?: boolean): any;
     /**
      * 生成宿主语言的文件路径
      * @param name 一般不用传，用于 rename

package/out/concepts/DataSource__.d.ts.map

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

package/out/concepts/DataSource__.js

@@ -285,31 +285,20 @@ let DataSource = class DataSource extends BaseNode_1.default {
     /**
      * 根据全局设置中的数据库命名规则，生成 实体表名
      */
-    genFormatEntityTableName(entity) {
+    genFormatEntityTableName(entity, useEntityName = false) {
         // Excel、数据源导入的实体不进行表名格式化
         if (entity.isIgnoreFormatTableAndColumnName()) {
             return entity.tableName;
         }
         const tableNameRule = this.app.preferenceMap?.['namingConvention.tableName'];
         // 平台内置生成的实体需特殊处理 LCAP 前缀
-        // 在驼峰规则时，保持 LCAP 前缀为大写
-        // LCAPUser 转驼峰-> LCAPUser
         // LCAPUser 转下划线-> lcap_user  *提前处理成 Lcap
-        // lcap_user 转驼峰-> LCAPUser  *转完处理成 LCAP
-        // lcap_user 转下划线-> lcap_user
-        const builtinEntityNames = [
-            'LCAPUser',
-            'LCAPRolePerMapping',
-            'LCAPLogicViewMapping',
-            'LCAPPerResMapping',
-            'LCAPUserRoleMapping',
-            'LCAPRole',
-            'LCAPPermission',
-            'LCAPResource',
-        ];
-        const isBuiltin = builtinEntityNames.some((name) => name === entity.name);
+        // lcap_user 转驼峰-> LcapUser
+        // 根据实体名称重新生成表名   * 提前处理成 Lcap
+        const isBuiltin = entity.name?.startsWith('LCAP'); // 当前使用 LCAP 来判断是否系统实体，虽然会有误判。
         let temSchemaName = '';
-        let temTableName = entity.tableName || entity.name;
+        const entityName = entity.name?.replace(/^LCAP/i, 'Lcap');
+        let temTableName = useEntityName ? entityName : (entity.tableName || entityName);
         if (this.multiSchema) {
             const splitList = temTableName.split('.');
             // 多模式数据源，表名为 schema.tableName
@@ -328,8 +317,13 @@ let DataSource = class DataSource extends BaseNode_1.default {
         // 格式化 entity tableName
         const tableNameFormatter = formatMap[tableNameRule];
         let newTableName = tableNameFormatter && tableNameFormatter(temTableName);
-        if (isBuiltin && tableNameRule === 'camelCase' && newTableName.startsWith('Lcap')) {
-            newTableName = newTableName.replace(/^Lcap/i, 'LCAP');
+        if (isBuiltin && tableNameRule === 'snake_case') {
+            const appId = this.app.id;
+            const appIdSuffix = appId.slice(0, 6);
+            const appIdSuffixWithUnderline = '_' + appIdSuffix;
+            if (newTableName.endsWith(appIdSuffix) && !newTableName.endsWith(appIdSuffixWithUnderline)) {
+                newTableName = newTableName.replace(new RegExp(appIdSuffix + '$'), appIdSuffixWithUnderline);
+            }
         }
         newTableName = this.getEntityUniqueTableName(newTableName, [entity]);
         const wholeNewTableName = temSchemaName ? `${temSchemaName}.${newTableName}` : newTableName;

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/Destination__.js

@@ -251,12 +251,12 @@ let Destination = class Destination extends LogicItem__1.default {
             }
             code += 'return url;';
         }
-        return `await (async () => {
-            try {
-                ${code};
-            } catch(err) {
-                console.log(err);
-            }
+        return `await (async () => {
+            try {
+                ${code};
+            } catch(err) {
+                console.log(err);
+            }
         })();`;
     }
     toVue(options) {

package/out/concepts/Entity__.d.ts

@@ -242,11 +242,11 @@ export declare class Entity extends Annotatable {
      */
     setTableName(tableName: string): void;
     isIgnoreFormatTableAndColumnName(): boolean;
-    genFormatTableName(): any;
+    genFormatTableName(useEntityName?: boolean): any;
     /**
      * 根据全局设置中的数据库命名规则，生成 属性列名
      */
-    genFormatPropertyColumnName(property: EntityProperty): any;
+    genFormatPropertyColumnName(property: EntityProperty, forceFormat?: boolean): any;
     /**
      * 根据全局设置中的数据库命名规则，将 实体表名 重命名
      * 此方法不会 update