@lcap/nasl 3.8.0-beta.3 → 3.8.0-beta.5

package/src/concepts/BindEvent__.ts

@@ -536,39 +536,18 @@ export class BindEvent extends BaseNode {
           if (logic.name.startsWith('__')) {
             return;
           }
-          if (logic.view) {
-            const logicName = logic.name;
-            if ((logic.parentNode as BindEvent)?.element) {
-              logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
-            }
-            logic.name = logic.name.replace(/-/g, '');
-            try {
-              code += yield* logic.toEmbeddedTS(
-                shiftState(state, code, {
-                  tabSize: (state?.tabSize || 0) + 2,
-                }),
-                'noExport',
-              );
-            } finally {
-              // 翻译logic可能出错
-              logic.name = logicName;
-            }
-          } else {
-            code += yield* logic.toEmbeddedTS(
-              shiftState(state, code, {
-                tabSize: (state?.tabSize || 0) + 2,
-              }),
-              'noExport',
-            );
-          }
+          code += yield* logic.toEmbeddedTS(
+            shiftState(state, code, {
+              tabSize: (state?.tabSize || 0) + 2,
+            }),
+            'noExport',
+          );
           code += indent(state?.tabSize || 0);
           code += ',\n';
         });
         code += '];\n';
       } else {
         yield* wrapForEach(self.logics, function* warpForEachGenerator(logic, index) {
-          const logicName = logic.name;
-          logic.name = logic.likeComponent.name + logic.name + index;
           code += yield* logic.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 2,
@@ -576,8 +555,7 @@ export class BindEvent extends BaseNode {
             'noExport',
           );
           code += indent(state?.tabSize || 0);
-          code += `${logic.name}();\n`;
-          logic.name = logicName;
+          code += `${logic.tsName}();\n`;
         });
       }
       return code;
@@ -598,24 +576,7 @@ export class BindEvent extends BaseNode {
       if (logic.name.startsWith('__')) {
         return;
       }
-      if (logic.view) {
-        const logicName = logic.name;
-        if ((logic.parentNode as BindEvent)?.element) {
-          logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
-        }
-        logic.name = logic.name.replace(/-/g, '');
-        try {
-          code += yield* logic.toEmbeddedTS(
-            shiftState(state, code, {
-              tabSize: (state?.tabSize || 0) + 2,
-            }),
-            'noExport',
-          );
-        } finally {
-          // 翻译logic可能出错
-          logic.name = logicName;
-        }
-      } else if (logic.processV2) {
+      if (logic.processV2) {
         code += yield* logic.toEmbeddedTSInProcess(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 2,

package/src/concepts/BusinessComponent__.ts

@@ -1841,6 +1841,10 @@ export class BusinessComponent extends BaseNode {
       const calleeLogic = (this.getAncestor('App') as App).logics.find((l) => l.name === calleeName);
       return calleeLogic ? `app.logics.${calleeName}(${calleeLogic.params.map(() => 'null').join(',')})` : null;
     }
+    // 调用依赖库逻辑可能会有子逻辑，子逻辑拼接可能有ts忽略先去掉
+    if (asserts.isCallLogic(rightNode) && rightNode.calleeNamespace?.startsWith('extensions.')) {
+      code = code.replaceAll('// @ts-ignore', '');
+    }
 
     // view 局部变量，申明提升前增加判断，使用 logic 内的 result 直接替换成对应 logic，logic 内部变量替换成 null
     if (logicRtn && code.includes(logicRtn.name)) {
@@ -2004,6 +2008,9 @@ export class BusinessComponent extends BaseNode {
           // 内置函数对集合类型的推导
           (asserts.isCallFunction(el) && el.derivablecollection?.name))
       ) {
+        if (el?.getAncestor('SubLogic')) {
+          return;
+        }
         if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
             (variable) => !variable.typeAnnotation && el.left?.name === variable.name,
@@ -2458,6 +2465,16 @@ export class BusinessComponent extends BaseNode {
     });
     return Array.from(res);
   }
+
+  getViewCallLogics(): string[] {
+    const callbackLogics: string[] = [];
+    this.traverseChildren((el) => {
+      if (asserts.isIdentifier(el) && el.namespace?.endsWith('logics')) {
+        callbackLogics.push(`${el.namespace}.${el.name}`);
+      }
+    });
+    return callbackLogics;
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/BusinessLogic__.ts

@@ -145,6 +145,9 @@ export class BusinessLogic extends Logic {
           // 内置函数对集合类型的推导
           (asserts.isCallFunction(el) && el.derivablecollection?.name))
       ) {
+        if (el?.getAncestor('SubLogic')) {
+          return;
+        }
         if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
             (variable) => !variable.typeAnnotation && el.left?.name === variable.name,

package/src/concepts/CallConnector__.ts

@@ -98,7 +98,7 @@ export class CallConnector extends CallLogic {
     if (this.calleeConnectionName) {
       let tsName = this.calleeConnectionName;
       // 匹配所有特殊字符都转为_
-      tsName = tsName.replace(/\W/g, '_');
+      tsName = tsName.replace(/[^\w\u4e00-\u9fa5]/g, '_');
       if (/^\d/.test(tsName)) {
         tsName = `$${tsName}`;
       }

package/src/concepts/CallFunction__.ts

@@ -690,7 +690,7 @@ export class CallFunction extends LogicItem {
         if (!arg) {
           code += '__IDENTIFIER__';
         } else {
-          code += arg.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+          code += indent(state.tabSize + 1) + arg.toNaturalTS(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 }));
         }
         if (index !== this.arguments.length - 1) {
           code += ',\n';

package/src/concepts/CallLogic__.ts

@@ -25,6 +25,7 @@ import {
 import type { ViewElement, ElementToVueOptions } from './ViewElement__';
 import type { MemberExpression } from './MemberExpression__';
 import type { StringLiteral } from './StringLiteral__';
+import type { TypeParam } from './TypeParam__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -965,7 +966,7 @@ export class CallLogic extends LogicItem {
           if (isSpreadFunc) {
             spreadParams = formatArgs.pop();
           }
-          const argsStr = formatArgs
+          const filterArgs = formatArgs
             .map((arg, index) => {
               const actualArg = completeArguments[index];
               const keyword = arg?.name;
@@ -976,10 +977,18 @@ export class CallLogic extends LogicItem {
             })
             .filter((item) => {
               return isShowArgument(item.arg);
-            })
+            });
+          const argsStr = filterArgs
             .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toJS(state)}`)
             .join(', ');
+
           code += argsStr;
+          // 如果参数长度不为 0，则表示有参数，需要添加逗号
+          // 放弃开头加逗号的写法，因为这样会导致参数为空的时候，会多一个逗号
+          // https://projectmanage.netease-official.lcap.163yun.com/dashboard/BugDetail?id=2851152441926912
+          if (filterArgs.length) {
+            code += ', ';
+          }
           // 如果是可变参数，需要单独处理
           if (isSpreadFunc) {
             const spreadArg = completeArguments.slice(formatArgs.length);
@@ -989,11 +998,11 @@ export class CallLogic extends LogicItem {
               })
               .map((arg) => arg?.toJS?.(state) || '')
               .join(', ');
-            code += `,\n${spreadParams.name}: [${spreadArgStr}]`;
+            code += `\n${spreadParams.name}: [${spreadArgStr}], `;
           }
 
           if (Array.isArray(completeTypeArguments) && completeTypeArguments.length) {
-            code += `,\n__typeArguments: ${JSON5.stringify(completeTypeArguments)}`;
+            code += `\n__typeArguments: ${JSON5.stringify(completeTypeArguments)}`;
           }
         }
         code += '\n}';
@@ -1320,21 +1329,21 @@ export class CallLogic extends LogicItem {
     // 统一处理需要有泛型的 调用逻辑，其余的走老逻辑
     if (completeTypeParams.length) {
       code += '(() =>{';
-      code += '\nconst genericWrapper = ';
+      code += '\nconst __genericWrapper = ';
       code += calleeKey;
       yield* setInputParam();
-      code += ';\nconst warpperRes =';
-      code += 'genericWrapper';
+      code += ';\nconst __warpperRes =';
+      code += '__genericWrapper';
       yield* setNeedCompleteTypeArguments();
-      code += '();\nconst wrapper =';
+      code += '();\nconst __wrapper =';
       if (handleError) {
         code += 'nasl.util.autoTypeHandleError(';
       }
-      code += 'warpperRes[0]';
+      code += '__warpperRes[0]';
       if (handleError) {
         code += ')';
       }
-      code += ';\nreturn wrapper';
+      code += ';\nreturn __wrapper';
       code += ';\n})()';
       setEndSemi();
       return code;
@@ -1363,7 +1372,7 @@ export class CallLogic extends LogicItem {
     }
 
     if (!state.callLogicNoIife && useIife) {
-      code += '(() =>{\nconst wrapper = ';
+      code += '(() =>{\nconst __wrapper = ';
       if (handleError) {
         code += 'nasl.util.autoHandleError(';
       }
@@ -1382,7 +1391,7 @@ export class CallLogic extends LogicItem {
       if (handleError) {
         code += ')';
       }
-      code += ';\nreturn wrapper';
+      code += ';\nreturn __wrapper';
       yield* setInputParam();
       code += ';\n})()';
     } else {
@@ -1430,8 +1439,8 @@ export class CallLogic extends LogicItem {
 
     let code = '';
     let calleeKey = this.calleeKey.replace('__elements', '$refs');
-    if (/^app.+?\.entities\..+?logics/.test(calleeKey))
-      calleeKey = calleeKey.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1Entity');
+    // if (/^app.+?\.entities\..+?logics/.test(calleeKey))
+    //   calleeKey = calleeKey.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1Entity');
     /** 设置函数范型参数 */
     const setTypeArguments = () => {
       if (Array.isArray(typeArguments) && typeArguments.length) {
@@ -1612,7 +1621,14 @@ export class CallLogic extends LogicItem {
       const characterOffset = 7;
       const code = getCode();
       const lines = code.split('\n');
-      const lineOffset = lines.findIndex((item) => item.startsWith('const warpperRes'));
+      let lineOffset = 0;
+      // nasl的 check 不让用 findLastIndex，自己写个for循环
+      for (let i = lines.length - 1; i >= 0; i--) {
+        if (lines[i]?.startsWith('const __warpperRes')) {
+          lineOffset = i;
+          break;
+        }
+      }
       return {
         line: range.start.line + lineOffset + 1,
         offset: characterOffset,
@@ -1621,7 +1637,7 @@ export class CallLogic extends LogicItem {
       const characterOffset = 8;
       const code = getCode();
       const lines = code.split('\n');
-      const lineOffset = lines.findIndex((item) => item.startsWith('return wrapper'));
+      const lineOffset = lines.findIndex((item) => item.startsWith('return __wrapper'));
 
       return {
         line: range.start.line + lineOffset + 1,
@@ -1631,7 +1647,19 @@ export class CallLogic extends LogicItem {
       // 怕改坏其他地方，业务组件单独处理
       return getBusinessComponentCallExpressionQuickInfo(range, getCode);
     } else {
-      return getCallExpressionQuickInfo(range, getCode);
+      const result = getCallExpressionQuickInfo(range, getCode);
+      let code = getCode();
+      if(code.includes('__elements.')){
+        const prefixOffset = code.indexOf('__elements.');
+        code = code.slice(prefixOffset);
+        let indexOf = code.indexOf('(');
+        const subStr = code.substring(0, indexOf);
+        const codeArr = subStr?.split('.');
+        const lastLen = codeArr?.[codeArr.length - 1]?.length;
+        indexOf = subStr.length - lastLen;
+        result.offset = result.offset + prefixOffset + indexOf;
+      }
+      return result;
     }
   }
 
@@ -1712,6 +1740,24 @@ export class CallLogic extends LogicItem {
     }
     return this.typeArguments;
   }
+
+  /**
+   * 获取需要用户手动选择的参数列表 的原始范型参数
+   */
+  get needCompleteTypeArgumentGenerics() {
+    if (this.completeTypeParams?.length) {
+      const typeParams: TypeParam[] = [];
+      this.completeTypeParams.forEach((typeParam, typeIndex) => {
+        if (typeParam.needChoose && this.typeArguments?.[typeIndex]) {
+          typeParams.push(typeParam);
+        }
+      });
+      return typeParams;
+    }
+    return [];
+  }
+
+
   static isSystem(node: CallLogic) {
     // 如此处需要更新，则需同时更新 menu-poppup 组件下的 includesSystemLogic 校验逻辑
     return ['nasl.process', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.io'].includes(

package/src/concepts/Connection__.ts

@@ -375,6 +375,22 @@ export class Connection extends BaseNode {
     };
   }
 
+  /**
+   * 获取当前的TsName
+   */
+  get tsName() {
+    if (this.name) {
+      let tsName = this.name;
+      // 匹配所有非数字、字母、中文字符都转为_
+      tsName = tsName.replace(/[^\w\u4e00-\u9fa5]/g, '_');
+      if (/^\d/.test(tsName)) {
+        tsName = `$${tsName}`;
+      }
+      return tsName;
+    }
+    return '';
+  }
+
   @withSourceMapGenerator
   *toEmbeddedTS(
     state = createCompilerState(),

package/src/concepts/DatabaseTypeAnnotation__.ts

@@ -62,7 +62,18 @@ export class DatabaseTypeAnnotation extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    return '';
+  }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = createDecoratorCode(state, this, ['typeName', 'arguments'], {
+      concept: true,
+    });
+    return code;
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/End__.ts

@@ -108,6 +108,9 @@ export class End extends LogicItem {
       case 'OverriddenLogic':
         ret = self.OverriddenLogic.returns[0];
         break;
+      case 'SubLogic':
+        ret = self.parentNode?.returns?.[0];
+        break;
       default:
         // 旧逻辑默认走这里，
         // 期望后期可以直接走完整的case， default 直接抛出异常好更明确定位错误
@@ -116,7 +119,8 @@ export class End extends LogicItem {
           self.parentNode.getAncestor('Logic') ||
           self.parentNode.getAncestor('AuthLogic') ||
           self.parentNode.getAncestor('AuthLogicForCallInterface') ||
-          self.parentNode.getAncestor('OverriddenLogic');
+          self.parentNode.getAncestor('OverriddenLogic') ||
+          self.parentNode.getAncestor('SubLogic');
         ret = (logic as Logic).returns[0];
     }
     if (ret && self.parentNode.concept === 'AuthLogicForCallInterface') {

package/src/concepts/EntityProperty__.ts

@@ -10,6 +10,7 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 import type CallQueryComponent from './CallQueryComponent__';
 
@@ -477,6 +478,10 @@ export class EntityProperty extends BaseNode {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
+
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['label', 'description']);
+    
     if (this.relationNamespace && this.relationEntity && this.relationProperty) {
       code += `@EntityRelation(() => new ${this.relationEntity}().${this.relationProperty})\n`;
       code += indent(state.tabSize);

package/src/concepts/Entity__.ts

@@ -11,12 +11,15 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
 import type CallQueryComponent from './CallQueryComponent__';
 import Module from './Module__';
 import DataSource from './DataSource__';
 import View from './View__';
+import ProcessV2 from './ProcessV2__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -837,7 +840,11 @@ export class Entity extends Annotatable {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState(), entityName?: string): string {
-    let code = `class ${this?.name} {\n`;
+    let code = '';
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['description']);
+    code = `class ${this?.name} {\n`;
+
     this.properties.forEach((property) => {
       code += `${property.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }))};\n`;
     });
@@ -961,6 +968,27 @@ export class Entity extends Annotatable {
     });
     return res;
   }
+
+  syncProcessPermission(propertyNames: string[]) {
+    const path = `${this.ns?.path}.${this.name}`
+    const bindProcessV2s = this.app?.processV2s.filter((processV2) => `${processV2.bind.refNamespace}.${processV2.bind.refName}` === path) || []
+    bindProcessV2s.forEach((processV2) => {
+      processV2.elements.forEach((ele) => {
+        if (['InitiateTask', 'ApprovalTask'].includes(ele.type)) {
+          const fieldPermissions = propertyNames.map((propertyName: string) => {
+            return {
+              concept: 'FieldPermissionV2',
+              propertyName,
+              permission: 'hidden',
+            }
+          })
+          ele.update({
+            fieldPermissions: [...ele.fieldPermissions, ...fieldPermissions]
+          })
+        }
+      })
+    })
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/EnumItem__.ts

@@ -8,6 +8,7 @@ import {
   TranslatorGenerator,
   indent,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 import Enum from './Enum__';
@@ -106,6 +107,62 @@ export class EnumItem extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  /**
+   * 删除静态字符串
+   * @param name 静态字符串名称
+   */
+  removeLabel(name: string): void;
+
+  /**
+   * 删除静态字符串
+   * @param label 已有的静态字符串实例
+   */
+  removeLabel(label: StaticString): void;
+
+  removeLabel(options: string | StaticString) {
+    let label: StaticString;
+    if (typeof options === 'string') {
+      label = this.label;
+      if (!label) {
+        throw new Error('找不到静态字符串 ' + options);
+      }
+    } else {
+      label = options;
+    }
+    return label.delete();
+  }
+
+  __removeStaticString(staticString: StaticString) {
+    const parentKey = staticString.parentKey;
+    const params: Params = {
+      parentNode: this,
+      parentKey,
+      index: -1,
+      object: null,
+      oldObject: staticString,
+    };
+    if (parentKey) {
+      params.parentKey = parentKey;
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = staticString.__v_raw || staticString;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
+        ~index && (this as any)[parentKey].splice(index, 1);
+        params.index = index;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
+      }
+    }
+    return params;
+  }
+
   /**
    * 祖先 Enum
    */
@@ -151,7 +208,13 @@ export class EnumItem extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    return `'${this.value}' = '${this.label?.value}'`;
+    let code = '';
+    
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['label']);
+    code += `'${this.value}' = '${this.label?.value}'`;
+
+    return code;
   }
 
   @withSourceMap()

package/src/concepts/Enum__.ts

@@ -10,6 +10,7 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 import type Identifier from './Identifier__';
@@ -317,7 +318,11 @@ export class Enum extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = `enum ${this.name} {\n`;
+    let code = '';
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['label', 'description']);
+
+    code += `enum ${this.name} {\n`;
     this.enumItems.forEach((item) => {
       code += indent(state.tabSize + 1);
       code += item.toNaturalTS(shiftState(state, code, { tabSize: 0 }));

package/src/concepts/ForEachStatement__.ts

@@ -472,7 +472,7 @@ export class ForEachStatement extends LogicItem {
     if (state?.focusedNodePath === `${this?.nodePath}.body[${this.body?.length}]`)
       code += `${indent((state?.tabSize || 0) + 1)}/* 当前位置 */\n`;
 
-    code += `${indent(state.tabSize)}\n}\n`;
+    code += `${indent(state.tabSize)}}\n`;
 
     return code;
   }