@lcap/nasl 4.4.0-beta.21 → 4.4.0-beta.22

package/out/service/storage/specTools.d.ts

@@ -1,4 +1,12 @@
 import { CodeAction } from '../../index';
+type ChangeViewResult = {
+    status: 'success';
+    result: any;
+} | {
+    status: 'fail';
+    error?: string;
+};
+type DependencyRecord = Record<string, Record<string, string>>;
 /**
  * 将代码操作转换为批量操作视图
  * @param params - 转换参数对象
@@ -15,6 +23,7 @@ export declare const transform2BatchView: ({ codeActions, app, sessionId, type,
     sessionId: string;
     type?: 'normal' | 'debug';
 }) => Promise<{
+    dependencies: DependencyRecord;
     batchActions: import("../../index").Operators;
     accumulatedTsCode?: string;
     parseJSON?: any;
@@ -23,12 +32,7 @@ export declare const transform2BatchView: ({ codeActions, app, sessionId, type,
         type: string;
         error: Error;
     }[];
-    batchView: {
-        status: string;
-        result: any;
-    } | {
-        status: string;
-        result?: undefined;
-    };
+    batchView: ChangeViewResult;
 }>;
+export {};
 //# sourceMappingURL=specTools.d.ts.map

package/out/service/storage/specTools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specTools.d.ts","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,UAAU,EAAc,MAAM,aAAa,CAAC;AA0B7E;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,2CAK7B;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;;;;;;;;;;;;;;;;EAgDA,CAAC"}
+{"version":3,"file":"specTools.d.ts","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,UAAU,EAAc,MAAM,aAAa,CAAC;AAM7E,KAAK,gBAAgB,GAAG;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhG,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAqH/D;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,2CAK7B;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;;;;;;;;;;;EA2DA,CAAC"}

package/out/service/storage/specTools.js

@@ -6,11 +6,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform2BatchView = void 0;
 const service_1 = __importDefault(require("./service"));
 const index_1 = require("../../index");
+// 常量定义
+const DEPENDENCIES_FILE_PATH = 'app.dependencies.json';
+/**
+ * 检查是否为普通对象（非数组、非null）
+ */
+const isPlainObject = (value) => {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+};
 /**
  * 获取变更视图
  * 通过存储服务调用变更视图接口，用于获取批量操作的预览效果
  * @param body - 请求体，包含批量操作数据
- * @returns Promise<{status: string, result?: any}> 返回操作状态和结果
+ * @returns Promise<ChangeViewResult> 返回操作状态和结果
  */
 const getChangeView = async (body) => {
     try {
@@ -24,12 +32,72 @@ const getChangeView = async (body) => {
         };
     }
     catch (error) {
-        // 如果调用失败，返回失败状态
+        // 如果调用失败，返回失败状态和错误信息
         return {
             status: 'fail',
+            error: error instanceof Error ? error.message : String(error),
         };
     }
 };
+/**
+ * 比对 app.dependencies.json，找出新增的依赖
+ * @param codeActions - 代码操作数组
+ * @param existFiles - 已存在的文件数组
+ * @returns 新增的依赖配置对象，如果没有新增依赖则返回 null
+ */
+const compareDependencies = (codeActions, existFiles) => {
+    // 从 codeActions 中查找新的依赖文件
+    const newDependenciesAction = codeActions.find((action) => action.path === DEPENDENCIES_FILE_PATH);
+    if (!newDependenciesAction) {
+        return null;
+    }
+    try {
+        // 解析新的依赖配置
+        const newDeps = JSON.parse(newDependenciesAction.content);
+        // 从 existFiles 中查找旧的依赖文件
+        const oldDependenciesFile = existFiles.find((file) => file.path === DEPENDENCIES_FILE_PATH);
+        // 如果不存在旧的依赖配置，所有依赖都是新增的
+        if (!oldDependenciesFile) {
+            return newDeps;
+        }
+        // 解析旧的依赖配置
+        const oldDeps = JSON.parse(oldDependenciesFile.content);
+        // 存储新增的依赖
+        const addedDeps = {};
+        // 遍历新配置中的所有顶级 key（如 extensions、uilibs 等）
+        Object.entries(newDeps).forEach(([category, newCategoryDeps]) => {
+            const oldCategoryDeps = oldDeps[category] || {};
+            // 如果新配置的这个 key 是对象类型，才进行比对
+            if (isPlainObject(newCategoryDeps)) {
+                // 找出这个类别下新增的依赖项
+                const addedInCategory = {};
+                Object.entries(newCategoryDeps).forEach(([depName, depVersion]) => {
+                    // 如果旧配置中不存在这个依赖，则为新增
+                    if (!oldCategoryDeps[depName]) {
+                        addedInCategory[depName] = depVersion;
+                    }
+                });
+                // 如果这个类别下有新增的依赖，添加到结果中
+                if (Object.keys(addedInCategory).length > 0) {
+                    addedDeps[category] = addedInCategory;
+                }
+            }
+        });
+        // 如果没有新增的依赖，返回 null
+        if (Object.keys(addedDeps).length === 0) {
+            return null;
+        }
+        // 返回新增的依赖
+        return addedDeps;
+    }
+    catch (error) {
+        console.error('解析 app.dependencies.json 失败:', {
+            error,
+            file: DEPENDENCIES_FILE_PATH,
+        });
+        return null;
+    }
+};
 /**
  * 将代码操作转换为批量操作视图
  * @param params - 转换参数对象
@@ -41,6 +109,9 @@ const getChangeView = async (body) => {
 
  */
 const transform2BatchView = async ({ codeActions, app, sessionId, type = 'normal', }) => {
+    if (process.env.NODE_ENV === 'development') {
+        console.log('codeActions', codeActions);
+    }
     const existFiles = (0, index_1.nasl2Files)({ app, range: 'all' });
     const existDtsFiles = existFiles
         .filter((file) => file.path.endsWith('.d.ts'))
@@ -50,7 +121,7 @@ const transform2BatchView = async ({ codeActions, app, sessionId, type = 'normal
     }));
     // 用 codeActions 合并出一份完整的 files，按 path 做覆盖
     const filesMap = new Map();
-    // 先添加已存在的 .d.ts 文件
+    // 先添加已存在的文件
     existDtsFiles.forEach((file) => {
         filesMap.set(file.path, file);
     });
@@ -73,13 +144,21 @@ const transform2BatchView = async ({ codeActions, app, sessionId, type = 'normal
         return {
             batchActions: null,
             batchView: null,
+            dependencies: null,
         };
     }
     const batchView = await getChangeView([result.batchActions]);
-    return {
+    // 比对 app.dependencies.json，找出新增的依赖
+    const dependencies = compareDependencies(codeActions, existFiles);
+    const res = {
         batchView,
         ...result,
+        dependencies,
     };
+    if (process.env.NODE_ENV === 'development') {
+        console.log('result', res);
+    }
+    return res;
 };
 exports.transform2BatchView = transform2BatchView;
 //# sourceMappingURL=specTools.js.map

package/out/service/storage/specTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"specTools.js","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAuC;AACvC,uCAA6E;AAE7E;;;;;GAKG;AACH,MAAM,aAAa,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;IACxC,IAAI,CAAC;QACH,gBAAgB;QAChB,MAAM,MAAM,GAAG,MAAM,iBAAc,CAAC,UAAU,CAAC;YAC7C,IAAI;SACL,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,MAAM;SACP,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gBAAgB;QAChB,OAAO;YACL,MAAM,EAAE,MAAM;SACf,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACI,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,WAAW,EACX,GAAG,EACH,SAAS,EACT,IAAI,GAAG,QAAQ,GAMhB,EAAE,EAAE;IACH,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAErD,MAAM,aAAa,GAAG,UAAU;SAC7B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SAC7C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACd,GAAG,IAAI;QACP,IAAI,EAAE,OAAO;KACd,CAAC,CAAC,CAAC;IAEN,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAe,CAAC;IAExC,mBAAmB;IACnB,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,sCAAsC;IACtC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;YACxB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC;QACpC,WAAW,EAAE,aAAa;QAC1B,GAAG;QACH,SAAS;QACT,IAAI;KACL,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,IAAI;SAChB,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IAE7D,OAAO;QACL,SAAS;QACT,GAAG,MAAM;KACV,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,mBAAmB,uBA0D9B"}
+{"version":3,"file":"specTools.js","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "4.4.0-beta.21",
+  "version": "4.4.0-beta.22",
   "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.0-beta.21",
-    "@lcap/nasl-language-server-core": "4.4.0-beta.21",
-    "@lcap/nasl-concepts": "4.4.0-beta.21",
-    "@lcap/nasl-log": "4.4.0-beta.21",
-    "@lcap/nasl-types": "4.4.0-beta.21",
-    "@lcap/nasl-translator": "4.4.0-beta.21",
-    "@lcap/nasl-unified-frontend-generator": "4.4.0-beta.21",
-    "@lcap/nasl-utils": "4.4.0-beta.21"
+    "@lcap/nasl-breakpoint": "4.4.0-beta.22",
+    "@lcap/nasl-concepts": "4.4.0-beta.22",
+    "@lcap/nasl-language-server-core": "4.4.0-beta.22",
+    "@lcap/nasl-log": "4.4.0-beta.22",
+    "@lcap/nasl-translator": "4.4.0-beta.22",
+    "@lcap/nasl-types": "4.4.0-beta.22",
+    "@lcap/nasl-unified-frontend-generator": "4.4.0-beta.22",
+    "@lcap/nasl-utils": "4.4.0-beta.22"
   },
   "devDependencies": {
     "@babel/preset-react": "7.24.1",