@lcap/nasl 2.22.0-beta.0 → 2.22.0-beta.2

package/src/server/formatTsUtils.ts

@@ -118,6 +118,8 @@ export function displayString2TypeAnnotation(typeStr: string, parentPrefix?: str
     } else {
         type = typeStr;
     }
+    if (!type)
+        return;
     type = type.replaceAll(' ', '');
     if (type === 'Promise<void>')
         return null;
@@ -137,7 +139,7 @@ export function displayString2TypeAnnotation(typeStr: string, parentPrefix?: str
     } catch (err) {
         console.log(err);
     }
-    return typeAnnotation;
+    return typeAnnotation as TypeAnnotation;
 }
 
 function createGenericTypeAnnotation(type: string, parentPrefix?: string) {
@@ -148,13 +150,15 @@ function createGenericTypeAnnotation(type: string, parentPrefix?: string) {
     // 如果还有匹配到的多层泛型;
     // 取出匹配到的内容
     const types = /\<([^()]+)\>/g.exec(type);
+    if (types === null)
+        return types;
     const newtext = types[1];
     // 把匹配的值，的内容在，检索一遍，看是不是泛型套泛型
     const newTypes = /\<([^()]+)\>/g.exec(newtext);
     // 如果是的话就去递归
     if (newTypes) {
         const argTypeAnnotation = createGenericTypeAnnotation(newtext, parentPrefix);
-        typeAnnotation.typeArguments = [argTypeAnnotation];
+        typeAnnotation.typeArguments = [argTypeAnnotation as TypeAnnotation];
     } else {
         const argTypeAnnotation = createType2Annotation(newtext, parentPrefix);
 
@@ -361,6 +365,7 @@ function getAStructureScopeType(type: string, parent: any, node: BaseNode) {
                     if (item.typeKey && !isNoChildType(item.typeKey)) {
                         newItem.children = nextObjectTypeChild(item.typeKey, newItem, node);
                     }
+                    newItem.typeAnnotation = displayString2TypeAnnotation(newItem.typeKey);
                     const completionProperty = new CompletionProperty(newItem);
                     completionProperty.icon = 'refProperty';
                     return completionProperty;
@@ -436,6 +441,7 @@ function getAStructureObjectStringType(type: string, parent: any, node: BaseNode
         if (item.typeKey && !isNoChildType(item.typeKey)) {
             newItem.children = nextObjectTypeChild(getPlatformType(item.typeKey), newItem, node);
         }
+        newItem.typeAnnotation = displayString2TypeAnnotation(newItem.typeKey);
         const completionProperty = new CompletionProperty(newItem);
 
         completionProperty.icon = 'refProperty';
@@ -484,6 +490,7 @@ export function formatVariableData(data: unknown | variableItem[], node: BaseNod
                 if (item.completionDetail?.hasOwnProperty('nodeType')) {
                     const typeAnnotation = type2TypeAnnotation(item.completionDetail.nodeType);
                     typeKey = typeAnnotation?.typeKey;
+                    item.typeAnnotation = typeAnnotation;
                 } else {
                     // 当前节点的完整类型，主要是在有T的内容使用 nasl.list<Enum1> 内部匹配内容给里面子集的T赋值类型
                     let currentType: string = formatTs2TypeString(item.completionDetail.displayParts as Array<{ text: string; kind: string }>);
@@ -504,6 +511,7 @@ export function formatVariableData(data: unknown | variableItem[], node: BaseNod
                         }
                     }
                     typeKey = getPlatformType(currentType);
+                    item.typeAnnotation = displayString2TypeAnnotation(typeKey);
                 }
             } else if (item instanceof StructureProperty || item instanceof EntityProperty) {
                 typeKey = item?.typeAnnotation?.typeKey;
@@ -659,20 +667,40 @@ export function formatFrontEndVariables(frontEndVariables: Array<Variable>) {
     return result;
 }
 
-export function formatConfigProperties(configProperties: Array<ConfigProperty>) {
-    const result = configProperties.map((item) => {
-        const namespace = item.getNamespace();
-        const newItem: any = {
-            name: item.name,
-            value: item.name,
-            expression: new Identifier({
+export function formatConfigProperties(configProperties: Array<ConfigProperty>, isView: Boolean) {
+    const result = configProperties.reduce((pre: any, item) => {
+        const { isPrivate = false } = item;
+
+        if (!isPrivate || !isView) {
+            const namespace = item.getNamespace();
+            const newItem: any = {
                 name: item.name,
-                namespace,
-            }),
-            icon: 'configProperty',
-            calleewholeKey: item.calleewholeKey,
-        };
-        return newItem;
-    });
+                value: item.name,
+                expression: new Identifier({
+                    name: item.name,
+                    namespace,
+                }),
+                icon: 'configProperty',
+                calleewholeKey: item.calleewholeKey,
+            };
+
+            pre.push(newItem);
+        }
+        return pre;
+    }, []);
+    // const result = configProperties.map((item) => {
+    //     const namespace = item.getNamespace();
+    //     const newItem: any = {
+    //         name: item.name,
+    //         value: item.name,
+    //         expression: new Identifier({
+    //             name: item.name,
+    //             namespace,
+    //         }),
+    //         icon: 'configProperty',
+    //         calleewholeKey: item.calleewholeKey,
+    //     };
+    //     return newItem;
+    // });
     return result;
 }

package/src/server/getLogics.ts

@@ -57,8 +57,28 @@ function iterator(tree: FakeNode | FakeProcessNode, searchContent: string, fakeN
 function toHump(name: string): string {
     return name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase());
 }
+
+function javaLogicDataSourceLogics(logics: Logic[]) {
+    let globalLogics: Logic[] = [];
+    let javaLogics: Logic[] = [];
+
+    logics.forEach(logic => {
+        const { body = [] } = logic;
+
+        if (body && body.length && body[0].concept === 'JavaLogic') {
+            javaLogics.push(logic);
+        } else {
+            globalLogics.push(logic);
+        }
+    });
+    return {
+        globalLogics,
+        javaLogics
+    };
+}
+
 export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic, needAllLogic: boolean = true) {
-    const app = node.rootNode as App;
+    const app = node?.rootNode as App;
     if (node.concept === 'CallLogic' || node.concept === 'BindEvent' || node.concept === 'Logic') {
         const result = [];
 
@@ -84,9 +104,10 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
                 pItem.originConcept = 'Process';
                 return pItem;
             });
-            const extensions = app.dependencies.map(moduleToLogicNamesapce).filter((item) => item.logics && item.logics.length);
+            const dependencies = app.dependencies.filter((d) => d.enable);
+            const extensions = dependencies.map(moduleToLogicNamesapce).filter((item) => item.logics && item.logics.length);
             const dependEntityNs: Namespace[] = [];
-            app.dependencies.forEach((dep) => {
+            dependencies.forEach((dep) => {
                 (dep.dataSources || []).forEach((dataSource) => {
                     if (Array.isArray(dataSource.entities)) {
                         const list = dataSource.entities.map((entity) => entity.ns);
@@ -104,8 +125,19 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
                 name: 'category',
                 path: `${app.getNamespace()}.logics`,
                 title: '全局逻辑',
-                logics: app.logics,
-                children: [...nc, ...extensions, ...dependEntityNs, ...ps],
+                logics: javaLogicDataSourceLogics(app.logics).globalLogics,
+                children: [
+                    ...nc, 
+                    ...extensions, 
+                    ...dependEntityNs, 
+                    ...ps,
+                    new Namespace({
+                        name: 'javalogicCategory',
+                        title: '扩展逻辑',
+                        logics: javaLogicDataSourceLogics(app.logics).javaLogics,
+                        expanded: false,
+                    }),
+                ],
             });
             tree.expanded = false;
             result.push(tree);
@@ -228,6 +260,9 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
             }
 
             app.dependencies.forEach((item) => {
+                if (!item.enable) {
+                    return;
+                }
                 const fed = item.frontends.find((item) => item.type === node?.frontend?.type);
                 if (fed?.logics.length > 0) {
                     systemTree.children.push(new Namespace({
@@ -280,7 +315,7 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
         }
         return result;
     } else if (node.concept === 'Identifier') {
-        const extensions = app.dependencies.map(moduleToLogicNamesapce).filter((item) => item.logics && item.logics.length);
+        const extensions = app.dependencies.filter((m) => m.enable).map(moduleToLogicNamesapce).filter((item) => item.logics && item.logics.length);
         const tree = new Namespace({
             name: 'category`',
             path: `${app.getNamespace()}.logics`,

package/src/server/getMemberIdentifier.ts

@@ -228,7 +228,7 @@ export function getEnumsIdentifier(node: BaseNode): CompletionProperty[] {
     const enums = app?.enums;
     const newEnums = enums ? formatEnums(enums) : [];
     // 添加依赖库的枚举选择
-    const modules = app?.dependencies?.filter((module) => module.type === 'extension') || [];
+    const modules = app?.dependencies?.filter((module) => module.enable && module.type === 'extension') || [];
     const extensionEnums: any[] = [];
     modules.forEach((module) => {
         extensionEnums.push({
@@ -284,9 +284,10 @@ export function getConfigsIdentifier(node: BaseNode): CompletionProperty[] {
     const groups = app?.configuration.groups;
     const customGroup = groups.find((group) => group.name === 'custom');
     const properties = customGroup ? customGroup.properties : [];
-    const newProperties = formatConfigProperties(properties);
+    const isView = !!(node as Identifier).view;
+    const newProperties = formatConfigProperties(properties, isView);
     // 添加依赖库的枚举选择
-    const modules = app?.dependencies?.filter((module) => module.type === 'extension') || [];
+    const modules = app?.dependencies?.filter((module) => module.enable && module.type === 'extension') || [];
     const extensionConfigProperties: any[] = [];
     modules.forEach((module) => {
         const groups = module?.configuration?.groups || [];
@@ -297,7 +298,7 @@ export function getConfigsIdentifier(node: BaseNode): CompletionProperty[] {
                 name: module.name,
                 concept: 'Module',
                 icon: 'depend-dataSource',
-                children: formatConfigProperties(properties),
+                children: formatConfigProperties(properties, isView),
             });
         }
     });