@lcap/nasl 3.8.2-beta.8 → 3.8.2-beta.9

package/src/concepts/basics/stdlib/nasl.processV2.ts

@@ -378,6 +378,51 @@ export function initialize() {
         }),
       ],
     }),
+    new Structure({
+      name: 'TaskInst',
+      properties: [
+        new StructureProperty({
+          name: 'processDefUniqueKey',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'processDefinitionId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'processInstanceId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'taskDefName',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'taskTitle',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'completeBy',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'finished',
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+        }),
+        new StructureProperty({
+          name: 'createTime',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new StructureProperty({
+          name: 'completeTime',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
   );
 
   processV2TypeList.push(
@@ -820,6 +865,24 @@ export function initialize() {
       ],
       returns: [],
     }),
+    new Logic({
+      name: 'getUsersForAddSign',
+      description: '查询可加签用户列表',
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createGeneric('List', {
+            typeArguments: [TypeAnnotation.createReference('LCAPUser', { typeNamespace: 'nasl.processV2' })],
+          }),
+        }),
+      ],
+    }),
     new Logic({
       name: 'terminateProcess',
       description: '终止',
@@ -919,6 +982,22 @@ export function initialize() {
         }),
       ],
     }),
+    new Logic({
+      name: 'getTaskInfo',
+      description: '查询流程任务信息',
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createReference('TaskInst', { typeNamespace: 'nasl.processV2' }),
+        }),
+      ],
+    }),
   ];
 
   const processComponents = [

package/src/concepts/basics/stdlib/nasl.ui.ts

@@ -1012,46 +1012,46 @@ export function initialize() {
     new Structure({
       name: 'KeyboardEvent',
       properties: [
-        // new StructureProperty({
-        //     name: 'altKey',
-        //     description: '事件触发时 alt 键 (OS X 系统上的 Option 或 ⌥ 键) 是 (true) 否 (false) 被按下',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'code',
-        //     description: '',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('String')
-        // }),
-        // new StructureProperty({
-        //     name: 'ctrlKey',
-        //     description: '事件触发时 control 键是 (true) 否 (false) 按下',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'isComposing',
-        //     description: '该事件是否在 compositionstart 之后和 compositionend 之前被触发',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'key',
-        //     description: '',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('String')
-        // }),
-        // new StructureProperty({
-        //     name: 'metaKey',
-        //     description: '指示 Meta 键是按下状态（true），还是释放状态（false）',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'repeat',
-        //     description: '如果按键被一直按住，返回值为true',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'shiftKey',
-        //     description: '事件触发时 shift 键是 (true) 否 (false) 按下',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // })
+        new StructureProperty({
+            name: 'altKey',
+            description: '事件触发时 alt 键 (OS X 系统上的 Option 或 ⌥ 键) 是 (true) 否 (false) 被按下',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'code',
+            description: '',
+            typeAnnotation: TypeAnnotation.createPrimitive('String')
+        }),
+        new StructureProperty({
+            name: 'ctrlKey',
+            description: '事件触发时 control 键是 (true) 否 (false) 按下',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'isComposing',
+            description: '该事件是否在 compositionstart 之后和 compositionend 之前被触发',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'key',
+            description: '',
+            typeAnnotation: TypeAnnotation.createPrimitive('String')
+        }),
+        new StructureProperty({
+            name: 'metaKey',
+            description: '指示 Meta 键是按下状态（true），还是释放状态（false）',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'repeat',
+            description: '如果按键被一直按住，返回值为true',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'shiftKey',
+            description: '事件触发时 shift 键是 (true) 否 (false) 按下',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        })
       ],
     }),
   );

package/src/generator/genBundleFiles.ts

@@ -860,7 +860,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
         if (window.annotationAllData) {
               resolve(window.annotationAllData);
           } else {
-           let sysPrefixPath =  window.appInfo && window.appInfo.sysPrefixPath || '';
+           let sysPrefixPath =  ${ config?.sysPrefixPath ? "'" + config?.sysPrefixPath + "'" : "'" + "'" } ||'';
            let urlEntity = sysPrefixPath + '/api/system/annotation/entityAll'
            let urlLogic = sysPrefixPath + '/api/system/annotation/logicAll'
            Promise.all([

package/src/generator/release-body/utils.ts

@@ -425,7 +425,7 @@ export function getProcessFormDefinitions(app: App) {
               );
               formDefinition = formDefinition.replaceAll(
                 `(${process.name} ||`,
-                '{processDetailFormData ||'
+                '(processDetailFormData ||'
               );
               formDefinition = formDefinition.replace(
                 /:ref="([^"]+)"/g,

package/src/natural/transformTS2UI.ts

@@ -976,11 +976,11 @@ function transformNode2Logic(node: babelTypes.FunctionDeclaration, name?: string
   const statements: babelTypes.Statement[] = node.body.body;
 
   const curLogic: any = new naslTypes.Logic({ name: name ?? node.id.name });
-  parameters.forEach((item: babelTypes.Identifier) => {
+  parameters?.forEach((item: babelTypes.Identifier) => {
     const param = transformParam(item);
     if (param && param.name !== 'event' && !curLogic.params.find((_: any) => _.name === param.name)) curLogic.addParam(param);
   });
-  statements.forEach((item) => {
+  statements?.forEach((item) => {
     if (item.type === 'ReturnStatement' && item?.argument) {
       if (!curLogic.returns.length) {
         curLogic.returns.push(new naslTypes.Return({
@@ -1015,6 +1015,7 @@ function transformNode2Logic(node: babelTypes.FunctionDeclaration, name?: string
 
 // 处理属性
 function transformNode2Attribute(node: any): any {
+  if (!node?.value || !node?.key) return {};
   let item = {} as any;
   let newNode = {} as any;
   if (['StringLiteral', 'NumericLiteral'].includes(node.value.type)) {
@@ -1214,14 +1215,16 @@ function transformNode2ViewConstruct(node: babelTypes.Node): naslTypes.ViewEleme
           } else if (properties?.[2].value.value === 'BindAttribute') {
             newNode = transformNode2Attribute({ key: element.left, value: element.right });
           }
-          const newNodeBackup = cloneDeep(newNode);
-          (newNode as any).aiParams = {
-            action: properties?.[0].value.value,
-            selectedNodeName: properties?.[1].value.value,
-            concept: properties?.[2].value.value,
-            object: newNodeBackup
-          };
-          newViewElement.push(newNode);
+          if (newNode) {
+            const newNodeBackup = cloneDeep(newNode);
+            (newNode as any).aiParams = {
+              action: properties?.[0].value.value,
+              selectedNodeName: properties?.[1].value.value,
+              concept: properties?.[2].value.value,
+              object: newNodeBackup
+            };
+            newViewElement.push(newNode);
+          }
         });
       }
     });
@@ -1246,19 +1249,21 @@ function transformNode2View(node: babelTypes.FunctionDeclaration, root?: ParseRe
   }
 
   const view = new naslTypes.View();
-  parameters.forEach((item) => {
+  parameters?.forEach((item) => {
     const param = transformParam(item);
     param && view.params.push(param);
   });
 
   const json: any = [];
-  statements.forEach((item) => {
+  statements?.forEach((item) => {
     const viewItem = transformNode2ViewConstruct(item) as any;
     if (item.type === 'ReturnStatement' && item?.argument?.type === 'CallExpression') {
       const action = (item.argument as any)?.callee?.name;
       const selectedNodeName = (item.argument as any).arguments?.[0]?.property?.name;
-      const newNodeBackup = cloneDeep(viewItem);
-      (viewItem as any).aiParams = { selectedNodeName, action, concept: 'ViewElement', object: newNodeBackup };
+      if (viewItem) {
+        const newNodeBackup = cloneDeep(viewItem);
+        (viewItem as any).aiParams = { selectedNodeName, action, concept: 'ViewElement', object: newNodeBackup };
+      }
     }
     if (item.type === 'ReturnStatement' && item?.argument?.type === 'ArrayExpression') {
       viewItem?.forEach((element: any) => {

package/src/server/getMemberIdentifier.ts

@@ -15,9 +15,9 @@ import {
   types,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
-  ComponentCompletionPropertyMap,
   configurationEnums,
   processV2Enums,
+  config,
 } from '..';
 import { formatVariableData, formatFrontEndVariables, formatConfigProperties, formatBackendVariables } from './formatTsUtils';
 
@@ -422,8 +422,8 @@ export function getConfigsIdentifier(node: BaseNode): CompletionProperty[] {
 }
 function flatElements(elements: ViewElement[], componentList: CompletionProperty[], nodeParentElement: string, currentAttriBute: string, parentNodeNames: string[]) {
   elements?.forEach((item) => {
-    // 根据ComponentCompletionPropertyMap添加
-    if (ComponentCompletionPropertyMap?.[item.tag]) {
+    // 根据readablePropsMap添加
+    if (config?.allNodesAPI[item.tag] && config?.allNodesAPI[item.tag].readablePropsMap) {
       // 是否当前组件
       const isCurrent = item.name === nodeParentElement;
       const stashItem: any = {
@@ -436,9 +436,9 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
         children: [],
       }
 
-      for (const key in ComponentCompletionPropertyMap[item.tag]) {
-        if (Object.prototype.hasOwnProperty.call(ComponentCompletionPropertyMap[item.tag], key)) {
-          const property = ComponentCompletionPropertyMap[item.tag][key];
+      for (const key in config?.allNodesAPI[item.tag].readablePropsMap) {
+        if (Object.prototype.hasOwnProperty.call(config?.allNodesAPI[item.tag].readablePropsMap, key)) {
+          const property = config?.allNodesAPI[item.tag].readablePropsMap[key];
 
           // 如果是当前组件，过滤掉当前属性
           if (!isCurrent || currentAttriBute !== property.prop) {
@@ -454,7 +454,7 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
               })
             })
 
-            completionProperty.name = `${key}（${property.label}）`;
+            completionProperty.name = `${key}（${property.title}）`;
             completionProperty.icon = property.icon || 'attr'
             stashItem.children.push(completionProperty)
           }
@@ -511,21 +511,21 @@ function getCurrentElement(item: any): ViewElement | undefined {
   if (!item?.parentNode) return undefined
   if (item.parentNode?.concept === 'ViewElement') {
     return item.parentNode
-  } else if (item.parentNode?.concept === 'View') {
+  } if (item.parentNode?.concept === 'View') {
     return undefined
-  } else {
-    return getCurrentElement(item.parentNode)
   }
+    return getCurrentElement(item.parentNode)
+
 }
 
 function getCurrentAttriBute(item: any): BindAttribute | undefined {
   if (item.concept === 'BindAttribute') {
     return item
-  } else {
+  }
     if (item?.parentNode && item.parentNode?.concept !== 'View') {
       return getCurrentAttriBute(item.parentNode)
-    } else {
-      return undefined
     }
-  }
+      return undefined
+
+
 }

package/src/server/naslServer.ts

@@ -653,7 +653,7 @@ class NaslServer {
     app.naslServer = this;
     const self = this;
     this.performance = performance;
-    const results = await utils.timeSlicingWithGenerator(getAllTsFiles());
+    const results = await utils.runGeneratorAsync(getAllTsFiles());
     const files = results.map((result) => ({
       file: result.filePath,
       fileContent: result.code,
@@ -3298,7 +3298,12 @@ class NaslServer {
       });
       refsList = [...newRefs.refs];
     } else if (node instanceof Module && !(node instanceof Connector)) {
-      const lists = node.logics || node.structures || node.enums;
+      // 数组有长度的情况下，才去查找
+      const { logics, structures, enums, interfaces } = node;
+      const lists = (logics?.length && logics) ||
+        (structures?.length && structures) ||
+        (enums?.length && enums) ||
+        (interfaces?.length && interfaces);
       const moduleName = (fileNode as FileNode).getEmbeddedFilePath();
       if (lists.length) {
         const item = lists[0];

package/test/concepts/member-expression/__snapshots__/toJS.spec.ts.snap

@@ -6,7 +6,7 @@ exports[`member-expression:toJS app.enums.UserStatusEnum 1`] = `
 `;
 
 exports[`member-expression:toJS elements.table-view.data 1`] = `
-"this.__tableView_dataSource;
+"this.__tableView_data;
 "
 `;
 

package/test/concepts/member-expression/__snapshots__/toVue.spec.ts.snap

@@ -6,7 +6,7 @@ exports[`member-expression:toVue app.enums.UserStatusEnum 1`] = `
 `;
 
 exports[`member-expression:toVue elements.table-view.data 1`] = `
-"<template>__tableView_dataSource</template>
+"<template>__tableView_data</template>
 "
 `;