@lcap/nasl 1.0.0-alpha.8 → 1.0.1

package/src/eventBus.ts

@@ -0,0 +1,5 @@
+import { EventEmitter } from './common/EventEmitter';
+
+export const eventBus = new EventEmitter();
+
+export default eventBus;

package/src/generator/genBundleFiles.ts

@@ -1,4 +1,4 @@
-import { App, View, BaseNode, Entity, Structure, Enum, uiStructures, collectionStructures, Logic } from '../concepts';
+import { App, Module, View, BaseNode, Entity, Structure, Enum, uiStructures, collectionStructures, Logic, Interface, Process } from '../concepts';
 import * as utils from '../utils';
 import { genHash, RawOptions } from '.';
 import { compileComponent } from './compileComponent';
@@ -22,6 +22,7 @@ export interface PageOptions {
     domainName: string;
     nuimsDomain: string;
     auth: boolean;
+    documentTitle?: string;
     router: {
         notFound: string;
         middleware: string[];
@@ -41,8 +42,37 @@ export async function genBundleFiles(app: App,
         nuimsDomain: string;
         STATIC_URL: string;
         USER_STATIC_URL: string;
+        extendedConfig: string;
+        lowcodeDomain: string;
+        appid: string;
     }) {
-    const { views = [], entities = [], structures = [], enums = [], logics = [], interfaceDependencies = [] } = app || {};
+    const modules: Module[] = [];
+    const views: View[] = [];
+    const entities: Entity[] = [];
+    const structures: Structure[] = [];
+    const enums: Enum[] = [];
+    const logics: Logic[] = [];
+    const interfaces: Interface[] = [];
+    const processes: Process[] = [];
+
+    app.views && views.push(...app.views);
+    app.entities && entities.push(...app.entities);
+    app.structures && structures.push(...app.structures);
+    app.enums && enums.push(...app.enums);
+    app.logics && logics.push(...app.logics);
+    app.processes && processes.push(...app.processes);
+
+    app.dependencies && modules.push(...app.dependencies);
+    app.interfaceDependencies && modules.push(...app.interfaceDependencies);
+
+    modules.forEach((module: Module) => {
+        module.views && views.push(...module.views);
+        module.entities && entities.push(...module.entities);
+        module.structures && structures.push(...module.structures);
+        module.enums && enums.push(...module.enums);
+        module.logics && logics.push(...module.logics);
+        module.interfaces && interfaces.push(...module.interfaces);
+    });
 
     const componentMap: {
         [name: string]: RawOptions;
@@ -84,7 +114,7 @@ export async function genBundleFiles(app: App,
         };
     } = {};
     const _custom: {
-        [id: string]: BaseNode;
+        [id: string]: any;
     } = {};
     const allLogics: Logic[] = [];
 
@@ -102,6 +132,7 @@ export async function genBundleFiles(app: App,
             domainName: app.name,
             nuimsDomain: config.nuimsDomain,
             auth: view.auth,
+            documentTitle: app.documentTitle,
             router: {
                 notFound: '/',
                 middleware: ['first', 'lock', 'auth', 'login'],
@@ -186,17 +217,27 @@ export async function genBundleFiles(app: App,
     }
 
     allLogics.forEach((node) => {
-        logicsMap[node.name] = node.toService();
+        const namespace = node.getNamespace();
+        const id = namespace ? `${namespace}.${node.name}` : node.name;
+        logicsMap[id] = node.toService();
     });
 
-    interfaceDependencies.forEach((node) => {
-        const namespace = node.getNamespace();
-        const id = `${namespace}.${node.name}`;
-        _custom[id] = node;
+    processes.forEach((process) => {
+        if (Array.isArray(process.logics)) {
+            process.logics.forEach((node) => {
+                const namespace = node.getNamespace();
+                const id = namespace ? `${namespace}.${node.name}` : node.name;
+                logicsMap[id] = node.toProcessService();
+            });
+        }
+    });
+
+    interfaces.forEach((interfaceItem: Interface) => {
+        _custom[`${interfaceItem.getNamespace()}.${interfaceItem.name}`] = interfaceItem.toService();
     });
 
     const data = JSON5.stringify({
-        pages,
+        // pages,
         metaData: {
             dataTypesMap,
             enumsMap,
@@ -205,13 +246,15 @@ export async function genBundleFiles(app: App,
                 _custom,
             },
         },
+        extendedConfig: config.extendedConfig,
+        lowcodeDomain: config.lowcodeDomain,
         tenant: config.tenant,
         env: config.env,
         indexName,
-        // extendedConfig: app.extendedConfig,
     }, null, 4);
+
     const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL);
-    console.log(assetsInfo);
+    // console.log(assetsInfo);
     // debugger;
     const customNames = JSON5.stringify(assetsInfo.custom.names);
     let content = `(function(){
@@ -228,54 +271,163 @@ export async function genBundleFiles(app: App,
         `;
     }
 
+    if (app.documentIcon) {
+        content += `{
+            const link = document.createElement('link');
+            link.rel = 'shortcut icon';
+            link.href = \`${app.documentIcon}\`;
+            document.head.appendChild(link);
+        }`;
+    }
+
     content += `
     var customNames = ${customNames};
     for(var i=0;i<customNames.length;i++){
-        var name = kebab2Camel(customNames[i]);
+        var name = window.kebab2Camel(customNames[i]);
         if(window[name]){
             window.CloudUI.install(window.Vue, window[name]);
         }
     }`;
+
+    function routeToString(route: Route): string {
+        return `{
+    path: '${route.path}',
+    component: (function(){
+        var componentOptions = ${route.component.script ? '(function(){\n' + route.component.script.trim().replace(/export default |module\.exports +=/, 'return ') + '\n})()' : '{}'};
+        Object.assign(componentOptions, {
+            template: \`${route.component.template.replace(/[`$]/g, (m) => '\\' + m)}\`,
+        });
+        return componentOptions;
+        // return window.Vue.extend(componentOptions);
+    })(),
+    children: [
+        ${route.children.map(routeToString).join(',\n')}
+    ],
+}`;
+    }
+
     content += `
         var data = ${data};
+        data.pages = {
+            ${Object.keys(pages)
+        .map((pageName) => {
+            const page = pages[pageName];
+            const rootRoute = page.rootRoute;
+            delete page.rootRoute;
+
+            let pageJSON = JSON5.stringify(page, null, 4);
+            pageJSON = pageJSON.slice(0, -1) + `\nrootRoute: ${routeToString(rootRoute)} }`;
+
+            return `${pageName}: ${pageJSON},`;
+        })
+        .join('\n')}
+        };
         var pageName = window.pageName;
         if(!pageName){
             pageName = data.indexName;
         }
         var page = data.pages[pageName];
         page.router.noLogin = noLogin;
-        compileComponent(page.rootRoute);
+
+        if(appVM){
+            appVM=null
+        }
         var appVM = window.cloudAdminDesigner.init(page, {
             tenant: data.tenant,
             env: data.env,
-            extendedConfig: data.extendedConfig
+            extendedConfig: data.extendedConfig,
+            envConfig: {
+                lowcodeDomain: data.lowcodeDomain,
+            },
         }, page.rootRoute, data.metaData);
         window.appVM = appVM;
-    })()`;
+    })();`;
 
     if (config.env === 'dev') {
+        // 加载资源js
+        const domain = config.lowcodeDomain.slice(5);
+        const targetUrl = `${location.origin}/empty?url=${domain}&appid=${config.appid}`;
+        const str = `
+       if(!document.querySelector("iframe[name='iframeEmpty']")){
+            var el = document.createElement('iframe');
+            el.setAttribute('src', "${targetUrl}");
+            el.setAttribute('name', 'iframeEmpty');
+            el.setAttribute('width', 0);
+            el.setAttribute('height', 0);
+            el.style.borderWidth = 0
+            el.style.display= "block"
+            document.getElementsByTagName('body')[0].appendChild(el);
+            document.domain = '${domain}'
+            var _div = document.createElement('div');
+            _div.classList = "div-load"
+            _div.innerHTML = "<div class='loading-container'></div><div>正在更新最新发布内容...</div>"
+            document.getElementsByTagName('body')[0].appendChild(_div);
+            window.showLoading  = function(){
+                document.querySelector(".div-load").style.display ="flex"
+            }
+            window.hideLoading  = function(){
+                document.querySelector(".div-load").style.display ="none"
+            }
+            var style = document.createElement('style');
+            style.innerHTML=\`.div-load{
+        width: 208px;
+        height: 40px;
+        background: rgba(48, 48, 48, 0.8);
+        box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
+        border-radius: 4px;
+        position: fixed;
+        top: 120px;
+        left: 50%;
+        margin-left: -104px;
+        color: #FFFFFF;
+        font-size: 14px;
+        display: none;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .loading-container{
+               width: 12px;
+               height: 12px;
+               margin-right: 10px;
+               animation: loading-animation 0.8s infinite linear;
+               border: 2px solid #f3f3f3;
+               border-top: 2px solid rgb(109, 108, 108);
+               border-right: 2px solid rgb(109, 108, 108);
+               border-bottom: 2px solid rgb(109, 108, 108);
+               border-radius: 50%;
+           }
+
+           @keyframes loading-animation{
+               0% {
+                   transform: rotate(0deg);
+               }
+               100% {
+                   transform: rotate(360deg);
+               }
+           }\`
+            document.getElementsByTagName('body')[0].appendChild(style);
+        }
+         `;
+        content += str;
     }
-    // // 加载资源js
-    // const str = ` const el = document.createElement('iframe');
-    // el.setAttribute('src', "http://defaulttenant.localhost.qa-ci.lcap.group:8850/empty?url=qa-ci.lcap.group");
-    // el.setAttribute('name', 'iframe');
-    // el.setAttribute('width', 0);
-    // el.setAttribute('height', 0);
-    // el.style.borderWidth = 0
-    // el.style.display= "block"
-    // document.getElementsByTagName('body')[0].appendChild(el);
-    // document.domain = '${mainCallbackService.envConfig.lowcodeDomain}'
-    // `;
-
-    const outputs: { [name: string]: string } = {};
 
     const bundlePath = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/bundle.${genHash(content)}.js`;
-    outputs[bundlePath] = content;
     const assetsContent = `(function() {
     LazyLoad.js(${JSON5.stringify(assetsInfo.basic.js.concat(assetsInfo.custom.js).concat([bundlePath]))});
     LazyLoad.css(${JSON5.stringify(assetsInfo.basic.css.concat(assetsInfo.custom.css))});
 })()
 `;
-    outputs[`${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/client.js`] = assetsContent;
+
+    const outputs = [
+        {
+            name: bundlePath,
+            content,
+        },
+        {
+            name: `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/client.js`,
+            content: assetsContent,
+        },
+    ];
     return outputs;
 }

package/src/generator/genMetaData.ts

@@ -1,4 +1,4 @@
-import { App, View, BaseNode, Entity, Structure, Enum, uiStructures, collectionStructures, Logic } from '../concepts';
+import { App, View, BaseNode, Module, Interface, Entity, Structure, Enum, uiStructures, collectionStructures, Logic, Process } from '../concepts';
 
 export function genMetaData(app: App,
     config: {
@@ -7,13 +7,59 @@ export function genMetaData(app: App,
         nuimsDomain: string;
         STATIC_URL: string;
         USER_STATIC_URL: string;
+        extendedConfig: string;
+        lowcodeDomain: string;
     }) {
+    const modules: Module[] = [];
+    const views: View[] = [];
+    const entities: Entity[] = [];
+    const structures: Structure[] = [];
+    const enums: Enum[] = [];
+    const logics: Logic[] = [];
+    const interfaces: Interface[] = [];
+    const processes: Process[] = [];
+
+    const {
+        entities: appEntities = [],
+        structures: appStructures = [],
+        enums: appEnums = [],
+        logics: appLogics = [],
+        interfaceDependencies: appInterfaceDependencies = [],
+        dependencies: appDependencies = [],
+        processes: appProcesses = [],
+    } = app || {};
+    entities.push(...appEntities);
+    structures.push(...appStructures);
+    enums.push(...appEnums);
+    logics.push(...appLogics);
+    processes.push(...appProcesses);
+    if (Array.isArray(appDependencies)) {
+        modules.push(...appDependencies);
+    }
+    if (Array.isArray(appInterfaceDependencies)) {
+        modules.push(...appInterfaceDependencies);
+    }
+    modules.forEach((module: Module) => {
+        const {
+            views: moduleViews = [],
+            entities: moduleEntities = [],
+            structures: moduleStructures = [],
+            enums: moduleEnums = [],
+            logics: moduleLogics = [],
+            interfaces: moduleInterfaces = [],
+        } = module;
+        views.push(...moduleViews);
+        entities.push(...moduleEntities);
+        structures.push(...moduleStructures);
+        enums.push(...moduleEnums);
+        logics.push(...moduleLogics);
+        interfaces.push(...moduleInterfaces);
+    });
+    const dataTypes: (Entity | Structure | Enum)[] = [];
+
     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;
@@ -30,11 +76,10 @@ export function genMetaData(app: App,
             };
         };
     } = {};
-
     const _custom: {
-        [id: string]: BaseNode;
+        [id: string]: any;
     } = {};
-
+    const allLogics: Logic[] = [];
     if (Array.isArray(enums)) {
         dataTypes.push(...enums);
         enums.forEach((node) => {
@@ -48,7 +93,6 @@ export function genMetaData(app: App,
             enumsMap[name] = enumObj;
         });
     }
-
     if (Array.isArray(entities)) {
         dataTypes.push(...entities);
         entities.forEach((entity) => {
@@ -67,7 +111,6 @@ export function genMetaData(app: App,
         const id = `${namespace}.${node.name}`;
         dataTypesMap[id] = node;
     });
-
     if (Array.isArray(uiStructures)) {
         const namespace = 'nasl.ui';
         uiStructures.forEach((node) => {
@@ -89,23 +132,31 @@ export function genMetaData(app: App,
     }
 
     allLogics.forEach((node) => {
-        logicsMap[node.name] = node.toService();
+        const namespace = node.getNamespace();
+        const id = namespace ? `${namespace}.${node.name}` : node.name;
+        logicsMap[id] = node.toService();
     });
 
-    interfaceDependencies.forEach((node) => {
-        const namespace = node.getNamespace();
-        const id = `${namespace}.${node.name}`;
-        _custom[id] = node;
+    processes.forEach((process) => {
+        if (Array.isArray(process.logics)) {
+            process.logics.forEach((node) => {
+                const namespace = node.getNamespace();
+                const id = namespace ? `${namespace}.${node.name}` : node.name;
+                logicsMap[id] = node.toProcessService();
+            });
+        }
+    });
+
+    interfaces.forEach((interfaceItem: Interface) => {
+        _custom[`${interfaceItem.getNamespace()}.${interfaceItem.name}`] = interfaceItem.toService();
     });
 
     return {
-        metaData: {
-            dataTypesMap,
-            enumsMap,
-            logicsMap,
-            servicesMap: {
-                _custom,
-            },
+        dataTypesMap,
+        enumsMap,
+        logicsMap,
+        servicesMap: {
+            _custom,
         },
     };
 }

package/src/index.ts

@@ -7,4 +7,6 @@ export { default as diagnosticManager } from './manager/diagnostic';
 export * as genBlock from './templator';
 export * as utils from './utils';
 export * from './config';
+export * from './eventBus';
 export { loadApp, loadAppSync } from './service/storage/init';
+import './automate/engine';

package/src/manager/diagnostic.ts

@@ -11,7 +11,7 @@ export interface Diagnostic {
     id?: string;
     severity: string;
     originalDiagnostic: tsProtocol.DiagnosticWithFileName;
-    message: string;
+    message?: string;
     code?: number;
     node?: BaseNode;
     text?: string;

package/src/server/createUiTs.ts

@@ -1,9 +1,23 @@
-import { Logic, TypeAnnotation, Param } from '..';
+import { Logic, TypeAnnotation, Param, LogicItem, NumericLiteral, BooleanLiteral, StringLiteral, Identifier, MemberExpression } from '..';
+
+const naslStdlibMap: any = {
+    'nasl.core.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.core.ts').default,
+    'nasl.collection.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.collection.ts').default,
+    'nasl.interface.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.interface.ts').default,
+    'nasl.util.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.util.ts').default,
+    'nasl.ui.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.ui.ts').default,
+    'nasl.browser.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.browser.ts').default,
+    'nasl.auth.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.auth.ts').default,
+    'nasl.configuration.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.configuration.ts').default,
+    'nasl.langUtil.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.langUtil.ts').default,
+    'nasl.annotation.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.annotation.ts').default,
+    'nasl.validation.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.validation.ts').default,
+};
 
 export default function formatUiTs(allComponent: any) {
     const indent = (tabSize: number) => ' '.repeat(tabSize * 2);
 
-    const toHump = (name: string) => name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '';
+    const toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
 
     const toNaslType = (type: string) => {
         if (type === 'number')
@@ -17,12 +31,29 @@ export default function formatUiTs(allComponent: any) {
         else
             return type;
     };
-
-    const creatMethodLogic = (method: {name: string, params: any[]}) => {
+    const createDefault = (param: any): LogicItem => {
+        const defaultValue = param.default;
+        if (defaultValue) {
+            if (typeof defaultValue === 'number') {
+                return new NumericLiteral({ value: `${defaultValue}` });
+            } else if (typeof defaultValue === 'boolean') {
+                return new BooleanLiteral({ value: `${defaultValue}` });
+            } else if (typeof defaultValue === 'string' && !defaultValue.includes('.')) {
+                return new StringLiteral({ value: defaultValue });
+            }
+            return null;
+        }
+        return null;
+    };
+    const creatMethodLogic = (method: { name: string; params: any[] }) => {
         const { name, params } = method;
         const logic = new Logic({
             name,
             params: params.map((param) => {
+                let required = true;
+                if (param.required === false) {
+                    required = false;
+                }
                 let typeAnnotation = null;
                 const { name, type } = param;
                 if (type === 'number')
@@ -41,6 +72,8 @@ export default function formatUiTs(allComponent: any) {
                 return new Param({
                     name,
                     typeAnnotation,
+                    defaultExpression: createDefault(param),
+                    required,
                 });
             }),
         });
@@ -53,18 +86,25 @@ export default function formatUiTs(allComponent: any) {
     export class lRoot<T> extends VueComponent{
         constructor(
             options?: {
+              [propname: string]: any,
+              bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
         }){super()}
     }
     export class div<T> extends VueComponent {
         constructor(
             options?: {
+              [propname: string]: any,
+              bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
+              click?: (event) => Array<any>,
         }){super()}
     }
     export class template<T> extends VueComponent {
         constructor(
             options?: {
+              [propname: string]: any,
+              bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
         }){super()}
     }
@@ -74,12 +114,13 @@ export default function formatUiTs(allComponent: any) {
         const item = allComponent[i];
         const componentName = toHump(item.name);
         if (!componentName)
-            break;
+            continue;
         // console.log(item);
         value += `export class ${componentName}<T> extends VueComponent{\n
                 constructor(\n
                 options?: {\n
-                [propname: string]: any,\n`;
+                [propname: string]: any,
+                bindAttr?: () => Array<any>,\n`;
         // 生成slot
         if (Object.prototype.toString.call(item.slots) === '[object Array]') {
             let hasDefault = false;
@@ -107,7 +148,7 @@ export default function formatUiTs(allComponent: any) {
                         value += `}) => Array<any>,\n`;
                     } else {
                         value += indent(3);
-                        value += slotName + `?: ()=> Array<any>,\n`;
+                        value += slotName + `?: (scope: any)=> Array<any>,\n`;
                     }
                 }
             });
@@ -136,7 +177,7 @@ export default function formatUiTs(allComponent: any) {
                         logics.push(creatMethodLogic(method));
                     } else {
                         value += indent(1);
-                        value += methodName + `: () => void;\n`;
+                        value += methodName + `: () => any;\n`;
                         logics.push(creatMethodLogic({ name: methodName, params: [] }));
                     }
                 }
@@ -151,5 +192,6 @@ export default function formatUiTs(allComponent: any) {
     return {
         code: value,
         elementsLogic,
+        naslStdlibMap,
     };
 }