@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.3

package/src/concepts/WhileStatement__.ts

@@ -7,6 +7,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';

package/src/concepts/basics/stdlib/index.ts

@@ -8,13 +8,13 @@ import naslUi from './nasl.ui';
 import naslInterface from './nasl.interface';
 import naslUtil from './nasl.util';
 import naslProcess from './nasl.process';
-import naslValidate from './nasl.validate';
+import naslValidation from './nasl.validation';
 
 export { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
 export const stdlibNamespace = new Namespace({
     name: 'nasl',
     path: 'nasl',
-    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidate],
+    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidation],
 });
 
 export default stdlibNamespace;

package/src/concepts/basics/stdlib/nasl.ui.ts

@@ -65,31 +65,11 @@ export const uiStructures = [
     }),
     new Structure({
         name: 'EventTarget',
-        properties: [
-            new StructureProperty({
-                name: 'preventDefault',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
-        ],
+        properties: [],
     }),
     new Structure({
         name: 'MouseEvent',
         properties: [
-            new StructureProperty({
-                name: 'target',
-                description: '事件对象',
-                typeAnnotation: TypeAnnotation.createReference('EventTarget'),
-            }),
-            new StructureProperty({
-                name: 'currentTarget',
-                description: '事件对象',
-                typeAnnotation: TypeAnnotation.createReference('EventTarget'),
-            }),
-            new StructureProperty({
-                name: 'relatedTarget',
-                description: '事件对象',
-                typeAnnotation: TypeAnnotation.createReference('EventTarget'),
-            }),
             new StructureProperty({
                 name: 'altKey',
                 description: '如果alt 键被按下，返回true',
@@ -161,7 +141,7 @@ export const uiStructures = [
                 typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
             new StructureProperty({
-                name: 'witch',
+                name: 'which',
                 description: '对应（键盘）按下的数字类型的 keyCode',
                 typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
@@ -201,7 +181,7 @@ export const uiStructures = [
                 typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
             new StructureProperty({
-                name: 'witch',
+                name: 'which',
                 description: '对应（键盘）按下的数字类型的 keyCode',
                 typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
@@ -249,11 +229,6 @@ export const uiStructures = [
                 description: '改变后的值是否合法',
                 typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -274,11 +249,6 @@ export const uiStructures = [
                 description: '',
                 typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -309,26 +279,11 @@ export const uiStructures = [
                 description: '旧的选择项相关对象',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'itemVM',
-                description: '选择项子组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
-            new StructureProperty({
-                name: 'oldVM',
-                description: '旧的选择项子组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
             new StructureProperty({
                 name: 'label',
                 description: '此选框的标签',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -344,11 +299,6 @@ export const uiStructures = [
                 description: '该选中项相关对象',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'itemVM',
-                description: '该选中项子组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
             new StructureProperty({
                 name: 'value',
                 description: '所有选中项的值',
@@ -377,20 +327,6 @@ export const uiStructures = [
                     typeArguments: [TypeAnnotation.createTypeParam('T')],
                 }),
             }),
-            new StructureProperty({
-                name: 'itemVMs',
-                description: '所有选中项子组件的数组',
-                typeAnnotation: TypeAnnotation.createGeneric('List', {
-                    typeArguments: [TypeAnnotation.createTypeParam('T')],
-                }),
-            }),
-            new StructureProperty({
-                name: 'oldVMs',
-                description: '旧的所有选中项子组件的数组',
-                typeAnnotation: TypeAnnotation.createGeneric('List', {
-                    typeArguments: [TypeAnnotation.createTypeParam('T')],
-                }),
-            }),
         ],
     }),
     new Structure({
@@ -430,11 +366,6 @@ export const uiStructures = [
                 description: '选择项相关对象',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'itemVM',
-                description: '选择项子组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -465,26 +396,6 @@ export const uiStructures = [
                 description: '节点相关对象',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'nodeVM',
-                description: '节点组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
-            new StructureProperty({
-                name: 'itemVM',
-                description: '面板组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
-            new StructureProperty({
-                name: 'groupVM',
-                description: '分组组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -540,11 +451,6 @@ export const uiStructures = [
                 description: '当前数据',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -635,11 +541,6 @@ export const uiStructures = [
                 description: '旧的页数',
                 typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -660,11 +561,6 @@ export const uiStructures = [
                 description: '提示停留的时间',
                 typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -733,21 +629,6 @@ export const uiStructures = [
                 description: '旧的选择项相关对象',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'nodeVM',
-                description: '选择项子组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
-            new StructureProperty({
-                name: 'oldVM',
-                description: '旧的选择项子组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -782,11 +663,6 @@ export const uiStructures = [
                 description: '选择项相关对象',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'nodeVM',
-                description: '选择项子组件',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
             new StructureProperty({
                 name: 'item',
                 description: '选择项相关对象',
@@ -822,11 +698,6 @@ export const uiStructures = [
                 description: '服务器回传信息',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({
@@ -887,11 +758,6 @@ export const uiStructures = [
                 description: '排序比较函数',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
-            new StructureProperty({
-                name: 'preventDefault',
-                description: '阻止改变流程',
-                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-            }),
         ],
     }),
     new Structure({

package/src/concepts/basics/stdlib/nasl.util.ts

@@ -64,20 +64,22 @@ export default new Namespace({
     functions: [
         new Function({
             name: 'Convert',
+            typeParams: [
+                new TypeParam({
+                    name: 'T',
+                }),
+            ],
             params: [
                 new Param({
                     name: 'value',
                     // typeAnnotation: new TypeAnnotation()
                     defaultExpression: new Identifier(),
                 }),
-                new Param({
-                    name: 'to',
-                    // typeAnnotation: new TypeAnnotation()
-                }),
             ],
             returns: [
                 new Return({
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    typeAnnotation: TypeAnnotation.createTypeParam('T'),
+                    // typeAnnotation: TypeAnnotation.createPrimitive('String'),
                 }),
             ],
         }),
@@ -581,5 +583,19 @@ export default new Namespace({
                 }),
             ],
         }),
+        new Function({
+            name: 'GetProperties',
+            params: [
+                new Param({
+                    name: 'name',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [
+                new Return({
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+        }),
     ],
 });

package/src/concepts/basics/stdlib/{nasl.validate.ts → nasl.validation.ts}

@@ -4,7 +4,7 @@ import Return from '../../Return__';
 import Function from '../../Function__';
 import TypeAnnotation from '../../TypeAnnotation__';
 
-const genEmptyParamFuncion = function (name: string) {
+const genEmptyParamFunction = function (name: string) {
     return new Function({
         name,
         params: [],
@@ -17,12 +17,12 @@ const genEmptyParamFuncion = function (name: string) {
 };
 
 export default new Namespace({
-    name: 'validate',
+    name: 'validation',
     functions: [
-        genEmptyParamFuncion('required'),
-        genEmptyParamFuncion('filled'),
-        genEmptyParamFuncion('notEmpty'),
-        genEmptyParamFuncion('empty'),
+        genEmptyParamFunction('required'),
+        genEmptyParamFunction('filled'),
+        genEmptyParamFunction('notEmpty'),
+        genEmptyParamFunction('empty'),
         new Function({
             name: 'minLength',
             params: [
@@ -280,8 +280,8 @@ export default new Namespace({
                 }),
             ],
         })*/
-        genEmptyParamFuncion('string'),
-        genEmptyParamFuncion('number'),
+        genEmptyParamFunction('string'),
+        genEmptyParamFunction('number'),
         new Function({
             name: 'numeric',
             params: [
@@ -297,7 +297,7 @@ export default new Namespace({
                 }),
             ],
         }),
-        genEmptyParamFuncion('integer'),
+        genEmptyParamFunction('integer'),
         new Function({
             name: 'decimal',
             params: [
@@ -347,7 +347,7 @@ export default new Namespace({
             'without--',
             'without__',
             'email',
-        ].map(genEmptyParamFuncion),
+        ].map(genEmptyParamFunction),
         new Function({
             name: 'ip',
             params: [
@@ -376,7 +376,7 @@ export default new Namespace({
                 }),
             ],
         }),
-        ...['port', 'url', 'macAddress', 'md5', 'ascii', 'base64'].map(genEmptyParamFuncion),
+        ...['port', 'url', 'macAddress', 'md5', 'ascii', 'base64'].map(genEmptyParamFunction),
         new Function({
             name: 'byteLength',
             params: [
@@ -395,7 +395,7 @@ export default new Namespace({
                 }),
             ],
         }),
-        genEmptyParamFuncion('dataURI'),
+        genEmptyParamFunction('dataURI'),
         new Function({
             name: 'divisibleBy',
             params: [
@@ -410,8 +410,8 @@ export default new Namespace({
                 }),
             ],
         }),
-        genEmptyParamFuncion('halfWidth'),
-        genEmptyParamFuncion('fullWidth'),
+        genEmptyParamFunction('halfWidth'),
+        genEmptyParamFunction('fullWidth'),
         /* hash ?
         new Function({
             name: 'hash',
@@ -428,11 +428,11 @@ export default new Namespace({
             ],
         }),
         */
-        genEmptyParamFuncion('hexColor'),
-        genEmptyParamFuncion('hex'),
-        genEmptyParamFuncion('creditCard'),
-        genEmptyParamFuncion('fqdn'),
-        genEmptyParamFuncion('ipOrFQDN'),
+        genEmptyParamFunction('hexColor'),
+        genEmptyParamFunction('hex'),
+        genEmptyParamFunction('creditCard'),
+        genEmptyParamFunction('fqdn'),
+        genEmptyParamFunction('ipOrFQDN'),
         new Function({
             name: 'isbn',
             params: [
@@ -447,8 +447,8 @@ export default new Namespace({
                 }),
             ],
         }),
-        genEmptyParamFuncion('issn'),
-        genEmptyParamFuncion('isin'),
+        genEmptyParamFunction('issn'),
+        genEmptyParamFunction('isin'),
         new Function({
             name: 'iso8601',
             params: [
@@ -463,11 +463,11 @@ export default new Namespace({
                 }),
             ],
         }),
-        genEmptyParamFuncion('iso31661Alpha2'),
-        genEmptyParamFuncion('iso31661Alpha3'),
-        genEmptyParamFuncion('json'),
-        genEmptyParamFuncion('jwt'),
-        genEmptyParamFuncion('latLong'),
+        genEmptyParamFunction('iso31661Alpha2'),
+        genEmptyParamFunction('iso31661Alpha3'),
+        genEmptyParamFunction('json'),
+        genEmptyParamFunction('jwt'),
+        genEmptyParamFunction('latLong'),
         new Function({
             name: 'mobile',
             params: [
@@ -488,7 +488,7 @@ export default new Namespace({
                 }),
             ],
         }),
-        genEmptyParamFuncion('mongoId'),
+        genEmptyParamFunction('mongoId'),
         new Function({
             name: 'postalCode',
             params: [
@@ -518,6 +518,6 @@ export default new Namespace({
                 }),
             ],
         }),
-        genEmptyParamFuncion('chinese'),
+        genEmptyParamFunction('chinese'),
     ],
 });

package/src/concepts/index__.ts

@@ -71,6 +71,10 @@ export * from './ProcessElement__';
 export * from './ProcessComponent__';
 export * from './ProcessOutcome__';
 export * from './Role__';
+export * from './Configuration__';
+export * from './ConfigGroup__';
+export * from './ConfigProperty__';
+export * from './ConfigPropertyValue__';
 export * from './CompletionProperty__';
 export * from './UseComponent__';
 export * from './Point__';

package/src/generator/compileComponent.ts

@@ -2,7 +2,7 @@ import { replaceTemplate, replaceCSS } from './styleReplacer';
 
 export interface RawOptions {
     filePath?: string;
-    tempPath?: string;
+    path?: string;
     hash?: string;
     template?: string;
     script?: string;

package/src/generator/genBundleFiles.ts

@@ -8,7 +8,6 @@ import * as JSON5 from 'json5';
 export interface Route {
     // id?: string;
     path?: string;
-    tempPath?: string;
     routePath?: string;
     component?: RawOptions; // ExtendedVue<Vue, unknown, unknown, unknown, Record<never, any>>;
     children?: Array<Route>;
@@ -213,7 +212,7 @@ export async function genBundleFiles(app: App, config: {
         indexName,
         // extendedConfig: app.extendedConfig,
     }, null, 4);
-    const assetsInfo = await app.genAllAssetsInfo(config.STATIC_URL);
+    const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL);
     const customNames = JSON5.stringify(assetsInfo.custom.names);
     let content = `(function(){
         `;

package/src/generator/genMetaData.ts

@@ -0,0 +1,111 @@
+import { App, View, BaseNode, Entity, Structure, Enum, uiStructures, collectionStructures, Logic } from '../concepts';
+
+export function genMetaData(app: App,
+    config: {
+        tenant: string;
+        env: string;
+        nuimsDomain: string;
+        STATIC_URL: string;
+        USER_STATIC_URL: string;
+    }) {
+    const dataTypesMap: {
+        [id: string]: BaseNode;
+    } = {};
+    const { entities = [], structures = [], enums = [], logics = [], interfaceDependencies = [] } = app || {};
+    const dataTypes: (Entity | Structure | Enum)[] = [];
+    const allLogics: Logic[] = [];
+    const enumsMap: {
+        [name: string]: {
+            [label: string]: string;
+        };
+    } = {};
+    const logicsMap: {
+        [id: string]: {
+            config: {
+                serviceType: string;
+            };
+            url: {
+                method: string;
+                path: string;
+            };
+        };
+    } = {};
+
+    const _custom: {
+        [id: string]: BaseNode;
+    } = {};
+
+    if (Array.isArray(enums)) {
+        dataTypes.push(...enums);
+        enums.forEach((node) => {
+            const { name, enumItems } = node || {};
+            const enumObj: {
+                [value: string]: string;
+            } = {};
+            enumItems.forEach(({ label, value }) => {
+                enumObj[value] = label;
+            });
+            enumsMap[name] = enumObj;
+        });
+    }
+
+    if (Array.isArray(entities)) {
+        dataTypes.push(...entities);
+        entities.forEach((entity) => {
+            const ns = entity.ns;
+            if (Array.isArray(ns?.logics)) {
+                allLogics.push(...ns.logics);
+            }
+        });
+    }
+    if (Array.isArray(structures)) {
+        dataTypes.push(...structures);
+    }
+
+    dataTypes.forEach((node) => {
+        const namespace = node.getNamespace();
+        const id = `${namespace}.${node.name}`;
+        dataTypesMap[id] = node;
+    });
+
+    if (Array.isArray(uiStructures)) {
+        const namespace = 'nasl.ui';
+        uiStructures.forEach((node) => {
+            const id = `${namespace}.${node.name}`;
+            dataTypesMap[id] = node;
+        });
+    }
+
+    if (Array.isArray(collectionStructures)) {
+        const namespace = 'nasl.collection';
+        collectionStructures.forEach((node) => {
+            const id = `${namespace}.${node.name}`;
+            dataTypesMap[id] = node;
+        });
+    }
+
+    if (Array.isArray(logics)) {
+        allLogics.push(...logics);
+    }
+
+    allLogics.forEach((node) => {
+        logicsMap[node.name] = node.toService();
+    });
+
+    interfaceDependencies.forEach((node) => {
+        const namespace = node.getNamespace();
+        const id = `${namespace}.${node.name}`;
+        _custom[id] = node;
+    });
+
+    return {
+        metaData: {
+            dataTypesMap,
+            enumsMap,
+            logicsMap,
+            servicesMap: {
+                _custom,
+            },
+        },
+    };
+}

package/src/generator/index.ts

@@ -2,3 +2,4 @@ export * from './genHash';
 export * from './compileComponent';
 export * from './styleReplacer';
 export * from './genBundleFiles';
+export * from './genMetaData';

package/src/index.ts

@@ -1,10 +1,10 @@
 export { EventEmitter, EventPayload, BaseNode } from './common';
 export * from './concepts';
-export { genBundleFiles } from './generator';
+export { genBundleFiles, genMetaData } from './generator';
 export * from './translator';
 export { default as diagnosticManager } from './manager/diagnostic';
 // export { default as server } from './server';
 export * as genBlock from './templator';
 export * as utils from './utils';
 export * from './config';
-export { loadApp } from './service/storage/init';
+export { loadApp, loadAppSync } from './service/storage/init';