@lcap/nasl 3.3.0-alpha.1 → 3.3.0-alpha.3

package/out/templator/genSelectBlock.d.ts

@@ -6,14 +6,14 @@ import { NameGroup } from '.';
  * @param nameGroup
  * @returns
  */
-export declare function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup): string;
+export declare function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any): string;
 /**
  * 生成select的模板（h5）
  * @param property
  * @param nameGroup
  * @returns
  */
-export declare function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup): string;
+export declare function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any): string;
 export declare function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogic: any): {
     concept: string;
     name: string;

package/out/templator/genSelectBlock.js

@@ -34,10 +34,11 @@ const utils_1 = require("./utils");
  * @param nameGroup
  * @returns
  */
-function genSelectTemplate(property, nameGroup) {
-    return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+function genSelectTemplate(property, nameGroup, newLogic) {
+    let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`;
+    return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :page-size="50" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
+    value-field="${nameGroup.lowerEntity}.id" :pagination="true">
 </u-select>`;
 }
 exports.genSelectTemplate = genSelectTemplate;
@@ -47,9 +48,10 @@ exports.genSelectTemplate = genSelectTemplate;
  * @param nameGroup
  * @returns
  */
-function genH5SelectTemplate(property, nameGroup) {
+function genH5SelectTemplate(property, nameGroup, newLogic) {
     const label = property.label || property.name;
-    return `<van-pickerson type="list" :show-toolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+    let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`;
+    return `<van-pickerson type="list" :show-toolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :page-size="50" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
     value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
     <template #title>${label}</template>
@@ -111,7 +113,7 @@ function genSelectBlock(entity, oldNode) {
     const newLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, false, module);
     const newLogics = [newLogic];
     return `<template>
-    ${config_1.config.scope === 'h5' ? genH5SelectTemplate(displayedProperty, nameGroup) : genSelectTemplate(displayedProperty, nameGroup)}
+    ${config_1.config.scope === 'h5' ? genH5SelectTemplate(displayedProperty, nameGroup, newLogic) : genSelectTemplate(displayedProperty, nameGroup, newLogic)}
 </template>
 
 <definition>

package/out/templator/genSelectBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":"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"}

package/out/templator/genTableBlock.d.ts

@@ -10,7 +10,7 @@ export declare function genTableColumnTemplate(property: EntityProperty, current
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export declare function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean): string;
+export declare function genTableTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string): string;
 /**
  * 生成表格 load 逻辑
  * @param entity 实体

package/out/templator/genTableBlock.js

@@ -67,12 +67,16 @@ exports.genTableColumnTemplate = genTableColumnTemplate;
  * @param entity 实体
  * @param nameGroup 命名组
  */
-function genTableTemplate(entity, nameGroup, modifyable) {
+function genTableTemplate(entity, nameGroup, newLogic, modifyable, entryFromCall) {
     const currentName = nameGroup.currentName || 'current';
     const properties = entity.properties.filter((0, _1.filterProperty)('inTable'));
-    return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+    let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
+    if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
+        dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
+    }
+    return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
-        :pagination="true" :show-sizer="true">
+        :pagination="true" :show-sizer="true" :page-size="20" :page-number="1">
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => `${genTableColumnTemplate(property, currentName)}\n`).join('')}
@@ -212,7 +216,7 @@ function genTableBlock(entity, oldNode) {
     newLogics.push(entityLogic);
     return `
 <template>
-    ${genTableTemplate(entity, nameGroup)}
+    ${genTableTemplate(entity, nameGroup, entityLogic)}
 </template>
 <definition>
 {
@@ -256,9 +260,10 @@ function genTableColumnBlock(property, oldNode) {
     const allEntities = [...entitySet];
     const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
+    let dataSourceValue = `(params) => ${entityLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
     return `
 <template>
-    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" :pagination="true" :show-sizer="true" data-schema="${nameGroup.structure}">
+    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :pagination="true" :page-size="20" :page-number="1" :show-sizer="true" data-schema="${nameGroup.structure}">
         ${properties.map((property) => `${genTableColumnTemplate(property)}\n`).join('')}
     </u-table-view>
 </template>

package/out/templator/genTableBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genTableBlock.js","sourceRoot":"","sources":["../../src/templator/genTableBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genTableBlock.js","sourceRoot":"","sources":["../../src/templator/genTableBlock.ts"],"names":[],"mappings":"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"}

package/out/templator/genUpdateBlock.js

@@ -62,9 +62,10 @@ function genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
                     // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
                     const key = [property.name, relationEntity.name].join('-');
                     const selectNameGroup = selectNameGroupMap.get(key);
+                    let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
                     formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                 }
@@ -155,9 +156,10 @@ function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
                     // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
                     const key = [property.name, relationEntity.name].join('-');
                     const selectNameGroup = selectNameGroupMap.get(key);
+                    let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
                     formItem += `
                         <template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-pickerson type="list" :show-toolbar="true" title="请选择${label}" placeholder="请选择${label}"
-                            v-model="${vModel}" :data-source="${selectNameGroup.viewLogicLoad}"
+                            v-model="${vModel}" :data-source="${dataSourceValue}" :page-size="50"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
                             :pageable="true" input-align="left" :remote-paging="true"></van-pickerson></van-linear-layout></template>

package/out/templator/genUpdateBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genUpdateBlock.js","sourceRoot":"","sources":["../../src/templator/genUpdateBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genUpdateBlock.js","sourceRoot":"","sources":["../../src/templator/genUpdateBlock.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.3.0-alpha.1",
+  "version": "3.3.0-alpha.3",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "clear": "rimraf ./out",
@@ -10,6 +10,7 @@
     "test": "nyc --source-map --reporter=html --reporter=text-summary mocha --file ./test/setup.ts",
     "test:ci": "nyc --source-map --reporter=cobertura --reporter=text-summary mocha --file ./test/setup.ts",
     "test:update": "npm run test -- --update",
+    "release:alpha": "npm run build && npm publish --tag alpha --access public --no-git-checks",
     "release:beta": "npm run build && npm publish --tag beta --access public --no-git-checks",
     "release": "npm run build && npm publish --tag latest --access public",
     "doc": "typedoc --out docs src --options docs-build/typedoc.json",
@@ -35,6 +36,7 @@
     "@babel/core": "^7.22.19",
     "@babel/generator": "^7.22.15",
     "@babel/parser": "7.13.13",
+    "@babel/preset-typescript": "^7.22.15",
     "axios": "^0.21.4",
     "compare-versions": "4.1.3",
     "date-fns": "2.6.0",

package/sandbox/stdlib/nasl.auth.ts

@@ -1,54 +1,50 @@
 declare namespace nasl.auth {
-  export function hasAuth(authPath: nasl.core.String): nasl.core.Boolean
-  export function login(): Promise<void>
-  export function logout(): Promise<void>
-  export function encryptByAES(authPath: nasl.core.String): nasl.core.String
-  export function decryptByAES(authPath: nasl.core.String): nasl.core.String
-  export function getUserList(
-    userNameFilter: nasl.core.String,
-    limit: nasl.core.Long,
-    offset: nasl.core.Long
-  ): nasl.collection.List<nasl.core.Any>
+  export function hasAuth(authPath: nasl.core.String): nasl.core.Boolean;
+  export function login(): Promise<void>;
+  export function logout(): Promise<void>;
+  export function encryptByAES(authPath: nasl.core.String): nasl.core.String;
+  export function decryptByAES(authPath: nasl.core.String): nasl.core.String;
+  export function getUserList(userNameFilter: nasl.core.String, limit: nasl.core.Long, offset: nasl.core.Long): nasl.collection.List<nasl.core.Any>;
 
   export class LCAPCurrentUserInfo {
-    status: nasl.core.String
-    userName: nasl.core.String
-    email: nasl.core.String
-    userId: nasl.core.String
-    phone: nasl.core.String
-    createTime: nasl.core.Long
-    updateTime: nasl.core.Long
-    nickName: nasl.core.String
-    source: nasl.core.String
+    status: nasl.core.String;
+    userName: nasl.core.String;
+    email: nasl.core.String;
+    userId: nasl.core.String;
+    phone: nasl.core.String;
+    createTime: nasl.core.Long;
+    updateTime: nasl.core.Long;
+    nickName: nasl.core.String;
+    source: nasl.core.String;
   }
 
-  export function getCurrentUser(): LCAPCurrentUserInfo
+  export function getCurrentUser(): LCAPCurrentUserInfo;
   export class LCAPUser {
-    userId: nasl.core.String
-    userName: nasl.core.String
-    extendFiledMap: Record<string, string>
+    userId: nasl.core.String;
+    userName: nasl.core.String;
+    extendFiledMap: Record<string, string>;
   }
   export const userInfo: {
-    Status: nasl.core.String
+    Status: nasl.core.String;
     UserInfoExtend: {
-      Company: nasl.core.String
-      JobLevel: nasl.core.String
-      JobNum: nasl.core.String
-      JobYear: nasl.core.String
-      RealName: nasl.core.String
-      NickName: nasl.core.String
-      NameAndEmail: nasl.core.String
-      Position: nasl.core.String
-      Department: nasl.core.String
-      EmployeeId: nasl.core.String
-    }
-    UserName: nasl.core.String
-    Email: nasl.core.String
-    UserId: nasl.core.String
-    Phone: nasl.core.String
-    CreateTime: nasl.core.Long
-    UpdateTime: nasl.core.Long
-    LoginCount: nasl.core.Long
-    Source: nasl.core.String
-  }
+      Company: nasl.core.String;
+      JobLevel: nasl.core.String;
+      JobNum: nasl.core.String;
+      JobYear: nasl.core.String;
+      RealName: nasl.core.String;
+      NickName: nasl.core.String;
+      NameAndEmail: nasl.core.String;
+      Position: nasl.core.String;
+      Department: nasl.core.String;
+      EmployeeId: nasl.core.String;
+    };
+    UserName: nasl.core.String;
+    Email: nasl.core.String;
+    UserId: nasl.core.String;
+    Phone: nasl.core.String;
+    CreateTime: nasl.core.Long;
+    UpdateTime: nasl.core.Long;
+    LoginCount: nasl.core.Long;
+    Source: nasl.core.String;
+  };
 }

package/sandbox/stdlib/nasl.core.ts

@@ -165,13 +165,20 @@ declare namespace nasl.core {
     export function add2(left: Any, right: String): String;
     export function add2(left: Long, right: Long): Long; // 为了让提示到整数上，最后补一个重载
 
-    // 包括 - * / %
+    // 包括 - * %
     export function arith2(left: Long, right: Long): Long;
     export function arith2(left: Decimal, right: Decimal): Decimal;
     export function arith2(left: Long, right: Decimal): Decimal;
     export function arith2(left: Decimal, right: Long): Decimal;
     export function arith2(left: Long, right: Long): Long; // 为了让提示到整数上，最后补一个重载
 
+    // 包括 /
+    export function divided2(left: Long, right: Long): Decimal;
+    export function divided2(left: Decimal, right: Decimal): Decimal;
+    export function divided2(left: Long, right: Decimal): Decimal;
+    export function divided2(left: Decimal, right: Long): Decimal;
+    export function divided2(left: Long, right: Long): Decimal; // 为了让提示到整数上，最后补一个重载
+
     export class Enums {
         accept: 'Enums';
     }

package/sandbox/stdlib/nasl.http.ts

@@ -1,31 +1,31 @@
 declare namespace nasl.http {
   export class HttpCookie {
-    name: nasl.core.String
-    value: nasl.core.String
-    domain: nasl.core.String
-    cookiePath: nasl.core.String
-    sameSite: nasl.core.String
-    httpOnly: nasl.core.Boolean
-    secure: nasl.core.Boolean
-    maxAge: nasl.core.Long
+    name: nasl.core.String;
+    value: nasl.core.String;
+    domain: nasl.core.String;
+    cookiePath: nasl.core.String;
+    sameSite: nasl.core.String;
+    httpOnly: nasl.core.Boolean;
+    secure: nasl.core.Boolean;
+    maxAge: nasl.core.Long;
   }
   export class HttpRequest<T> {
-    requestURL: nasl.core.String
-    remoteIp: nasl.core.String
-    requestMethod: nasl.core.String
-    pathParams: nasl.collection.Map<nasl.core.String, nasl.core.String>
-    body: T
-    headers: nasl.collection.Map<nasl.core.String, nasl.core.String>
-    queryParams: nasl.collection.Map<nasl.core.String, nasl.core.String>
-    cookies: nasl.collection.Map<nasl.core.String, HttpCookie>
-    constructor(obj: Partial<HttpRequest<T>>)
+    requestURL: nasl.core.String;
+    remoteIp: nasl.core.String;
+    requestMethod: nasl.core.String;
+    pathParams: nasl.collection.Map<nasl.core.String, nasl.core.String>;
+    body: T;
+    headers: nasl.collection.Map<nasl.core.String, nasl.core.String>;
+    queryParams: nasl.collection.Map<nasl.core.String, nasl.core.String>;
+    cookies: nasl.collection.Map<nasl.core.String, HttpCookie>;
+    constructor(obj: Partial<HttpRequest<T>>);
   }
   export class HttpResponse<T> {
-    status: nasl.core.Long
-    body: T
+    status: nasl.core.Long;
+    body: T;
     // headers: nasl.collection.Map<any, nasl.core.String>;
-    headers: nasl.collection.Map<nasl.core.String, nasl.core.String>
-    cookies: nasl.collection.Map<nasl.core.String, HttpCookie>
-    constructor(obj: Partial<HttpResponse<T>>)
+    headers: nasl.collection.Map<nasl.core.String, nasl.core.String>;
+    cookies: nasl.collection.Map<nasl.core.String, HttpCookie>;
+    constructor(obj: Partial<HttpResponse<T>>);
   }
 }

package/sandbox-natural/stdlib/nasl.util.ts

@@ -1,26 +1,85 @@
 declare namespace nasl.util {
-    export function Split(str: String, seperator: String): List<String>;
+    // 类型转换与格式化函数
+    export function Convert(value: null): <T extends never>() => T;
+    export function FormatNumber(doubleValue: Decimal | Integer, digits: Integer, showGroups: Boolean): String;
+    export function FormatDateTime(dateTime: DateTime, formatter: String): String;
+    export function FormatDate(date: Date, formatter: String): String;
+    /**
+     * @example nasl.util.FromString<Date>(variable1)
+     */
+    export function FromString<T extends Decimal | Date | Time | DateTime | Integer | Boolean>(value: String): T;
+    export function ToString(value: Any): String;
+
+    // 字符串函数
+    export function Concat(...args: Any): String;
+    export function Length(str1: String): Decimal;
+    export function Length<K, V>(str1: Map<K, V>): Decimal;
+    export function Length<T>(str1: List<T>): Decimal;
+    export function IndexOf(str: String, search: String, formIndex: Decimal, ignoreCase: Boolean): Decimal;
     export function Join(list: List<Any>, seperator: String): String;
+    export function LastIndexOf(str: String, search: String, ignoreCase: Boolean): Decimal;
+    export function Replace(str: String, search: String, replace: String): String;
+    export function Split(str: String, seperator: String): List<String>;
+    export function SubString(str: String, start: Decimal, length: Integer): String;
+    export function ToLower(str1: String): String;
+    export function ToUpper(str1: String): String;
+    export function Trim(str1: String): String;
 
-    export function Clone<T>(struct: T): T;
-    export function Clear<T>(struct: T): T;
-    export function RandomInt(start: Integer, end: Integer): Integer;
+    // 日期与时间函数
+    export function CurrDate(): Date;
+    export function CurrDateTime(): DateTime;
+    export function CurrTime(): Time;
+    export function DateDiff<T extends Date | Time | DateTime>(dateTime1: T, dateTime2: T, calcType: String, isAbs: Boolean): Decimal;
 
-    export function FormatNumber(doubleValue: Decimal | Integer, digits: Integer, showGroups: Boolean): String;
-    export function FormatDateTime(dateTime: DateTime, formatter: String): String;
+    // 列表（List）函数
+    export function Add<T, K extends T>(list: List<T>, item: K): void;
+    export function AddAll<T>(list: List<T>, addList: List<T>): Decimal;
+    export function Contains<T, K extends T>(list: List<T>, item: K): Boolean;
+    export function Insert<T, K extends T>(list: List<T>, index: Decimal, item: K): void;
+    export function ListDistinct<T>(list: List<T>): void;
+    export function ListDistinctBy<A>(list: List<A>, by: List<{ items: Array<(elem: A) => any> }>): List<A>;
+    export function ListFilter<T>(list: List<T>, by: (item: T) => Boolean): List<T>;
+    export function ListFind<T>(list: List<T>, by: (item: T) => Boolean): T;
+    export function ListFindIndex<T>(list: List<T>, by: (item: T) => Boolean): Decimal;
+    export function ListFlatten<T>(list: List<List<T>>): List<T>;
+    export function ListGroupBy<A, K extends Boolean | Decimal | Decimal | String>(list: List<A>, by: (elem: A) => K): Map<K, List<A>>;
+    export function ListHead<T>(list: List<T>): T;
+    export function ListLast<T>(list: List<T>): T;
+    export function ListMax<T extends Decimal | Decimal | String>(list: List<T>): T;
+    export function ListMin<T extends Decimal | Decimal | String>(list: List<T>): T;
+    export function ListReverse<T>(list: List<T>): void;
+    export function ListSlice<T>(list: List<T>, start: Decimal, end: Decimal): List<T>;
+    export function ListSort<T>(list: List<T>, by: (item: T) => any, sort: Boolean): void;
     export function ListSum<T extends Integer | Decimal>(list: List<T>): T;
+    export function ListToMap<T, K extends Boolean | Decimal | Decimal | String, V>(map: List<T>, byKey: (elem: T) => K, byVal: (elem: T) => V): Map<K, V>;
     export function ListTransform<T0, T>(list: List<T0>, by : (elem : T0) => T): List<T>;
-    export function ListFilter<T>(list: List<T>, by: (item: T) => Boolean): List<T>;
-    export function Add<T, K extends T>(list: List<T>, item: K): void;
+    export function Get<T>(list: List<T>, index: Decimal): T;
+    export function Remove<T, K extends T>(list: List<T>, item: K): void;
     export function RemoveAt<T>(list: List<T>, index: Integer): T;
+    export function Set<T, K extends T>(list: List<T>, index: Decimal, item: K): T;
 
-    export function ToString(value: Any): String;
-    export function FromString<T extends Decimal | Date | Time | DateTime | Integer | Boolean>(value: String): T;
-    export function SubString(str: String, start: Integer, length?: Integer): String;
+    // 映射（Map）函数
+    export function MapContains<K, V>(map: Map<K, V>, key: K): Boolean;
+    export function MapGet<K, V>(map: Map<K, V>, key: K): V;
+    export function MapPut<K, V>(map: Map<K, V>, key: K, value: V): void;
+    export function MapKeys<K, V>(map: Map<K, V>): List<K>;
+    export function MapRemove<K, V>(map: Map<K, V>, key: K): void;
+    export function MapValues<K, V>(map: Map<K, V>): List<V>;
 
-    export function CurrDate(): Date;
-    export function CurrDateTime(): DateTime;
-    export function AddDays(date: Date, amount: Integer): Date;
+    // 枚举函数
+    /**
+    * @example nasl.util.EnumToList<aEnum>({ typeNamespace: 'app.enums' });
+    */
+    export function EnumToList<T extends Enums>({ typeNamespace } : { typeNamespace: 'app.enums' }): void;
+    export function EnumValueToText<T extends Enums>(value: any, { typeNamespace } : { typeNamespace: 'app.enums' }): String;
+    export function StringToEnumValue<T extends Enums>(value: String, { typeNamespace } : { typeNamespace: 'app.enums' }): String;
+
+    // 数学函数
+    export function Round(value: Decimal, mode: 'HalfUp' | 'TowardsZero' | 'TowardsInfinity'): Decimal;
+
+    // 其他函数
+    export function Clear<T>(struct: T): T;
+    export function Clone<T>(struct: T): T;
+    export function HasValue(...args: Any[]): Boolean;
     export function RandomInt(start: Integer, end: Integer): Integer;
-    export function EnumValueToText(value: any, { typeNamespace } : { typeNamespace: 'app.enums' }): String;
 }

package/src/automate/upgrader/2.20.js

@@ -1,15 +1,15 @@
 import * as nasl from '@nasl';
 
 const excludedKeySet = new Set([
-    'parentNode',
-    'sourceMap',
-    'storageJSON',
-    'tsErrorDetail',
-    'NaslAnnotatedJSON',
-    'calledFrom',
-    '_events',
-    '_collectingList',
-    '_historyList',
+  'parentNode',
+  'sourceMap',
+  'storageJSON',
+  'tsErrorDetail',
+  'NaslAnnotatedJSON',
+  'calledFrom',
+  '_events',
+  '_collectingList',
+  '_historyList',
 ]);
 
 /**
@@ -35,8 +35,12 @@ export function replace(script) {
  * @returns 升级后的 JSON
  */
 export function upgrade(json) {
-    nasl.utils.traverse((current) => {
-        const { node, parent } = current;
-    }, { node: json }, { mode: 'anyObject', depthFirst: true, excludedKeySet });
-    return json;
+  nasl.utils.traverse(
+    (current) => {
+      const { node, parent } = current;
+    },
+    { node: json },
+    { mode: 'anyObject', depthFirst: true, excludedKeySet }
+  );
+  return json;
 }