@lcap/nasl 3.4.0-alpha.1 → 3.4.0-alpha.2

package/src/generator/genReleaseBody.ts

@@ -1,32 +1,13 @@
 import {
   App,
-  Assignment,
-  BatchAssignment,
-  CallFunction,
-  CallInterface,
-  CallLogic,
-  ForEachStatement,
-  IfStatement,
-  Logic,
-  LogicItem,
-  Match,
-  MatchCase,
-  MemberExpression,
   Role,
-  SwitchCase,
-  SwitchStatement,
   View,
   ViewElement,
-  WhileStatement,
-  StringInterpolation,
   Frontend,
-  ExternalDestination,
-  NewComposite,
-  SelectMembers,
-  NewList,
 } from '../concepts';
 import { genFrontendBundleFiles } from './genBundleFiles';
 import { genPermissionData, genLogicAuthFlag } from './permission';
+
 import * as utils from '../utils';
 
 interface ServerValidationData {
@@ -35,11 +16,6 @@ interface ServerValidationData {
   uuid: string;
 }
 
-interface FileData {
-  name: string;
-  content: string;
-}
-
 interface ReleaseData {
   env: string;
   debug: boolean;
@@ -61,154 +37,178 @@ interface ReleaseData {
   frontends: Array<Frontend>;
   validations: InputServerValidationData;
   logPublishFunc: Function;
+  appSpecification?: number;
 }
 
 type InputServerValidationData = { [key in string]: ServerValidationData[] };
 
-function getValidationMap(serverData: InputServerValidationData) {
-  const map = new Map<string, ServerValidationData>();
+async function mergeBodyData(app: App, opt: ReleaseData) {
+  await utils.delay(500);
+  utils.timeline.time('组装初始 Body 数据');
 
-  Object.values(serverData).forEach((logic) => {
-    logic.forEach((item) => {
-      map.set(item.uuid, item);
-    });
-  });
-
-  return map;
-}
+  const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, opt.frontends);
+  opt.logPublishFunc?.(`[权限] "[${app.title}]" 分析权限数据成功！`);
+  const logicPageResourceDtoList = await genPermissionData(app);
+  const releaseFrontends = app.frontends.map((frontend) => ({
+    name: frontend.name,
+    type: frontend.type,
+    path: frontend.path,
+    selected: opt.frontends.includes(frontend),
+    title: frontend.title,
+  }));
+  const body = {
+    ...authReport, // 如果发布需要上报权限，导出源码不需要
+    logicPageResourceDtoList,
+    logicAuthFlag: genLogicAuthFlag(app),
+    reportIdList: findAllReportIdList(app, opt.frontends),
+    appId: app.id,
+    env: opt.env,
+    replicas: opt.replicas,
+    appSpecification: opt.appSpecification,
+    callbackLogicsName: app.getExtensionsCallbackLogics(),
+    frontends: releaseFrontends,
+    callLogicValidations: {},
+    files: [] as Array<{ name: string; content: string }>,
+  };
 
-function clearValidationMap(serverData: InputServerValidationData) {
-  Object.values(serverData).forEach((logic) => {
-    logic.forEach((item) => {
-      item.rules = [];
-      item.failureRules = [];
-    });
-  });
+  if (logicPageResourceDtoList) {
+    Object.assign(body, { logicPageResourceDtoList });
+  }
 
-  return serverData;
+  utils.timeline.timeEnd('组装初始 Body 数据');
+  return body;
 }
 
-function mergeValidation(serverData: InputServerValidationData, nasl: App) {
-  const map = getValidationMap(serverData);
+async function getCalllogicData(app: App, releaseData: ReleaseData) {
+  function getValidationMap(serverData: InputServerValidationData) {
+      const map = new Map<string, ServerValidationData>();
+      Object.values(serverData).forEach((logic) => {
+        logic.forEach((item) => {
+            map.set(item.uuid, item);
+        });
+    });
+    return map;
+  }
 
-  if (map.size === 0) {
-    return {};
+  function clearValidationMap(serverData: InputServerValidationData) {
+    Object.values(serverData).forEach((logic) => {
+        logic.forEach((item) => {
+            item.rules = [];
+            item.failureRules = [];
+        });
+    });
+    return serverData;
   }
 
-  nasl.traverseChildren((node) => {
-    if (node.concept === 'CallLogic' && 'uuid' in node && node.validation && map.has(node.uuid)) {
-      const data = map.get(node.uuid);
-      const naslRules = node.validation.rules.map((rule) => rule.toJSON());
-      data.rules = [...naslRules, ...data.rules];
-    }
-  });
+  function mergeValidation(serverData: InputServerValidationData, nasl: App) {
+    const map = getValidationMap(serverData);
 
-  return serverData;
-}
+    if (map.size === 0) {
+      return {};
+    }
 
-/**
- * 移除密码的验证规则
- * @description 之后可能移除
- */
-function removePasswordValidation(serverData: InputServerValidationData, nasl: App) {
-  const validationMap = getValidationMap(serverData);
+    nasl.traverseChildren((node) => {
+      if (
+          node.concept === 'CallLogic' &&
+          'uuid' in node &&
+          node.validation &&
+          map.has(node.uuid)
+      ) {
+          const data = map.get(node.uuid)!;
+          const naslRules = node.validation.rules.map((rule) => rule.toJSON());
+          data.rules = [...naslRules, ...data.rules];
+      }
+    });
 
-  if (validationMap.size === 0) {
-    return {};
+    return serverData;
   }
 
-  const passwordCallLogicUuid = new Set<string>();
-  const removeRuleNames = [
-    'rangeLength',
-    'pattern',
-    '^az',
-    '^az09',
-    '^az09_',
-    '^azAZ',
-    '^azAZ09',
-    '^azAZ09_',
-    'az09$',
-    'azAZ09$',
-    '^09$',
-    '^az09$',
-    '^az09-$',
-    '^az09-.$',
-    '^azAZ09$',
-    '^azAZ09-$',
-    '^azAZ09_$',
-    '^azAZ09-_$',
-  ];
-
-  // 获取所有调用加密函数的调用节点 uuid
-  nasl.traverseChildren((node) => {
-    if (node.concept !== 'CallLogic' || !('uuid' in node)) {
-      return;
+  /**
+   * 移除密码的验证规则
+   * @description 之后可能移除
+   */
+  function removePasswordValidation(serverData: InputServerValidationData, nasl: App) {
+    const validationMap = getValidationMap(serverData);
+
+    if (validationMap.size === 0) {
+      return {};
     }
 
-    const calledLogicPath = `${node.calleeNamespace}.${node.calleeName}`;
+    const passwordCallLogicUuid = new Set<string>();
+    const removeRuleNames = [
+        "rangeLength",
+        "pattern",
+        "^az",
+        "^az09",
+        "^az09_",
+        "^azAZ",
+        "^azAZ09",
+        "^azAZ09_",
+        "az09$",
+        "azAZ09$",
+        "^09$",
+        "^az09$",
+        "^az09-$",
+        "^az09-.$",
+        "^azAZ09$",
+        "^azAZ09-$",
+        "^azAZ09_$",
+        "^azAZ09-_$",
+    ];
+
+    // 获取所有调用加密函数的调用节点 uuid
+    nasl.traverseChildren((node) => {
+      if (node.concept !== 'CallLogic' || !('uuid' in node)) {
+        return;
+      }
+      const calledLogicPath = `${node.calleeNamespace}.${node.calleeName}`;
+
+      if (
+        Boolean(node.uuid) &&
+        (
+          calledLogicPath === 'app.dataSources.defaultDS.entities.LCAPUser.logics.update' ||
+          calledLogicPath === 'app.dataSources.defaultDS.entities.LCAPUser.logics.create' ||
+          calledLogicPath.includes('encrypt')
+        )
+      ) {
+        passwordCallLogicUuid.add(node.uuid);
+      }
+    });
 
-    if (
-      Boolean(node.uuid) &&
-      (calledLogicPath === 'app.dataSources.defaultDS.entities.LCAPUser.logics.update' ||
-        calledLogicPath === 'app.dataSources.defaultDS.entities.LCAPUser.logics.create' ||
-        calledLogicPath.includes('encrypt'))
-    ) {
-      passwordCallLogicUuid.add(node.uuid);
+    if (passwordCallLogicUuid.size === 0) {
+      return serverData;
     }
-  });
-
-  if (passwordCallLogicUuid.size === 0) {
-    return serverData;
-  }
 
-  passwordCallLogicUuid.forEach((uuid) => {
-    const validation = validationMap.get(uuid);
+    passwordCallLogicUuid.forEach((uuid) => {
+      const validation = validationMap.get(uuid);
 
-    if (!validation) {
-      return;
-    }
+      if (!validation) {
+        return;
+      }
 
-    for (let i = 0; i < validation.rules.length; i++) {
-      const current = validation.rules[i];
+      for (let i = 0; i < validation.rules.length; i++) {
+        const current = validation.rules[i];
 
-      if (removeRuleNames.includes((current as any).calleeName)) {
-        validation.rules.splice(i, 1);
-        i--;
+        if (removeRuleNames.includes((current as any).calleeName)) {
+          validation.rules.splice(i, 1);
+          i--;
+        }
       }
-    }
-  });
+    });
 
-  return serverData;
-}
+    return serverData;
+  }
+
+  await utils.delay(500);
 
-export async function genReleaseBody(app: App, releaseData: ReleaseData) {
   const {
-    env,
-    debug,
-    replicas,
-    realRelease,
-    appInfo,
-    staticUrl,
-    frontends = [],
     validations = {},
-    logPublishFunc = (): void => undefined,
   } = releaseData;
   const {
-    preferenceMap: { serverValidationRules },
+      preferenceMap: {
+          serverValidationRules,
+      },
   } = app;
-
-  const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, frontends);
-  logPublishFunc(`[权限] "[${app.title}]" 分析权限数据成功！`);
-  const logicPageResourceDtoList = await genPermissionData(app);
-
-  const releaseFrontends = app.frontends.map((frontend) => ({
-    name: frontend.name,
-    type: frontend.type,
-    path: frontend.path,
-    selected: frontends.includes(frontend),
-    title: frontend.title,
-  }));
-
   const serverValidationRulesBySwitch =
     serverValidationRules === 'custom'
       ? // 自定义
@@ -218,69 +218,85 @@ export async function genReleaseBody(app: App, releaseData: ReleaseData) {
         validations
       : // 关闭
         clearValidationMap(validations);
-  const removedPasswordValidation = removePasswordValidation(serverValidationRulesBySwitch, app);
-  const body = {
-    ...authReport, // 如果发布需要上报权限，导出源码不需要
-    logicPageResourceDtoList,
-    logicAuthFlag: genLogicAuthFlag(app),
-    reportIdList: findAllReportIdList(app, frontends),
-    appId: app.id,
-    env,
-    replicas,
-    callbackLogicsName: app.getExtensionsCallbackLogics(),
-    frontends: releaseFrontends,
-    callLogicValidations: removedPasswordValidation,
-    files: [] as Array<{ name: string; content: string }>,
-  };
 
-  if (logicPageResourceDtoList) {
-    Object.assign(body, { logicPageResourceDtoList });
-  }
+  return removePasswordValidation(serverValidationRulesBySwitch, app);
+}
 
-  let NaslAnnotatedJSON;
+async function getNaslAnnotatedJSON(app: App, opt: ReleaseData) {
+  await utils.delay(500);
+
+  utils.timeline.time('获取全量标注');
+
+  let NaslAnnotatedJSON: any;
   try {
     NaslAnnotatedJSON = await (app as any).naslServer.getNaslAnnotatedJSON(app, true);
-    logPublishFunc(`[语言] "[${app.title}]" 获取类型标注成功！`);
+    opt.logPublishFunc?.(`[语言] "[${app.title}]" 获取类型标注成功！`);
+
+    // 打印传给服务端的 nasl,为了服务端排查问题方便
+    if (globalThis.window) {
+      console.info(NaslAnnotatedJSON, '标注后的nasl');
+    }
   } catch (err) {
     console.error(err);
-    throw new Error(`代码标注失败，原因是：${err.message}，请稍后重试！或刷新后重试！`);
+    throw new Error('代码标注失败，请稍后重试！或刷新后重试！');
+  }
+  // 如果是发布，就排除 views，导出源码就不排除
+  if (opt.realRelease) {
+    NaslAnnotatedJSON.frontends.forEach((frontend: Frontend) => {
+      delete (frontend as any).views;
+    });
   }
 
-  // 可能所有的前端都不选
-  let files: FileData[] = [];
-  if (frontends && frontends.length) {
-    logPublishFunc(`[代码] "[${app.title}]" 生成页面代码：开始`);
-    files = genFrontendBundleFiles(app, frontends, {
-      ...appInfo,
-      env,
-      debug,
+  utils.timeline.timeEnd('获取全量标注');
+
+  return {
+    name: 'nasl-annotated.json',
+    content: JSON.stringify(NaslAnnotatedJSON),
+  };
+}
+
+async function getFrontendBundleFiles(app: App, opt: ReleaseData) {
+  await utils.delay(500);
+
+  utils.timeline.time('生成页面代码');
+
+  let files: utils.GetPromise<ReturnType<typeof genFrontendBundleFiles>> = [];
+
+  if (opt.frontends && opt.frontends.length) {
+    opt.logPublishFunc?.(`[代码] "[${app.title}]" appApi.staticResourceSync生成页面代码：开始`);
+    files = await genFrontendBundleFiles(app, opt.frontends, {
+      ...opt.appInfo,
+      env: opt.env,
+      debug: opt.debug,
       appid: app.id,
       devDnsAddr: (app as any).devDnsAddr,
       miniEnable: (app as any).miniEnable,
     } as any);
+
     if (files && files.length === 0) {
       throw new Error('前端代码生成失败');
     }
 
-    if (staticUrl) files = replaceAssetUrl(files, appInfo.USER_STATIC_URL, staticUrl);
-    logPublishFunc(`[代码] "[${app.title}]" 生成页面代码：完成！`);
-  }
+    if (opt.staticUrl) {
+      files = replaceAssetUrl(files, opt.appInfo.USER_STATIC_URL, opt.staticUrl);
+    }
 
-  // 如果是发布，就排除views，导出源码就不排除
-  if (realRelease) {
-    NaslAnnotatedJSON.frontends.forEach((frontend: Frontend) => {
-      delete frontend.views;
-    });
+    opt.logPublishFunc?.(`[代码] "[${app.title}]" 生成页面代码：完成！`);
   }
-  const jsonString = JSON.stringify(NaslAnnotatedJSON);
 
-  // 打印传给服务端的nasl,为了服务端排查问题方便
-  if (globalThis.window) {
-    console.info(NaslAnnotatedJSON, '标注后的nasl');
-  }
+  utils.timeline.timeEnd('生成页面代码');
+  return files;
+}
+
+export async function genReleaseBody(app: App, opt: ReleaseData) {
+  const body = await mergeBodyData(app, opt);
+  const callLogicValidations = await getCalllogicData(app, opt);
+  const annotationFile = await getNaslAnnotatedJSON(app, opt);
+  const files = await getFrontendBundleFiles(app, opt);
 
-  files.push({ name: 'nasl-annotated.json', content: jsonString });
+  files.push(annotationFile);
   body.files = files;
+  body.callLogicValidations = callLogicValidations;
 
   return body;
 }

package/src/natural/genNaturalTS.ts

@@ -5,7 +5,7 @@ import naslStdlibMap from './naslStdlibMap';
 
 export function genNaturalTS(app: App, currentNode?: BaseNode) {
   const logic = currentNode as Logic;
-  const code = logic.toNaturalTS(undefined);
+  const code = logic?.toNaturalTS(undefined);
   return code;
 }
 
@@ -17,33 +17,33 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
   code += `${Object.values(naslStdlibMap).join('\n')}\n`;
   /* 全局上下文 */
   code += '\n// 全局上下文\n';
-  app.enums.forEach((enumeration) => code += `${enumeration.toNaturalTS()}\n`);
+  app.enums.forEach((enumeration) => code += `${enumeration?.toNaturalTS()}\n`);
   app.dataSources.forEach((dataSource) => dataSource.entities
     .filter((entity) => !entity.name.startsWith('LCAP') || entity.name === 'LCAPUser')
-    .forEach((entity) => code += `${entity.toNaturalTS()}\n`));
+    .forEach((entity) => code += `${entity?.toNaturalTS()}\n`));
   app.structures
     .filter((entity) => !entity.name.startsWith('LCAP'))
-    .forEach((structure) => code += `${structure.toNaturalTS()}\n`);
-  
+    .forEach((structure) => code += `${structure?.toNaturalTS()}\n`);
+
   code += '\n// 服务端逻辑\n';
-  app.logics
-    .filter((logic) => logic !== currentNode && !logic.name.startsWith('LCAP'))
-    .forEach((logic) => code += `${logic.toNaturalTS(undefined, undefined, undefined, currentNode)}`);
+  app?.logics
+    ?.filter((logic) => logic !== currentNode && !logic.name.startsWith('LCAP'))
+    ?.forEach((logic) => code += `${logic?.toNaturalTS(undefined, undefined, undefined, currentNode)}`);
+
 
-    
   const frontend = currentNode?.getAncestor('Frontend') as Frontend;
   if (frontend) {
     code += '\n// 前端全局变量\n';
-    frontend.variables.forEach((variable) => {
+    frontend?.variables?.forEach((variable) => {
       const state = createCompilerState();
       code += 'let ';
-      code += variable.toNaturalTS(shiftState(state, code, { inline: true }));
+      code += variable?.toNaturalTS(shiftState(state, code, { inline: true }));
       code += ';\n';
     });
-    
+
     code += '\n// 前端页面\n';
-    frontend.views.forEach((view) => {
-      code += view.toNaturalTS(undefined, currentNode, true);
+    frontend?.views?.forEach((view) => {
+      code += view?.toNaturalTS(undefined, currentNode, true);
     });
   }
 
@@ -63,7 +63,7 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
     view.variables.forEach((variable) => {
       const state = createCompilerState();
       code += 'let ';
-      code += variable.toNaturalTS(shiftState(state, code, { inline: true }));
+      code += variable?.toNaturalTS(shiftState(state, code, { inline: true }));
       code += ';\n';
     });
     code += 'let current.item.supplier: Supplier; \n';
@@ -81,9 +81,10 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
   // code += '// 页面上下文\n';
   code += ``;
   if (view) { // 为页面中的逻辑
-    code += view.toNaturalTS(undefined, currentNode);
+    console.log("lemon ~ genNaturalTSContext ~ view:", view)
+    code += view?.toNaturalTS(undefined, currentNode);
   } else if (logic) { // 为全局逻辑
-    code += logic.toNaturalTS(undefined);
+    code += logic?.toNaturalTS(undefined);
   }
   code += `\n\`\`\`\n`;
   return code;

package/src/natural/index.ts

@@ -1,4 +1,2 @@
 export * from './genNaturalTS';
 export * from './transformTSCode';
-export * from './RequirementAnalyzer';
-export * from './RequirementExecutor';

package/src/sentry/index.ts

@@ -25,10 +25,10 @@ type Listener = (source: Source) => FunctionType | void;
 
 type Monitor = (key: string) => <T extends ClassType>(SourceClass: T) => T;
 
-const developing = process.env.NODE_ENV === 'development';
+const developing = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'testing';
 
 const flag = '__monitor__';
-const passthroughProperties = ['constructor', 'getClassName', 'getAncestor'];
+const passthroughProperties = ['constructor', 'concept', 'getAncestor'];
 
 const classStore: { [key: string]: ClassType } = {};
 const listenersStore: { [key: string]: Listener[] } = {};

package/src/server/createUiTs.ts

@@ -205,6 +205,36 @@ export default function formatUiTs(allComponent: any) {
     }
 
     value += `${indent(1)}\n}){super()}\n`;
+    // 生成属性
+    if (Object.prototype.toString.call(item.attrs) === '[object Array]') {
+        item.attrs.forEach((attr: any) => {
+            if (attr.name === 'data-source') {
+                value += indent(1);
+                value += `'${attr.name}': Array<T>;\n`;
+            } else if (attr.name === 'sorting') {
+                value += indent(1);
+                value += `'${attr.name}': {
+                    field: nasl.core.String
+                    order: nasl.core.String
+                };\n`;
+            } else if (attr.name === 'value') {
+                value += indent(1);
+                value += `'${attr.name}': any;\n`;
+            } else {
+                if (attr.type === 'number') {
+                    value += indent(1);
+                    value += `'${attr.name}': nasl.core.Long;\n`;
+                } else if (attr.type === 'Array') {
+                    value += indent(1);
+                    value += `'${attr.name}': Array<any>;\n`;
+                }
+            }
+        });
+        if (['u-select', 'van-pickerson'].includes(item.name)) {
+            value += indent(1);
+            value += `'page-number': nasl.core.Long;\n`;
+        }
+    }
     // 生成methods
     if (Object.prototype.toString.call(item.methods) === '[object Array]') {
       //   beforeNavigate?:($event: {to: string | Location, replace: boolean, append: boolean, preventDefault: Function}) => void
@@ -235,7 +265,6 @@ export default function formatUiTs(allComponent: any) {
     value += '}\n';
   }
   value += '}\n';
-  // console.log(value);
   // console.log(elementsLogic);
   // const elementsEventsMap = getAllComponentEventMap(allComponent);
   return {

package/src/server/extendBaseNode.ts

@@ -206,6 +206,24 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
   }
 };
 
+/** 删除连接器 */
+function delConnection(node: Connection) {
+    const app = node.rootNode as App;
+    app.emit('collect:start', {
+        actionMsg: '删除连接器',
+    });
+    if (node.connector?.connectorKind === 'kafka') {
+        // 删除相关的触发器
+        app.triggerLaunchers.forEach((launcher) => {
+            if ((launcher as MsgTriggerLauncher).calleeConnectionName === node.name) {
+                launcher.delete();
+            }
+        });
+    }
+    node.delete();
+    app.emit('collect:end');
+}
+
 /**
  * 准备删除
  */
@@ -441,24 +459,6 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
   }
 };
 
-/** 删除连接器 */
-function delConnection(node: Connection) {
-  const app = node.rootNode as App;
-  app.emit('collect:start', {
-    actionMsg: '删除连接器',
-  });
-  if (node.connector?.connectorKind === 'kafka') {
-    // 删除相关的触发器
-    app.triggerLaunchers.forEach((launcher) => {
-      if ((launcher as MsgTriggerLauncher).calleeConnectionName === node.name) {
-        launcher.delete();
-      }
-    });
-  }
-  node.delete();
-  app.emit('collect:end');
-}
-
 /**
  * 如果添加需要触发查找引用并且在之后，对内容产生影响
  */