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

package/src/server/formatTsUtils.ts

@@ -342,8 +342,6 @@ function getAStructureScopeType(type: string, parent: any, node: SynatxNode) {
         property: new Identifier({ name: structureItem.name }),
       });
       structureItem.expression = memberExpression;
-      // 如果是从实体或者数据结构取的属性，就需要重置一下类型
-      structureItem.concept = 'CompletionProperty';
       const completionProperty = new CompletionProperty(structureItem);
       completionProperty.icon = 'refProperty';
 
@@ -379,8 +377,6 @@ function getAStructureScopeType(type: string, parent: any, node: SynatxNode) {
             property: new Identifier({ name: newItem.name }),
           });
           newItem.expression = memberExpression;
-          // 如果是从实体或者数据结构取的属性，就需要重置一下类型
-          newItem.concept = 'CompletionProperty';
           // 如果有类型而且类型不是没有子集的类型，就把他当前的类型拿到
           if (item.typeKey && !isNoChildType(item.typeKey)) {
             newItem.children = nextObjectTypeChild(item.typeKey, newItem, node);
@@ -445,9 +441,6 @@ function getAStructureObjectStringType(type: string, parent: any, node: SynatxNo
   parentItem.value = parentItem.text;
   parentItem.name = parentItem.text;
 
-  // 如果是从实体或者数据结构取的属性，就需要重置一下类型
-  parentItem.concept = 'CompletionProperty';
-
   res = res.map((item) => {
     const newItem: any = item;
     // 如果没有父节点就是Identifier
@@ -457,8 +450,6 @@ function getAStructureObjectStringType(type: string, parent: any, node: SynatxNo
       property: new Identifier({ name: newItem.name }),
     });
     newItem.expression = memberExpression;
-    // 如果是从实体或者数据结构取的属性，就需要重置一下类型
-    newItem.concept = 'CompletionProperty';
     // 如果有类型而且类型不是没有子集的类型，就把他当前的类型拿到
     if (item.typeKey && !isNoChildType(item.typeKey)) {
       newItem.children = nextObjectTypeChild(getPlatformType(item.typeKey), newItem, node);
@@ -669,8 +660,6 @@ export function formatVariableData(data: unknown | variableItem[], node: SynatxN
           nextFindTypeChild(typeKey, item, node);
         }
       }
-      // 如果是从实体或者数据结构取的属性，就需要重置一下类型
-      item.concept = 'CompletionProperty';
       const completionProperty = new CompletionProperty(item);
       completionProperty.jsonName = item.jsonName;
       // 标记实体属性是否是符合类型

package/src/server/getConnector.ts

@@ -9,33 +9,69 @@ export function getConnections(node: CallConnector) {
 }
 
 export function getConnectorTree(node: CallConnector, filterText: string) {
-  const source: Connection[] = getConnections(node);
-  let target = source;
-  if (filterText) {
-    target = source.filter((dep) => new RegExp(filterText).test(dep.name));
-  }
-  const tree = [];
-  const redises = target.filter((dep) => dep.connector.connectorKind === 'redis');
-  const kafkas = target.filter((dep) => dep.connector.connectorKind === 'kafka');
-  if (redises.length) {
-    tree.push({
-      name: 'Redis连接器',
-      title: 'Redis连接器',
-      icon: 'redis',
-      expanded: true,
-      unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
-      children: redises,
+    const source: Connection[] = getConnections(node);
+    let target = source;
+    if (filterText) {
+        target = source.filter((dep) => new RegExp(filterText).test(dep.name));
+    }
+    const tree = [];
+    const redises = target.filter((dep) => dep.connector.connectorKind === 'redis');
+    const kafkas = target.filter((dep) => dep.connector.connectorKind === 'kafka');
+    if (redises.length) {
+        tree.push({
+            name: 'Redis连接器',
+            title: 'Redis连接器',
+            icon: 'redis',
+            expanded: true,
+            unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
+            children: redises,
+        });
+    }
+    if (kafkas.length) {
+        tree.push({
+            name: 'Kafka连接器',
+            title: 'Kafka连接器',
+            icon: 'kafka',
+            expanded: true,
+            unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
+            children: kafkas,
+        });
+    }
+    // 自定义连接器相关逻辑处理
+    const customConnectionNameMap = new Map<Connector, Connection[]>();
+    target?.forEach((item) => {
+        const { connector } = item;
+        const { connectorKind } = connector;
+        if (connectorKind === 'app') {
+            if (customConnectionNameMap.has(connector)) {
+                customConnectionNameMap.get(connector).push(item);
+            } else {
+                customConnectionNameMap.set(connector, [item]);
+            }
+        }
     });
-  }
-  if (kafkas.length) {
-    tree.push({
-      name: 'Kafka连接器',
-      title: 'Kafka连接器',
-      icon: 'kafka',
-      expanded: true,
-      unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
-      children: kafkas,
+    customConnectionNameMap.forEach((value, key) => {
+        tree.push({
+            name: key.title,
+            title: key.title,
+            icon: key.previewImg,
+            expanded: true,
+            unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
+            isCustom: true, // 自定义属性。用于标注当前选项是否是自定义连接器
+            children: value,
+        });
     });
-  }
-  return tree;
+    return tree;
+}
+
+export function publishConnector(app: App, connector: Connector) {
+    const dependenciesNames = app.dependencies.map((dep) => dep.name);
+    // 已经存在，直接更新
+    if (dependenciesNames.includes(connector.name)) {
+        const tconnector = app.dependencies.findIndex((dep) => dep.name === connector.name);
+        app.removeConnectorInDependencies(connector.name);
+        app.insertConnectorInDependenciesAt(connector, tconnector);
+        return;
+    }
+    app.addConnectorInDependencies(connector);
 }

package/src/server/getMemberIdentifier.ts

@@ -354,9 +354,8 @@ export function getConfigsIdentifier(node: BaseNode): CompletionProperty[] {
   return newProperties.concat(extensionConfigProperties);
 }
 function flatElements(elements: ViewElement[], componentList: CompletionProperty[], nodeParentElement: string, currentAttriBute: string) {
-  elements.forEach((item) => {
+  elements?.forEach((item) => {
       if (PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
-          console.log('componentItem', item)
           const current = item.name === nodeParentElement
           const stashItem: any = {
               name: `${item.name}${current ? '(当前组件)' : ''}`,
@@ -490,4 +489,4 @@ function getCurrentAttriBute(item: any): BindAttribute | undefined {
           return undefined
       }
   }
-}
+}

package/src/server/index.ts

@@ -1,5 +1,5 @@
 import { getLogics, iteratorTree } from './getLogics';
-import { getConnectorTree } from './getConnector';
+import { getConnectorTree, publishConnector } from './getConnector';
 import { getInterfaces } from './getInterfaces';
 import { getFunctions, getBuildInFunction } from './getFunctions';
 import { getLogging } from './getLogging';
@@ -10,6 +10,7 @@ import {
   getVariableIdentifier,
   getEnumsIdentifier,
   getGlobalVariableIdentifier,
+  getBackendVariablesIdentifier,
   getLiteralsIdentifier,
   getSelectNextCompletionData,
   getConfigsIdentifier,
@@ -34,12 +35,14 @@ const server: any = {
   getVariableIdentifier,
   getEnumsIdentifier,
   getGlobalVariableIdentifier,
+  getBackendVariablesIdentifier,
   getLiteralsIdentifier,
   getAllComponentEventMap,
   getLogging,
   displayString2TypeAnnotation,
   getConfigsIdentifier,
   getConnectorTree,
+  publishConnector,
 };
 export default server;
 export const NaslServer = NaslServerClass;