@lcap/nasl 3.4.0-alpha.2 → 3.4.0-beta.1

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 '..';
@@ -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');
@@ -458,7 +458,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

@@ -77,10 +77,8 @@ import {
   Integration,
   Backend,
   CallAuthInterface,
-  AuthLogicForCallInterface,
   Connector,
   AuthInterface,
-  SynatxNode,
   Connection,
   TriggerLauncher,
   CallConnector,
@@ -146,6 +144,8 @@ let isChangeInterface = false; // 判断是否导入接口
 type ActionNode = { target: Variable; typeannotation: TypeAnnotation };
 let actionArr: Array<ActionNode> = []; //用于导入接口收集更改的节点
 let timer: number | null = null; //超时器用于收集导入接口相关
+// naslStdlib文件缓存；作为全局变量给多实例用复用
+const __naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map();
 
 // 联合类型切割取出类型
 export function getDisplayString2Type(displayString: string) {
@@ -186,7 +186,7 @@ export function getDisplayString2Type(displayString: string) {
 @sentryMonitorNaslServer
 class NaslServer {
   /** naslStdlib文件缓存 */
-  naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map();
+  naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
 
   messager: Messager;
 
@@ -676,7 +676,7 @@ class NaslServer {
 
   // 缓存添加过的文件
   cacheFile(options: tsProtocol.OpenRequestArgs) {
-    this.naslStdlibFileCacheMap.set(options.file, options);
+    __naslStdlibFileCacheMap.set(options.file, options);
   }
 
   /** u

package/src/service/storage/init.ts

@@ -1,4 +1,4 @@
-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';
@@ -206,7 +206,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/translator/utils.ts

@@ -11,14 +11,12 @@ export const indent = (tabSize: number) => ' '.repeat(tabSize * 4);
  * 创建编译器状态
  */
 export function createCompilerState(startCode: string = '', options?: Partial<TranslatorState>) {
-  const state: TranslatorState = Object.assign({
-    position: {
+  const state: TranslatorState = {position: {
       line: 0,
       character: 0,
       offset: 0,
     },
-    tabSize: 0,
-  }, options);
+    tabSize: 0, ...options};
   if (!state.sourceMap)
     state.sourceMap = new Map<BaseNode, SourceMapItem>();
 
@@ -29,7 +27,7 @@ export function createCompilerState(startCode: string = '', options?: Partial<Tr
  * 根据代码移动位置
  */
 export function shiftPosition(pos: Position, code: string = ''): Position {
-  const res = Object.assign({}, pos);
+  const res = { ...pos};
   if (code) {
     const arr = code.split('\n');
     res.offset += code.length;
@@ -48,7 +46,7 @@ export function shiftPosition(pos: Position, code: string = ''): Position {
  * 根据代码移动状态
  */
 export function shiftState(state: TranslatorState, code?: string, options?: Partial<TranslatorState>): TranslatorState {
-  state = Object.assign({}, state);
+  state = { ...state};
   state.position = shiftPosition(state.position, code);
   Object.assign(state, options); // 优先 options
   return Object.freeze(state);
@@ -70,8 +68,8 @@ export function withSourceMap() {
       } catch (err) {}
       if (!state) {
         // 没有状态不生成 SourceMap
-        return oldMethod.call(this);
-      } else {
+        return oldMethod.call(this, state, ...args);
+      } 
         // state = Object.freeze(Object.assign({
         //   position: { line: 0, character: 0, offset: 0 },
         //   tabSize: 0,
@@ -96,7 +94,7 @@ export function withSourceMap() {
         }));
 
         return before + code;
-      }
+      
     };
 
     return descriptor;