@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/out/templator/genTableBlock.js

@@ -33,16 +33,20 @@ const utils_1 = require("./utils");
  */
 function genTableColumnTemplate(property) {
     const entity = property.entity;
+    const dataSource = entity.parentNode;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     let expression = `scope.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
     if (property.relationEntity) {
         const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
+        const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+        const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
         // 有外键关联
-        expression = (0, _1.getExpression)(property, `scope.item.${relationLowerEntityName}.${property.relationProperty}`);
+        expression = (0, _1.getExpression)(property, `scope.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
     }
-    else
+    else {
         expression = (0, _1.getExpression)(property, `scope.item.${lowerEntityName}.${property.name}`);
+    }
     const getText = (property) => {
         if (property.typeAnnotation.typeName === 'Boolean') {
             return `
@@ -94,8 +98,8 @@ exports.genTableTemplate = genTableTemplate;
  * @param entity 实体
  */
 function genTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
-    const parentNode = entity.parentNode;
-    const parentNamespace = parentNode?.getNamespace();
+    const moduleNode = utils.findClosestModule(entity);
+    const moduleNamespace = moduleNode?.getNamespace();
     const params = [
         (0, _1.genLogicParam)(`${newLogic.params[0].name}`, 'params.page'),
         (0, _1.genLogicParam)(`${newLogic.params[1].name}`, 'params.size'),
@@ -117,7 +121,7 @@ function genTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
                 name: 'result',
                 typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
                     utils_1.NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -131,7 +135,7 @@ function genTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
                     name: 'result',
                 }),
                 right: utils_1.NaslLogicItem.CallLogic({
-                    calleeNamespace: `${parentNamespace}.logics`,
+                    calleeNamespace: `${moduleNamespace}.logics`,
                     calleeName: newLogic.name,
                     arguments: params,
                 }),
@@ -147,8 +151,8 @@ exports.genTableLoadLogic = genTableLoadLogic;
  */
 function genTableRemoveLogic(entity, nameGroup) {
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const parentNode = entity.parentNode;
-    const parentNamespace = parentNode?.getNamespace();
+    const moduleNode = utils.findClosestModule(entity);
+    const moduleNamespace = moduleNode?.getNamespace();
     const ns = entity.ns;
     const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
     const idPropertys = entity.properties.filter((property) => property.primaryKey);
@@ -163,7 +167,7 @@ function genTableRemoveLogic(entity, nameGroup) {
                 name: 'scope',
                 typeAnnotation: utils_1.NaslUITypeAnnotation.ScopeOf([
                     utils_1.NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -201,30 +205,33 @@ exports.genTableRemoveLogic = genTableRemoveLogic;
  *        load_select_student -> load_someView_select_student
  */
 function genTableBlock(entity, view) {
-    const parentNode = entity.parentNode;
+    const dataSource = entity.parentNode;
+    const module = dataSource.parentNode;
     const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = (0, _1.genUniqueQueryNameGroup)(parentNode, view, viewElementMainView);
+    const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet = new Set();
+    entitySet.add(entity);
     const newStructures = [];
     const newLogics = [];
     entity.properties.forEach((property) => {
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
+    const allEntities = [...entitySet];
     const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
     newStructures.push(entityStructure);
-    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, parentNode);
+    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
     return `
 <template>
@@ -246,31 +253,34 @@ function genTableBlock(entity, view) {
 exports.genTableBlock = genTableBlock;
 function genTableColumnBlock(property, view) {
     const entity = property.entity;
-    const parentNode = entity.parentNode;
+    const dataSource = entity.parentNode;
+    const module = dataSource.parentNode;
     const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = (0, _1.genUniqueQueryNameGroup)(parentNode, view, viewElementMainView);
+    const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet = new Set();
+    entitySet.add(entity);
     const newStructures = [];
     const newLogics = [];
     const properties = [property];
     properties.forEach((property) => {
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
+    const allEntities = [...entitySet];
     const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
     newStructures.push(entityStructure);
-    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, parentNode);
+    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
     return `
 <template>

package/out/templator/genTableBlock.js.map

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

package/out/templator/genUpdateBlock.js

@@ -29,7 +29,8 @@ const utils = __importStar(require("../utils"));
 const utils_1 = require("./utils");
 const _1 = require(".");
 function genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
-    const parentNode = entity.parentNode;
+    const dataSource = entity.parentNode;
+    const module = dataSource.parentNode;
     const properties = entity.properties.filter((0, _1.filterProperty)('inForm'));
     return `<u-form ref="${nameGroup.viewElementMainView}">
     ${properties
@@ -49,13 +50,15 @@ function genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
         const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                    const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    const selectNameGroup = selectNameGroupMap.get(key);
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
@@ -93,7 +96,7 @@ function genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
             const namespaceArr = propertyTypeNamespace.split('.');
             const type = namespaceArr.pop();
             if (type === 'enums') {
-                formItem += (0, _1.genEnumSelectBlock)(parentNode.findEnumByName(propertyTypeName), `${vModel}`, '', `请选择${label}`, true);
+                formItem += (0, _1.genEnumSelectBlock)(module.findEnumByName(propertyTypeName), `${vModel}`, '', `请选择${label}`, true);
             }
             else {
                 formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
@@ -110,7 +113,8 @@ function genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
 }
 exports.genUpdateFormTemplate = genUpdateFormTemplate;
 function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
-    const parentNode = entity.parentNode;
+    const dataSource = entity.parentNode;
+    const module = dataSource.parentNode;
     const properties = entity.properties.filter((0, _1.filterProperty)('inForm'));
     return `<van-form ref="${nameGroup.viewElementMainView}">
     ${properties
@@ -125,24 +129,26 @@ function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
         if (required)
             rules.push('required');
         const rulesStr = rules.join(' | ');
-        let formItem = `            <van-field drole="other" label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
+        let formItem = `            <van-field drole="other" ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
         const { typeAnnotation } = property || {};
         const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                    const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    const selectNameGroup = selectNameGroupMap.get(key);
                     formItem += `
-                        <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
+                        <template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${vModel}" :data-source="${selectNameGroup.viewLogicLoad}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
-                            :pageable="true" :remote-paging="true"></van-cascader></template>
+                            :pageable="true" input-align="left" :remote-paging="true"></van-cascader></van-linear-layout></template>
                     `;
                 }
                 else
@@ -152,37 +158,38 @@ function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
                 return '';
         }
         else if (propertyTypeName === 'Boolean') {
-            formItem += `<template #input><van-switch v-model="${vModel}"></van-switch></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-switch v-model="${vModel}"></van-switch></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-            formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Double') {
-            formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Text') {
-            formItem += `<template #input><van-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></van-linear-layout></template>`;
             // @TODO
         }
         else if (propertyTypeName === 'Date') {
-            formItem += `<template #input><van-calendar clearable :default-date.sync="${vModel}" placeholder="请输入${label}"></van-calendar></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar clearable :default-date.sync="${vModel}" placeholder="请输入${label}" input-align="left"></van-calendar></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'Time') {
-            formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
         }
         else if (propertyTypeName === 'DateTime') {
-            formItem += `<template #input><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
+            formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
         }
         else {
             const namespaceArr = propertyTypeNamespace.split('.');
             const type = namespaceArr.pop();
             if (type === 'enums') {
-                formItem += '<template #input>' + (0, _1.genEnumSelectBlock)(parentNode.findEnumByName(propertyTypeName), `${vModel}`, '', `请选择${label}`, true) + '</template>';
+                formItem += '<template #input><van-linear-layout style="width:100%;" direction="horizontal">' + (0, _1.genEnumSelectBlock)(module.findEnumByName(propertyTypeName), `${vModel}`, '', `请选择${label}`, true) + '</van-linear-layout></template>';
             }
             else {
-                formItem += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></van-linear-layout></template>`;
             }
         }
+        formItem += `<template #title><van-text text="${label}"><van-text></template>`;
         formItem += `            </van-field>\n`;
         formItem = formItem.replace(/>\n<van-input|<\/van-input>/g, '');
         return formItem;
@@ -251,7 +258,7 @@ function genSubmitLogic(updateLogic, nameGroup) {
     });
 }
 function genLoadLogic(getLogic, nameGroup) {
-    const params = [(0, _1.genLogicParam)(`${getLogic.params[0].name}`, 'id')];
+    const params = [(0, _1.genLogicParam)(`${getLogic.params[0].name}`, nameGroup.viewParamId)];
     return utils_1.NaslNode.Logic({
         name: nameGroup.viewLogicLoad,
         description: '',
@@ -275,7 +282,8 @@ function genLoadLogic(getLogic, nameGroup) {
     });
 }
 function genUpdateBlock(entity, view) {
-    const parentNode = entity.parentNode;
+    const dataSource = entity.parentNode;
+    const module = dataSource.parentNode;
     const ns = entity.ns;
     const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
     const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
@@ -293,16 +301,18 @@ function genUpdateBlock(entity, view) {
     entity.properties.forEach((property) => {
         // 有外键关联
         if (property.relationEntity) {
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const viewElementSelect = view.getViewElementUniqueName('select');
-                    const selectNameGroup = (0, _1.genUniqueQueryNameGroup)(parentNode, view, viewElementSelect, false, relationEntity.name);
+                    const selectNameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementSelect, false, relationEntity.name);
                     selectNameGroup.viewElementSelect = viewElementSelect;
-                    selectNameGroupMap.set(relationEntity.name, selectNameGroup);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    selectNameGroupMap.set(key, selectNameGroup);
                     const newStructure = (0, _1.genQueryStructure)([relationEntity], selectNameGroup);
-                    const newLogic = (0, _1.genQueryLogic)([relationEntity], selectNameGroup, false, false, parentNode);
+                    const newLogic = (0, _1.genQueryLogic)([relationEntity], selectNameGroup, false, false, module);
                     newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push((0, _1.genLoadSelectLogic)(relationEntity, selectNameGroup, newLogic));

package/out/templator/genUpdateBlock.js.map

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

package/out/templator/utils.d.ts

@@ -1,4 +1,4 @@
-import { App, Namespace, Entity, EntityProperty, Logic, View } from '../concepts';
+import { App, Module, Entity, EntityProperty, Logic, View, Namespace } from '../concepts';
 export declare const filterProperty: (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') => (property: EntityProperty) => boolean;
 /**
  * 生成表达式的代码
@@ -53,7 +53,7 @@ export interface NameGroup {
  * @param suffix 其它后缀，比如实体名等等
  * @param defaultInView 是否在页面逻辑中用 load 简写
  */
-export declare function genUniqueQueryNameGroup(scope: App | Namespace, view: View, componentName?: string, defaultInView?: boolean, suffix?: string): NameGroup;
+export declare function genUniqueQueryNameGroup(scope: App | Module | Namespace, view: View, componentName?: string, defaultInView?: boolean, suffix?: string): NameGroup;
 export declare const NaslCoreTypeAnnotation: {
     Boolean: {
         concept: string;
@@ -550,7 +550,7 @@ export declare const NaslQueryExpression: {
         pageElement: any;
         pageSizeElement: any;
     };
-    CallQueryComponent: ({ label, typeAnnotation, select, from, where, limit, groupBy, having, orderBy, logicName, structureName, }: {
+    CallQueryComponent: ({ label, typeAnnotation, select, from, where, limit, groupBy, having, orderBy, logicName, structureName, ideVersion, }: {
         label?: string;
         typeAnnotation: any;
         select: any;
@@ -562,6 +562,7 @@ export declare const NaslQueryExpression: {
         orderBy: any[];
         logicName: string;
         structureName: string;
+        ideVersion: string;
     }) => {
         concept: string;
         name: string;
@@ -577,6 +578,7 @@ export declare const NaslQueryExpression: {
         orderBy: any[];
         logicName: string;
         structureName: string;
+        ideVersion: string;
     };
 };
 export declare const NaslNode: {

package/out/templator/utils.js

@@ -367,7 +367,7 @@ exports.NaslQueryExpression = {
         pageElement,
         pageSizeElement,
     }),
-    CallQueryComponent: ({ label, typeAnnotation, select, from, where, limit, groupBy, having, orderBy, logicName, structureName, }) => ({
+    CallQueryComponent: ({ label, typeAnnotation, select, from, where, limit, groupBy, having, orderBy, logicName, structureName, ideVersion, }) => ({
         concept: 'CallQueryComponent',
         name: '',
         label,
@@ -382,6 +382,7 @@ exports.NaslQueryExpression = {
         orderBy,
         logicName,
         structureName,
+        ideVersion,
     }),
 };
 exports.NaslNode = {

package/out/templator/utils.js.map

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

package/out/test/integration/connect-file.js

@@ -35,14 +35,14 @@ describe('connect-file', () => {
     it('batchAction', async () => {
         await nasl.connect('file', path.join(__dirname, '../examples/app1.json'));
         const app = await nasl.loadApp();
-        if (app.entities.length > 0) {
-            const oldLength = app.entities.length;
-            await app.entities[0].delete();
-            (0, chai_1.expect)(app.entities.length).to.equal(oldLength - 1);
+        if (app.dataSources.length > 0) {
+            const oldLength = app.dataSources.length;
+            await app.dataSources[0].delete();
+            (0, chai_1.expect)(app.dataSources.length).to.equal(oldLength - 1);
         }
         else {
-            await app.addEntity();
-            (0, chai_1.expect)(app.entities.length).to.equal(1);
+            await app.addDataSource();
+            (0, chai_1.expect)(app.dataSources.length).to.equal(1);
         }
     });
 });

package/out/test/integration/connect-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-file.js","sourceRoot":"","sources":["../../../src/test/integration/connect-file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA8B;AAC9B,2CAA6B;AAC7B,4CAA8B;AAE9B,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,IAAA,aAAM,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAA,aAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;SACvD;aAAM;YACH,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;YACtB,IAAA,aAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC3C;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"connect-file.js","sourceRoot":"","sources":["../../../src/test/integration/connect-file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA8B;AAC9B,2CAA6B;AAC7B,4CAA8B;AAE9B,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,IAAA,aAAM,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;YACzC,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAClC,IAAA,aAAM,EAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;SAC1D;aAAM;YACH,MAAM,GAAG,CAAC,aAAa,EAAE,CAAC;YAC1B,IAAA,aAAM,EAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC9C;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/out/translator/index.js

@@ -76,7 +76,7 @@ function withSourceMap() {
                 // }, state));
                 let before = '';
                 if (!state.inline) {
-                    before = (0, exports.indent)(state.tabSize);
+                    before = (0, exports.indent)((state?.tabSize || 0));
                     state = shiftState(state, before);
                 }
                 else {

package/out/translator/index.js.map

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

package/out/utils/index.d.ts

@@ -1,6 +1,11 @@
 export * from './string';
 export * from './traverse';
 export * from './logger';
+import { BaseNode } from '..';
+export declare function findClosestModule(node: BaseNode): BaseNode;
+export declare function findConceptKeyWordByNamespace(namespace: string): string;
+export declare function findConceptKeyWordIndexFromNamespace(namespace: string, keyword: string): number;
+export declare function findConceptValueFromNamespace(namespace: string, keyword: string): string;
 export declare function getGlobalEnv(): any;
 /**
  * 用 lodash 的 throttle 好像有点问题，先临时做个处理