@lcap/nasl 2.18.0 → 2.20.0-beta.1

package/src/concepts/index__.ts

@@ -1,6 +1,7 @@
 export * from './App__';
 export * from './Module__';
 export * from './Namespace__';
+export * from './Frontend__';
 export * from './TypeAnnotation__';
 export * from './TypeParam__';
 export * from './Structure__';
@@ -65,6 +66,10 @@ export * from './Match__';
 export * from './UnaryExpression__';
 export * from './MemberExpression__';
 export * from './Unparsed__';
+export * from './New__';
+export * from './NewComposite__';
+export * from './NewList__';
+export * from './NewMap__';
 export * from './CallQueryComponent__';
 export * from './QueryFromExpression__';
 export * from './QueryJoinExpression__';
@@ -81,6 +86,7 @@ export * from './ProcessElement__';
 export * from './ProcessComponent__';
 export * from './ProcessOutcome__';
 export * from './Assignee__';
+export * from './ProcessOutcomes__';
 export * from './Role__';
 export * from './Configuration__';
 export * from './ConfigGroup__';
@@ -92,3 +98,4 @@ export * from './Point__';
 export * from './Rect__';
 export * from './SelectMembers__';
 export * from './AssignmentLine__';
+export * from './NewList__';

package/src/enums/KEYWORDS.ts

@@ -1225,4 +1225,13 @@ export const USER_CUSTOM_KEYWORDS_PAGENAME = [
     'getCustomConfig',
     'getCurrentIp',
     'config',
+    'tenantExpiration',
+];
+
+export const FRONTEND_PATH_KEYWORDS = [
+    'api',
+    'rest',
+    'system',
+    'getCustomConfig',
+    'proxy',
 ];

package/src/generator/genBundleFiles.ts

@@ -1,8 +1,4 @@
-import {
-    App, Module, View, Entity, Structure, Enum,
-    uiStructures, collectionStructures, interfaceStructures, processStructures,
-    Logic, Interface, Process,
-} from '../concepts';
+import { App, Module, View, Frontend } from '../concepts';
 import * as utils from '../utils';
 import { genHash, RawOptions } from '.';
 import { compileComponent } from './compileComponent';
@@ -13,6 +9,8 @@ import parserBabel = require('prettier/parser-babel');
 
 import * as UglifyJS from 'uglify-js-export';
 
+import { genMetaData } from './genMetaData';
+
 export interface Route {
     path?: string;
     component?: RawOptions; // ExtendedVue<Vue, unknown, unknown, unknown, Record<never, any>>;
@@ -20,63 +18,34 @@ export interface Route {
     redirect?: string;
 }
 
-export function genBundleFiles(app: App,
-    config: {
-        tenant: string;
-        env: string;
-        nuimsDomain: string;
-        STATIC_URL: string;
-        USER_STATIC_URL: string;
-        extendedConfig: string;
-        lowcodeDomain: string;
-        envLcpDomain: any,
-        envNuimsDomain: any,
-        tenantType: any,
-        tenantLevel: any,
-        appid: string;
-        devDnsAddr: string;
-        miniEnable: boolean
-    }) {
+interface Config {
+    tenant: string;
+    env: string;
+    nuimsDomain: string;
+    STATIC_URL: string;
+    USER_STATIC_URL: string;
+    extendedConfig: string;
+    lowcodeDomain: string;
+    envLcpDomain: any,
+    envNuimsDomain: any,
+    tenantType: any,
+    tenantLevel: any,
+    appid: string;
+    devDnsAddr: string;
+    miniEnable: boolean
+}
+
+export function genBundleFiles(app: App, frontend: Frontend,
+    config: Config) {
     const fnNuimsDomain = config?.envNuimsDomain?.[config?.env] || config?.nuimsDomain;
     const fnLowcodeDomain = config?.envLcpDomain?.[config?.env]?.lcpDomain || config?.lowcodeDomain;
     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);
-    if (Array.isArray(app.dataSources)) {
-        app.dataSources.forEach((dataSource) => {
-            if (Array.isArray(dataSource.entities)) {
-                entities.push(...dataSource.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);
-
+    frontend.views && views.push(...frontend.views);
     modules.forEach((module: Module) => {
         module.views && views.push(...module.views);
-        module.structures && structures.push(...module.structures);
-        module.enums && enums.push(...module.enums);
-        module.logics && logics.push(...module.logics);
-        module.interfaces && interfaces.push(...module.interfaces);
-        if (Array.isArray(module.dataSources)) {
-            module.dataSources.forEach((dataSource) => {
-                if (Array.isArray(dataSource.entities)) {
-                    entities.push(...dataSource.entities);
-                }
-            });
-        }
     });
 
     const componentMap: {
@@ -95,31 +64,6 @@ export function genBundleFiles(app: App,
      * vue.config.js page options
      */
     const routes: Route[] = [];
-    const dataTypes: (Entity | Structure | Enum)[] = [];
-    const dataTypesMap: {
-        [id: string]: Object;
-    } = {};
-    const frontendVariables = app.frontendVariables;
-    const enumsMap: {
-        [name: string]: {
-            [label: string]: string;
-        };
-    } = {};
-    const logicsMap: {
-        [id: string]: {
-            config: {
-                serviceType: string;
-            };
-            url: {
-                method: string;
-                path: string;
-            };
-        };
-    } = {};
-    const _custom: {
-        [id: string]: any;
-    } = {};
-    const allLogics: Logic[] = [];
     // 开启了权限的页面
     const authResourceViews: View[] = [];
     const baseResourcePaths: string[] = [];
@@ -218,10 +162,14 @@ export function genBundleFiles(app: App,
         let content = `{
             path: '${route.path}',\n`;
         if (route?.component?.script) {
+            let template = route.component.template;
+            if (config.env !== 'dev') {
+                template = template.replace(/[\t\r\n]/g, '');
+            }
             content += `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)}\`,
+                    template: \`${template.replace(/[`$]/g, (m) => '\\' + m)}\`,
                 });
                 return componentOptions;
             })(),\n`;
@@ -250,93 +198,6 @@ export function genBundleFiles(app: App,
     }
     routesStr += ']';
 
-    if (Array.isArray(enums)) {
-        dataTypes.push(...enums);
-        enums.forEach((node) => {
-            let { name, enumItems } = node || {};
-            if (node.module) {
-                name = `extensions.${node.module.name}.enums.${name}`;
-            }
-            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.toJSON?.();
-    });
-
-    [
-        {
-            namespace: 'nasl.ui',
-            list: uiStructures,
-        },
-        {
-            namespace: 'nasl.collection',
-            list: collectionStructures,
-        },
-        {
-            namespace: 'nasl.interface',
-            list: interfaceStructures,
-        },
-        {
-            namespace: 'nasl.process',
-            list: processStructures,
-        },
-    ].forEach((item) => {
-        const { namespace, list } = item || {};
-        if (Array.isArray(list)) {
-            list.forEach((node) => {
-                const id = `${namespace}.${node.name}`;
-                dataTypesMap[id] = node.toJSON?.();
-            });
-        }
-    });
-
-    if (Array.isArray(logics)) {
-        allLogics.push(...logics);
-    }
-
-    allLogics.forEach((node) => {
-        const namespace = node.getNamespace();
-        const id = namespace ? `${namespace}.${node.name}` : node.name;
-        logicsMap[id] = node.toService();
-    });
-
-    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 platformConfig = JSON5.stringify({
         appConfig: {
             project: app.name,
@@ -350,8 +211,9 @@ export function genBundleFiles(app: App,
                 lowcodeDomain: fnLowcodeDomain,
             },
             tenant: config.tenant,
-            documentTitle: app.documentTitle,
+            documentTitle: frontend.documentTitle,
             rootViewData,
+            basePath: frontend.basePath,
         },
         dnsAddr: app.dnsAddr,
         devDnsAddr: config.devDnsAddr,
@@ -364,68 +226,15 @@ export function genBundleFiles(app: App,
         miniEnable: config.miniEnable,
     }, null, 4);
 
-    function collectTypeAnnotation(typeAnnotation: any) {
-        if (typeAnnotation) {
-            const { sortedTypeKey, properties, typeArguments } = typeAnnotation || {};
-            if (!dataTypesMap[sortedTypeKey]) {
-                dataTypesMap[sortedTypeKey] = typeAnnotation?.toJSON?.();
-            }
-            if (Array.isArray(properties)) {
-                properties.forEach((property) => {
-                    collectTypeAnnotation(property?.typeAnnotation);
-                });
-            }
-            if (Array.isArray(typeArguments)) {
-                typeArguments.forEach((typeArg) => {
-                    collectTypeAnnotation(typeArg);
-                });
-            }
-        }
-    }
+    const metaData = genMetaData(app, frontend);
+    const metaDataStr = JSON5.stringify(metaData);
 
-    utils.traverse((current) => {
-        const { node } = current || {};
-        const { concept } = node || {};
-        let typeAnnotation;
-        if (['Param', 'Variable', 'Return', 'CallFunction', 'CallInterface', 'CallLogic'].includes(concept)) {
-            typeAnnotation = node.typeAnnotation || node.__TypeAnnotation;
-        }
-        collectTypeAnnotation(typeAnnotation);
-    }, {
-        node: {
-            children: views,
-        } as any,
-    }, {
-        mode: 'anyObject',
-        excludedKeySet: new Set([
-            'parentNode',
-            'sourceMap',
-            'storageJSON',
-            'tsErrorDetail',
-            'NaslAnnotatedJSON',
-            'calledFrom',
-            '_events',
-            '_collectingList',
-            '_historyList',
-        ]),
-    });
-
-    const metaData = JSON5.stringify({
-        frontendVariables,
-        dataTypesMap,
-        enumsMap,
-        logicsMap,
-        servicesMap: {
-            _custom,
-        },
-    });
-
-    const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL);
+    const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL, frontend.type);
     const customNames = JSON5.stringify(assetsInfo.custom.names);
     let content = `(function(){
         `;
 
-    const themeCSS = app.genThemeCSS();
+    const themeCSS = frontend.genThemeCSS();
     if (themeCSS) {
         content += `{
                             const el = document.createElement('style');
@@ -436,11 +245,11 @@ export function genBundleFiles(app: App,
         `;
     }
 
-    if (app.documentIcon) {
+    if (frontend.documentIcon) {
         content += `{
             const link = document.createElement('link');
             link.rel = 'shortcut icon';
-            link.href = \`${app.documentIcon}\`;
+            link.href = \`${frontend.documentIcon}\`;
             document.head.appendChild(link);
         }`;
     }
@@ -456,7 +265,7 @@ export function genBundleFiles(app: App,
 
     content += `
         var platformConfig = ${platformConfig};
-        var metaData = ${metaData};
+        var metaData = ${metaDataStr};
         var routes = ${routesStr};
 
         window.createLcapApp = () => window.appVM = window.cloudAdminDesigner.init(platformConfig.appConfig, platformConfig, routes, metaData);
@@ -465,19 +274,19 @@ export function genBundleFiles(app: App,
 
     if (config.env === 'dev') {
         // 加载资源js
-        const domain = fnLowcodeDomain.slice(fnLowcodeDomain.indexOf('.') + 1);
-        const targetUrl = `${typeof location !== 'undefined' ? location.origin : `http://${config.tenant}.${fnLowcodeDomain}`}/empty?url=${domain}&appid=${config.appid}`;
+        // const domain = fnLowcodeDomain.slice(fnLowcodeDomain.indexOf('.') + 1);
+        // const targetUrl = `${typeof location !== 'undefined' ? location.origin : `http://${config.tenant}.${fnLowcodeDomain}`}/empty?url=${domain}&appid=${config.appid}`;
+        // 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}'
         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>"
@@ -527,14 +336,27 @@ export function genBundleFiles(app: App,
                }
            }\`
             document.getElementsByTagName('body')[0].appendChild(style);
-        }
+            window.addEventListener('message', function (e) {
+                console.log('message:',e)
+                if(e.data ==="release-start"){
+                    showLoading()
+                }
+                if(e.data==="release-end"){
+                    hideLoading()
+                    window.location.reload();
+                }
+            })
          `;
         content += str;
     }
-
-    const bundlePath = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/bundle.${genHash(content)}.js`;
+    const baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
+    let bundlePath = `${baseUrl}/bundle.${genHash(content)}.js`;
+    let bundleMinPath = `${baseUrl}/bundle.${genHash(content)}.min.js`;
+    if (frontend.basePath) {
+        bundlePath = `${baseUrl}${frontend.basePath}/bundle.${genHash(content)}.js`;
+        bundleMinPath = `${baseUrl}${frontend.basePath}/bundle.${genHash(content)}.min.js`;
+    }
     const bundleSourceMapPath = `${bundlePath}.map`;
-    const bundleMinPath = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/bundle.${genHash(content)}.min.js`;
     const otherJsList = config.miniEnable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
     const assetsContent = `(function() {
     LazyLoad.js(${JSON5.stringify(assetsInfo.basic.js.concat(assetsInfo.custom.js, otherJsList).concat([bundleMinPath]))});
@@ -565,7 +387,7 @@ export function genBundleFiles(app: App,
             content: minifyObj.code,
         },
         {
-            name: `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/client.js`,
+            name: frontend.basePath ? `${baseUrl}${frontend.basePath}/client.js` : `${baseUrl}/client.js`,
             content: assetsContent,
         },
     ];
@@ -582,3 +404,10 @@ export function genBundleFiles(app: App,
     }
     return outputs;
 }
+
+export function genFrontendBundleFiles(app: App, frontends: Array<Frontend>,
+    config: Config) {
+    let outputs:any = [];
+    outputs = outputs.concat(...frontends.map((frontend) => genBundleFiles(app, frontend, config)));
+    return outputs;
+}