@jay-framework/json-patch 0.9.0 → 0.10.0

package/dist/index.d.ts

@@ -1,29 +1,35 @@
-declare const ADD = "add";
-declare const REPLACE = "replace";
-declare const REMOVE = "remove";
-declare const MOVE = "move";
-type JSONPointer = (string | number)[];
-interface JSONPatchAdd {
+type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, ...0[]];
+type Paths<T, Depth extends number = 7> = Depth extends 0 ? never : T extends object ? {
+    [K in keyof T]: K extends string | number ? T[K] extends any[] ? [K] | [K, number] | (T[K][number] extends object ? [K, number, ...Paths<T[K][number], Prev[Depth]>] : never) : T[K] extends object ? [K] | [K, ...Paths<T[K], Prev[Depth]>] : [K] : never;
+}[keyof T] : never;
+declare const ADD: "add";
+declare const REPLACE: "replace";
+declare const REMOVE: "remove";
+declare const MOVE: "move";
+type IsAny<T> = 0 extends 1 & T ? true : false;
+type IsUnknown<T> = unknown extends T ? (T extends unknown ? true : false) : false;
+type JSONPointer<T = unknown> = IsAny<T> extends true ? (string | number)[] : IsUnknown<T> extends true ? (string | number)[] : [T] extends [never] ? (string | number)[] : Paths<T> extends never ? (string | number)[] : Paths<T>;
+interface JSONPatchAdd<T = unknown> {
     op: typeof ADD;
-    path: JSONPointer;
+    path: JSONPointer<T>;
     value: any;
 }
-interface JSONPatchReplace {
+interface JSONPatchReplace<T = unknown> {
     op: typeof REPLACE;
-    path: JSONPointer;
+    path: JSONPointer<T>;
     value: any;
 }
-interface JSONPatchRemove {
+interface JSONPatchRemove<T = unknown> {
     op: typeof REMOVE;
-    path: JSONPointer;
+    path: JSONPointer<T>;
 }
-interface JSONPatchMove {
+interface JSONPatchMove<T = unknown> {
     op: typeof MOVE;
-    from: JSONPointer;
-    path: JSONPointer;
+    from: JSONPointer<T>;
+    path: JSONPointer<T>;
 }
-type JSONPatchOperation = JSONPatchAdd | JSONPatchReplace | JSONPatchRemove | JSONPatchMove;
-type JSONPatch = JSONPatchOperation[];
+type JSONPatchOperation<T = unknown> = JSONPatchAdd<T> | JSONPatchReplace<T> | JSONPatchRemove<T> | JSONPatchMove<T>;
+type JSONPatch<T = unknown> = JSONPatchOperation<T>[];
 
 type MeasureOfChange = number;
 type DataFields = number;
@@ -33,6 +39,6 @@ type ArrayContext = {
 type ArrayContexts = [JSONPointer, ArrayContext][];
 declare function diff<T>(newValue: T, oldValue: T, contexts?: ArrayContexts, path?: JSONPointer): [JSONPatch, MeasureOfChange, DataFields];
 
-declare function patch<T>(target: T, jsonPatch: JSONPatch, level?: number): T;
+declare function patch<T>(target: T, jsonPatch: JSONPatch<T>, level?: number): T;
 
 export { ADD, type ArrayContexts, type JSONPatch, type JSONPatchAdd, type JSONPatchMove, type JSONPatchOperation, type JSONPatchRemove, type JSONPatchReplace, type JSONPointer, MOVE, REMOVE, REPLACE, diff, patch };

package/dist/index.js

@@ -113,41 +113,51 @@ function validateMove({ from, path }) {
 function patch(target, jsonPatch, level = 0) {
   const copy = Array.isArray(target) ? [...target] : { ...target };
   let equalCount = 0;
-  const patchesGroupedByProp = jsonPatch.reduce((prev, patchOperation) => {
-    const pathItem = patchOperation.path[level];
+  const patchesGroupedByProp = {};
+  for (const patchOperation of jsonPatch) {
+    const path = patchOperation.path;
+    const pathItem = path[level];
     const op = patchOperation.op;
-    if (patchOperation.path.length - 1 === level) {
+    if (path.length - 1 === level) {
       if (op === REPLACE || op === ADD) {
-        if (Array.isArray(copy) && op === ADD)
-          copy.splice(pathItem, 0, patchOperation.value);
-        else if (copy[pathItem] === patchOperation.value)
+        if (Array.isArray(copy) && op === ADD) {
+          copy.splice(
+            pathItem,
+            0,
+            patchOperation.value
+          );
+        } else if (copy[pathItem] === patchOperation.value) {
           equalCount += 1;
-        else
+        } else {
           copy[pathItem] = patchOperation.value;
+        }
       } else if (op === REMOVE) {
         if (Array.isArray(copy))
           copy.splice(pathItem, 1);
         else
           delete copy[pathItem];
       } else if (op === MOVE && Array.isArray(copy) && validateMove(patchOperation)) {
-        let [item] = copy.splice(patchOperation.from[level], 1);
+        const fromPath = patchOperation.from;
+        const [item] = copy.splice(fromPath[level], 1);
         copy.splice(pathItem, 0, item);
       }
-    } else if (!prev[pathItem])
-      prev[pathItem] = [patchOperation];
-    else
-      prev[pathItem].push(patchOperation);
-    return prev;
-  }, {});
-  Object.keys(patchesGroupedByProp).forEach((key) => {
+    } else if (!patchesGroupedByProp[pathItem]) {
+      patchesGroupedByProp[pathItem] = [patchOperation];
+    } else {
+      patchesGroupedByProp[pathItem].push(patchOperation);
+    }
+  }
+  for (const key of Object.keys(patchesGroupedByProp)) {
     if (copy[key]) {
+      const targetVal = target[key];
       const patched = patch(copy[key], patchesGroupedByProp[key], level + 1);
-      if (target[key] === patched)
+      if (targetVal === patched) {
         equalCount += patchesGroupedByProp[key].length;
-      else
-        copy[key] = patch(copy[key], patchesGroupedByProp[key], level + 1);
+      } else {
+        copy[key] = patched;
+      }
     }
-  });
+  }
   if (equalCount === jsonPatch.length)
     return target;
   else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/json-patch",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "type": "module",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -20,10 +20,10 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/list-compare": "^0.9.0"
+    "@jay-framework/list-compare": "^0.10.0"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.9.0",
+    "@jay-framework/dev-environment": "^0.10.0",
     "@types/node": "^20.11.5",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.1",