Sort translated strings keys by original input

Author: joyqi

src/structure/kv.ts

@@ -5,6 +5,8 @@ import { addedDiff, deletedDiff } from 'deep-object-diff';
 type KVStructure = Record<string, string>;
 
 export default class implements Structure<KVStructure> {
+    private keys: string[] = [];
+
     split(data: KVStructure, enc: Tiktoken, chunkSize: number): KVStructure[] {
         let left: KVStructure = {};
         const result: KVStructure[] = [];
@@ -48,13 +50,8 @@ export default class implements Structure<KVStructure> {
             dst = {};
         }
 
-        const patch: KVStructure = {};
-        const addedDiffs = addedDiff(dst, src) as KVStructure;
-
-        for (const [key, value] of Object.entries(addedDiffs)) {
-            patch[key] = value;
-        }
-
+        this.keys = Object.keys(src);
+        const patch = addedDiff(dst, src) as KVStructure;
         const deletedDiffs = deletedDiff(dst, src) as KVStructure;
 
         for (const key of Object.keys(deletedDiffs)) {
@@ -65,7 +62,13 @@ export default class implements Structure<KVStructure> {
     }
 
     merge(src: KVStructure, patch: KVStructure): KVStructure {
+        const result: KVStructure = {};
         Object.assign(src, patch);
-        return src;
+
+        for (const key of this.keys) {
+            result[key] = src[key];
+        }
+
+        return result;
     }
 }

src/structure/tree.ts

@@ -9,15 +9,15 @@ export default class implements Structure<TreeStructure> {
     private kv = new kv();
 
     split(data: TreeStructure, enc: Tiktoken, chunkSize: number): TreeStructure[] {
-        return this.kv.split(flatten(data), enc, chunkSize);
+        return this.kv.split(data, enc, chunkSize);
     }
 
     join(chunks: TreeStructure[]): TreeStructure {
         return this.kv.join(chunks);
     }
 
     diff(src: TreeStructure, dst: TreeStructure | null): [TreeStructure, TreeStructure] {
-        return this.kv.diff(src, dst);
+        return this.kv.diff(flatten(src), flatten(dst || {}));
     }
 
     merge(src: TreeStructure, patch: TreeStructure): TreeStructure {