@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/concepts/WhileStatement__.ts

@@ -14,12 +14,13 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
 import LogicItem from './LogicItem__';
 
 /**
@@ -29,7 +30,11 @@ import LogicItem from './LogicItem__';
 export class WhileStatement extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'WhileStatement';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -39,14 +44,13 @@ export class WhileStatement extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'WhileStatement';
-
   /**
    * 条件表达式
    */
   @property({
     objectRef: 'LogicItem',
   })
-  test!: LogicItem;
+  test: LogicItem;
 
   /**
    * 循环体
@@ -187,77 +191,22 @@ export class WhileStatement extends LogicItem {
     return node;
   }
 
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeTest(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param test 已有的逻辑项实例
-   */
-  removeTest(test: LogicItem): void;
-
-  removeTest(options: string | LogicItem) {
-    let test: LogicItem;
-    if (typeof options === 'string') {
-      test = this.test;
-      if (!test) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      test = options;
-    }
-    return test.delete();
-  }
-
   /**
    * 删除逻辑项
    * @param logicItem 已有的逻辑项实例
    */
-  removeItemInBody(logicItem: LogicItem): void;
+  removeItem(logicItem: LogicItem): void;
 
-  removeItemInBody(options: LogicItem) {
+  removeItem(options: LogicItem) {
     let logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+
   public static getDefaultOptions() {
     return {
       label: 'While 循环分支',

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

@@ -66,30 +66,30 @@ export function initialize() {
         }),
       ],
     }),
-    new Structure({
-      name: 'LCAPUser',
-      properties: [
-        new StructureProperty({
-          name: 'userName',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
-        }),
-        new StructureProperty({
-          name: 'userId',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
-        }),
-        new StructureProperty({
-          name: 'extendFiledMap',
-          typeAnnotation: TypeAnnotation.createGeneric('map', {
-            typeArguments: [
-              // TypeAnnotation.createPrimitive('String'),
-              // TypeAnnotation.createPrimitive('String'),
-              TypeAnnotation.createTypeParam('K'),
-              TypeAnnotation.createTypeParam('V'),
-            ],
-          }),
-        }),
-      ],
-    }),
+    // new Structure({
+    //   name: 'LCAPUser',
+    //   properties: [
+    //     new StructureProperty({
+    //       name: 'userName',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new StructureProperty({
+    //       name: 'userId',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new StructureProperty({
+    //       name: 'extendFiledMap',
+    //       typeAnnotation: TypeAnnotation.createGeneric('map', {
+    //         typeArguments: [
+    //           // TypeAnnotation.createPrimitive('String'),
+    //           // TypeAnnotation.createPrimitive('String'),
+    //           TypeAnnotation.createTypeParam('K'),
+    //           TypeAnnotation.createTypeParam('V'),
+    //         ],
+    //       }),
+    //     }),
+    //   ],
+    // }),
   );
 
   authTypeList.push(
@@ -105,12 +105,15 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
+      description: '检查当前用户是否有当前资源的权限',
       returns: [],
     }),
     new Logic({
       name: 'logout',
       params: [],
       returns: [],
+      description: '退出当前登录状态',
+
     }),
     new Logic({
       name: 'encryptByAES',
@@ -120,10 +123,14 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
+      description: '对字符串实现aes加密 返回加密后的字符串',
+
       returns: [],
     }),
     new Logic({
       name: 'decryptByAES',
+      description: '对字符串实现aes解密 返回解密后的字符串',
+
       params: [
         new Param({
           name: 'string',
@@ -132,34 +139,90 @@ export function initialize() {
       ],
       returns: [],
     }),
+    // new Logic({
+    //   name: 'getUserList',
+    //   params: [
+    //     new Param({
+    //       name: 'userNameFilter',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new Param({
+    //       name: 'limit',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //     new Param({
+    //       name: 'offset',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //   ],
+    //   returns: [
+    //     new Return({
+    //       name: 'result',
+    //       typeAnnotation: TypeAnnotation.createGeneric('List', {
+    //         typeArguments: [TypeAnnotation.createTypeParam('T')],
+    //       }),
+    //     }),
+    //   ],
+    // }),
     new Logic({
-      name: 'getUserList',
+      name: 'encryptPassword',
+      description: '密码加密（采用Bcrypt算法进行加密，salt默认10位）',
       params: [
         new Param({
-          name: 'userNameFilter',
+          name: 'password',
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+      ],
+      returns: [
+        new Return({
+          name: 'BcryptedHashPassword',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'validatePassword',
+      description: '密码校验（采用Bcrypt算法进行校验）',
+      params: [
         new Param({
-          name: 'limit',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+          name: 'plainText',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }), new Param({
+          name: 'hashedText',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+
+      ],
+      returns: [
+        new Return({
+          name: 'matchResult',
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'generateUserId',
+      description: '生成用户唯一标识（根据Md5算法）',
+      params: [
         new Param({
-          name: 'offset',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+          name: 'userName',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }), new Param({
+          name: 'source',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+
       ],
       returns: [
         new Return({
           name: 'result',
-          typeAnnotation: TypeAnnotation.createGeneric('List', {
-            typeArguments: [TypeAnnotation.createTypeParam('T')],
-          }),
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
     }),
     new Logic({
       name: 'getCurrentUser',
-      description: '获取当前登录用户信息，需在登录后调用',
+      description: '即将下线，请使用服务端全局变量currentUser',
       returns: [
         new Return({
           name: 'result',

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

@@ -177,12 +177,10 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
-    }),
+    })
   );
 
-  processTypeList.push(
-    ...reference2TypeAnnotationList(processStructures, 'nasl.process'),
-  );
+  processTypeList.push(...reference2TypeAnnotationList(processStructures, 'nasl.process'));
 
   const logics = [
     new Logic({
@@ -382,6 +380,22 @@ export function initialize() {
         }),
       ],
     }),
+    new Logic({
+      name: 'getTaskInstanceV2',
+      description: '获取任务详情，支持历史任务',
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createTypeParam('T'),
+        }),
+      ],
+    }),
     new Logic({
       name: 'getTaskInstanceList',
       description: '获取流程任务列表',
@@ -467,6 +481,91 @@ export function initialize() {
         }),
       ],
     }),
+    new Logic({
+      name: 'getTaskInstanceListV2',
+      description: '获取流程任务列表，包含历史任务',
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'user',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'finished',
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+        }),
+        new Param({
+          name: 'processId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'processIdIn',
+          typeAnnotation: TypeAnnotation.createGeneric('List', {
+            typeArguments: [TypeAnnotation.createTypeParam('String')],
+          }),
+        }),
+        new Param({
+          name: 'processDefName',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'taskDefName',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'createTimeBefore',
+          typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+        }),
+        new Param({
+          name: 'createTimeAfter',
+          typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+        }),
+        new Param({
+          name: 'completeTimeBefore',
+          typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+        }),
+        new Param({
+          name: 'completeTimeAfter',
+          typeAnnotation: TypeAnnotation.createPrimitive('DateTime'),
+        }),
+        new Param({
+          name: 'page',
+          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+        }),
+        new Param({
+          name: 'size',
+          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+        }),
+        new Param({
+          name: 'sort',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'order',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createTypeAnonymousStructure([
+            new StructureProperty({
+              name: 'list',
+              typeAnnotation: TypeAnnotation.createGeneric('List', {
+                typeArguments: [TypeAnnotation.createTypeParam('T')],
+              }),
+            }),
+            new StructureProperty({
+              name: 'total',
+              typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+            }),
+          ]),
+        }),
+      ],
+    }),
     new Logic({
       name: 'claimTaskInstance',
       description: '认领流程任务',
@@ -628,7 +727,6 @@ export function initialize() {
           title: '名称',
           description: '名称',
           group: '运行属性',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
           useComponent: new UseComponent({ type: 's-edit-user' }),
         }),
         new Attribute({
@@ -636,14 +734,12 @@ export function initialize() {
           title: '任务标题',
           description: '任务标题',
           group: '任务箱属性',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
         new Attribute({
           name: 'destination',
           title: '跳转页面',
           description: '跳转页面',
           group: '任务箱属性',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
     }),

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

@@ -325,7 +325,7 @@ export function initialize() {
       ],
     }),
     new Function({
-      name: 'ToEnumValue',
+      name: 'ToEnumItem',
       description: '在指定enum中找到与参数str相同的枚举值并返回。',
       typeParams: [
         new TypeParam({
@@ -1845,36 +1845,36 @@ export function initialize() {
         }),
       ],
     }),
-    new Function({
-      name: 'SliceToListPage',
-      description: '将列表按照规则切片，返回切片后的列表分页',
-      params: [
-        new Param({
-          name: 'list',
-          description: '指定列表',
-          typeAnnotation: TypeAnnotation.createGeneric('List', {
-            typeArguments: [TypeAnnotation.createTypeParam('T')],
-          }),
-        }),
-        new Param({
-          name: 'page',
-          description: '页数，integer类型，从1开始',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
-        }),
-        new Param({
-          name: 'size',
-          description: '每页的大小，integer类型',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
-        }),
-      ],
-      returns: [
-        new Return({
-          typeAnnotation: TypeAnnotation.createGeneric('PageOf', {
-            typeArguments: [TypeAnnotation.createTypeParam('T')],
-          }),
-        }),
-      ],
-    }),
+    // new Function({
+    //   name: 'SliceToListPage',
+    //   description: '将列表按照规则切片，返回切片后的列表分页',
+    //   params: [
+    //     new Param({
+    //       name: 'list',
+    //       description: '指定列表',
+    //       typeAnnotation: TypeAnnotation.createGeneric('List', {
+    //         typeArguments: [TypeAnnotation.createTypeParam('T')],
+    //       }),
+    //     }),
+    //     new Param({
+    //       name: 'page',
+    //       description: '页数，integer类型，从1开始',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //     new Param({
+    //       name: 'size',
+    //       description: '每页的大小，integer类型',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //   ],
+    //   returns: [
+    //     new Return({
+    //       typeAnnotation: TypeAnnotation.createGeneric('PageOf', {
+    //         typeArguments: [TypeAnnotation.createTypeParam('T')],
+    //       }),
+    //     }),
+    //   ],
+    // }),
     new Function({
       name: 'New',
       description: '根据参数选择的类型，返回该参数的实例化对象',

package/src/concepts/index__.ts

@@ -24,18 +24,31 @@ export * from './BindAttribute__';
 export * from './BindDirective__';
 export * from './BindEvent__';
 export * from './BindStyle__';
-export * from './ViewComponent__';
+export * from './ThemeVariable__';
+export * from './BaseSetter__';
+export * from './InputSetter__';
+export * from './SwitchSetter__';
+export * from './SetterOption__';
+export * from './EnumSelectSetter__';
+export * from './CapsulesSetter__';
+export * from './NumberInputSetter__';
+export * from './IconSetter__';
+export * from './ImageSetter__';
+export * from './PropertySelectSetter__';
+export * from './ViewComponentDeclaration__';
 export * from './BusinessComponent__';
 export * from './Attribute__';
 export * from './Event__';
-export * from './Slot__';
+export * from './PropDeclaration__';
+export * from './EventDeclaration__';
+export * from './SlotDeclaration__';
+export * from './LogicDeclaration__';
 export * from './Theme__';
-export * from './StaticString__';
 export * from './Logic__';
 export * from './AuthLogic__';
-export * from './BusinessLogic__';
 export * from './AuthLogicForCallInterface__';
 export * from './OverriddenLogic__';
+export * from './BusinessLogic__';
 export * from './AbstractInterface__';
 export * from './Param__';
 export * from './ParamWithGroup__';
@@ -47,8 +60,8 @@ export * from './Constant__';
 export * from './LogicItem__';
 export * from './Function__';
 export * from './AnonymousFunction__';
-export * from './Interface__';
 export * from './ImportedInterface__';
+export * from './Interface__';
 export * from './InterfaceParam__';
 export * from './Transactional__';
 export * from './DefaultValue__';
@@ -80,6 +93,7 @@ export * from './NullLiteral__';
 export * from './BooleanLiteral__';
 export * from './StringLiteral__';
 export * from './StringInterpolation__';
+export * from './StaticString__';
 export * from './NumericLiteral__';
 export * from './BinaryExpression__';
 export * from './MatchCase__';
@@ -91,6 +105,7 @@ export * from './New__';
 export * from './NewComposite__';
 export * from './NewList__';
 export * from './NewMap__';
+export * from './Paginate__';
 export * from './CallQueryComponent__';
 export * from './QueryFromExpression__';
 export * from './QueryJoinExpression__';
@@ -105,12 +120,12 @@ export * from './OqlQueryComponent__';
 export * from './Process__';
 export * from './ProcessElement__';
 export * from './ProcessComponent__';
-export * from './ProcessOutcome__';
-export * from './Assignee__';
-export * from './ProcessOutcomes__';
 export * from './MultiApprovalPolicy__';
 export * from './SequentialPolicy__';
 export * from './CountersignPolicy__';
+export * from './ProcessOutcome__';
+export * from './Assignee__';
+export * from './ProcessOutcomes__';
 export * from './Role__';
 export * from './Configuration__';
 export * from './ConfigGroup__';
@@ -125,6 +140,7 @@ export * from './SelectMembers__';
 export * from './AssignmentLine__';
 export * from './FrontendLibrary__';
 export * from './ViewBlock__';
+export * from './ViewBlockWithImage__';
 export * from './AuthInterface__';
 export * from './CallAuthInterface__';
 export * from './TriggerEvent__';