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

package/out/service/logic/api.d.ts

@@ -5,5 +5,14 @@ declare namespace _default {
             const method: string;
         }
     }
+    namespace queryDebugTypescriptBatch {
+        export namespace url_1 {
+            const path_1: string;
+            export { path_1 as path };
+            const method_1: string;
+            export { method_1 as method };
+        }
+        export { url_1 as url };
+    }
 }
 export default _default;

package/out/service/logic/api.js

@@ -7,5 +7,11 @@ exports.default = {
             method: 'post',
         },
     },
+    queryDebugTypescriptBatch: {
+        url: {
+            path: '/api/v1/querydebug/generate/typescriptBatch',
+            method: 'post',
+        },
+    },
 };
 //# sourceMappingURL=api.js.map

package/out/service/logic/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/service/logic/api.js"],"names":[],"mappings":";;AAAA,kBAAe;IACX,oBAAoB,EAAE;QAClB,GAAG,EAAE;YACD,IAAI,EAAE,wCAAwC;YAC9C,MAAM,EAAE,MAAM;SACjB;KACJ;CACJ,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/service/logic/api.js"],"names":[],"mappings":";;AAAA,kBAAe;IACX,oBAAoB,EAAE;QAClB,GAAG,EAAE;YACD,IAAI,EAAE,wCAAwC;YAC9C,MAAM,EAAE,MAAM;SACjB;KACJ;IACD,yBAAyB,EAAE;QACvB,GAAG,EAAE;YACD,IAAI,EAAE,6CAA6C;YACnD,MAAM,EAAE,MAAM;SACjB;KACJ;CACJ,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.8.3-beta.5",
+  "version": "3.8.3-beta.7",
   "author": "Forrest <rainforest92@126.com>",
   "main": "./out",
   "license": "MIT",

package/sandbox/stdlib/nasl.collection.ts

@@ -1,11 +1,11 @@
 declare namespace nasl.collection {
-    export class List<in out T> {
+    export class List<T> {
         length: nasl.core.Long;
         __slice: (start?: nasl.core.Long, end?: nasl.core.Long) => List<T>;
         __forEach: (callbackfn: (value: T, index: nasl.core.Long) => void) => void;
         __get: (index?: any) => T;
     }
-    export class PageOf<in out T> {
+    export class PageOf<T> {
         content: nasl.collection.List<T>;
         number: nasl.core.Long;
         size: nasl.core.Long;
@@ -16,7 +16,7 @@ declare namespace nasl.collection {
         empty: nasl.core.Boolean;
         totalElements: nasl.core.Long;
     }
-    export class Map<in out K, in out V> {
+    export class Map<K, V> {
         __set: (key?: K, value?: V) => any;
         length: nasl.core.Long;
         accept: 'Map';

package/src/common/utils.ts

@@ -1,17 +1,239 @@
+import type { AxiosInstance } from 'axios';
 import type { types } from '../concepts';
+import EntityProperty from '../concepts/EntityProperty__';
+import Entity from '../concepts/Entity__';
+import OqlQueryComponent from '../concepts/OqlQueryComponent__';
+import api from '../service/logic/api';
+import { naslOQLCacheStore } from '../utils/language-cache/nasl';
 
-export function waitOqlQueryComponentChildrenFinish(node: types.SyntaxNode) {
-  const needGetSourceMapOqlList: Promise<any>[] = [];
+type OQLEmbeddedTSRequestPayload = {
+  appId: 'myAppId';
+  oqlIdentifier: 'myoqlIdentifier';
+  dataSourceName: string;
+  oql: string;
+  ideVersion: string;
+  dataSourceNasl: any[];
+  typeScriptStartLine: 1;
+  typeScriptStartLineColumn: 1;
+};
+
+type PayloadWithCacheKey = {
+  payload: OQLEmbeddedTSRequestPayload | null;
+  cacheKey: string;
+};
+
+function preparePayloadAndCacheKey(oql: OqlQueryComponent): PayloadWithCacheKey {
+  if (oql.code) {
+    let dataSourceNasl = oql.app.findNodeByCompleteName(oql.dataSource)?.toJSON();
+    if (dataSourceNasl) {
+      dataSourceNasl = {
+        concept: 'DataSource',
+        entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity: Entity) => {
+          return {
+            name: entity.name,
+            concept: entity.concept,
+            tableName: entity.tableName,
+            properties: entity.properties?.map((prop: EntityProperty) => {
+              return {
+                name: prop.name,
+                concept: prop.concept,
+                columnName: prop.columnName,
+              };
+            }),
+          };
+        })),
+      };
+    }
+    const payload: OQLEmbeddedTSRequestPayload = {
+      appId: 'myAppId',
+      oqlIdentifier: 'myoqlIdentifier',
+      dataSourceName: oql.dataSource,
+      oql: oql.code,
+      ideVersion: oql.app.ideVersion,
+      dataSourceNasl,
+      typeScriptStartLine: 1,
+      typeScriptStartLineColumn: 1,
+    };
+    return {
+      cacheKey: JSON.stringify(payload),
+      payload: payload,
+    };
+  }
+  return {
+    cacheKey: '',
+    payload: null,
+  };
+}
+
+type RequestedEmbeddedTS = {
+  typescript: string;
+  lexicalErrorCode: number;
+};
+
+// 从服务端获取 SQL -> TS 的翻译和 sourceMap
+export async function requestEmbeddedTS(this: OqlQueryComponent): Promise<void> {
+  const { http, logger } = this.rootNode.naslServer;
+
+  if (this.code) {
+    let dataSourceNasl = this.app.findNodeByCompleteName(this.dataSource)?.toJSON();
+    if (dataSourceNasl) {
+      dataSourceNasl = {
+        concept: 'DataSource',
+        entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity: Entity) => {
+          return {
+            name: entity.name,
+            concept: entity.concept,
+            tableName: entity.tableName,
+            properties: entity.properties?.map((prop: EntityProperty) => {
+              return {
+                name: prop.name,
+                concept: prop.concept,
+                columnName: prop.columnName,
+              };
+            }),
+          };
+        })),
+      };
+    }
+
+    const queryWithCache = async () => {
+      const params = {
+        appId: 'myAppId',
+        oqlIdentifier: 'myoqlIdentifier',
+        dataSourceName: this.dataSource,
+        oql: this.code,
+        ideVersion: this.app.ideVersion,
+        dataSourceNasl,
+        typeScriptStartLine: 1,
+        typeScriptStartLineColumn: 1,
+      };
+      const key = JSON.stringify(params);
+      let res = null;
+      let canUseCache = false;
+      try {
+        res = await naslOQLCacheStore.getItem(key);
+        canUseCache = true;
+      } catch (error) {}
+      if (res !== null) {
+        return res;
+      }
+      return http.post(api.queryDebugTypescript.url.path, params).then(async ({ data }) => {
+        if (canUseCache) {
+          try {
+            await naslOQLCacheStore.setItem(key, data);
+          } catch (error) {}
+        }
+        return data;
+      });
+    };
+
+    return queryWithCache()
+      .then((data: any) => {
+        this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
+      })
+      .catch((err) => {
+        logger.error('Oql 请求失败', err.toString());
+        this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
+      });
+  }
+  this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
+}
+
+async function makeCachedBatchRequest(
+  http: AxiosInstance,
+  payloadWithCacheKeyList: PayloadWithCacheKey[]
+): Promise<(RequestedEmbeddedTS | null)[]> {
+  const itemsWithIndex = payloadWithCacheKeyList.map((item, index) => {
+    return { item, index };
+  });
+
+  const cacheTest = await Promise.all(
+    itemsWithIndex.map(async ({ item, index }) => {
+      const cached: RequestedEmbeddedTS | null = await naslOQLCacheStore.getItem(item.cacheKey);
+      return { item, index, cached };
+    })
+  );
+
+  const notCachedList = cacheTest.filter((x) => !x.cached);
+  const cachedList = cacheTest.filter((x) => x.cached);
+
+  const resultContainer = Array.from<RequestedEmbeddedTS | null>({
+    length: payloadWithCacheKeyList.length,
+  }).fill(null);
+
+  for (const { cached, index } of cachedList) {
+    resultContainer[index] = cached;
+  }
+  const paramList = notCachedList.map((x) => x.item.payload);
+  const tempResultList: (RequestedEmbeddedTS | null)[] = paramList.length
+    ? await http
+        .post(api.queryDebugTypescriptBatch.url.path, paramList)
+        .then((x) => x.data.result)
+        .then(async (resultList: (RequestedEmbeddedTS | null)[]) => {
+          await Promise.all(
+            resultList.map((res, index) => {
+              const payload = notCachedList[index];
+              resultContainer[payload.index] = res;
+              return naslOQLCacheStore.setItem(payload.item.cacheKey, res);
+            })
+          );
+          return resultList;
+        })
+    : [];
+  if (tempResultList.length !== paramList.length) {
+    throw new Error('返回的数据长度不一致');
+  }
+  return resultContainer;
+}
+
+// 从服务端获取 SQL -> TS 的翻译和 sourceMap
+export async function requestEmbeddedTSBatch(
+  http: AxiosInstance,
+  oqlList: OqlQueryComponent[]
+): Promise<void> {
+  const paramList = oqlList.map((oql) => {
+    const { cacheKey, payload } = preparePayloadAndCacheKey(oql);
+    return { oql, cacheKey, payload };
+  });
+
+  return makeCachedBatchRequest(http, paramList)
+    .then((data) => {
+      if (data.length !== oqlList.length) {
+        throw new Error('返回的数据长度不一致');
+      }
+      data.forEach((item, index) => {
+        const targetOql = oqlList[index];
+        targetOql.codeSourceMap = item ?? { typescript: '', lexicalErrorCode: 1001 };
+      });
+    })
+    .catch((err) => {
+      // TODO wudengke logger
+      console.error('Oql 请求失败', err.toString());
+      console.error(err);
+    });
+}
+
+export async function waitOqlQueryComponentChildrenFinish(node: types.SyntaxNode) {
+  const oqlList: OqlQueryComponent[] = [];
 
   node.traverseStrictChildren((el) => {
     if (el.concept === 'OqlQueryComponent') {
       if (!el.codeSourceMap) {
-        needGetSourceMapOqlList.push(el.requestEmbeddedTS());
+        oqlList.push(el);
       }
     }
   });
 
-  if (needGetSourceMapOqlList.length > 0) {
-    return Promise.all(needGetSourceMapOqlList);
+  if (oqlList.length > 0) {
+    const http =
+      node.rootNode?.naslServer.http ??
+      // @ts-expect-error
+      // 若是App节点
+      node?.naslServer.http;
+    if (http) {
+      return requestEmbeddedTSBatch(http, oqlList);
+    } else {
+      throw new Error('http client 不存在');
+    }
   }
 }

package/src/concepts/OqlQueryComponent__.ts

@@ -14,9 +14,6 @@ import type StructureProperty from './StructureProperty__';
 import type Structure from './Structure__';
 import type Identifier from './Identifier__';
 import type MemberExpression from './MemberExpression__';
-import type { Entity } from './Entity__';
-import type { EntityProperty } from './EntityProperty__';
-import { naslOQLCacheStore } from '../utils/language-cache/nasl';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -32,6 +29,7 @@ import * as asserts from './utils/asserts';
 
 import TypeAnnotation from './TypeAnnotation__';
 import LogicItem from './LogicItem__';
+import api from '../service/logic/api';
 
 /**
  * SQL 查询
@@ -278,77 +276,6 @@ export class OqlQueryComponent extends LogicItem {
     return `sql"${code}"`;
   }
 
-  // 从服务端获取 SQL -> TS 的翻译和 sourceMap
-  async requestEmbeddedTS(): Promise<any> {
-    const { http, logger } = this.rootNode.naslServer;
-
-    if (this.code) {
-      let dataSourceNasl = this.app.findNodeByCompleteName(this.dataSource)?.toJSON();
-      if (dataSourceNasl) {
-        dataSourceNasl = {
-          concept: 'DataSource',
-          entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity: Entity) => {
-            return {
-              name: entity.name,
-              concept: entity.concept,
-              tableName: entity.tableName,
-              properties: entity.properties?.map((prop: EntityProperty) => {
-                return {
-                  name: prop.name,
-                  concept: prop.concept,
-                  columnName: prop.columnName,
-                };
-              }),
-            };
-          })),
-        };
-      }
-
-      const query = async () => {
-        const params = {
-          appId: 'myAppId',
-          oqlIdentifier: 'myoqlIdentifier',
-          dataSourceName: this.dataSource,
-          oql: this.code,
-          ideVersion: this.app.ideVersion,
-          dataSourceNasl,
-          typeScriptStartLine: 1,
-          typeScriptStartLineColumn: 1,
-        };
-        const key = JSON.stringify(params);
-        let res = null;
-        let canUseCache = false;
-        try {
-          res = await naslOQLCacheStore.getItem(key);
-          canUseCache = true;
-        } catch (error) {}
-        if (res !== null) {
-          return res;
-        }
-        return http
-          .post('/api/v1/querydebug/generate/typescript', params)
-          .then(async ({ data }) => {
-            if (canUseCache) {
-              try {
-                await naslOQLCacheStore.setItem(key, data);
-              } catch (error) {}
-            }
-            return data;
-          });
-      };
-
-      return query()
-        .then((data: any) => {
-          this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
-        })
-        .catch((err) => {
-          logger.error('Oql 请求失败', err.toString());
-          this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
-        });
-    }
-    this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
-  }
-
   /**
    * 获取添加时的默认选项
    * @returns

package/src/natural/transformTS2UI.ts

@@ -1001,7 +1001,7 @@ function transformNode2Logic(node: babelTypes.FunctionDeclaration, name: string,
       let logicItem = transformNode2Expression(item, 'logic');
       if (logicItem) {
         if ((logicItem as any).concept === 'Variable') {
-          if (!curLogic.variables.find((_: any) => _.name === logicItem.name)) curLogic.addVariable(logicItem);
+          if (!curLogic.variables.find((_: any) => _.name === logicItem.name)) curLogic.addVariable({ ...logicItem, defaultValue: undefined });
           logicItem = new naslTypes.Assignment({
             left: new naslTypes.Identifier({ name: logicItem?.name }),
             right: (logicItem as any).defaultValue?.expression || '',

package/src/natural/transforms/transform2LogicItem.ts

@@ -1320,7 +1320,7 @@ export function transform2LogicItem(node: babelTypes.Node, options: TransformOpt
   transformManager.registerCallExpression('alert', transformAlert2ShowMessage);
   transformManager.registerCallExpression((node, calleeName) => /^app.dataSources|app.logics/.test(calleeName), transformCall2CallDataSourceLogic);
   transformManager.registerCallExpression((node, calleeName) => /interfaces\./.test(calleeName), transformCall2Interface);
-  transformManager.registerCallExpression((node, calleeName) => /connectors\./.test(calleeName), transformCall2Connector);
+  transformManager.registerCallExpression((node, calleeName) => /connector\./.test(calleeName), transformCall2Connector);
   transformManager.registerCallExpression((node, calleeName) => /extensions\./.test(calleeName), transformCall2Extension);
   transformManager.registerCallExpression((node) => node.callee.type === 'ArrowFunctionExpression', transformArrowFunction2Match);
   transformManager.registerCallExpression((node, calleeName) => ['plus', 'minus', 'multiply', 'divide', 'remainder', 'STARTWITH', 'ENDWITH', 'LIKE', 'IN'].includes(calleeName), transformCallExpressionToBinaryExpression);

package/src/server/naslServer.ts

@@ -123,6 +123,7 @@ import { traverse, FileNode } from '../utils';
 import { withQueueExecute } from '../decorators';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 import { isApp, isConnection, isConnector, isMsgTriggerEvent, isProcess, isProcessV2, isStrictLogic } from '../concepts/utils/asserts';
+import { waitOqlQueryComponentChildrenFinish } from '../common/utils';
 
 import { collectAllSemanticCtx, clearSemanticData, printSemanticDataInfo } from './semanticData';
 
@@ -587,6 +588,8 @@ class NaslServer {
       frontends = []
     } = module as Module;
 
+    const oqlFinished = waitOqlQueryComponentChildrenFinish(module);
+
     yield* getTsFiles(structures, 'structure');
     yield* getTsFiles(metadataTypes, 'metadataType');
 
@@ -621,6 +624,7 @@ class NaslServer {
     yield* getTsFiles(concat(dataSources, 'entities'), 'dataSource_entity');
     yield* getTsFiles(interfaces as FileNode[], 'interface');
     yield* getTsFiles(enums, 'enum');
+    yield oqlFinished;
     yield* getTsFiles(logics, 'logic');
     yield* getTsFiles(authLogics, 'authLogic', Logic);
     yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface', Logic);

package/src/service/logic/api.js

@@ -5,4 +5,10 @@ export default {
             method: 'post',
         },
     },
+    queryDebugTypescriptBatch: {
+        url: {
+            path: '/api/v1/querydebug/generate/typescriptBatch',
+            method: 'post',
+        },
+    },
 };