@lcap/nasl 2.18.0-beta.5 → 2.18.0-beta.7

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 } 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>>;
@@ -41,42 +39,11 @@ export function genBundleFiles(app: App,
     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);
-
+    app.views && views.push(...app.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 +62,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 +160,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 +196,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,
@@ -364,61 +223,8 @@ 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);
-                });
-            }
-        }
-    }
-
-    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 metaData = genMetaData(app);
+    const metaDataStr = JSON5.stringify(metaData);
 
     const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL);
     const customNames = JSON5.stringify(assetsInfo.custom.names);
@@ -456,7 +262,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 +271,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,7 +333,16 @@ 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;
     }

package/src/generator/genMetaData.ts

@@ -1,58 +1,92 @@
-import { App, View, BaseNode, Module, Interface, Entity, Structure, Enum, uiStructures, collectionStructures, processStructures, Logic, Process, DataSource } from '../concepts';
-
-export function genMetaData(app: App,
-    config: {
-        tenant: string;
-        env: string;
-        nuimsDomain: string;
-        envNuimsDomain: Object;
-        STATIC_URL: string;
-        USER_STATIC_URL: string;
-        extendedConfig: string;
-        lowcodeDomain: string;
-    }) {
+import {
+    App, Module, View, Entity, Structure, Enum,
+    uiStructures, collectionStructures, interfaceStructures, processStructures,
+    Logic, Interface, Process, BaseNode,
+} from '../concepts';
+import * as utils from '../utils';
+
+// 生成typeKey
+function genSortedTypeKey(typeAnnotation: any) {
+    const {
+        typeKind, typeNamespace, typeName,
+        typeArguments, properties,
+    } = typeAnnotation || {};
+    const typeKeyArr = [];
+    if (typeKind === 'union') { // 联合类型
+        if (Array.isArray(typeArguments)) {
+            // 按返回的每个具体项排序
+            const childTypeArgs: any = typeArguments.map((typeArg) => genSortedTypeKey(typeArg)).sort((name1, name2) => name1 > name2 ? 1 : -1);
+            typeKeyArr.push(childTypeArgs.join(' | '));
+        }
+    } else if (typeKind === 'anonymousStructure') { // 匿名数据结构
+        typeKeyArr.push('{');
+        if (Array.isArray(properties)) {
+            // 按匿名数据结构的key排序
+            const childTypeArgs: any = properties.sort(({ name: name1 }, { name: name2 }) => name1 > name2 ? 1 : -1).map((typeArg) => {
+                const { name: typeArgName, typeAnnotation: typeArgTypeAnnotation } = typeArg || {};
+                return `${typeArgName}: ${genSortedTypeKey(typeArgTypeAnnotation)}`;
+            });
+            typeKeyArr.push(childTypeArgs.join(', '));
+        }
+        typeKeyArr.push('}');
+    } else {
+        const typeArr = [];
+        typeNamespace && typeArr.push(typeNamespace);
+        typeName && typeArr.push(typeName);
+        const typeKey = typeArr.join('.');
+        typeKey && typeKeyArr.push(typeKey);
+        if (typeKind === 'generic') {
+            typeKeyArr.push('<');
+            if (Array.isArray(typeArguments)) {
+                // 必须按typeArguments定义的顺序，否则实参位置不对
+                const childTypeArgs: any = typeArguments.map((typeArg) => genSortedTypeKey(typeArg));
+                typeKeyArr.push(childTypeArgs.join(', '));
+            }
+            typeKeyArr.push('>');
+        }
+    }
+    return typeKeyArr.join('');
+}
+
+export function genMetaData(app: App) {
     const modules: Module[] = [];
     const views: View[] = [];
-    const dataSources: DataSource[] = [];
+    const entities: Entity[] = [];
     const structures: Structure[] = [];
     const enums: Enum[] = [];
     const logics: Logic[] = [];
     const interfaces: Interface[] = [];
     const processes: Process[] = [];
 
-    const {
-        dataSources: appDataSources = [],
-        structures: appStructures = [],
-        enums: appEnums = [],
-        logics: appLogics = [],
-        interfaceDependencies: appInterfaceDependencies = [],
-        dependencies: appDependencies = [],
-        processes: appProcesses = [],
-    } = app || {};
-    dataSources.push(...appDataSources);
-    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);
+    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);
+
     modules.forEach((module: Module) => {
-        const {
-            views: moduleViews = [],
-            structures: moduleStructures = [],
-            enums: moduleEnums = [],
-            logics: moduleLogics = [],
-            interfaces: moduleInterfaces = [],
-        } = module;
-        views.push(...moduleViews);
-        structures.push(...moduleStructures);
-        enums.push(...moduleEnums);
-        logics.push(...moduleLogics);
-        interfaces.push(...moduleInterfaces);
+        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 dataTypes: (Entity | Structure | Enum)[] = [];
 
@@ -80,6 +114,7 @@ export function genMetaData(app: App,
         [id: string]: any;
     } = {};
     const allLogics: Logic[] = [];
+
     if (Array.isArray(enums)) {
         dataTypes.push(...enums);
         enums.forEach((node) => {
@@ -96,17 +131,17 @@ export function genMetaData(app: App,
             enumsMap[name] = enumObj;
         });
     }
-    if (Array.isArray(dataSources)) {
-        dataSources.forEach((dataSource) => {
-            dataSource.entities.forEach((entity) => {
-                dataTypes.push(entity);
-                const ns = entity.ns;
-                if (Array.isArray(ns?.logics)) {
-                    allLogics.push(...ns.logics);
-                }
-            });
+
+    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);
     }
@@ -114,31 +149,47 @@ export function genMetaData(app: App,
     dataTypes.forEach((node) => {
         const namespace = node.getNamespace();
         const id = `${namespace}.${node.name}`;
-        dataTypesMap[id] = node;
+        dataTypesMap[id] = node.toJSON?.();
+        const { properties } = (node) as any;
+        if (Array.isArray(properties)) {
+            properties.forEach((property) => {
+                collectTypeAnnotation(property?.typeAnnotation);
+            });
+        }
     });
-    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(processStructures)) {
-        const namespace = 'nasl.process';
-        processStructures.forEach((node) => {
-            const id = `${namespace}.${node.name}`;
-            dataTypesMap[id] = node;
-        });
-    }
+    [
+        {
+            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?.();
+                const { properties } = (node) as any;
+                if (Array.isArray(properties)) {
+                    properties.forEach((property) => {
+                        collectTypeAnnotation(property?.typeAnnotation);
+                    });
+                }
+            });
+        }
+    });
 
     if (Array.isArray(logics)) {
         allLogics.push(...logics);
@@ -164,6 +215,60 @@ export function genMetaData(app: App,
         _custom[`${interfaceItem.getNamespace()}.${interfaceItem.name}`] = interfaceItem.toService();
     });
 
+    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',
+        ]),
+    });
+
+    if (Array.isArray(frontendVariables)) {
+        frontendVariables.forEach((frontendVariable) => {
+            const typeAnnotation = frontendVariable.typeAnnotation || frontendVariable.__TypeAnnotation;
+            collectTypeAnnotation(typeAnnotation);
+        });
+    }
+
+    function collectTypeAnnotation(typeAnnotation: any) {
+        if (typeAnnotation) {
+            const sortedTypeKey = genSortedTypeKey(typeAnnotation);
+            if (!dataTypesMap[sortedTypeKey]) {
+                dataTypesMap[sortedTypeKey] = typeAnnotation?.toJSON?.() ?? typeAnnotation;
+                const { properties, typeArguments } = (dataTypesMap[sortedTypeKey] || {}) as any;
+                if (Array.isArray(properties)) {
+                    properties.forEach((property) => {
+                        collectTypeAnnotation(property?.typeAnnotation);
+                    });
+                }
+                if (Array.isArray(typeArguments)) {
+                    typeArguments.forEach((typeArg) => {
+                        collectTypeAnnotation(typeArg);
+                    });
+                }
+            }
+        }
+    }
+
     return {
         frontendVariables,
         dataTypesMap,

package/src/generator/genReleaseBody.ts

@@ -37,8 +37,13 @@ export async function genReleaseBody(app: App, {
         generateMini,
         files: [] as Array<{ name: string, content: string }>,
     };
-
-    const NaslAnnotatedJSON = await (app as any).naslServer.getNaslAnnotatedJSON(app, true);
+    let NaslAnnotatedJSON;
+    try {
+        NaslAnnotatedJSON = await (app as any).naslServer.getNaslAnnotatedJSON(app, true);
+    } catch (err) {
+        console.error(err);
+        throw new Error('代码标注失败');
+    }
 
     let files = genBundleFiles(app, Object.assign({}, appInfo, {
         env,
@@ -59,7 +64,9 @@ export async function genReleaseBody(app: App, {
     const jsonString = JSON.stringify(NaslAnnotatedJSON);
 
     // 打印传给服务端的nasl,为了服务端排查问题方便
-    console.log(NaslAnnotatedJSON, '标注后的nasl');
+    if (globalThis.window) {
+        console.log(NaslAnnotatedJSON, '标注后的nasl');
+    }
     files.push({ name: 'nasl-annotated.json', content: jsonString });
 
     body.files = files;