@lcap/nasl 2.18.0-beta.7 → 2.20.0-beta.1

package/out/translator/index.js.map

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

package/out/utils/index.d.ts

@@ -36,4 +36,3 @@ export declare type NoReadonly<T> = {
     -readonly [P in keyof T]: T[P];
 };
 export declare function toBriefExpr(expression: LogicItem): string;
-export declare function replaceNode(oldNode: any, newNode: any): void;

package/out/utils/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceNode = exports.toBriefExpr = exports.shouldLoadCss = exports.specialOfficialCustoms = exports.officialCustoms = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = exports.findConceptValueFromNamespace = exports.findConceptKeyWordIndexFromNamespace = exports.findConceptKeyWordByNamespace = exports.findClosestModule = void 0;
+exports.toBriefExpr = exports.shouldLoadCss = exports.specialOfficialCustoms = exports.officialCustoms = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = exports.findConceptValueFromNamespace = exports.findConceptKeyWordIndexFromNamespace = exports.findConceptKeyWordByNamespace = exports.findClosestModule = void 0;
 __exportStar(require("./string"), exports);
 __exportStar(require("./traverse"), exports);
 __exportStar(require("./logger"), exports);
@@ -151,41 +151,4 @@ function toBriefExpr(expression) {
     return expr;
 }
 exports.toBriefExpr = toBriefExpr;
-function replaceNode(oldNode, newNode) {
-    const { parentNode, parentKey, offsetX, offsetY, app } = oldNode;
-    const logic = oldNode.logic;
-    if (!Array.isArray(parentNode[parentKey])) {
-        parentNode.update({
-            [parentKey]: newNode,
-        });
-    }
-    else {
-        // 虽然如果不在参数里使用属性访问没有意义，但是得兼容
-        app.emit('collect:start', {
-            actionMsg: '删除属性变量',
-        });
-        if (parentNode.concept === 'Logic') {
-            if (parentKey === 'body') {
-                const expIndex = logic.body.findIndex((item) => item === oldNode);
-                logic.insertItemInBodyAt(newNode, expIndex);
-            }
-            else {
-                const expIndex = logic.playground.findIndex((item) => item === oldNode);
-                Object.assign(newNode, { offsetX, offsetY });
-                logic.insertItemInPlaygroundAt(newNode, expIndex);
-            }
-        }
-        else {
-            const expIndex = parentNode[parentKey].findIndex((item) => item === oldNode);
-            const firstUpperText = parentKey[0].toUpperCase() + parentKey.slice(1, parentKey.length);
-            if (parentNode[`insertItemIn${firstUpperText}At`])
-                parentNode[`insertItemIn${firstUpperText}At`](newNode, expIndex);
-            else
-                parentNode.insertItemAt(newNode, expIndex);
-        }
-        oldNode.delete();
-        app.emit('collect:end');
-    }
-}
-exports.replaceNode = replaceNode;
 //# sourceMappingURL=index.js.map

package/out/utils/index.js.map

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

package/out/utils/string.d.ts

@@ -1,28 +1,15 @@
 /**
- * 中划线格式 转 驼峰格式  kebab-case -> camelCase
+ * 中划线格式 -转-> 驼峰格式
  * @param name 原名称
  * @return 转换后的名称
  */
 export declare const kebab2Camel: (name: string) => string;
 /**
- * 下划线格式 转 驼峰格式  snake_case -> camelCase
- * @param name 原名称
- * @param notPascalCase = false 首字母是否小写
- * @return 转换后的名称
- */
-export declare const snake2Camel: (name: string, notPascalCase?: boolean) => string;
-/**
- * 驼峰格式 转 中划线格式  camelCase -> kebab-case
+ * 驼峰格式 -转-> 中划线格式
  * @param name 原名称
  * @return 转换后的名称
  */
 export declare const Camel2kebab: (name: string) => string;
-/**
- * 驼峰格式 转 下划线格式  camelCase -> snake_case
- * @param name 原名称
- * @return 转换后的名称
- */
-export declare const Camel2Snake: (name: string) => string;
 /**
  * 首字母大写
  * @param value 字符串

package/out/utils/string.js

@@ -1,35 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sliceTagContent = exports.getLastOfPath = exports.unique = exports.firstLowerCase = exports.firstUpperCase = exports.Camel2Snake = exports.Camel2kebab = exports.snake2Camel = exports.kebab2Camel = void 0;
+exports.sliceTagContent = exports.getLastOfPath = exports.unique = exports.firstLowerCase = exports.firstUpperCase = exports.Camel2kebab = exports.kebab2Camel = void 0;
 /**
- * 中划线格式 转 驼峰格式  kebab-case -> camelCase
+ * 中划线格式 -转-> 驼峰格式
  * @param name 原名称
  * @return 转换后的名称
  */
 const kebab2Camel = (name) => name.replace(/(?:^|-)([a-zA-Z0-9])/g, (m, $1) => $1.toUpperCase());
 exports.kebab2Camel = kebab2Camel;
 /**
- * 下划线格式 转 驼峰格式  snake_case -> camelCase
- * @param name 原名称
- * @param notPascalCase = false 首字母是否小写
- * @return 转换后的名称
- */
-const snake2Camel = (name, notPascalCase = false) => name.replace(/(?:^|_+?)([a-zA-Z0-9])/g, (m, $1, offset) => (notPascalCase && !offset) ? $1.toLowerCase() : $1.toUpperCase());
-exports.snake2Camel = snake2Camel;
-/**
- * 驼峰格式 转 中划线格式  camelCase -> kebab-case
+ * 驼峰格式 -转-> 中划线格式
  * @param name 原名称
  * @return 转换后的名称
  */
 const Camel2kebab = (name) => name.replace(/([A-Z]|[0-9]+)/g, (m, $1, offset) => (offset ? '-' : '') + $1.toLowerCase());
 exports.Camel2kebab = Camel2kebab;
-/**
- * 驼峰格式 转 下划线格式  camelCase -> snake_case
- * @param name 原名称
- * @return 转换后的名称
- */
-const Camel2Snake = (name) => name.replace(/([A-Z])/g, (m, $1, offset) => (offset ? '_' : '') + $1.toLowerCase());
-exports.Camel2Snake = Camel2Snake;
 /**
  * 首字母大写
  * @param value 字符串

package/out/utils/string.js.map

@@ -1 +1 @@
-{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAAnG,QAAA,WAAW,eAAwF;AAEhH;;;;;GAKG;AACI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,gBAAyB,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAA7L,QAAA,WAAW,eAAkL;AAE1M;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAA3H,QAAA,WAAW,eAAgH;AAExI;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAApH,QAAA,WAAW,eAAyG;AAEjI;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AAA3F,QAAA,cAAc,kBAA6E;AACxG;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AAA3F,QAAA,cAAc,kBAA6E;AAExG;;;;GAIG;AACH,SAAgB,MAAM,CAAC,GAAW,EAC9B,GAAgF,EAChF,QAAgB,CAAC,EACjB,cAAuB,KAAK;IAC5B,IAAI,GAAG,CAAC;IACR,IAAI,WAAW,EAAE;QACb,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE;YACnB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG,EAAE;gBAC1C,wBAAwB;gBACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACxB,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;oBACZ,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC;oBACrB,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;wBAC7B,OAAO,IAAI,CAAC;qBACf;oBACD,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;iBACvB;gBACD,OAAO,KAAK,CAAC;aAChB;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;gBACzB,6BAA6B;gBAC7B,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,CAAC;iBAChD;gBACD,oBAAoB;gBACpB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,CAAC;aACrD;QACL,CAAC,CAAC;KACL;SAAM;QACH,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE;YACnB,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;gBACxC,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBACpB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;gBACvB,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;;gBAE1B,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC;KACL;IAED,OAAO,GAAG,CAAC,GAAG,CAAC;QACX,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,GAAG,CAAC;AACf,CAAC;AA3CD,wBA2CC;AAEM,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;IAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB;AAEF;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,QAAgB,EAAE,EAAE,EAAE;IAC/E,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,sBAAsB,GAAG,GAAG,CAAC,CAAC;IACvF,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}
+{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.18.0-beta.7",
+  "version": "2.20.0-beta.1",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",
@@ -67,4 +67,4 @@
     "typedoc": "^0.22.17",
     "typescript": "^4.1.3"
   }
-}
+}

package/sandbox/stdlib/nasl.auth.ts

@@ -4,7 +4,7 @@ declare namespace nasl.auth {
     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 getProcessStartBy(userNameFilter: nasl.core.String, limit: nasl.core.Long, offset: nasl.core.Long): nasl.collection.List<nasl.core.Any>;
+    export function getUserList(userNameFilter: nasl.core.String, limit: nasl.core.Long, offset: nasl.core.Long): nasl.collection.List<nasl.core.Any>;
    
 
     export class LCAPCurrentUserInfo {

package/sandbox/stdlib/nasl.core.ts

@@ -207,4 +207,5 @@ declare namespace nasl.core {
     export class Enums {
         accept: 'Enums';
     }
+    export type Incompatible<A, B> = A extends B ? never : A
 }

package/sandbox/stdlib/nasl.logging.ts

@@ -1,6 +1,6 @@
 declare namespace nasl.logging {
-    export function INFO<T>(log: nasl.core.String, ..._arg: any[]): T;
-    export function DEBUG<T>(log: nasl.core.String, ..._arg: any[]): T;
-    export function WARN<T>(log: nasl.core.String, ..._arg: any[]): T;
-    export function ERROR<T>(log: nasl.core.String, ..._arg: any[]): T;
+    export function INFO<T>(log: nasl.core.Any, ..._arg: any[]): T;
+    export function DEBUG<T>(log: nasl.core.Any, ..._arg: any[]): T;
+    export function WARN<T>(log: nasl.core.Any, ..._arg: any[]): T;
+    export function ERROR<T>(log: nasl.core.Any, ..._arg: any[]): T;
 }

package/sandbox/stdlib/nasl.util.ts

@@ -13,6 +13,8 @@ declare namespace nasl.util {
     export function Convert(value: nasl.core.Boolean): <T extends nasl.core.String | nasl.core.Integer | nasl.core.Decimal>() => T;
     export function Convert(value: nasl.core.Any): <T extends nasl.core.String>() => T;
 
+    export function ToString<T extends nasl.core.Any>(value: T): nasl.core.String;
+    export function FromString(value: nasl.core.String): <T extends nasl.core.Decimal | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Double | nasl.core.Integer | nasl.core.Long | nasl.core.Boolean>() => T;
     export function EnumToList<T extends nasl.core.Enums>(): nasl.collection.List<{ text: nasl.core.String, value: nasl.core.String }>;
     export function EnumValueToText<T extends nasl.core.Enums>(value: nasl.core.Enums): nasl.core.String;
     export function StringToEnumValue<T extends nasl.core.Enums>(value: nasl.core.String): T;
@@ -44,9 +46,9 @@ declare namespace nasl.util {
     export function ListHead<T>(list: nasl.collection.List<T>): T;
     export function ListLast<T>(list: nasl.collection.List<T>): T;
     export function ListFlatten<T>(list: nasl.collection.List<nasl.collection.List<T>>): nasl.collection.List<T>;
-    export function ListTransform<T0, T>(list: nasl.collection.List<T0>, by : (elem : T0) => T): nasl.collection.List<T>;
-    export function ListToMap<T, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.List<T>, byKey: (elem : T) => K, byVal: (elem : T) => V): nasl.collection.Map<K, V>;
-    export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by : (elem : A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
+    export function ListTransform<T0, T>(list: nasl.collection.List<T0>, by: (elem: T0) => T): nasl.collection.List<T>;
+    export function ListToMap<T, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.List<T>, byKey: (elem: T) => K, byVal: (elem: T) => V): nasl.collection.Map<K, V>;
+    export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
 
     export function ListSum<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
     export function ListProduct<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
@@ -93,6 +95,8 @@ declare namespace nasl.util {
     export function Clear<T>(struct: T): T;
     export function RandomInt(start: nasl.core.Integer, end: nasl.core.Integer): nasl.core.Integer;
     export function New<T>(): T;
+    export function NewList<T>(...args: T[]): nasl.collection.List<T>;
+    export function NewMap<K, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
 
     export function CreateListPage<T>(list: nasl.collection.List<T>, total: nasl.core.Integer): { list: nasl.collection.List<T>, total: nasl.core.Integer };
 
@@ -101,7 +105,7 @@ declare namespace nasl.util {
     export function jsonDeserialize<T>(arg: nasl.core.String): T;
 
     export function concatString(...args: nasl.core.String[]): any;
-    export function stringInterpolation(...args:( nasl.core.String | nasl.core.Boolean | nasl.core.Integer | nasl.core.Double | nasl.core.Decimal | nasl.core.Long | nasl.core.Text | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Email) []): String;
+    export function stringInterpolation(...args: (nasl.core.String | nasl.core.Boolean | nasl.core.Integer | nasl.core.Double | nasl.core.Decimal | nasl.core.Long | nasl.core.Text | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Email)[]): String;
 }
 
 

package/src/automate/engine/index.js

@@ -260,7 +260,7 @@ function autoScript(stack) {
         return ${JSON.stringify(roleNASL)};
     }
 
-    const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback, finalCallback) {
+    const execTemplate = function(app, frontend, getCtor, getCMeta, base, rootBindCallback, roleCallback, finalCallback) {
         let _templateObjects = [];
         const {
             _set,
@@ -271,7 +271,7 @@ function autoScript(stack) {
         } = injectModule.operators;
         const _uniqueName = new injectModule.uniqueName();
 
-        _uniqueName.initAppUniqueNames(app);
+        _uniqueName.initAppUniqueNames(app, frontend);
 
         app.emit('collect:start', {
             actionMsg: '导入页面模板'
@@ -440,7 +440,7 @@ export function getRoles(script) {
     const { exportRoles } = eval(script);
     return exportRoles();
 }
-export function applyTemplate(script, app, rootBindCallback, roleCallback, finalCallback) {
+export function applyTemplate(script, app, frontend, rootBindCallback, roleCallback, finalCallback) {
     operatorModule.upgraders.forEach((upgrader) => upgrader.replace && (script = upgrader.replace(script)));
     const { execTemplate, importModule } = eval(script);
     // 为了兼容 2.11 老模板
@@ -448,7 +448,7 @@ export function applyTemplate(script, app, rootBindCallback, roleCallback, final
         importModule('operators', operatorModule);
         importModule('uniqueName', uniqueName);
     }
-    execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
+    execTemplate(app, frontend, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
 }
 
 export function applyDropComponent(app, view, element) {

package/src/automate/engine/uniqueName.js

@@ -1,7 +1,7 @@
 import { unique } from '../../utils/string';
 export class uniqueName {
     NamesWeakMap = new Map();
-    initAppUniqueNames(app) {
+    initAppUniqueNames(app, frontend) {
         const NamesWeakMap = this.NamesWeakMap;
         const defaultDS = app.dataSources.find((d) => d.name === 'defaultDS');
         NamesWeakMap.set('defaultDS', new Set(defaultDS.getEntityExistingNames()));
@@ -11,10 +11,10 @@ export class uniqueName {
         NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
         NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));
         NamesWeakMap.set('Interface', new Set(app.getInterfaceExistingNames()));
-        NamesWeakMap.set('View', new Set(app.getViewExistingNames()));
+        NamesWeakMap.set('View', new Set(frontend.getViewExistingNames()));
         NamesWeakMap.set('Process', new Set(app.getProcessExistingNames()));
         NamesWeakMap.set('Role', new Set(app.getRoleExistingNames()));
-        NamesWeakMap.set('Variable', new Set(app.getVarExistingNames()));
+        NamesWeakMap.set('Variable', new Set(frontend.getVarExistingNames()));
     }
     getGenUniqNameFunctionName(item, concept) {
         if (item.name === null)

package/src/automate/template/myProcess.js

@@ -10009,7 +10009,7 @@ export const processComponent = (function () {
 		_set(t_CallLogic_unknown_1178, "label", "调用逻辑");
 		_set(t_CallLogic_unknown_1178, "folded", false);
 		_set(t_CallLogic_unknown_1178, "calleeNamespace", "nasl.auth");
-		_set(t_CallLogic_unknown_1178, "calleeName", "getProcessStartBy");
+		_set(t_CallLogic_unknown_1178, "calleeName", "getUserList");
 		_set(t_CallLogic_unknown_1178, "typeArguments", null);
 		_push(t_CallLogic_unknown_1178, "arguments", t_Argument_unknown_1179);
 		_push(t_CallLogic_unknown_1178, "arguments", t_Argument_unknown_1183);

package/src/automate/upgrader/2.20.js

@@ -0,0 +1,41 @@
+import * as nasl from '@nasl';
+
+const excludedKeySet = new Set([
+    'parentNode',
+    'sourceMap',
+    'storageJSON',
+    'tsErrorDetail',
+    'NaslAnnotatedJSON',
+    'calledFrom',
+    '_events',
+    '_collectingList',
+    '_historyList',
+]);
+
+/**
+ * 升级要点：
+ * - 增加frontend参数
+ * @param script 升级前的 script
+ * @returns 升级后的 script
+ */
+export function replace(script) {
+    script = script.replace('execTemplate = function(app,', 'execTemplate = function(app, frontend, ');
+    script = script.replace('_uniqueName.initAppUniqueNames(app);', '_uniqueName.initAppUniqueNames(app, frontend);');
+    return script;
+}
+
+/**
+ * 升级要点：
+ * - app下新建frontends
+ * - 将views放到frontends
+ * - 将frontendVariables放到frontends
+ * - 将componentDependencies放到frontends
+ * @param json 升级前的 JSON
+ * @returns 升级后的 JSON
+ */
+export function upgrade(json) {
+    nasl.utils.traverse((current) => {
+        const { node, parent } = current;
+    }, { node: json }, { mode: 'anyObject', depthFirst: true, excludedKeySet });
+    return json;
+}

package/src/bak/translator.js

@@ -45,7 +45,10 @@ export default function (definition) {
     viewVariables.forEach((viewVariable) => {
         dataMap[viewVariable.code || viewVariable.name] = true;
         const typeAnnotation = viewVariable.typeAnnotation || viewVariable.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && !['primitive', 'union'].includes(typeAnnotation.typeKind);
+        const needGenInitFromSchema = typeAnnotation && (
+            !['primitive', 'union'].includes(typeAnnotation.typeKind)
+            || typeAnnotation.typeName === 'DateTime'
+        );
         let code = `${safeCodeAsKey(viewVariable.name)}:`;
         if (needGenInitFromSchema) {
             code += `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', `;

package/src/concepts/AnonymousFunction__.ts

@@ -2,6 +2,10 @@ import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import ForEachStatement from './ForEachStatement__';
+import NewList from './NewList__';
+import CallLogic from './CallLogic__';
+import MemberExpression from './MemberExpression__';
+import Entity from './Entity__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -412,6 +416,12 @@ export class AnonymousFunction extends BaseNode {
     //================================================================================
 
     toJS(state?: TranslatorState): String {
+        const grandParent = this.parentNode?.parentNode;
+        if(grandParent instanceof CallLogic
+            && /dataSources\.[^.]+\.entities\.[^.]+\.logics/.test(grandParent.calleeNamespace)
+            && ['update', 'updateBy', 'createOrUpdate', 'batchUpdate'].includes(grandParent.calleeName))
+            return this.toJSOfEntityLogicProperties(state);
+
         let code = '';
         code += '(';
         this.params.forEach((param, index) => {
@@ -429,6 +439,18 @@ export class AnonymousFunction extends BaseNode {
         return code;
     }
 
+    toJSOfEntityLogicProperties(state?: TranslatorState): String {
+        let code = '[';
+        if (this.body && this.body instanceof NewList) {
+            this.body.items.forEach((item: MemberExpression, index, array) => {
+                code += `'${item.property.toJS(shiftState(state, code))}'`;
+                if(index !== array.length-1) code += ',';
+            });
+        }
+        code += ']';
+        return code;
+    }
+
     getVarExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return [...this.params].filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -445,6 +467,24 @@ export class AnonymousFunction extends BaseNode {
     }
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
+        let updateNoPropertyCode = '';
+        const grandParent = this.parentNode?.parentNode;
+        if(grandParent instanceof CallLogic
+            && /dataSources\.[^.]+\.entities\.[^.]+\.logics/.test(grandParent.calleeNamespace)
+            && ['update', 'updateBy', 'createOrUpdate', 'batchUpdate'].includes(grandParent.calleeName)) {
+                const logicNode = grandParent.getCallNode();
+                const entity = logicNode.upperNode.upperNode as Entity;
+                const primaryKeys = entity.properties.filter((item) => item.primaryKey);
+
+                const propertyArg = grandParent.arguments.find((item) => item.keyword === 'properties');
+                const expression = propertyArg?.expression as unknown as AnonymousFunction;
+                const newList = expression?.body as NewList;
+                const newListItems = newList?.items;
+                
+                if(primaryKeys.length === newListItems?.length)
+                    updateNoPropertyCode = 'const __UpdateNoProperty__: any = null;\n';
+        }
+
         let code = '';
         if (this.body) {
             code += `(`;
@@ -454,12 +494,18 @@ export class AnonymousFunction extends BaseNode {
                     code += ', ';
             });
             code += `)`;
-            code += ` => (`;
+            code += ` => {\n`;
+
+            if(updateNoPropertyCode)
+                code += updateNoPropertyCode;
 
+            code += `return `;
+            
             if (this.body) {
                 code += this.body.toEmbeddedTS && this.body.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
             }
-            code += indent(state.tabSize) + ')';
+            code += ';'
+            code += indent(state.tabSize) + '}';
         } else {
             code += '__IDENTIFIER__';
         }