@lcap/nasl 2.18.0-beta.7 → 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,4 +1,4 @@
-import { App, Module, View } from '../concepts';
+import { App, Module, View, Frontend } from '../concepts';
 import * as utils from '../utils';
 import { genHash, RawOptions } from '.';
 import { compileComponent } from './compileComponent';
@@ -18,30 +18,32 @@ 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[] = [];
     app.dependencies && modules.push(...app.dependencies);
     app.interfaceDependencies && modules.push(...app.interfaceDependencies);
-    app.views && views.push(...app.views);
+    frontend.views && views.push(...frontend.views);
     modules.forEach((module: Module) => {
         module.views && views.push(...module.views);
     });
@@ -209,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,
@@ -223,15 +226,15 @@ export function genBundleFiles(app: App,
         miniEnable: config.miniEnable,
     }, null, 4);
 
-    const metaData = genMetaData(app);
+    const metaData = genMetaData(app, frontend);
     const metaDataStr = JSON5.stringify(metaData);
 
-    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');
@@ -242,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);
         }`;
     }
@@ -346,10 +349,14 @@ export function genBundleFiles(app: App,
          `;
         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]))});
@@ -380,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,
         },
     ];
@@ -397,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;
+}

package/src/generator/genMetaData.ts

@@ -1,7 +1,7 @@
 import {
     App, Module, View, Entity, Structure, Enum,
     uiStructures, collectionStructures, interfaceStructures, processStructures,
-    Logic, Interface, Process, BaseNode,
+    Logic, Interface, Process, BaseNode, Frontend,
 } from '../concepts';
 import * as utils from '../utils';
 
@@ -48,7 +48,7 @@ function genSortedTypeKey(typeAnnotation: any) {
     return typeKeyArr.join('');
 }
 
-export function genMetaData(app: App) {
+export function genMetaData(app: App, frontend: Frontend) {
     const modules: Module[] = [];
     const views: View[] = [];
     const entities: Entity[] = [];
@@ -58,7 +58,7 @@ export function genMetaData(app: App) {
     const interfaces: Interface[] = [];
     const processes: Process[] = [];
 
-    app.views && views.push(...app.views);
+    frontend.views && views.push(...frontend.views);
     if (Array.isArray(app.dataSources)) {
         app.dataSources.forEach((dataSource) => {
             if (Array.isArray(dataSource.entities)) {
@@ -93,7 +93,7 @@ export function genMetaData(app: App) {
     const dataTypesMap: {
         [id: string]: BaseNode;
     } = {};
-    const frontendVariables = app.frontendVariables;
+    const frontendVariables = frontend.variables;
     const enumsMap: {
         [name: string]: {
             [label: string]: string;
@@ -217,12 +217,7 @@ export function genMetaData(app: App) {
 
     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);
+        collectTypeAnnotation(node?.typeAnnotation || node?.__TypeAnnotation);
     }, {
         node: {
             children: views,

package/src/generator/genReleaseBody.ts

@@ -1,5 +1,6 @@
-import { App, Assignment, BatchAssignment, CallFunction, CallInterface, CallLogic, ForEachStatement, IfStatement, Logic, LogicItem, Match, MatchCase, Role, SwitchCase, SwitchStatement, View, ViewElement, WhileStatement } from '../concepts';
-import { genBundleFiles } from './genBundleFiles';
+import { App, Assignment, BatchAssignment, CallFunction, CallInterface, CallLogic, ForEachStatement, IfStatement, Logic, LogicItem, Match, MatchCase, Role, SwitchCase, SwitchStatement, View, ViewElement, WhileStatement, Frontend } from '../concepts';
+import { genFrontendBundleFiles } from './genBundleFiles';
+import { genPermissionData } from './permission';
 
 export async function genReleaseBody(app: App, {
     env,
@@ -8,6 +9,7 @@ export async function genReleaseBody(app: App, {
     realRelease,
     appInfo,
     staticUrl,
+    frontends = [],
 }: {
     env: string,
     replicas: number,
@@ -26,15 +28,37 @@ export async function genReleaseBody(app: App, {
         tenantLabel: string,
     },
     staticUrl?: string,
+    frontends: Array<Frontend>,
 }) {
+    let authReport: ReturnType<typeof getAuthReport>;
+    let logicPageResourceDtoList;
+    if (realRelease) {
+        authReport = getAuthReport(app, frontends);
+        const permissionData = await genPermissionData(app);
+        authReport.resourceDataList = authReport.resourceDataList.concat(permissionData.resourceDataList);
+        authReport.resourceList = authReport.resourceList.concat(permissionData.resourceList);
+
+        logicPageResourceDtoList = permissionData.logicPageResourceDtoList;
+    }
+
+    const releaseFrontends = app.frontends.map((frontend) => ({
+        name: frontend.name,
+        type: frontend.type,
+        path: frontend.path,
+        selected: frontends.includes(frontend),
+    }));
+
     const body = {
-        ...(realRelease ? getAuthReport(app) : undefined), // 如果发布需要上报权限，导出源码不需要
-        noAuthApiPathList: getAuthApiPathList(app),
-        reportIdList: findAllReportIdList(app),
+        ...authReport, // 如果发布需要上报权限，导出源码不需要
+        logicPageResourceDtoList,
+        noAuthApiPathList: getAuthApiPathList(app, frontends),
+        reportIdList: findAllReportIdList(app, frontends),
         appId: app.id,
         env,
         replicas,
+        callbackLogicsName: app.getExtensionsCallbackLogics(),
         generateMini,
+        frontends: releaseFrontends,
         files: [] as Array<{ name: string, content: string }>,
     };
     let NaslAnnotatedJSON;
@@ -45,7 +69,7 @@ export async function genReleaseBody(app: App, {
         throw new Error('代码标注失败');
     }
 
-    let files = genBundleFiles(app, Object.assign({}, appInfo, {
+    let files = genFrontendBundleFiles(app, frontends, Object.assign({}, appInfo, {
         env,
         appid: app.id,
         devDnsAddr: (app as any).devDnsAddr,
@@ -76,11 +100,11 @@ export async function genReleaseBody(app: App, {
 /**
  * 权限上报数据
  */
-function getAuthReport(app: App) {
+function getAuthReport(app: App, frontends: Array<Frontend>) {
     const result = {
         roleList: [] as Array<Role>,
         resourceList: [] as Array<string>,
-        resourceDataList: [] as Array<{ value: string, description: string }>,
+        resourceDataList: [] as Array<{ value: string, description: string, type: 'page' | 'component' | 'logic', clientType?: string }>,
         roleResourceMappingList: [] as Array<{ roleName: string, resourcePath: string }>,
     };
 
@@ -91,12 +115,12 @@ function getAuthReport(app: App) {
         return authDirective?.value;
     };
 
-    const loopViews = (view: View | ViewElement, isMain: boolean) => {
+    const loopViews = (view: View | ViewElement, isMain: boolean, frontend: Frontend) => {
         if (view.children) {
-            view.children.forEach((item) => loopViews(item, false));
+            view.children.forEach((item) => loopViews(item, false, frontend));
         }
         if (view.concept === 'View' && view.elements) {
-            view.elements.forEach((item) => loopViews(item, false));
+            view.elements.forEach((item) => loopViews(item, false, frontend));
         }
 
         if ((view.concept === 'View' && view.auth)
@@ -107,6 +131,8 @@ function getAuthReport(app: App) {
             result.resourceDataList.push({
                 value: view.authPath,
                 description: view.authDescription,
+                type: view.concept === 'View' ? 'page' : 'component',
+                clientType: frontend.name,
             });
             if (view.bindRoles) {
                 const _arr = view.bindRoles.map((it) => ({
@@ -118,7 +144,9 @@ function getAuthReport(app: App) {
             }
         }
     };
-    app.views.forEach((view) => loopViews(view, true));
+    frontends.forEach((frontend) => {
+        frontend.views.forEach((view) => loopViews(view, true, frontend));
+    });
 
     return result;
 }
@@ -127,8 +155,8 @@ function getAuthReport(app: App) {
 /**
  * 上报白名单
  */
-function getAuthApiPathList(app: App) {
-    const thisDiffLogicList: Array<string> = [];
+function getAuthApiPathList(app: App, frontends: Array<Frontend>) {
+    const thisDiffLogicList: Array<{logicName:string, frontendName: string}> = [];
 
     /* 转换Path */
     function getPathMethods(logicNameSpace: string) {
@@ -220,7 +248,7 @@ function getAuthApiPathList(app: App) {
         }
     }
     /* 获取LogicITEM */
-    function getStatement(state: LogicItem) {
+    function getStatement(state: LogicItem, frontend: Frontend) {
         let logicItems: Array<LogicItem> = [];
         if (state instanceof Assignment) {
             logicItems = [state.left, state.right];
@@ -231,18 +259,18 @@ function getAuthApiPathList(app: App) {
         } else if (state instanceof ForEachStatement) {
             logicItems = [...state.body, state.each, state.start, state.end];
         } else if (state instanceof Match) {
-            logicItems = state.cases.map(getStatement).flat(1);
+            logicItems = state.cases.map((case1) => getStatement(case1, frontend)).flat(1);
         } else if (state instanceof MatchCase) {
             logicItems = [...state.patterns as LogicItem[], ...state.body];
         } else if (state instanceof SwitchStatement) {
-            logicItems = state.cases.map(getStatement).flat(1);
+            logicItems = state.cases.map((case1) => getStatement(case1, frontend)).flat(1);
         } else if (state instanceof SwitchCase) {
             logicItems = [state.test, ...state.consequent];
         } else if (state instanceof WhileStatement) {
             logicItems = [state.test, ...state.body];
         } else if (state instanceof CallLogic) {
             logicItems = state.arguments?.map((item) => item.expression);
-            getLogic(state.calleewholeKey);
+            getLogic(state.calleewholeKey, frontend);
         } else if (state instanceof CallFunction) {
             logicItems = state.arguments?.map((item) => item.expression);
         } else if (state instanceof CallInterface) {
@@ -252,27 +280,27 @@ function getAuthApiPathList(app: App) {
         return logicItems.filter((item) => !!item);
     }
     /* 获取非鉴权全局逻辑 */
-    function getLogic(key: string) {
-        if (!thisDiffLogicList.includes(key)) {
-            thisDiffLogicList.push(key);
+    function getLogic(key: string, frontend: Frontend) {
+        if (!thisDiffLogicList.find((diffLogic) => diffLogic.logicName === key && diffLogic.frontendName === frontend.name)) {
+            thisDiffLogicList.push({ logicName: key, frontendName: frontend.name });
             const logic: Logic = app.findNodeByCompleteName(key);
             if (logic && logic.body && logic.body.length > 2) {
-                logic.body.map((item) => getStatement(item));
+                logic.body.map((item) => getStatement(item, frontend));
             }
         }
     }
 
     const importList: Array<string> = [];
-    const itemloop = (state: LogicItem, view: View | ViewElement) => {
-        const logicItems = getStatement(state);
+    const itemloop = (state: LogicItem, view: View | ViewElement, frontend: Frontend) => {
+        const logicItems = getStatement(state, frontend);
         if (logicItems.length) {
-            logicItems.map((item) => itemloop(item, view));
+            logicItems.map((item) => itemloop(item, view, frontend));
         }
     };
 
-    const loopEle = (view: View | ViewElement) => {
-        view?.children?.forEach(loopEle);
-        view.concept === 'View' && view?.elements?.forEach(loopEle);
+    const loopEle = (view: View | ViewElement, frontend: Frontend) => {
+        view?.children?.forEach((vitem) => loopEle(vitem, frontend));
+        view.concept === 'View' && view?.elements?.forEach((ele) => loopEle(ele, frontend));
         if (!view.parentAuth) {
             if (view.bindEvents) {
                 view.bindEvents.forEach((item) => {
@@ -280,7 +308,7 @@ function getAuthApiPathList(app: App) {
                         item.logics.forEach((logic) => {
                             if (logic.body.length > 2) {
                                 logic.body.forEach((it) => {
-                                    itemloop(it, view);
+                                    itemloop(it, view, frontend);
                                 });
                             }
                         });
@@ -295,14 +323,14 @@ function getAuthApiPathList(app: App) {
             }
         }
     };
-    const loopViews = (view: View, isChild: boolean) => {
+    const loopViews = (view: View, isChild: boolean, frontend:Frontend) => {
         // 有权限的页面下的逻辑都不需要上报白名单
         if (!view.auth) {
             if (view.logics) {
                 view.logics.forEach((logic) => {
                     if (logic.body.length > 2) {
                         logic.body.forEach((it) => {
-                            itemloop(it, view);
+                            itemloop(it, view, frontend);
                         });
                     }
                 });
@@ -313,7 +341,7 @@ function getAuthApiPathList(app: App) {
                         item.logics.forEach((logic) => {
                             if (logic.body.length > 2) {
                                 logic.body.forEach((it) => {
-                                    itemloop(it, view);
+                                    itemloop(it, view, frontend);
                                 });
                             }
                         });
@@ -321,27 +349,35 @@ function getAuthApiPathList(app: App) {
                 });
             }
 
-            view.children.forEach((item) => loopViews(item, true));
+            view.children.forEach((item) => loopViews(item, true, frontend));
         }
         if (!isChild) {
-            view.children.forEach(loopEle);
-            view.elements.forEach(loopEle);
+            view.children.forEach((vitem) => loopEle(vitem, frontend));
+            view.elements.forEach((vele) => loopEle(vele, frontend));
         }
     };
-    app.views.map((item) => loopViews(item, false));
+    frontends.forEach((frontend) => {
+        frontend.views.forEach((view) => loopViews(view, true, frontend));
+    });
 
-    const diffLogicList = thisDiffLogicList.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
-    const authApiList = [...diffLogicList.map(getPathMethods), ...Array.from(new Set(importList.map((item) => item + ':POST')))].filter((item) => !!item);
+    const diffLogicList = thisDiffLogicList.filter((item) => item.logicName.startsWith('app') || item.logicName.startsWith('extensions'));
+    const authApiList = [
+        ...diffLogicList.map((diffLogic) => {
+            const path = getPathMethods(diffLogic.logicName);
+            return `${path}:${diffLogic.frontendName}`;
+        }),
+        ...Array.from(new Set(importList.map((item) => item + ':POST'))),
+    ].filter((item) => !!item);
     return authApiList;
 }
 
 /**
  * 获取页面中所有 分析报告组件 的reportId
  */
-function findAllReportIdList(app: App) {
+function findAllReportIdList(app: App, frontends: Array<Frontend>) {
     const reportIds: string[] = [];
-    app?.views.forEach((view) => {
-        loop(view);
+    frontends.forEach((frontend) => {
+        frontend.views.forEach((view) => loop(view));
     });
 
     function loop(root: View | ViewElement) {

package/src/generator/index.ts

@@ -4,3 +4,4 @@ export * from './styleReplacer';
 export * from './genBundleFiles';
 export * from './genMetaData';
 export * from './genReleaseBody';
+export * from './permission';