@lcap/nasl 4.4.1-rc.5 → 4.4.2-rc.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "4.4.1-rc.5",
+  "version": "4.4.2-rc.2",
   "author": "Forrest <rainforest92@126.com>",
   "main": "./out",
   "types": "./out/index.d.ts",
@@ -79,14 +79,14 @@
     "vue": "3.4.33",
     "vue-template-compiler": "2.6.14",
     "vue-template-es2015-compiler": "1.9.1",
-    "@lcap/nasl-breakpoint": "4.4.1-rc.5",
-    "@lcap/nasl-concepts": "4.4.1-rc.5",
-    "@lcap/nasl-language-server-core": "4.4.1-rc.5",
-    "@lcap/nasl-translator": "4.4.1-rc.5",
-    "@lcap/nasl-types": "4.4.1-rc.5",
-    "@lcap/nasl-log": "4.4.1-rc.5",
-    "@lcap/nasl-unified-frontend-generator": "4.4.1-rc.5",
-    "@lcap/nasl-utils": "4.4.1-rc.5"
+    "@lcap/nasl-breakpoint": "4.4.2-rc.2",
+    "@lcap/nasl-concepts": "4.4.2-rc.2",
+    "@lcap/nasl-language-server-core": "4.4.2-rc.2",
+    "@lcap/nasl-log": "4.4.2-rc.2",
+    "@lcap/nasl-translator": "4.4.2-rc.2",
+    "@lcap/nasl-types": "4.4.2-rc.2",
+    "@lcap/nasl-unified-frontend-generator": "4.4.2-rc.2",
+    "@lcap/nasl-utils": "4.4.2-rc.2"
   },
   "devDependencies": {
     "@babel/preset-react": "7.24.1",
@@ -113,6 +113,7 @@
     "test:ci": "pnpm test:gen && pnpm run --filter @lcap/nasl-test-toolkit runtest:ci --require $PWD/tests/setup.ts --config $PWD/.mocharc.js --j 3",
     "test:qa": "pnpm test:gen && pnpm run --filter @lcap/nasl-test-toolkit runtest:ci --require $PWD/tests/setup.ts --config $PWD/.mocharc.js --j 1",
     "test:tdd": "node_modules/@lcap/nasl-test-toolkit/node_modules/mocha/bin/mocha.js --no-config --file $PWD/tests/tdd/tdd.spec.js",
+    "test:batch": "node_modules/@lcap/nasl-test-toolkit/node_modules/mocha/bin/mocha.js --no-config --file $PWD/tests/tdd/batchActions.spec.js",
     "test:tdd:one": "node --inspect node_modules/@lcap/nasl-test-toolkit/node_modules/mocha/bin/mocha.js --no-config --file $PWD/tests/tdd/tdd.one.spec.js",
     "test:update": "npm run test -- --update",
     "release:alpha": "npm run build && pnpm publish --tag alpha --access public --no-git-checks",

package/sandbox/stdlib/nasl.util.ts

@@ -19,7 +19,8 @@ declare namespace nasl.util {
   export function ConvertBoolean<T extends nasl.core.Boolean | nasl.core.String | nasl.core.Long | nasl.core.Decimal>(value: nasl.core.Boolean): T;
   export function Convertany<T extends nasl.core.String>(value: nasl.core.Any): T;
 
-  export function ToString(value: nasl.core.Any, timeZone?: nasl.core.String): nasl.core.String;
+  export function ToString(value: nasl.core.DateTime, timeZone: nasl.core.String): nasl.core.String;
+  export function ToString(value: nasl.core.Any): 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.Long | nasl.core.Boolean>() => T;
   export function EnumToList<T extends nasl.core.Enums<nasl.core.Long>>(): nasl.collection.List<nasl.core.AStructure<{ text: nasl.core.String, value: nasl.core.Long, item: T }>>;
@@ -36,13 +37,13 @@ declare namespace nasl.util {
   export function Length(str1: nasl.core.String): nasl.core.Long;
   export function Length<K, V>(str1: nasl.collection.Map<K, V>): nasl.core.Long;
   export function Length<T>(str1: nasl.collection.List<T>): nasl.core.Long;
-  export function IndexOf(str: nasl.core.String, search: nasl.core.String, formIndex: nasl.core.Long, ignoreCase: nasl.core.Boolean): nasl.core.Long;
+  export function IndexOf(str: nasl.core.String, search: nasl.core.String, fromIndex: nasl.core.Long, ignoreCase: nasl.core.Boolean): nasl.core.Long;
   export function LastIndexOf(str: nasl.core.String, search: nasl.core.String, ignoreCase: nasl.core.Boolean): nasl.core.Long;
   export function Replace(str: nasl.core.String, search: nasl.core.String | nasl.util.Regex, replace: nasl.core.String): nasl.core.String;
   export function SubString(str: nasl.core.String, start: nasl.core.Long, length?: nasl.core.Long): nasl.core.String;
-  export function ToLower(str1: nasl.core.String): nasl.core.String;
-  export function ToUpper(str1: nasl.core.String): nasl.core.String;
-  export function Trim(str1: nasl.core.String): nasl.core.String;
+  export function ToLower(str: nasl.core.String): nasl.core.String;
+  export function ToUpper(str: nasl.core.String): nasl.core.String;
+  export function Trim(str: nasl.core.String): nasl.core.String;
 
   export function Get<T>(list: nasl.collection.List<T>, index: nasl.core.Long): T;
   export function Set<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Long, item: K): T;
@@ -91,7 +92,6 @@ declare namespace nasl.util {
                                    ,by: nasl.collection.List<{ items: Array<(elem: A) => any> }>): nasl.collection.List<A>;
   export function ListSlice<T>(list: nasl.collection.List<T>, start: nasl.core.Long, end: nasl.core.Long): nasl.collection.List<T>;
 
-  export function ListRange(end: nasl.core.Long): nasl.collection.List<nasl.core.Long>;
   export function ListRange(start: nasl.core.Long, end: nasl.core.Long, step?: nasl.core.Long): nasl.collection.List<nasl.core.Long>;
 
   export function ListRepeat<T>(item: T, length: nasl.core.Long): nasl.collection.List<T>;
@@ -117,8 +117,8 @@ declare namespace nasl.util {
   export function FormatDate(date: nasl.core.Date, formatter: nasl.core.String): nasl.core.String;
   export function FormatDateTime(dateTime: nasl.core.DateTime, formatter: nasl.core.String, timeZone?: nasl.core.String): nasl.core.String;
   export function FormatTime(time: nasl.core.Time, formatter: nasl.core.String): nasl.core.String;
-  export function FormatNumber(doubleValue: nasl.core.Decimal | nasl.core.Long, digits: nasl.core.Long, omit: nasl.core.Boolean, showGroups: nasl.core.Boolean, fix: nasl.core.String, unit: nasl.core.String): nasl.core.String;
-  export function FormatPercent(doubleValue: nasl.core.Decimal | nasl.core.Long, digits: nasl.core.Long, omit: nasl.core.Boolean, showGroups: nasl.core.Boolean): nasl.core.String;
+  export function FormatNumber(value: nasl.core.Decimal | nasl.core.Long, digits: nasl.core.Long, omit: nasl.core.Boolean, showGroups: nasl.core.Boolean, fix: nasl.core.String, unit: nasl.core.String): nasl.core.String;
+  export function FormatPercent(value: nasl.core.Decimal | nasl.core.Long, digits: nasl.core.Long, omit: nasl.core.Boolean, showGroups: nasl.core.Boolean): nasl.core.String;
 
   export function AddDays(dateTime: nasl.core.Date, amount: nasl.core.Long): nasl.core.Date;
   export function AddDays(dateTime: nasl.core.DateTime, amount: nasl.core.Long): nasl.core.DateTime;
@@ -126,17 +126,17 @@ declare namespace nasl.util {
   export function AddMonths(dateTime: nasl.core.Date, amount: nasl.core.Long): nasl.core.Date;
   export function AddMonths(dateTime: nasl.core.DateTime, amount: nasl.core.Long): nasl.core.DateTime;
 
-  export function DateDiff<T extends nasl.core.Date | nasl.core.Time | nasl.core.DateTime>(dateTime1: T, dateTime2: T, calcType: nasl.core.String, isAbs: nasl.core.Boolean): nasl.core.Long;
+  export function DateDiff<T extends nasl.core.Date | nasl.core.Time | nasl.core.DateTime>(startDateTime: T, endDateTime: T, calcType: nasl.core.String, isAbs: nasl.core.Boolean): nasl.core.Long;
   export function ConvertTimezone<T extends nasl.core.DateTime>(dateTime: T, timeZone: nasl.core.String): T;
   export function AlterDateTime<T extends nasl.core.Date | nasl.core.DateTime>(dateTime: T, option: nasl.core.String, amount: nasl.core.Long, unit: nasl.core.String): T;
 
-  export function GetDateCount<T extends nasl.core.Date | nasl.core.DateTime>
-    (dateTime: T, metric: nasl.core.String, timeZone?: nasl.core.String): nasl.core.Long;
+  export function GetDateCount(dateTime: nasl.core.Date, metric: nasl.core.String): nasl.core.Long;
+  export function GetDateCount(dateTime: nasl.core.DateTime, metric: nasl.core.String, timeZone: nasl.core.String): nasl.core.Long;
     export function GetDateCountOld<T extends nasl.core.Date | nasl.core.DateTime>
     (dateTime: T, metric: nasl.core.String, timeZone?: nasl.core.String): nasl.core.Long;
 
-  export function GetSpecificDaysOfWeek<T extends nasl.core.Date | nasl.core.DateTime>(startDate: T, endDate: T,
-    target: nasl.collection.List<nasl.core.Long>, timeZone?: nasl.core.String): nasl.collection.List<T>;
+  export function GetSpecificDaysOfWeek(startDate: nasl.core.Date, endDate: nasl.core.Date, target: nasl.collection.List<nasl.core.Long>): nasl.collection.List<nasl.core.Date>;
+  export function GetSpecificDaysOfWeek(startDate: nasl.core.DateTime, endDate: nasl.core.DateTime, target: nasl.collection.List<nasl.core.Long>, timeZone: nasl.core.String): nasl.collection.List<nasl.core.DateTime>;
 
   export function Clone<T>(struct: T): T;
   // export function Clear<T>(struct: T): T;
@@ -151,6 +151,7 @@ declare namespace nasl.util {
   // 为防止nasl没有被干净，先保留这部分的声明
   export function consoleLog(arg: nasl.core.Any): void;
 
+  export function jsonSerialize(arg: nasl.core.DateTime, timeZone: nasl.core.String): nasl.core.String;
   export function jsonSerialize(arg: nasl.core.Any): nasl.core.String;
   export function jsonDeserialize<T>(arg: nasl.core.String): T;
 
@@ -195,8 +196,8 @@ declare namespace nasl.util {
   export function Cbrt(value: nasl.core.Decimal): nasl.core.Decimal;
   export function Log(value: nasl.core.Decimal): nasl.core.Decimal;
 
-  export function PadStart(str: nasl.core.String, length: nasl.core.Long, padStr: nasl.core.String): nasl.core.String;
-  export function PadEnd(str: nasl.core.String, length: nasl.core.Long, padStr: nasl.core.String): nasl.core.String;
+  export function PadStart(str: nasl.core.String, targetLength: nasl.core.Long, fillStr: nasl.core.String): nasl.core.String;
+  export function PadEnd(str: nasl.core.String, targetLength: nasl.core.Long, fillStr: nasl.core.String): nasl.core.String;
   export function TrimStart(str: nasl.core.String): nasl.core.String;
   export function TrimEnd(str: nasl.core.String): nasl.core.String;
   export function MatchRegex(

package/out/natural/exports/transform2BatchActions.d.ts

@@ -1,114 +0,0 @@
-/**
- *
- * 这个模块的主要功能是将多个代码文件操作（创建、更新、删除）转换为统一的nasl批量操作格式，
- *
- * 主要处理流程：
- * 1. 解析codeAction 的路径，提取命名空间和项目类型信息
- * 2. 将代码内容包装在适当的命名空间中
- * 3. 使用 parseNaturalTS 解析 TypeScript 代码为 NASL 对象
- * 4. 为每种类型（entity、structure、enum、logic、view）提供统一的操作接口
- * 5. 生成批量操作数组，支持创建、更新和删除操作
- * 6. 处理操作过程中的错误并提供调试信息
- *
- * 目前支持的类型：
- * - entity: 数据实体
- * - structure: 数据结构
- * - enum: 枚举类型
- * - logic: 业务逻辑
- * - view: 视图组件
- * - backendVariables: 后端变量
- * - frontendVariables: 前端类型变量
- */
-/**
- * 用于描述对代码文件的操作，包括路径、内容和操作类型
- */
-export interface CodeAction {
-    /** 文件路径，例如: 'src/app.enums.SomeType.ts' */
-    path: string;
-    /** 文件内容 */
-    content: string;
-    /** 操作类型：创建、更新、删除或已存在（用于自动生成的父级视图） */
-    action: 'create' | 'update' | 'delete' | 'exist';
-}
-/**
- * 批量操作接口
- * 用于描述单个批量操作的详细信息
- */
-interface BatchAction {
-    /** 操作类型 */
-    action: string;
-    /** 操作路径 */
-    path: string;
-    /** NASL 对象 */
-    object: any;
-}
-/**
- * 用于描述一组批量操作及其元信息
- */
-export interface Operators {
-    /** 唯一标识符 */
-    uuid: string;
-    /** 批量操作数组 */
-    actions: BatchAction[];
-    /** 操作描述信息 */
-    actionMsg: string;
-    /** 源类型 */
-    sourceType: string;
-}
-/**
- * 布局模板参数接口
- */
-interface LayoutTemplateParams {
-    viewName: string;
-    title: string;
-    namespace: string;
-}
-/**
- * 生成空的路由容器模板
- * 用于为嵌套视图创建父级容器视图
- * @param params - 包含视图名称、标题和命名空间的参数
- * @returns 生成的路由容器模板代码
- */
-export declare const generateRouterContainerTemplate: (params: Pick<LayoutTemplateParams, 'viewName' | 'title' | 'namespace'>) => string;
-/**
- * 将 codeAction 数组转换为批量操作
- * 这是整个模块的核心函数，负责将多个codeAction 转换成统一的批量操作格式
- *
- * 处理流程：
- * 1. 解析每个 codeAction ，提取类型和名称信息
- * 2. 将需要解析的代码合并并通过 parseNaturalTS 解析
- * 3. 为每个操作生成对应的 NASL 对象
- * 4. 构建批量操作数组，支持创建、更新和删除操作
- * 5. 处理错误并返回结果
- *
- * @param codeActions - codeAction 数组，每个元素包含 path、content、action
- * @param app - NASL 应用实例，用于操作目标应用
- * @param sessionId - 会话 ID，用于生成唯一标识
- * @param type - 操作类型，'normal' 为正常模式，'debug' 为调试模式（会返回更多信息）
- * @param files - 可选的完整文件列表，包含现有文件和新文件
- * @returns 包含批量操作和可选调试信息的对象
- */
-export declare const transform2BatchActions: ({ codeActions, app, sessionId, type, }: {
-    codeActions: CodeAction[];
-    app: any;
-    sessionId: string;
-    type?: 'normal' | 'debug';
-}) => {
-    batchActions: Operators;
-    accumulatedTsCode?: string;
-    parseJSON?: any;
-    errors?: Array<{
-        item: string;
-        type: string;
-        error: Error;
-    }>;
-};
-/**
- * 将批量操作应用到 app 实例
- * 处理批量操作（create/update/delete），并将其应用到 app 中
- * @param app - NASL 应用实例，需传入 Vue 劫持后的响应式 app
- * @param batchActions - 需要应用的批量操作
- */
-export declare const applyBatchActions: (app: any, batchActions: Operators) => void;
-export {};
-//# sourceMappingURL=transform2BatchActions.d.ts.map

package/out/natural/exports/transform2BatchActions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"transform2BatchActions.d.ts","sourceRoot":"","sources":["../../../src/natural/exports/transform2BatchActions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAQH;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;CAClD;AAED;;;GAGG;AACH,UAAU,WAAW;IACnB,WAAW;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,cAAc;IACd,MAAM,EAAE,GAAG,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,YAAY;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,aAAa;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,aAAa;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU;IACV,UAAU,EAAE,MAAM,CAAC;CACpB;AAwBD;;GAEG;AACH,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,WAClC,KAAK,oBAAoB,EAAE,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC,KACrE,MAeF,CAAC;AA6xBF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,sBAAsB,2CAKhC;IACD,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC3B,KAAG;IACF,YAAY,EAAE,SAAS,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;CAmN9D,CAAC;AA6ZF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,QAAS,GAAG,gBAAgB,SAAS,SA2DlE,CAAC"}