@lcap/nasl 3.7.0-beta.4 → 3.7.0-beta.5

package/src/manager/diagnostic.ts

@@ -38,20 +38,44 @@ export interface Diagnostic {
  */
 export interface DiagnosticRecord {
   id: string;
+
   logicId?: string;
-  // typeCheckNote: TypeCheckNote,
+
   filePath?: string;
   node: BaseNode;
   message: string;
   syntaxDiagnostics: Array<Diagnostic>;
   semanticDiagnostics: Array<Diagnostic>;
   suggestionDiagnostics: Array<Diagnostic>;
-  // processComponentId?: string,
-  // attributes?: TypeCheckAttribute[],
 }
 
 export class DiagnosticManager {
-  records: Array<DiagnosticRecord> = [];
+  private initVersionByFilePath(filePath: string) {
+    if (this.versions[filePath] === undefined) {
+      this.versions[filePath] = 0;
+    }
+    return this.versions[filePath];
+  }
+
+  incrementVersionByFilePath(filePath: string): number {
+    this.initVersionByFilePath(filePath);
+    return ++this.versions[filePath];
+  }
+
+  getVersionByFilePath(filePath: string) {
+    // 单纯 get 不需要写入
+    return this.versions[filePath] ?? 0;
+  }
+
+  deleteVersionByFilePath(filePath: string) {
+    if (!filePath) {
+      return true;
+    }
+    delete this.versions[filePath];
+  }
+
+  private versions: Record<string, number> = Object.create(null);
+  private records: Array<DiagnosticRecord> = [];
 
   push(record: DiagnosticRecord) {
     const index = this.records.findIndex((item) => item.id === record.id);
@@ -60,15 +84,7 @@ export class DiagnosticManager {
     } else {
       this.records.splice(index, 1, record);
     }
-
-    // if(record.typeCheckNote?.message?.filter)
-    //     record.typeCheckNote.message = record.typeCheckNote.message.filter((item) => !!item);
-
-    // if(!record.typeCheckNote || record.typeCheckNote.status === 'success'
-    //     || (record.typeCheckNote && record.typeCheckNote.message && record.typeCheckNote.message.length === 0))
-    //     return;
   }
-
   getRecord(id: string) {
     const index = this.records.findIndex((item) => item.id === id);
     return this.records[index];
@@ -76,27 +92,18 @@ export class DiagnosticManager {
 
   deleteOwn(id: string) {
     const index = this.records.findIndex((item) => item.id === id);
+    if (index !== -1) {
+      const path = this.records[index].filePath;
+      if (path) {
+        this.deleteVersionByFilePath(path);
+      }
+    }
     ~index && this.records.splice(index, 1);
   }
 
-  delete(id: string) {
-    // const node = vertexsMap.get(id);
-    // this.deleteOwn(id);
-    // if (node) {
-    //     const children: LogicItem[] = [];
-    //     // [...logicItemKeyOfLogicItem, ...logicItemArrayKeyOfLogicItem].forEach((key) => {
-    //     //     const item = (node as LogicItem)[key as keyof LogicItem];
-    //     //     if (item)
-    //     //         children = children.concat(item);
-    //     // });
-    //     children.forEach((item) => {
-    //         this.delete(item.id);
-    //     });
-    // }
-  }
-
   clear() {
     this.records.splice(0, this.records.length);
+    this.versions = Object.create(null);
   }
 
   pushAll(records: DiagnosticRecord[]) {
@@ -108,9 +115,6 @@ export class DiagnosticManager {
     return [].concat(
       ...this.records.map((record) => {
         const diagnostics: Diagnostic[] = [].concat(record.semanticDiagnostics, record.suggestionDiagnostics);
-        // if (!showTSError) {
-        //     diagnostics = diagnostics.filter((diagnostic) => chineseRE.test(diagnostic.message));
-        // }
         return diagnostics;
       })
     );

package/src/natural/transformTSCode.ts

@@ -687,11 +687,36 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         pushElseIf(node, switchStatement);
         return switchStatement;
       }
-      return new naslTypes.IfStatement({
+      let consequentIndex: number;
+      let alternateIndex: number;
+      const naslNode = new naslTypes.IfStatement({
         test: transformLogicNode(node.test),
-        consequent: !node.consequent ? [] : (node.consequent as babelTypes.BlockStatement).body.map((item) => transformLogicNode(item)).filter((item) => !!item),
-        alternate: !node.alternate ? [] : (node.alternate as babelTypes.BlockStatement).body.map((item) => transformLogicNode(item)).filter((item) => !!item),
-      });
+        consequent: !node.consequent ? [] : (node.consequent as babelTypes.BlockStatement).body.map((item: any, index: number) => {
+          if (item?.type === 'ReturnStatement') {
+            item.ends = true;
+            if (item?.argument) {
+              consequentIndex = index;
+            }
+          }
+          return transformLogicNode(item);
+        }).filter((item) => !!item),
+        alternate: !node.alternate ? [] : (node.alternate as babelTypes.BlockStatement).body.map((item: any, index: number) => {
+          if (item?.type === 'ReturnStatement') {
+            item.ends = true;
+            if (item?.argument) {
+              alternateIndex = index;
+            }
+          }
+          return transformLogicNode(item);
+        }).filter((item) => !!item),
+      }) as any;
+      if (consequentIndex !== undefined) {
+        naslNode?.consequent?.splice(consequentIndex + 1, 0, new naslTypes.End());
+      }
+      if (alternateIndex !== undefined) {
+        naslNode?.alternate?.splice(alternateIndex + 1, 0, new naslTypes.End());
+      }
+      return naslNode;
     } else if (node.type === 'WhileStatement') {
       return new naslTypes.WhileStatement({
         test: transformLogicNode(node.test),
@@ -883,6 +908,9 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           right: transformLogicNode(node.argument),
         });
       }
+      if ((node as any)?.ends) {
+        return new naslTypes.End();
+      }
     } else if (node.type === 'EmptyStatement') {
       return node.leadingComments && new naslTypes.Comment({
         value: String(node.leadingComments[0].value),

package/src/server/extendBaseNode.ts

@@ -30,7 +30,7 @@ import { EventPayload, invokeCommand, registerCommand } from '../common';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 import { extendSentryMonitorNaslNode } from '../sentry';
-import { ca } from 'date-fns/locale';
+import { isAuthLogicForCallInterface, isParam } from '../concepts/utils/asserts';
 
 interface SetNameNode extends BaseNode {
   setName(name: string): any;
@@ -114,6 +114,23 @@ BaseNode.prototype.nodeFindRefNodes = function nodeFindRefNodes() {
   }
 };
 
+/**
+ * AuthLogicForCallInterface 通过当前节点，查找被引用的节点
+ * 以下面代码为例由于相关文件TS代码翻译的特殊性，
+ * 导致在查找引用的时候是以类型参数为准，而不是实际参数
+ * 此种行为会导致函数体内的参数无法查找到引用
+ * ({par, pa, api}:{    par:     nasl.core.String,     pa:     nasl.core.String, api?: ApiReturn})
+ * 为此需要重新查找一次引用
+ */
+async function extensionRefForAuthLogicForCallInterfaceParams(refsList: any[], node: BaseNode, naslServer: NaslServer) {
+  const target = refsList[0];
+  const newRefs = await naslServer.references({
+    file: refsList[0].file,
+    line: target.start.line,
+    offset: target.start.offset,
+  })
+  return [...newRefs.refs];
+}
 BaseNode.prototype.changeName = async function changeName(newValue: string, updateAll: boolean = false) {
   try {
     /**
@@ -121,7 +138,13 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
      */
     const app = this.getAncestor('App');
     const naslServer = (app as any).naslServer as NaslServer;
-    const refsList = await naslServer._isHaveRef(this);
+    let refsList = await naslServer._isHaveRef(this);
+    // 鉴权方式 参数修改需要协同变更相关参数
+    // 但由于鉴权返回实现TS的特殊性，在查询节点的时候，只会查询类型参数的引用，导致引用查找缺失
+    // 因此需要手动更新一下
+    if (isParam(this) && isAuthLogicForCallInterface(this.parentNode)) {
+      refsList = await extensionRefForAuthLogicForCallInterfaceParams(refsList, this, naslServer);
+    }
     // 是不是有引用有的话，就返回
     /**
      * @param this 当前重命名的节点
@@ -185,8 +208,16 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
             } else {
               if (_this.concept === 'AuthLogicForCallInterface' && itemNode.concept === 'CallAuthInterface') {
                 const { calleewholeKey } = itemNode;
-                const targetItf: AuthInterface = getNodeByNodeCallee(App, calleewholeKey);
-                targetItf.setAuthLogic(newValue);
+                let targetItf: AuthInterface;
+                const connector = itemNode.getAncestor('Connector') as Connector;
+                if (connector) {
+                  targetItf = connector.interfaces?.find((itf: Interface | AuthInterface) => {
+                    return calleewholeKey.endsWith(itf.name);
+                  }) as AuthInterface;
+                } else {
+                  targetItf = getNodeByNodeCallee(App, calleewholeKey)
+                }
+                targetItf?.setAuthLogic?.(newValue);
                 // 需要触发更新，否则对应的ts文件不会更新会导致鉴权方式找不到报错
                 itemNode.update({});
               } else {

package/src/server/formatTsUtils.ts

@@ -231,7 +231,7 @@ function createType2Annotation(type: string, parentPrefix?: string): TypeAnnotat
   }
   return typeAnnotation;
 }
-export function getPlatformType(type: string): string {
+export function getPlatformType(type: string, node?: types.SyntaxNode): string {
   let tsType = '';
 
   if (type?.includes(': ')) {
@@ -241,7 +241,7 @@ export function getPlatformType(type: string): string {
     tsType = type;
   }
   tsType = tsType.replaceAll(' ', '');
-  const namespacePrefix = ['app', 'extensions', 'apis', 'components', 'nasl'];
+  const namespacePrefix = ['app', 'extensions', 'apis', 'components', 'nasl', 'connector'];
   if (tsType === 'String') {
     return 'nasl.core.String';
   } else if (tsType === 'Boolean') {
@@ -253,6 +253,9 @@ export function getPlatformType(type: string): string {
     const first = strTypes[0];
     // 如果不是这几个前缀就加一个namespace
     if (!namespacePrefix.includes(first)) {
+      if (node && (node as any)?.connector) {
+        return `${(node as any)?.connector?.getNamespacePrefix || ''}${tsType}`;
+      };
       return 'app.' + tsType;
     }
   }
@@ -623,7 +626,7 @@ export function formatVariableData(data: unknown | variableItem[], node: types.S
               }
             }
           }
-          typeKey = getPlatformType(currentType);
+          typeKey = getPlatformType(currentType, node);
           item.typeAnnotation = displayString2TypeAnnotation(typeKey);
         }
       } else if (item instanceof StructureProperty || item instanceof EntityProperty) {

package/src/server/getConnector.ts

@@ -1,7 +1,7 @@
-import CallConnector from '../concepts/CallConnector__';
-import { App } from '..';
-import Connector from '../concepts/Connector__';
-import Connection from '../concepts/Connection__';
+import type CallConnector from '../concepts/CallConnector__';
+import type { App } from '..';
+import type Connector from '../concepts/Connector__';
+import type Connection from '../concepts/Connection__';
 
 export function getConnections(node: CallConnector) {
     const app = node?.rootNode as App;
@@ -91,11 +91,11 @@ function notifyTsWorkToUpdateConnections(app: App, connector: Connector) {
 }
 
 export function publishConnector(app: App, connector: Connector) {
-    const dependenciesNames = app.dependencies.map((dep) => dep.name);
+    const dependenciesNames = app.connectorDependencies.map((dep) => dep.name);
     // 已经存在，直接更新
     if (dependenciesNames.includes(connector.name)) {
-        const connectorIndex = app.dependencies.findIndex((dep) => dep.name === connector.name);
-        const oldConnector = app.dependencies[connectorIndex] as Connector;
+        const connectorIndex = app.connectorDependencies.findIndex((dep) => dep.name === connector.name);
+        const oldConnector = app.connectorDependencies[connectorIndex] as Connector;
         app.removeConnector(oldConnector);
         // 由于 CallInterface 会在setTimeout 中处理删除Interface
         // 为了防止误删已经增加的。需要同样做一个延迟操作

package/src/server/getLogics.ts

@@ -147,7 +147,7 @@ function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeN
       }
       const viewElement = new Namespace({
         title: toHump(item.name),
-        logics: eleLogis.filter(e => e).map((item: Logic) => Logic.from(item.toJSON())),
+        logics: eleLogis.filter(e => e?.toJSON).map((item: Logic) => Logic.from(item.toJSON())),
         path,
         originConcept: 'ViewElement',
       });
@@ -185,8 +185,12 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
         pItem.originConcept = 'Process';
         return pItem;
       });
-      const dependencies = app.dependencies; //.filter((d) => d.enable);
-      const extensions = app.dependencies
+      // 连接器 相关迁移到了 conenctorDependencies 下，因此这边需要扩展
+      const dependencies = [
+        ...app.dependencies,
+        ...(app.connectorDependencies || [])
+      ]; //.filter((d) => d.enable);
+      const extensions = [...app.dependencies, ...(app.connectorDependencies || [])]
         .map((dep) => moduleToLogicNamesapce(dep, app.overriddenLogics))
         .filter((item) => item.logics && item.logics.length);
       const dependEntityNs: Namespace[] = [];
@@ -310,10 +314,14 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
                       'getIsMiniApp',
                       'navigateToUserInfo',
                       'getWeChatHeadImg',
+                      'getWeChatLocation',
                       'getWeChatNickName',
                       'getWeChatPhone',
                       'getWeChatOpenid',
                       'navigateToUserPhone',
+                      'navigateToScanCode',
+                      'getWeChatScanCode',
+                      'navigateToLocation'
                     ].includes(item.name)
                 ),
             expanded: false,
@@ -398,7 +406,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
             title: '微信',
             logics: getStdlibNamespace()
               .findChild('browser')
-              .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid', 'navigateToUserPhone', 'getWeChatPhone'].includes(item.name)),
+              .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid', 'navigateToUserPhone', 'getWeChatPhone','navigateToScanCode','getWeChatScanCode','navigateToLocation','getWeChatLocation'].includes(item.name)),
             expanded: false,
           })
         );
@@ -469,8 +477,15 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
       result.push(systemTree);
     }
     return result;
-  } else if (node?.concept === 'Identifier') {
-    const extensions = app.dependencies
+  }
+  if (node?.concept === 'Identifier') {
+    // 之前 连接器 Connector 相关也存在与 app.dependencies 下，
+    // 现在迁移到 app.connectorDependencies 下，
+    // 为保证上下游逻辑与之前保持一致，这边做相应的扩展
+    const extensions = [
+      ...app.dependencies,
+      ...(app.connectorDependencies || [])
+    ]
       .map((dep) => moduleToLogicNamesapce(dep, app.overriddenLogics))
       .filter((item) => item.logics && item.logics.length);
     const tree = new Namespace({