@lcap/nasl 3.8.2-beta.7 → 3.8.2-beta.8

package/package.json

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

package/src/concepts/BusinessComponent__.ts

@@ -1657,7 +1657,7 @@ export class BusinessComponent extends BaseNode {
               logics: [newLogic],
             },
             this,
-            'events',
+            'bindEvents',
           );
           this.addBindEvent(event);
         } else {

package/src/concepts/CallInterface__.ts

@@ -368,7 +368,8 @@ export class CallInterface extends LogicItem {
       if (!this.calleeNamespace || !this.calleeName) throw new Error('调用接口为空');
       throw new Error(`${_name}下的${_interfaceName}接口未找到`);
     }
-    let isSimpleBody = false; // 兼容body只有基本类型的
+    // 兼容 body 基本类型、List、Object
+    let bodyType: 'primitive' | 'List'  = null;
     const _params = (_interface as Interface).params;
     const _queries = _params.filter((item) => item.in === 'query').map((item) => item.name);
     const _headers = _params.filter((item) => item.in === 'header').map((item) => item.name);
@@ -376,7 +377,9 @@ export class CallInterface extends LogicItem {
       .filter((item) => item.in === 'body')
       .map((item) => {
         if (item.typeAnnotation.typeKind === 'primitive') {
-          isSimpleBody = true;
+          bodyType = 'primitive';
+        } else if (item.typeAnnotation.typeKind === 'generic' && item.typeAnnotation.typeName === 'List') {
+          bodyType = 'List';
         }
         return item.name;
       });
@@ -420,9 +423,13 @@ export class CallInterface extends LogicItem {
     code = setArgumentCode(completeArguments, _headers, code, true, false);
     code += `},\n`;
 
-    if (isSimpleBody) {
+    if (bodyType === 'primitive') {
       code += `body: `;
       code = setArgumentCode(completeArguments, _body, code, false, false);
+    } else if (bodyType === 'List') {
+      code += `body: [`;
+      code = setArgumentCode(completeArguments, _body, code, false, true);
+      code += ']';
     } else {
       code += `body: {`;
       code = setArgumentCode(completeArguments, _body, code, false, true);

package/src/concepts/EnumItem__.ts

@@ -211,8 +211,8 @@ export class EnumItem extends BaseNode {
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
 
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['label']);
+    // if (state.descriptionComment)
+    //   code += createDescriptionComment(state, this, ['label']);
     code += `'${this.value}' = '${this.label?.value}'`;
 
     return code;

package/src/concepts/ViewElement__.ts

@@ -1915,7 +1915,6 @@ export class ViewElement extends Annotatable {
               noNeedParams: true,
               callLogicNoIife: true,
             };
-            debugger;
             const value = yield* attr.expression.toEmbeddedTS(
               shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
             );
@@ -3186,6 +3185,7 @@ export class ViewElement extends Annotatable {
 
         result && parts.push(result);
       });
+    let preAnnoParts:any = []
     const genDirectiveByAnno = (viewElement: ViewElement) => {
       if (viewElement?.applyAnnotations?.length > 0) {
         // todo: 根据注解生成自定义指令 v-annoName="context"
@@ -3203,22 +3203,12 @@ export class ViewElement extends Annotatable {
           };
           let argsList = aa.arguments.map((arg: any) => getExpressionValue(arg.expression));
           let annoArgs = {
+            annotationName:aa.annotationName,
             argsList,
             dataRefList,
           };
-          // 所有参数序列化之后当字符串传进指令参数 （目前不支持<div v-demo="{ color: 'white', text: 'hello!' }"></div>
-          let expression = StringLiteral.from({
-            concept: 'StringLiteral',
-            kind: 'Expression',
-            name: '',
-            value: JSON.stringify(annoArgs),
-          });
-          let annoDirective = BindDirective.from({
-            name: aa.annotationName,
-            // arg:'arg',
-            expression,
-          });
-          return annoDirective;
+          return annoArgs
+
         });
       }
     };
@@ -3258,9 +3248,8 @@ export class ViewElement extends Annotatable {
                       propName: attr?.expression.toUI()?.replace('current.item.', ''),
                     };
                     dataRefList.push(ref);
-                    // 要考虑 多个元素 每个元素有多个注解的情况
-                    let result = (genDirectiveByAnno(viewElement) as any)?.map((d: any) => d?.toVue());
-                    result && result?.length > 0 && parts.push(...result);
+                    let result = (genDirectiveByAnno(viewElement) as any)
+                    result && result?.length > 0 && preAnnoParts.push(...result);
                   }
                 }
               }
@@ -3309,8 +3298,9 @@ export class ViewElement extends Annotatable {
                 propName: entityPropName,
               };
               dataRefList.push(ref);
-              let result = (genDirectiveByAnno(viewElement) as any)?.map((d: any) => d?.toVue());
-              result && result?.length > 0 && parts.push(...result);
+
+              let result = (genDirectiveByAnno(viewElement) as any)
+              result && result?.length > 0 && preAnnoParts.push(...result);
             }
             // typeName "Entity1"
             // typeNamespace "app.dataSources.defaultDS.entities"
@@ -3337,7 +3327,38 @@ export class ViewElement extends Annotatable {
       // 2 向上是线性布局 卡片 template gridView
     };
     getEntityDataRef(this);
+    let annoMap:any = {}
 
+    preAnnoParts?.map((annoArgs:any)=>{
+      let annotationName =annoArgs.annotationName
+      if(!annoMap[annotationName] ){
+        annoMap[annotationName]  =[]
+      }
+      annoMap[annotationName] = annoArgs
+    })
+    Object.keys(annoMap)?.map(key=>{
+    let annoArgs =annoMap[key]
+      let {
+        annotationName,
+        argsList,
+        dataRefList,
+      }= annoArgs;
+      // 一个元素可以有多个指令； 其中一个指令可以从多处获取参数 这里就不能直接生成指令了 不然多个参数就变成了多个指令 实现同一个指令多个参数
+          // 所有参数序列化之后当字符串传进指令参数 （目前不支持<div v-demo="{ color: 'white', text: 'hello!' }"></div>
+          let expression = StringLiteral.from({
+            concept: 'StringLiteral',
+            kind: 'Expression',
+            name: '',
+            value: JSON.stringify(annoArgs),
+          });
+          let annoDirective = BindDirective.from({
+            name: annotationName,
+            // arg:'arg',
+            expression,
+          });
+      let directString = annoDirective?.toVue()
+      directString && parts.push(directString)
+    })
     if (vIfs.length === 2) parts.push(`v-if="(${vIfs[0]}) && (${vIfs[1]})"`);
     else if (vIfs.length === 1) parts.push(`v-if="${vIfs[0]}"`);
 

package/src/natural/getContext/index.ts

@@ -191,7 +191,7 @@ export function getEnums(app: App, state: TranslatorState) {
   const namespace = 'app.enums';
   const data = [] as Snippet[];
   app.enums.forEach((enumeration) => {
-    const temp = `${enumeration?.toNaturalTS({ ...state, needNamespace: true })}`;
+    const temp = `${enumeration?.toNaturalTS({ ...state, needNamespace: true, })}`;
     data.push({ description: enumeration?.description || enumeration?.name, code: temp });
   });
   return { namespace, enums: { namespace, data } };
@@ -201,7 +201,7 @@ export const getEnumsCode = (enums: any) => {
   let code = '';
   code += `declare namespace ${enums?.namespace} {\n`;
   enums?.data?.forEach((item: any) => {
-    code += item?.description ? `/* ${item.description} */ \n` : '';
+    // code += item?.description ? `/* ${item.description} */ \n` : '';
     code += `${item.code}\n`;
   });
   code += `}\n`;
@@ -338,6 +338,7 @@ export const getModuleInterfacesCode = (interfaceDependencies: any, codeType: 'd
       if (requiredIndexes?.length && !requiredIndexes?.includes(interfaceIndex)) return;
       if (codeType === 'short') {
         const tempCode = item.code.replace(`${interfaceDependency?.logics.namespace}.`, '');
+        // code += `[${interfaceIndex}] \`${tempCode}\`\n`;
         code += `[${interfaceIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
       } else {
         code += item.codeWithDetail;
@@ -457,7 +458,8 @@ export const getConnectorsCode = (connections: any, codeType: 'detail' | 'short'
       if (codeType === 'short') {
         const namespace = item?.namespace || connection?.logics.namespace;
         const tempCode = item.code.replace(`${namespace}.`, '');
-        code += `[${interfaceIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
+        code += `[${interfaceIndex}] \`${tempCode}\`\n`;
+        // code += `[${interfaceIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
       } else {
         code += item.codeWithDetail;
       }
@@ -527,7 +529,8 @@ export const getDependenciesCode = (dependencies: any, codeType: 'detail' | 'sho
       if (requiredIndexes?.length && !requiredIndexes?.includes(logicIndex)) return;
       if (codeType === 'short') {
         const tempCode = item.code.replace(`${dependency?.logics.namespace}.`, '');
-        code += `[${logicIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
+        code += `[${logicIndex}] \`${tempCode}\`\n`;
+        // code += `[${logicIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
       } else {
         code += item.codeWithDetail;
       }
@@ -632,7 +635,7 @@ export function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: s
       function (state) {
         let code = '';
         code += `\n${indent(state.tabSize)}`;
-        
+
         if (experimental) {
           code += this.elements[0].toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
         } else {

package/src/natural/tools.ts

@@ -80,7 +80,9 @@ export const getUnImportedModulesForLogic = (json: BaseNode, app: App, material:
       // 如果 连接器 不存在，则需要导入并初始化连接
       if (!connectorNode) {
         item.operator = 'importAndInit';
-        item.version = material?.connectors?.find((node: any) => node.name === item.symbol)?.version;
+        const curDep = material?.connectors?.find((node: any) => node.name === item.symbol)
+        item.version = curDep?.version;
+        item.provider = curDep?.provider || '资产中心';
         needImportModule.needImportConnector = true;
         needImportModule.connectors.set(item.symbol, item);
       } else {
@@ -104,7 +106,9 @@ export const getUnImportedModulesForLogic = (json: BaseNode, app: App, material:
       item.category = 'library';
       const logicNode = app.dependencies?.find((node: any) => node.name === item.symbol);
       if (!logicNode) {
-        item.version = material?.dependencies?.find((node: any) => node.name === item.symbol)?.version;
+        const curDep = material?.dependencies?.find((node: any) => node.name === item.symbol);
+        item.version = curDep?.version;
+        item.provider = curDep?.provider || '资产中心';
         needImportModule.library.set(item.symbol, item);
       }
     } else if (item.node.concept === 'ViewElement') {
@@ -116,7 +120,9 @@ export const getUnImportedModulesForLogic = (json: BaseNode, app: App, material:
         item.category = 'library';
         item.key = `${libraryName}-${name}`;
         item.symbol = libraryName;
-        item.version = material?.dependencies?.find((node: any) => node.name === libraryName)?.version;
+        const curDep = material?.dependencies?.find((node: any) => node.name === item.symbol);
+        item.version = curDep?.version;
+        item.provider = curDep?.provider || '';
         needImportModule.extensionMaterials.set(name, item);
       }
     }

package/src/server/naslServer.ts

@@ -416,6 +416,7 @@ class NaslServer {
 
     // 处理一堆api.ts的类型
     const convertTsCode = (code: string) => {
+      code = code || '';
       code = code.replace(/nasl.core.Integer/g, 'nasl.core.Long')
       // 匹配union类型的正则
       const unionReg = /\s*['"].*['"](\s*\|\s*['"].*['"])+/g;