@lcap/nasl 3.6.4-beta.3 → 3.6.4-beta.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.6.4-beta.3",
+  "version": "3.6.4-beta.4",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "clear": "rimraf ./out",

package/sandbox-natural/stdlib/nasl.core.ts

@@ -20,8 +20,6 @@ interface Entity<T> {
   update(entity: T): T;
   delete(id: Integer): void;
   createOrUpdate(body: T): T;
-  updateBy(filter: string, body: T): T;
-  deleteBy(filter: string, body: T): T;
   batchCreate(list: List<T>): List<T>;
   batchUpdate(list: List<T>): List<T>;
   batchDelete(list: List<Integer>): void;

package/src/generator/release-body/body.ts

@@ -16,7 +16,7 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
 
   let NaslAnnotatedJSON: any;
   try {
-    NaslAnnotatedJSON = await (app as any).naslServer.getNaslAnnotatedJSON(app, true);
+    NaslAnnotatedJSON = await app.naslServer.getNaslAnnotatedJSON(app, true);
     await opt.logPublishFunc?.('语言', '获取类型标注成功');
 
     // // 打印传给服务端的 nasl,为了服务端排查问题方便
@@ -48,6 +48,7 @@ async function getFrontendBundleFiles(app: App, opt: InternalReleaseData) {
 
   if (opt.frontends && opt.frontends.length) {
     await opt.logPublishFunc?.('代码', '生成页面代码：开始');
+    app.naslServer.logger.time('生成前端页面');
     files = await genFrontendBundleFiles(app, opt.frontends, {
       ...opt.appInfo,
       ...opt,
@@ -64,9 +65,11 @@ async function getFrontendBundleFiles(app: App, opt: InternalReleaseData) {
       files = replaceAssetUrl(files, opt.appInfo.USER_STATIC_URL, opt.staticUrl);
     }
 
+    app.naslServer.logger.timeEnd('生成前端页面');
     await opt.logPublishFunc?.('代码', '生成页面代码：完成');
   }
 
+
   return files;
 }
 

package/src/generator/release-body/data.ts

@@ -17,6 +17,7 @@ import { Logger, File } from '../../utils';
 export async function getReleaseData(app: App, data: ReleaseData, naslServer: NaslServer, inputLogger?: Logger) {
   const { http, logger: defaultLogger } = naslServer;
   const logger = inputLogger ?? defaultLogger;
+  defaultLogger.time('前端生成器发布');
   const appInfo =  await getAppInfo(http, data);
   await logger.info('构建环境', '获取环境信息成功');
   const { version, fullVersion, dependencies } = await getVersionDetail(http, app);
@@ -74,6 +75,7 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
   });
 
   await logger.info('前端生成器', '应用发布数据准备完成');
+  defaultLogger.timeEnd('前端生成器发布');
 
   return releaseBody;
 }

package/src/natural/transformTSCode.ts

@@ -668,11 +668,36 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         pushElseIf(node, switchStatement);
         return switchStatement;
       }
-      return new naslTypes.IfStatement({
+      let consequentIndex: number;
+      let alternateIndex: number;
+      const naslNode = new naslTypes.IfStatement({
         test: transformLogicNode(node.test),
-        consequent: !node.consequent ? [] : (node.consequent as babelTypes.BlockStatement).body.map((item) => transformLogicNode(item)).filter((item) => !!item),
-        alternate: !node.alternate ? [] : (node.alternate as babelTypes.BlockStatement).body.map((item) => transformLogicNode(item)).filter((item) => !!item),
-      });
+        consequent: !node.consequent ? [] : (node.consequent as babelTypes.BlockStatement).body.map((item: any, index: number) => {
+          if (item?.type === 'ReturnStatement') {
+            item.ends = true;
+            if (item?.argument) {
+              consequentIndex = index;
+            }
+          }
+          return transformLogicNode(item);
+        }).filter((item) => !!item),
+        alternate: !node.alternate ? [] : (node.alternate as babelTypes.BlockStatement).body.map((item: any, index: number) => {
+          if (item?.type === 'ReturnStatement') {
+            item.ends = true;
+            if (item?.argument) {
+              alternateIndex = index;
+            }
+          }
+          return transformLogicNode(item);
+        }).filter((item) => !!item),
+      }) as any;
+      if (consequentIndex !== undefined) {
+        naslNode?.consequent?.splice(consequentIndex + 1, 0, new naslTypes.End());
+      }
+      if (alternateIndex !== undefined) {
+        naslNode?.alternate?.splice(alternateIndex + 1, 0, new naslTypes.End());
+      }
+      return naslNode;
     } else if (node.type === 'WhileStatement') {
       return new naslTypes.WhileStatement({
         test: transformLogicNode(node.test),
@@ -873,6 +898,9 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           right: transformLogicNode(node.argument),
         });
       }
+      if ((node as any)?.ends) {
+        return new naslTypes.End();
+      }
     } else if (node.type === 'EmptyStatement') {
       return node.leadingComments && new naslTypes.Comment({
         value: String(node.leadingComments[0].value),

package/src/server/getLogics.ts

@@ -147,7 +147,7 @@ function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeN
       }
       const viewElement = new Namespace({
         title: toHump(item.name),
-        logics: eleLogis.filter(e => e).map((item: Logic) => Logic.from(item.toJSON())),
+        logics: eleLogis.filter(e => e?.toJSON).map((item: Logic) => Logic.from(item.toJSON())),
         path,
         originConcept: 'ViewElement',
       });

package/src/server/naslServer.ts

@@ -4399,6 +4399,7 @@ class NaslServer {
     if (this.changeStackList?.length) {
       throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
     }
+    this.logger.time('全量标注');
     const nodes: QuickInfoNodes = [];
     this.file2NodeMap.forEach((fileNode, filePath) => {
       // 先不排除view，传递给后端的时候，去除views下的标注
@@ -4412,12 +4413,11 @@ class NaslServer {
         });
       }
     });
-    this.logger.time('全量标注');
     const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
-    this.logger.timeEnd('全量标注');
 
     const json = app.toJSON();
-    this.logger.info(json)
+
+    this.logger.timeEnd('全量标注');
 
     if (releaseFlag) {
       // 全量标注后对json进行一些修改，为了服务端翻译处理