@lcap/nasl 1.0.2 → 2.12.0-beta

package/src/templator/genTableBlock.ts

@@ -1,5 +1,5 @@
 import * as utils from '../utils';
-import { App, Namespace, Entity, EntityProperty, View } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, View, DataSource } from '../concepts';
 import {
     getExpression,
     filterProperty,
@@ -83,8 +83,8 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
  * @param entity 实体
  */
 export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic: any, supportFilter: boolean) {
-    const parentNode = entity.parentNode as App | Namespace;
-    const parentNamespace = parentNode?.getNamespace();
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    const moduleNamespace = moduleNode?.getNamespace();
     const params = [
         genLogicParam(`${newLogic.params[0].name}`, 'params.page'),
         genLogicParam(`${newLogic.params[1].name}`, 'params.size'),
@@ -108,7 +108,7 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
                 name: 'result',
                 typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -122,7 +122,7 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
                     name: 'result',
                 }),
                 right: NaslLogicItem.CallLogic({
-                    calleeNamespace: `${parentNamespace}.logics`,
+                    calleeNamespace: `${moduleNamespace}.logics`,
                     calleeName: newLogic.name,
                     arguments: params,
                 }),
@@ -138,8 +138,8 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
  */
 export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const parentNode = entity.parentNode as App | Namespace;
-    const parentNamespace = parentNode?.getNamespace();
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    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);
@@ -154,7 +154,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                 name: 'scope',
                 typeAnnotation: NaslUITypeAnnotation.ScopeOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -192,10 +192,11 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
  *        load_select_student -> load_someView_select_student
  */
 export function genTableBlock(entity: Entity, view: View) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
 
     const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementMainView);
+    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
@@ -207,7 +208,7 @@ export function genTableBlock(entity: Entity, view: View) {
     entity.properties.forEach((property) => {
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty)
@@ -217,7 +218,7 @@ export function genTableBlock(entity: Entity, view: View) {
     });
     const entityStructure = genQueryStructure(allEntities, nameGroup);
     newStructures.push(entityStructure);
-    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, parentNode);
+    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
 
     return `
@@ -240,10 +241,11 @@ export function genTableBlock(entity: Entity, view: View) {
 
 export function genTableColumnBlock(property: EntityProperty, view: View) {
     const entity = property.entity;
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
 
     const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementMainView);
+    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
@@ -256,7 +258,7 @@ export function genTableColumnBlock(property: EntityProperty, view: View) {
     properties.forEach((property) => {
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty)
@@ -267,7 +269,7 @@ export function genTableColumnBlock(property: EntityProperty, view: View) {
 
     const entityStructure = genQueryStructure(allEntities, nameGroup);
     newStructures.push(entityStructure);
-    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, parentNode);
+    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
 
     return `

package/src/templator/genUpdateBlock.ts

@@ -1,6 +1,6 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Namespace, Entity, Logic, View, Enum } from '../concepts';
+import { App, Module, Namespace, Entity, Logic, View, Enum, DataSource } from '../concepts';
 import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
     NameGroup,
@@ -16,7 +16,8 @@ import {
 } from '.';
 
 export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<u-form ref="${nameGroup.viewElementMainView}">
@@ -39,7 +40,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             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 = getFirstDisplayedProperty(relationEntity);
@@ -73,7 +74,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 const namespaceArr = propertyTypeNamespace.split('.');
                 const type = namespaceArr.pop();
                 if (type === 'enums') {
-                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                    formItem += genEnumSelectBlock(module.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
                 } else {
                     formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
                 }
@@ -90,7 +91,8 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 }
 
 export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<van-form ref="${nameGroup.viewElementMainView}">
@@ -107,13 +109,13 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 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 = getFirstDisplayedProperty(relationEntity);
@@ -150,12 +152,13 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 const namespaceArr = propertyTypeNamespace.split('.');
                 const type = namespaceArr.pop();
                 if (type === 'enums') {
-                    formItem += '<template #input>' + genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</template>';
+                    formItem += '<template #input>' + genEnumSelectBlock(module.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</template>';
                 } else {
                     formItem += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></template>`;
                 }
             }
 
+            formItem += `<template #title><van-text text="${label}"><van-text></template>`;
             formItem += `            </van-field>\n`;
 
             formItem = formItem.replace(/>\n<van-input|<\/van-input>/g, '');
@@ -251,7 +254,8 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 }
 
 export function genUpdateBlock(entity: Entity, view: View) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
     const ns = entity.ns;
     const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
     const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
@@ -271,16 +275,16 @@ export function genUpdateBlock(entity: Entity, view: View) {
     entity.properties.forEach((property) => {
         // 有外键关联
         if (property.relationEntity) {
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty) {
                     const viewElementSelect = view.getViewElementUniqueName('select');
-                    const selectNameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementSelect, false, relationEntity.name);
+                    const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
                     selectNameGroup.viewElementSelect = viewElementSelect;
                     selectNameGroupMap.set(relationEntity.name, selectNameGroup);
                     const newStructure = genQueryStructure([relationEntity], selectNameGroup);
-                    const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, parentNode);
+                    const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
                     newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));

package/src/templator/utils.ts

@@ -1,5 +1,5 @@
 import { utils } from '..';
-import { App, Namespace, Entity, EntityProperty, Logic, View } from '../concepts';
+import { App, Module, Entity, EntityProperty, Logic, View, Namespace } from '../concepts';
 
 export const filterProperty = (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') => (property: EntityProperty) => {
     if (property.display) {
@@ -136,7 +136,7 @@ function capFirstLetter(word: string) {
  * @param suffix 其它后缀，比如实体名等等
  * @param defaultInView 是否在页面逻辑中用 load 简写
  */
-export function genUniqueQueryNameGroup(scope: App | Namespace, view: View, componentName: string = '', defaultInView: boolean = true, suffix: string = '') {
+export function genUniqueQueryNameGroup(scope: App | Module | Namespace, view: View, componentName: string = '', defaultInView: boolean = true, suffix: string = '') {
     const result: NameGroup = {};
     result.viewLogicLoad = view.getLogicUniqueName(`load${defaultInView ? '' : capFirstLetter(componentName)}${suffix ? capFirstLetter(suffix) : ''}`);
     result.logic = scope.getLogicUniqueName(`load${capFirstLetter(view.name)}${componentName ? capFirstLetter(componentName) : ''}${suffix ? capFirstLetter(suffix) : ''}`);

package/src/test/integration/connect-file.ts

@@ -12,13 +12,13 @@ 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();
-            expect(app.entities.length).to.equal(oldLength - 1);
+        if (app.dataSources.length > 0) {
+            const oldLength = app.dataSources.length;
+            await app.dataSources[0].delete();
+            expect(app.dataSources.length).to.equal(oldLength - 1);
         } else {
-            await app.addEntity();
-            expect(app.entities.length).to.equal(1);
+            await app.addDataSource();
+            expect(app.dataSources.length).to.equal(1);
         }
     });
 });

package/src/translator/index.ts

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

package/src/utils/index.ts

@@ -3,8 +3,40 @@ export * from './traverse';
 export * from './logger';
 
 import { compare } from 'compare-versions';
+import { BaseNode } from '..';
 import { traverse } from './traverse';
 
+// 查找最近的模块
+export function findClosestModule(node: BaseNode) {
+    let moduleNode = node;
+    while (moduleNode && !['App', 'Module'].includes(moduleNode.concept)) {
+        moduleNode = moduleNode.parentNode;
+    }
+    return moduleNode;
+}
+
+// 从namespace获取关键字
+export function findConceptKeyWordByNamespace(namespace: string) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const keywordViews = namespaceArr.filter((namespaceItem, index) => index % 2 === mod);
+    return keywordViews.pop();
+}
+
+// 从namespace中查找concept关键字
+export function findConceptKeyWordIndexFromNamespace(namespace: string, keyword: string) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    return namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+}
+
 export function getGlobalEnv() {
     return typeof window !== 'undefined' ? (window as any).appInfo.env : (global as any).appInfoEnv;
 }