@lcap/nasl 3.7.0-beta.8 → 3.7.1-alpha.1

package/package.json

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

package/src/concepts/ConnectorTrigger__.ts

@@ -4,20 +4,7 @@ import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 import Interface from './Interface__';
-import Namespace from './Namespace__';
-import Connector from './Connector__';
 import type InterfaceTriggerEvent from './InterfaceTriggerEvent__';
-import { EmbeddedTSFileGenerator } from '../utils';
-import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
-import {
-  TranslatorState,
-  shiftState,
-  withSourceMap,
-  createCompilerState,
-  withSourceMapGenerator,
-  withGenerator,
-  TranslatorGenerator,
-} from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -195,153 +182,6 @@ export class ConnectorTrigger extends BaseNode {
     // });
     this.app?.emit('collect:end');
   }
-  /**
-   * 祖先 Connector
-   */
-  get connector() {
-    return this.getAncestor('Connector') as Connector;
-  }
-
-  // 是否来自于 集成中心
-  get integration() {
-    return this.getAncestor('Integration');
-  }
-
-  @withSourceMapGenerator
-  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
-    const self = this;
-    let code = '';
-    code += `export function ${self.tsName} () {\n`;
-    try {
-      // code += ';\n';
-      code += '}\n';
-    } catch (error) {
-      console.error('找不到目标服务端逻辑', error);
-    }
-    return code;
-  }
-
-  *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
-    let code = `namespace ${this.getTsNamespace()} {\n`;
-    const state = createCompilerState(code, { tabSize: 1 });
-    try {
-      code += yield* this.toEmbeddedTS(state);
-    } catch (err) {
-      code += '';
-      console.log(err);
-    }
-    code += '}\n';
-
-    return {
-      code,
-      filePath: this.getEmbeddedFilePath(),
-      sourceMap: state.sourceMap,
-    };
-  }
-
-  getTsNamespace() {
-    if (this.parentNode?.concept === 'Connector') {
-      return `connector.${this.parentNode.tsName}.triggers`;
-    }
-  }
-
-  get tsName(): string {
-    const excludeds = [
-      'abstract',
-      'arguments',
-      'await',
-      'boolean',
-      'break',
-      'byte',
-      'case',
-      'catch',
-      'char',
-      'class',
-      'const',
-      'continue',
-      'debugger',
-      'default',
-      'delete',
-      'do',
-      'double',
-      'decimal',
-      'else',
-      'enum',
-      'eval',
-      'export',
-      'extends',
-      'false',
-      'final',
-      'finally',
-      'float',
-      'for',
-      'function',
-      'goto',
-      'if',
-      'implements',
-      'import',
-      'in',
-      'instanceof',
-      'int',
-      'interface',
-      'let',
-      'long',
-      'native',
-      'new',
-      'null',
-      'package',
-      'private',
-      'protected',
-      'public',
-      'return',
-      'short',
-      'static',
-      'super',
-      'switch',
-      'synchronized',
-      'this',
-      'throw',
-      'throws',
-      'transient',
-      'true',
-      'try',
-      'typeof',
-      'var',
-      'void',
-      'volatile',
-      'while',
-      'with',
-      'yield,as',
-      'any',
-      'number',
-      'string',
-      'get',
-      'type',
-      'typeof',
-      'instanceof',
-      'require',
-    ];
-    if (excludeds.includes(this.name)) {
-      return `_${this.name}`;
-    }
-    // 来自集成中心，且是连接内部的逻辑，则认为是编辑态的，需要加上后缀
-    if (this.connector && this.integration) {
-      return `${this.name}${CUSTOM_CONNECTOR_EDITABLE_SUFFIX}`;
-    }
-    return this.name;
-  }
-
-  /**
-   * 生成宿主语言的文件路径
-   * @param name 一般不用传，用于 rename
-   */
-  getEmbeddedFilePath(name = this.name) {
-    // 自定义连接器 编辑态文件对应parentKey 为 connectors，
-
-    if (this.parentNode.concept === 'Connector') {
-      return `/embedded/${this.app.name}/${this.parentNode.parentKey}/${this.parentNode.name}/triggers/${name}.ts`;
-    }
-  }
 
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/Connector__.ts

@@ -1215,10 +1215,7 @@ export class Connector extends Module {
           name: namespace.name,
           expanded: true,
           unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
-          children: namespace.logics?.map((logic: any) => {
-            logic._exName = `${namespace.name}_${logic.name}`;
-            return logic;
-          }),
+          children: namespace.logics,
         };
       });
     }

package/src/concepts/TriggerLauncher__.ts

@@ -167,7 +167,6 @@ export class TriggerLauncher extends BaseNode {
       // 仅仅作引用查找不需要入参校验
       if (self.concept === 'ConnectorTriggerLauncher') {
         const connectorTrigger = (self as unknown as ConnectorTriggerLauncher).connectorTrigger
-        code += `let trigger = connector.${(self as unknown as ConnectorTriggerLauncher).connector.name}.triggers.${connectorTrigger.tsName};\n`
         let stashParams = ''
         if (connectorTrigger?.triggerEvent?.callBackLogic?.typeArguments?.[0]) {
           stashParams = 'params'
@@ -180,8 +179,9 @@ export class TriggerLauncher extends BaseNode {
         }
         code += ` = ${self.callBackLogicKey}(${stashParams})`;
       } else {
-        code += `${self.callBackLogicKey};\n`;
+        code += `${self.callBackLogicKey}`;
       }
+      code += ';\n';
       code += '}\n';
     } catch (error) {
       console.error('找不到目标服务端逻辑', error);

package/src/config.ts

@@ -31,11 +31,6 @@ export const config = {
      * 使用场景：导出源码
      */
     frontendPackagesResource: [] as {path: string, isDir: boolean, url: string}[],
-    assets: [] as Array<{
-        path: string,
-        isDir: boolean,
-        url: string;
-    }>,
 };
 
 /* eslint-disable no-redeclare */

package/src/generator/genBundleFiles.ts

@@ -11,7 +11,6 @@ import { compileComponent } from './compileComponent';
 
 import { genMetaData } from './genMetaData';
 import { integrateMicroApp } from './microApp';
-import type { Asset } from './release-body/internal';
 
 export interface Route {
   path?: string;
@@ -39,8 +38,6 @@ interface Config {
   miniEnable: boolean;
   isPreviewFe?: boolean;
   previewVersion?: string;
-  assets: Array<Asset>;
-  assetsMap: Map<string, Asset>;
 }
 
 // 将metaData转成字符串
@@ -775,25 +772,6 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     ${microAppIntegration || 'loadAssets();'}
 })()
 `;
-  const assets = config.assets;
-  // 导出源码才处理
-  if (config.isExport && Array.isArray(assets) && assets.length) {
-    const assetsMap = config.assetsMap;
-    const regex = new RegExp(assets.map((asset) => asset.fileUrl).join("|"), "g");
-    content = content.replace(regex, (url) => {
-      const asset = assetsMap.get(url);
-      if (asset) {
-        const path = `/assets/${asset.name}`;
-        globalConfig.assets.push({
-          path,
-          isDir: false,
-          url,
-        });
-        return path;
-      }
-      return url;
-    });
-  }
   let minifyObj = { code: '' };
   // 开发环境加上sourceMap
   if (config.env === 'dev') {

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

@@ -10,39 +10,6 @@ import { genPermissionData, genLogicAuthFlag } from '../permission';
 import { getCallLogicData } from './validation';
 
 import * as utils from '../../utils';
-import { config as globalConfig } from '../../config'
-
-/**
- * 替换端类型中的资源
- * @param frontendTypes 
- * @param fn 
- */
-export function replaceFrontendTypesAssets(frontendTypes: FrontendType[], fn: Function) {
-  frontendTypes.forEach((frontendType: FrontendType) => {
-    utils.traverse((current: {
-      node: any
-    }) => {
-      for (const key in current.node) {
-        const attr = current.node[key];
-        if (typeof attr === 'string') {
-          fn(current.node, key, attr);
-        }
-      }
-    }, { node: frontendType }, {
-      mode: 'anyObject', excludedKeySet: new Set([
-        'parentNode',
-        'sourceMap',
-        'storageJSON',
-        'tsErrorDetail',
-        'NaslAnnotatedJSON',
-        'calledFrom',
-        '_events',
-        '_collectingList',
-        '_historyList',
-      ])
-    });
-  });
-}
 
 async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
   await utils.delay(500);
@@ -68,40 +35,6 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
     });
   }
 
-  const assets = opt.assets;
-  if (Array.isArray(assets) && assets.length) {
-    const assetsMap = opt.assetsMap;
-    const regex = new RegExp(assets.map((asset) => asset.fileUrl).join("|"), "g");
-    replaceFrontendTypesAssets(NaslAnnotatedJSON.frontendTypes, (node: any, key: string, url: string) => {
-      if (['staticStyle'].includes(key)) {
-        node[key] = url.replace(regex, (url) => {
-          const asset = assetsMap.get(url);
-          if (asset) {
-            const path = `/assets/${asset.name}`;
-            globalConfig.assets.push({
-              path,
-              isDir: false,
-              url,
-            });
-            return path;
-          }
-          return url;
-        });
-      } else {
-        const asset = assetsMap.get(url);
-        if (asset) {
-          const path = `/assets/${asset.name}`;
-          globalConfig.assets.push({
-            path,
-            isDir: false,
-            url,
-          });
-          node[key] = path;
-        }
-      }
-    });
-  }
-
   return {
     name: 'nasl-annotated.json',
     content: JSON.stringify(NaslAnnotatedJSON),
@@ -144,7 +77,7 @@ async function mergeBodyData(app: App, opt: InternalReleaseData) {
   await utils.delay(500);
 
   const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, opt.frontends);
-  await opt.logPublishFunc?.('权限', '分析权限数据成功！');
+  await opt.logPublishFunc?.('权限',  '分析权限数据成功！');
   const logicPageResourceDtoList = await genPermissionData(app);
   const allFrontends = getFrontendByTypes(app?.frontendTypes);
   const releaseFrontends = allFrontends.map((frontend: Frontend) => ({

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

@@ -1,10 +1,9 @@
 import type { App } from '../../concepts';
 import { ReleaseData, ReleaseMode } from './types';
 import type { NaslServer } from '../../server/naslServer';
-import type { InternalReleaseData, Asset } from './internal';
+import type { InternalReleaseData } from './internal';
 import { genReleaseBody } from './body';
 import {
-  loadFiles,
   staticResourceSync,
   getContentType,
   getPackageInfos,
@@ -14,13 +13,12 @@ import {
   getValidationRules,
 } from './utils';
 import { Logger, File } from '../../utils';
-import { config as globalConfig } from '../../config'
 
 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);
+  const appInfo =  await getAppInfo(http, data);
   await logger.info('构建环境', '获取环境信息成功');
   const { version, fullVersion, dependencies } = await getVersionDetail(http, app);
   await logger.info('构建环境', '获取版本数据成功');
@@ -29,13 +27,6 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
   const releaseFrontends = inputFrontendNames.length > 0
     ? allFrontend.filter((item) => data.config.frontendNames.includes(item.name))
     : allFrontend;
-  // 当前应用使用到的资源
-  const assets = await loadFiles(http, data.appId);
-  const assetsMap = new Map();
-  assets.forEach((asset: Asset) => {
-    const { fileUrl } = asset;
-    assetsMap.set(fileUrl, asset);
-  });
   const result: InternalReleaseData = {
     appInfo: appInfo as any,
     env: data.env,
@@ -50,8 +41,6 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
     appSpecification: data.appSpecification,
     frontends: releaseFrontends,
     validations: {},
-    assets,
-    assetsMap,
     logPublishFunc: (text: string) => logger.info('前端生成器', text),
   };
 
@@ -63,7 +52,7 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
 
   // 私有化环境，需要同步资源；内部环境暂不需要，针对使用 CDN 场景增加判断
   if (String(appInfo.isPrivatized) === 'true') {
-    result.staticUrl = await staticResourceSync(http, assets, data.appId, data.env, releaseFrontends);
+    result.staticUrl = await staticResourceSync(http, data.appId, data.env, releaseFrontends);
     await logger.info('构建环境', '私有化部署同步资源成功');
   }
 
@@ -96,7 +85,7 @@ export function getReleaseFormData(body: any) {
   const formData = new FormData();
 
   if (!body.isPreviewFe) {
-    body.files = body.files.map(
+    body.files =  body.files.map(
       (item: any) => new File([item.content], item.name, { type: getContentType(item.name) })
     ) as any;
   }

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

@@ -8,14 +8,6 @@ export interface ServerValidationData {
 
 export type InputServerValidationData = { [key in string]: ServerValidationData[] };
 
-export interface Asset {
-  name: string;
-  type: string;
-  subType: string;
-  fileUrl: string;
-  contentType: string;
-}
-
 /** @internal */
 export interface InternalReleaseData {
   env: string;
@@ -44,8 +36,6 @@ export interface InternalReleaseData {
   validations: InputServerValidationData;
   logPublishFunc: Function;
   appSpecification?: number;
-  assets: Array<Asset>;
-  assetsMap: Map<string, Asset>;
 }
 
 /** @internal */

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

@@ -10,7 +10,7 @@ import type {
 import { AxiosInstance } from 'axios';
 import * as asserts from '../../concepts/utils/asserts';
 import { ReleaseData, ReleaseMode } from './types';
-import { HttpData, VersionDetail, MaterialData, EnvData, TenantData, AppDetailData, Asset } from './internal';
+import { HttpData, VersionDetail, MaterialData, EnvData, TenantData, AppDetailData } from './internal';
 
 /**
  * 权限上报数据
@@ -115,24 +115,13 @@ export function getFrontendByTypes(frontendTypes: FrontendType[] = []) {
   return (frontendTypes?.map((frontendType) => (frontendType?.frontends || [])) || []).flat(2);
 }
 
-/**
- * 当前应用使用到的资源
- * @param axios 
- * @param id 
- * @returns 
- */
-export async function loadFiles(axios: AxiosInstance, id: string) {
+export async function getUsedAssets(axios: AxiosInstance, id: string, frontends: Frontend[]) {
   const { data: res } = await axios.get('/api/v1/user/file', {
-    params: {
-      appId: id,
-    },
+      params: {
+          appId: id,
+      },
   });
   const assets = (res as any).result?.list || [];
-  return assets;
-}
-
-export async function getUsedAssets(axios: AxiosInstance, id: string, frontends: Frontend[]) {
-  const assets = await loadFiles(axios, id);
   const urlNameMap: Record<string, string> = {};
   const assetSet = new Set<string>();
 
@@ -152,29 +141,13 @@ export async function getUsedAssets(axios: AxiosInstance, id: string, frontends:
   return Array.from(assetSet);
 }
 
-export async function staticResourceSync(axios: AxiosInstance, assets: Array<Asset>, id: string, env: string, frontends: Frontend[]) {
-  const urlNameMap: Record<string, string> = {};
-  const assetSet = new Set<string>();
-
-  for (const { fileUrl, name } of assets) {
-    urlNameMap[fileUrl] = name;
-  }
-
-  frontends.forEach((frontend) => {
-    frontend.views.forEach((view) => {
-      view.traverseStrictChildren((ele) => {
-        if (asserts.isBindAttribute(ele) && urlNameMap[ele.value]) {
-          assetSet.add(urlNameMap[ele.value]);
-        }
-      });
-    });
-  });
+export async function staticResourceSync(axios: AxiosInstance, id: string, env: string, frontends: Frontend[]) {
   // 发起资源同步请求，传递nasl使用到的资源名称
-  const needSyncResourceNameList = Array.from(assetSet);
+  const assets = await getUsedAssets(axios, id, frontends);
   const { data: res } = await axios.post(
       '/api/v1/app/env/staticResourceSync',
       {
-        needSyncResourceNameList,
+          needSyncResourceNameList: assets,
       },
       {
           params: {

package/src/natural/index.ts

@@ -1,3 +1,4 @@
 export * from './genNaturalTS';
 export * from './transformTSCode';
+export * from './transformTS2UI';