@lcap/nasl 1.0.1 → 2.12.0-beta.1

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,
@@ -20,16 +20,20 @@ import { NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslUITypeAnnotat
  */
 export function genTableColumnTemplate(property: EntityProperty) {
     const entity = property.entity;
+    const dataSource = entity.parentNode as DataSource;
     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 = getFirstDisplayedProperty(relationEntity);
         // 有外键关联
-        expression = getExpression(property, `scope.item.${relationLowerEntityName}.${property.relationProperty}`);
-    } else
+        expression = getExpression(property, `scope.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
+    } else {
         expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
+    }
 
     const getText = (property: EntityProperty) => {
         if (property.typeAnnotation.typeName === 'Boolean') {
@@ -83,8 +87,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 +112,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 +126,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 +142,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 +158,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,32 +196,35 @@ 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');
 
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet: Set<Entity> = new Set();
+    entitySet.add(entity);
     const newStructures: any[] = [];
     const newLogics: any[] = [];
     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)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
+    const allEntities = [...entitySet];
     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,34 +247,36 @@ 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');
 
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet: Set<Entity> = new Set();
+    entitySet.add(entity);
     const newStructures: any[] = [];
     const newLogics: any[] = [];
     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 = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
-
+    const allEntities = [...entitySet];
     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,13 +40,15 @@ 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);
                     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}">
@@ -73,7 +76,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 +93,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,55 +111,58 @@ 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);
                     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
                         return '';
                 } else
                     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>' + genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</template>';
+                    formItem += '<template #input><van-linear-layout style="width:100%;" direction="horizontal">' + genEnumSelectBlock(module.findEnumByName(propertyTypeName) as Enum, `${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, '');
@@ -226,7 +233,7 @@ function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
 }
 
 function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
-    const params = [genLogicParam(`${getLogic.params[0].name}`, 'id')];
+    const params = [genLogicParam(`${getLogic.params[0].name}`, nameGroup.viewParamId)];
     return NaslNode.Logic({
         name: nameGroup.viewLogicLoad,
         description: '',
@@ -251,7 +258,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 +279,18 @@ 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 key = [property.name, relationEntity.name].join('-');
+                    selectNameGroupMap.set(key, 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) : ''}`);
@@ -440,6 +440,7 @@ export const NaslQueryExpression = {
         orderBy,
         logicName,
         structureName,
+        ideVersion,
     }: {
         label?: string;
         typeAnnotation: any;
@@ -452,6 +453,7 @@ export const NaslQueryExpression = {
         orderBy: any[];
         logicName: string;
         structureName: string;
+        ideVersion: string
     }) => ({
         concept: 'CallQueryComponent',
         name: '',
@@ -467,6 +469,7 @@ export const NaslQueryExpression = {
         orderBy,
         logicName,
         structureName,
+        ideVersion,
     }),
 };
 

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,59 @@ 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;
+    });
+}
+
+// 从namespace中查找concept，返回找到类型对应的值
+// 如 namespace : app.datasource.defaultDS  keyword: datasource
+// 返回 defaultDS
+export function findConceptValueFromNamespace(namespace: string, keyword: string) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const findIndex = namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+
+    if (findIndex)
+        return namespaceArr[findIndex + 1];
+    return '';
+}
+
 export function getGlobalEnv() {
     return typeof window !== 'undefined' ? (window as any).appInfo.env : (global as any).appInfoEnv;
 }

package/out/concepts/basics/stdlib/nasl.browser copy.d.ts

@@ -1,3 +0,0 @@
-import Namespace from '../../Namespace__';
-declare const _default: Namespace;
-export default _default;

package/out/concepts/basics/stdlib/nasl.browser copy.js

@@ -1,70 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Namespace__1 = __importDefault(require("../../Namespace__"));
-const Param__1 = __importDefault(require("../../Param__"));
-const Logic__1 = __importDefault(require("../../Logic__"));
-const TypeAnnotation__1 = __importDefault(require("../../TypeAnnotation__"));
-exports.default = new Namespace__1.default({
-    name: 'browser',
-    logics: [
-        new Logic__1.default({
-            name: 'requestFullscreen',
-            params: [],
-        }),
-        new Logic__1.default({
-            name: 'exitFullscreen',
-        }),
-        new Logic__1.default({
-            name: 'hasAuth',
-            params: [
-                new Param__1.default({
-                    name: 'authPath',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-        new Logic__1.default({
-            name: 'getDistance',
-            params: [
-                new Param__1.default({
-                    name: 'Point1',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-                new Param__1.default({
-                    name: 'Point2',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-        new Logic__1.default({
-            name: 'logOut',
-            params: [
-                new Param__1.default({
-                    name: 'Point1',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-                new Param__1.default({
-                    name: 'Point2',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-        new Logic__1.default({
-            name: 'getConfiguration',
-            params: [
-                new Param__1.default({
-                    name: 'name',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-    ],
-});
-//# sourceMappingURL=nasl.browser%20copy.js.map

package/out/concepts/basics/stdlib/nasl.browser copy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"nasl.browser copy.js","sourceRoot":"","sources":["../../../../src/concepts/basics/stdlib/nasl.browser copy.ts"],"names":[],"mappings":";;;;;AAAA,mEAA0C;AAC1C,2DAAkC;AAElC,2DAAkC;AAClC,6EAAoD;AAEpD,kBAAe,IAAI,oBAAS,CAAC;IACzB,IAAI,EAAE,SAAS;IACf,MAAM,EAAE;QACJ,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,mBAAmB;YACzB,MAAM,EAAE,EACP;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,gBAAgB;SACzB,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,SAAS;YACf,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,UAAU;oBAChB,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;gBACF,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;gBACF,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,kBAAkB;YACxB,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,MAAM;oBACZ,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;KACL;CACJ,CAAC,CAAC"}

package/out/terms/LEVEL_NAME_MAP.d.ts

@@ -1,26 +0,0 @@
-export declare const LEVEL_NAME_MAP: {
-    app: string;
-    service: string;
-    page: string;
-    view: string;
-    block: string;
-    logic: string;
-    param: string;
-    timer: string;
-    variable: string;
-    return: string;
-    interface: string;
-    dataNode: string;
-    entity: string;
-    structure: string;
-    enum: string;
-    enumItem: string;
-    property: string;
-    element: string;
-    attr: string;
-    event: string;
-    directive: string;
-    logicItem: string;
-    logicNode: string;
-    expressionNode: string;
-};

package/out/terms/LEVEL_NAME_MAP.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LEVEL_NAME_MAP = void 0;
-exports.LEVEL_NAME_MAP = {
-    app: '应用',
-    service: '服务',
-    page: '页面',
-    view: '子页面',
-    block: '区块',
-    logic: '逻辑',
-    param: '输入参数',
-    timer: '定时任务',
-    variable: '局部变量',
-    return: '输出参数',
-    interface: '接口',
-    dataNode: '数据',
-    entity: '实体',
-    structure: '数据结构',
-    enum: '枚举',
-    enumItem: '枚举项',
-    property: '属性',
-    element: '元素',
-    attr: '属性',
-    event: '事件',
-    directive: '指令',
-    logicItem: '逻辑项',
-    logicNode: '逻辑节点',
-    expressionNode: '表达式节点',
-};
-//# sourceMappingURL=LEVEL_NAME_MAP.js.map

package/out/terms/LEVEL_NAME_MAP.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LEVEL_NAME_MAP.js","sourceRoot":"","sources":["../../src/terms/LEVEL_NAME_MAP.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC1B,GAAG,EAAE,IAAI;IACT,OAAO,EAAE,IAAI;IAEb,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,IAAI;IAEX,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,MAAM;IACd,SAAS,EAAE,IAAI;IAEf,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,MAAM;IACjB,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,IAAI;IAEd,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,IAAI;IAEf,SAAS,EAAE,KAAK;IAChB,SAAS,EAAE,MAAM;IACjB,cAAc,EAAE,OAAO;CAC1B,CAAC"}