@lcap/nasl 3.3.3-beta.2 → 3.3.3-beta.4

package/src/server/formatTsUtils.ts

@@ -12,7 +12,7 @@ import {
   Logic,
   ConfigProperty,
   App,
-  SynatxNode,
+  SyntaxNode,
   BindAttribute,
   Interface,
   CallLogic,
@@ -278,7 +278,7 @@ function findNode(typeKey: string, node: BaseNode) {
  * @param item 当前节点的内容
  * @param node 获取变量框的位置
  */
-export function nextFindTypeChild(typeKey: string, item: any, node: SynatxNode) {
+export function nextFindTypeChild(typeKey: string, item: any, node: SyntaxNode) {
   const newType = findNode(typeKey, node);
   if ((newType as Structure)?.properties && (newType as Structure).properties.length) {
     // 处理泛型的内容要取到值
@@ -312,7 +312,7 @@ export function nextFindTypeChild(typeKey: string, item: any, node: SynatxNode)
     lCAPRolePerMapping: dataSources.defaultDS.entities.LCAPRolePerMapping;
 }>`
  */
-function getAStructureScopeType(type: string, parent: any, node: SynatxNode) {
+function getAStructureScopeType(type: string, parent: any, node: SyntaxNode) {
   let newType = type
     .replaceAll(' ', '')
     .replaceAll('\n', '')
@@ -412,7 +412,7 @@ function getAStructureScopeType(type: string, parent: any, node: SynatxNode) {
     total: nasl.core.Long;
 }`
  */
-function getAStructureObjectStringType(type: string, parent: any, node: SynatxNode) {
+function getAStructureObjectStringType(type: string, parent: any, node: SyntaxNode) {
   let newType = type
     .replaceAll(' ', '')
     .replaceAll('\n', '')
@@ -467,7 +467,7 @@ function getAStructureObjectStringType(type: string, parent: any, node: SynatxNo
   completionProperty.icon = getNodeiconFromLogic(completionProperty, node);
   return completionProperty;
 }
-function nextObjectTypeChild(typeKey: string, item: any, node: SynatxNode) {
+function nextObjectTypeChild(typeKey: string, item: any, node: SyntaxNode) {
   const newType = findNode(typeKey, node);
   if ((newType as Structure)?.properties && (newType as Structure).properties.length) {
     // 处理泛型的内容要取到值
@@ -492,7 +492,7 @@ function nextObjectTypeChild(typeKey: string, item: any, node: SynatxNode) {
   }
 }
 
-function getNodeTypeVariableData(nodeType: any, item: any, node: SynatxNode) {
+function getNodeTypeVariableData(nodeType: any, item: any, node: SyntaxNode) {
   item.value = item.text;
   item.name = item.text;
   const parentExpression = new Identifier({ name: item.text });
@@ -589,7 +589,7 @@ function getNextFlag(typeKey: string, typeKeyMap: Map<string, number>) {
   return true;
 }
 // 格式化变量数据
-export function formatVariableData(data: unknown | variableItem[], node: SynatxNode, parent?: any) {
+export function formatVariableData(data: unknown | variableItem[], node: SyntaxNode, parent?: any) {
   if (Array.isArray(data)) {
     let result = data.map((item) => {
       item.children = [];
@@ -688,7 +688,7 @@ export function formatVariableData(data: unknown | variableItem[], node: SynatxN
 }
 
 // 从logic获取节点的icon
-function getNodeiconFromLogic(completionProperty: CompletionProperty, node: SynatxNode): string {
+function getNodeiconFromLogic(completionProperty: CompletionProperty, node: SyntaxNode): string {
   const { name: propName } = completionProperty;
   const { view } = node as Param;
   const logic = (node as Param).logic || (node as Param).OverriddenLogic || (node as Param).AuthLogic || (node as Param).AuthLogicForCallInterface;

package/src/server/getMemberIdentifier.ts

@@ -11,7 +11,7 @@ import {
   LogicItem,
   Frontend,
   View,
-  SynatxNode,
+  SyntaxNode,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
 } from '..';
@@ -173,10 +173,10 @@ function getCurrentLogic(
 ) {
   // 只有data-source check-file可以
   if (
-    (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file')) ||
+    (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file' || node.name === 'can-dragable-handler' || node.name === 'can-dropin-handler')) ||
     (node instanceof Identifier &&
       node.parentNode instanceof BindAttribute &&
-      (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file'))
+      (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file' || node.parentNode.name === 'can-dragable-handler' || node.parentNode.name === 'can-dropin-handler'))
   ) {
     const { view } = node;
     const viewLogics = view.logics;
@@ -194,7 +194,7 @@ function getCurrentLogic(
   }
 }
 
-export async function getMemberIdentifier(node: SynatxNode) {
+export async function getMemberIdentifier(node: SyntaxNode) {
   if (node) {
     // 获取字面量
     const literals = getLiteralsIdentifier();
@@ -278,7 +278,7 @@ export function getBackendVariablesIdentifier(node: BaseNode): CompletionPropert
   return newvariables;
 }
 // 获取变量
-export async function getVariableIdentifier(node: SynatxNode): Promise<CompletionProperty[]> {
+export async function getVariableIdentifier(node: SyntaxNode): Promise<CompletionProperty[]> {
   let completionData: CompletionProperty[] = [new CompletionProperty({})];
   // 只获取第一层内容
   const app = node.getAncestor('App');
@@ -474,7 +474,7 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
 }
 
 // 获取页面组件
-export function getPageComponentsIdentifier(node: SynatxNode): CompletionProperty[] {
+export function getPageComponentsIdentifier(node: SyntaxNode): CompletionProperty[] {
   const { fileNode } = node.getCurrentSource();
   const stashElements = (fileNode as View).elements;
   const componentList: CompletionProperty[] = []

package/src/server/naslServer.ts

@@ -80,7 +80,7 @@ import {
   AuthLogicForCallInterface,
   Connector,
   AuthInterface,
-  SynatxNode,
+  SyntaxNode,
   Connection,
   TriggerLauncher,
   CallConnector,
@@ -2197,7 +2197,7 @@ class NaslServer {
             }
           }
         }
-     
+
         if (node instanceof Return || node instanceof Variable) {
           const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
           if (!node.typeAnnotation && !node.__TypeAnnotation) {
@@ -2320,11 +2320,11 @@ class NaslServer {
 
   _treeMetadataType2CoreType(type: TypeAnnotation, app: App) {
     type.typeArguments?.forEach((item: TypeAnnotation) => {
-      if (item.typeNamespace.endsWith('.metadataTypes')) {
+      if (item.typeNamespace?.endsWith('.metadataTypes')) {
         let originType = {} as TypeAnnotation
         if (item.typeNamespace === 'app.metadataTypes') {
             originType = app.metadataTypes?.find((metadataType) => metadataType.name === item.typeName)?.typeAnnotation;
-        } else if (item.typeNamespace.startsWith('extensions.') && item.typeNamespace.endsWith('.metadataTypes')) {
+        } else if (item.typeNamespace?.startsWith('extensions.') && item.typeNamespace?.endsWith('.metadataTypes')) {
             const dependencyName = item.typeNamespace.replace('extensions.', '').replace('.metadataTypes', '')
             originType = app.dependencies?.find((dependency) => dependency.name === dependencyName)?.metadataTypes?.find((ele) => ele.name === item.typeName)?.typeAnnotation ?? {} as TypeAnnotation
         }

package/src/server/translator.ts

@@ -33,7 +33,6 @@ import {
   CallInterface,
   Return,
   ProcessElement,
-  NullLiteral,
   SwitchCase,
   WhileStatement,
   IfStatement,
@@ -41,6 +40,7 @@ import {
   ForEachStatement,
   CallFunction,
   ProcessOutcome,
+  ProcessOutcomes,
   Function,
   Anchor,
   BatchAssignment,
@@ -573,6 +573,15 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       }
     } else if (node.parentNode instanceof NewList && text.includes(`parameter of type 'never'`)) {
       tsErrorDetail.message = '自动推导不出类型！newList中有未知类型';
+    } else if (node instanceof ProcessOutcome || node instanceof ProcessOutcomes) {
+      const cap = /Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'/.exec(text);
+      const selectComes = cap[1].split(' | ');
+      const currentComes = cap[2].split(' | ');
+      if (node instanceof ProcessOutcome) {
+        tsErrorDetail.message = `流向出口不存在，${selectComes.map((item) => item).join(',')}出口流不属于[${currentComes.map((item) => item).join(',')}]当中的某个流`
+      } else {
+        tsErrorDetail.message = `流向出口不存在，${selectComes.map((item) => item).join(',')}有错误的出口流`
+      }
     }
   }
   if (node instanceof Argument || node instanceof Anchor) {

package/src/service/storage/init.ts

@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, SynatxNode, BindDirective, CallLogic } from '../../concepts';
+import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, SyntaxNode, BindDirective, CallLogic } from '../../concepts';
 import { addBreakpointNodesFromApp } from '../../breakpoint';
 import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
@@ -454,7 +454,7 @@ async function doAction(app: any, actionItem: any) {
   try {
     if (Array.isArray(list)) {
       list.forEach((event) => {
-        const emitTarget = event?.originEvent?.target as SynatxNode;
+        const emitTarget = event?.originEvent?.target as SyntaxNode;
         const _path: string = event.originEvent.path;
         const _root = _path.split('.')?.[1] || '';
         if (['backend', 'overriddenLogics', 'dataSources', 'processes', 'roles', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies', 'authLogics', 'authLogicsForCallInterface', 'triggerLaunchers', 'connections'].some((item) => _root.startsWith(item))) {

package/src/service/storage/jsoner.ts

@@ -28,6 +28,27 @@ function excludeProperties(node: any, excludes: string[]) {
     return newNode;
 }
 
+// "app.configuration.groups[name=system].properties[name=system.custom.log.level]"
+function splitPath(path: string) {
+    path = path || '';
+    const res = [];
+    let prevDot = -1;
+    let countLeftBracket = 0;
+    for(let i=0;i<path.length;i+=1) {
+        if(path[i] === '[')
+            countLeftBracket += 1;
+        else if(path[i] === ']')
+            countLeftBracket -= 1;
+
+        if(path[i] === '.' && countLeftBracket === 0) {
+            res.push(path.slice(prevDot+1, i));
+            prevDot = i;
+        }
+    }
+    res.push(path.slice(prevDot+1));
+    return res;
+}
+
 /**
  * 通过路径查找节点
  * @param json 根节点
@@ -35,7 +56,7 @@ function excludeProperties(node: any, excludes: string[]) {
  * @returns
  */
 export function queryNodeByPath(json: any, path: string): any {
-    const pathArr = path?.split('.') || [];
+    const pathArr = splitPath(path);
     let pathItem = pathArr.shift();
     let node: any = json;
     while (pathItem) {
@@ -69,9 +90,9 @@ export async function batchQuery(json: any, queryList: Array<Query>) {
         if (node) {
             if (Array.isArray(node)) {
                 return node.map((nodeItem) => excludeProperties(nodeItem, excludes));
-            } 
+            }
                 return excludeProperties(node, excludes);
-            
+
         }
         return null;
     });

package/src/translator/utils.ts

@@ -121,7 +121,7 @@ export function withSourceMap() {
 export function transfromMetadataType(expTypeAnnotation: TypeAnnotation, app: App) {
     let { sortedTypeKey, typeKind, typeNamespace, typeName } = expTypeAnnotation || {};
     if (expTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
-      const referenceNode = app.findNodeByCompleteName(expTypeAnnotation.typeNamespace + '.' + expTypeAnnotation.typeName) || {}
+      const referenceNode = app?.findNodeByCompleteName(expTypeAnnotation.typeNamespace + '.' + expTypeAnnotation.typeName) || {}
       const typeAn = referenceNode.typeAnnotation || {};
       typeKind = typeAn.typeKind;
       typeNamespace = typeAn.typeNamespace;
@@ -134,4 +134,18 @@ export function transfromMetadataType(expTypeAnnotation: TypeAnnotation, app: Ap
       typeName,
       sortedTypeKey
     }
+}
+
+export function transfromUnionTypeAnnotation(expTypeAnnotation: TypeAnnotation, app: App) {
+  // 针对union类型，typeAnntatation拿不到app数据，暂时先在这里处理
+  if (expTypeAnnotation?.typeKind === 'union' && expTypeAnnotation?.typeArguments?.length) {
+    expTypeAnnotation?.typeArguments?.forEach((typeArg: any) => {
+      if (typeArg.typeNamespace?.endsWith('.metadataTypes')) {
+        const referenceNode = app?.findNodeByCompleteName(typeArg.typeNamespace + '.' + typeArg.typeName)?.typeAnnotation || {};
+        typeArg.typeName = referenceNode.typeName
+        typeArg.typeKind = referenceNode.typeKind
+        typeArg.typeNamespace = referenceNode.typeNamespace
+      }
+    })
+  }
 }