KeyValues.toObject support base list merging

robincodex · Dec 3, 2024 · 23f8c88 · 23f8c88
1 parent b3d4c74
commit 23f8c88
Show file tree

Hide file tree

Showing 5 changed files with 267 additions and 486 deletions.
diff --git a/__tests__/KeyValues.test.ts b/__tests__/KeyValues.test.ts
@@ -263,6 +263,10 @@ describe('KeyValues', () => {
         expect(typeof obj2['Ha']['t1']['ggg']).toBe('object');
         expect(typeof obj2['test']).toBe('object');
 
+        const kv3 = await KeyValues.Load(join(__dirname, 'KeyValues.base.txt'));
+        const obj3 = kv3.toObject();
+        expect(obj3).toMatchSnapshot();
+
         try {
             new KeyValues('a', '123').toObject();
         } catch (e) {

diff --git a/__tests__/__snapshots__/KeyValues.test.ts.snap b/__tests__/__snapshots__/KeyValues.test.ts.snap
@@ -2,6 +2,21 @@
 
 exports[`KeyValues Check KeyValues #base 1`] = `"#base    "npc/file01.txt" // file01"`;
 
+exports[`KeyValues Check KeyValues.toObject 1`] = `
+{
+  "DOTAAbilities": {
+    "ability01": {
+      "AbilityBehavior": "DOTA_ABILITY_BEHAVIOR_POINT",
+      "BaseClass": "ability_lua",
+    },
+    "ability02": {
+      "AbilityBehavior": "DOTA_ABILITY_BEHAVIOR_POINT",
+      "BaseClass": "ability_datadriven",
+    },
+  },
+}
+`;
+
 exports[`KeyValues Check KeyValues.txt 1`] = `
 ""DOTAAbilities"
 {

diff --git a/package.json b/package.json
@@ -32,21 +32,21 @@
     "license": "MIT",
     "devDependencies": {
         "@jest/globals": "^29.7.0",
-        "@rollup/plugin-commonjs": "26.0.1",
-        "@rollup/plugin-node-resolve": "15.2.3",
-        "@rollup/plugin-typescript": "11.1.6",
-        "@types/jest": "^29.5.12",
-        "@types/mocha": "^10.0.7",
-        "@types/node": "^22.5.4",
+        "@rollup/plugin-commonjs": "28.0.1",
+        "@rollup/plugin-node-resolve": "15.3.0",
+        "@rollup/plugin-typescript": "12.1.1",
+        "@types/jest": "^29.5.14",
+        "@types/mocha": "^10.0.10",
+        "@types/node": "^22.10.1",
         "iconv-lite": "^0.6.3",
         "jest": "^29.7.0",
         "jest-coverage-badges": "^1.1.2",
-        "prettier": "^3.3.3",
-        "rollup": "4.21.2",
+        "prettier": "^3.4.1",
+        "rollup": "4.28.0",
         "rollup-plugin-dts": "^6.1.1",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2",
-        "tslib": "^2.7.0",
-        "typescript": "5.5.4"
+        "tslib": "^2.8.1",
+        "typescript": "5.7.2"
     }
 }