@lcap/nasl 3.6.2-beta.2 → 3.6.2-beta.3

package/package.json

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

package/src/common/BaseNode.ts

@@ -395,17 +395,17 @@ export class BaseNode extends EventEmitter {
         // eventStop为true后，数据不再存入eventList，就不再会将冒泡数据发送给后端
         eventStop: true,
       };
-      this.parentNode?.emit('update', event);
+      this.parentNode?.emit?.('update', event);
     }
   }
 
   nodeEditing($event: EventPayload) {
-    this.parentNode?.emit('node:Editing', $event);
+    this.parentNode?.emit?.('node:Editing', $event);
   }
 
   createNode({ parentNode, parentKey, index }: { parentNode: types.SyntaxNode; parentKey: string; index: number }) {
     if(!actionable) {
-      eventBus.emit('NotActionable')
+      eventBus.emit?.('NotActionable')
       return;
     }
 

package/src/concepts/App__.ts

@@ -4043,6 +4043,8 @@ export class App extends BaseNode {
 
   /* 判断接口是否有误，需要重新导出 */
   getQualifiedInterface(interfaces: AbstractInterface[] = this.interfaces): MessageData[] {
+    // getConceptConstructor
+    const TypeAnnotationClass = getConceptConstructor('TypeAnnotation');
     const errorList: MessageData[] = [];
     (interfaces as unknown as Interface[]).forEach((item: Interface) => {
       const logic = this.logics.find((logic: Logic) => logic.name === item.originLogicName);
@@ -4056,7 +4058,7 @@ export class App extends BaseNode {
         logicParamMap[param.name] = param.typeAnnotation;
       });
       item.params.forEach((param) => {
-        const logicTypeAnnotation = logicParamMap[param.name]?.toJSON();
+        const logicTypeAnnotation = TypeAnnotationClass.from(logicParamMap[param.name]?.toJSON());
         delete logicParamMap[param.name];
         if (!logicTypeAnnotation) {
           return errorList.push({
@@ -4067,14 +4069,14 @@ export class App extends BaseNode {
             message: `参数“${param.name}”已被删除，请确定请求类型无误后点击“重新导出”`,
           });
         }
-        const interfaceTypeAnnotation = param.typeAnnotation.toJSON() as TypeAnnotation;
+        const interfaceTypeAnnotation = TypeAnnotationClass.from(param.typeAnnotation.toJSON());
         let isSame = false;
         if (logicTypeAnnotation?.typeNamespace === 'app.enums') {
           if (interfaceTypeAnnotation.typeNamespace === 'nasl.core' && interfaceTypeAnnotation.typeName === 'String') {
             isSame = true;
           }
         }
-        if (JSON.stringify(logicTypeAnnotation) === JSON.stringify(interfaceTypeAnnotation)) {
+        if (logicTypeAnnotation.isSame(interfaceTypeAnnotation)) {
           isSame = true;
         }
         if (!isSame) {
@@ -4144,8 +4146,7 @@ export class App extends BaseNode {
               });
             }
           } else if (
-            JSON.stringify(logicReturns[0]?.typeAnnotation?.toJSON()) !==
-            JSON.stringify(interfaceReturns[0]?.typeAnnotation?.toJSON())
+            !logicReturns[0]?.typeAnnotation.isSame(interfaceReturns[0]?.typeAnnotation)
           ) {
             errorList.push({
               logicName: logic.name,

package/src/concepts/BindEvent__.ts

@@ -985,8 +985,8 @@ export class BindEvent extends BaseNode {
         }
 
         const cap = suffixRE.exec(event?.title);
-        if (cap) return `${event.title.replace(suffixRE, '')}${title ? `“${title}”` : ''}${parent.name}${cap[0]}`;
-        else return `${event.title}${title ? `“${title}”` : ''}${parent.name}`;
+        if (cap) return `${event?.title?.replace(suffixRE, '')}${title ? `“${title}”` : ''}${parent.name}${cap[0]}`;
+        else return `${event?.title || ''}${title ? `“${title}”` : ''}${parent.name}`;
       }
       return `${parent.name}-${this.name}`;
     }

package/src/concepts/TypeAnnotation__.ts

@@ -1180,9 +1180,19 @@ export class TypeAnnotation extends BaseNode {
   /* 判断2个类型是否一致 */
   isSame(typeAnnotation: TypeAnnotation) {
     typeAnnotation.typeArguments;
+    // 由于 序列化 出来的 TypeAnnotation 会有很多多余的属性
+    // 因此增加白名单，只有这些值才会被比较，其他均会被忽略
+    const whiteList = [
+      'concept', 'typeKind', 'typeNamespace', 'typeName', 'typeArguments',
+      'returnType', 'inferred', 'ruleMap', 'properties', 'name', 'label',
+      'description', 'typeAnnotation', 'required', 'defaultValue', 'jsonName'
+    ]
     const typeAnnotation1 = this.toJSON();
     const typeAnnotation2 = typeAnnotation.toJSON();
     const ignoreNull = (key: any, value: any) => {
+      if (!whiteList.includes(key)) {
+        return undefined; // 忽略此属性
+      }
       if (value === null || value === undefined) {
         return undefined; // 忽略此属性
       }

package/src/generator/genBundleFiles.ts

@@ -625,8 +625,8 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
          `;
     content += str;
   }
-  const getBundleFileName =()=>{
-    if (config.isPreviewFe && config.previewVersion){
+  const getBundleFileName = ()=> {
+    if (config.isPreviewFe && config.previewVersion) {
       return `mockBundle-${config.previewVersion}`
     }
     return 'bundle'

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

@@ -50,8 +50,7 @@ async function getFrontendBundleFiles(app: App, opt: InternalReleaseData) {
     await opt.logPublishFunc?.('代码', '生成页面代码：开始');
     files = await genFrontendBundleFiles(app, opt.frontends, {
       ...opt.appInfo,
-      env: opt.env,
-      debug: opt.debug,
+      ...opt,
       appid: app.id,
       devDnsAddr: (app as any).devDnsAddr,
       miniEnable: (app as any).miniEnable,

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

@@ -35,7 +35,7 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
     isExport: data.config.mode === ReleaseMode.ExportCode,
     isPreviewFe: data.config.mode === ReleaseMode.ExportTemplate,
     ignoreFiles: data.config.ignoreFiles ?? false,
-    previewVersion: data.config.releaseVersion,
+    previewVersion: data.config.previewVersion ?? '',
     appSpecification: data.appSpecification,
     frontends: releaseFrontends,
     validations: {},
@@ -56,7 +56,7 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
 
   // 服务端验证规则
   if (app.preferenceMap.onDemandInterfaceGeneration !== 'false') {
-    result.validations = await getValidationRules(http, version, releaseFrontends);
+    result.validations = await getValidationRules(http, version, app.frontendTypes);
 
     if (typeof result.validations === 'string') {
       throw new Error(result.validations);

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

@@ -27,8 +27,8 @@ export interface ReleaseConfig {
   mode: ReleaseMode;
   /** 忽略前端文件 */
   ignoreFiles?: boolean;
-  /** 发布版本 */
-  releaseVersion?: string;
+  /** 预览版本 */
+  previewVersion?: string;
   /** 调试模式 */
   debug?: boolean;
   /**

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

@@ -202,9 +202,9 @@ export async function getVersionDetail(axios: AxiosInstance, app: any) {
   };
 }
 
-export async function getValidationRules(axios: AxiosInstance, ideVersion: string, frontends: Frontend[]) {
+export async function getValidationRules(axios: AxiosInstance, ideVersion: string, frontends: FrontendType[]) {
   const formData = new FormData();
-  formData.append('file', new Blob([JSON.stringify(frontends.map((view: any) => view.toJSON()))], { type: 'application/json' }));
+  formData.append('file', new Blob([JSON.stringify(frontends.map((view) => view.toJSON()))], { type: 'application/json' }));
   const validations = await axios<HttpData>({
     method: 'post',
     url: `/api/v1/ide/nasl/frontend/call-logic/validations/batch`,

package/src/server/naslServer.ts

@@ -94,6 +94,7 @@ import {
   Paginate,
   MsgTriggerLauncher,
   ConnectorTrigger,
+  FrontendType,
 } from '../concepts';
 
 import * as utils from '../utils';
@@ -3021,9 +3022,9 @@ class NaslServer {
               const groupByLength = callQueryComponent.groupBy.filter(
                 (item) => (item.groupElement as QueryFieldExpression)?.propertyName && (item.groupElement as QueryFieldExpression).asName
               ).length;
-              if (!groupByLength && !aggregateLength && callQueryComponentTypeAnnotation.typeKind === 'anonymousStructure') {
+              if (!groupByLength && !aggregateLength && callQueryComponentTypeAnnotation.typeKind === 'generic') {
                 // 拿到 List 的泛型（匿名数据结构）的所有属性
-                const {properties} = callQueryComponentTypeAnnotation.properties[0].typeAnnotation.typeArguments[0];
+                const {properties} = callQueryComponentTypeAnnotation.typeArguments[0];
                 const targetProperty = properties.find((p) => p.name === utils.firstLowerCase(node.name));
                 if (!targetProperty) {
                   continue;
@@ -3449,6 +3450,32 @@ class NaslServer {
               const newTextValue = node.parentNode.name === 'defaultDS' ? `/api/${newName}/import` : `/api/${node.parentNode.name}/${newName}/import`;
               minRange.setTypeMethods = 'setUrlValue';
               minRange.newValue = newTextValue;
+            } else if (minRange.node instanceof BindAttribute && (minRange.node.name === 'valueField')) {
+              // eslint-disable-next-line no-confusing-arrow
+              minRange.newValue = (minRange.node.value || '').split('.').map((v, i) => i ? v : newValue.charAt(0).toLowerCase() + newValue.slice(1)).join('.')
+              minRange.setTypeMethods = 'setValue';
+            } else if (minRange.node instanceof BindAttribute && (minRange.node.name === 'sorting') && minRange.node.value) {
+              // 现在 sorting 是不把 field 翻译出具体实体类型的，在文件系统中没有引用关系，无法处理他的改名
+              try {
+                // "{ field: undefined, order: 'desc' }" 格式解析成 Object
+                const sortingObj = JSON.parse(
+                  minRange.node.value
+                    .replace(/([{,])\s*([A-Za-z0-9_]+)\s*:/g, '$1"$2":')
+                    .replace(/undefined/g, 'null')
+                    .replace(/'/g, '"')
+                )
+                if (sortingObj.field) {
+                  const handleValue = (value: any) => {
+                    return value ? `'${value}'` : undefined
+                  }
+                  // eslint-disable-next-line no-confusing-arrow
+                  const newField = sortingObj.field.split('.').map((v: string, i: number) => i ? v: newValue.charAt(0).toLowerCase() + newValue.slice(1)).join('.')
+                  minRange.newValue = `{ field: ${handleValue(newField)}, order: ${handleValue(sortingObj.order)} }`
+                  minRange.setTypeMethods = 'setValue';
+                }
+              } catch (error) {
+                console.error(error)
+              }
             } else if (minRange.node instanceof Identifier) {
               minRange.newValue = utils.firstLowerCase(newValue);
             }
@@ -3997,6 +4024,7 @@ class NaslServer {
       !(fileNode.parentNode instanceof DataSource) &&
       !(fileNode.parentNode instanceof Frontend) &&
       !(fileNode.parentNode instanceof Backend) &&
+      !(fileNode.parentNode instanceof FrontendType) &&
       !isConnectorLogic &&
       !(fileNode instanceof View) &&
       !(fileNode instanceof BusinessComponent) &&
@@ -4040,7 +4068,7 @@ class NaslServer {
 
       if (['BindAttribute', 'BindDirective', 'BindStyle'].includes(node.concept)) {
         range.line = lsp2tspNumber(currentSource.end.line);
-        range.offset = 0;
+        range.offset = 1;
       }
 
       return this._getFieldKeySelectCompletion({
@@ -4915,6 +4943,22 @@ class NaslServer {
    */
   async incidentalAction(action: string, fileNode: BaseNode, targetNode: BaseNode, oldpath?: string) {
     if ((action === 'create' || action === 'delete' || (action === 'update' && oldpath)) && fileNode === targetNode) {
+      // 删除、新增端类型
+      if (fileNode instanceof FrontendType && (fileNode.frontends?.length || fileNode.businessComponents?.length)) {
+        const fileNodeChildren = [...fileNode.frontends, ...fileNode.businessComponents];
+        for (let i = 0; i < fileNodeChildren.length; i++) {
+          const fileNodeItem = fileNodeChildren[i];
+          const result = await utils.timeSlicingWithGenerator((fileNodeItem as FileNode).toEmbeddedTSFile());
+          fileNodeItem.sourceMap = result.sourceMap;
+          if (action === 'create') {
+            await this.handleChange(fileNodeItem, fileNodeItem, result, action);
+            await this.incidentalAction(action, fileNodeItem, fileNodeItem);
+          } else if (action === 'delete') {
+            await this.handleDelete(fileNodeItem, fileNodeItem, result);
+            await this.incidentalAction(action, fileNodeItem, fileNodeItem);
+          }
+        }
+      }
       // 删除、更改、新增端
       if (fileNode instanceof Frontend && (fileNode.views?.length || fileNode.variables?.length)) {
         const fileNodeChildren = [...fileNode.views, ...fileNode.variables];

package/tmp/node-2.js

@@ -39,6 +39,7 @@ async function projectOverLimit(files, root, limit) {
 
     result.push({
       title: data.title,
+      desc: data.desc,
       id: data.id,
       count: nodeCount,
       version: data.ideVersion,
@@ -57,7 +58,8 @@ async function main() {
   const largeInternalProjects = await projectOverLimit(internalProjects, internal, nodeLimit);
   const largeExternalProjects = await projectOverLimit(externalProjects, external, nodeLimit);
 
-2debugger;
+  console.log(JSON.stringify(largeInternalProjects, null, 2));
+  console.log(JSON.stringify(largeExternalProjects, null, 2));
 }
 
 main();