fixup! fix: update config imports and scopes file error

Byzanteam · Jul 2, 2024 · 440c6cc · 440c6cc
1 parent dc2d691
commit 440c6cc
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 112 deletions.
diff --git a/deno.json b/deno.json
@@ -15,6 +15,7 @@
     "jsonschema": "npm:[email protected]",
     "jsonpatch": "npm:[email protected]",
     "just-diff": "npm:[email protected]",
+    "just-diff-apply": "npm:[email protected]",
     "ejs": "npm:[email protected]"
   },
   "tasks": {

diff --git a/deno.lock b/deno.lock
diff --git a/src/jcli/config/project-json-patch-builder.ts b/src/jcli/config/project-json-patch-builder.ts
@@ -14,6 +14,8 @@ import {
   ProjectPluginInstanceUpdatePatch,
 } from "@/jcli/config/project-json.ts";
 
+import { diffApply } from "just-diff-apply";
+
 type PathNode = string | number;
 
 type DiffPatchOp = "add" | "replace" | "remove";
@@ -377,23 +379,16 @@ function buildImportsPatch(
   patch: ProjectPatch,
   context: BuilderContext,
 ): void {
-  switch (op) {
-    case "replace": {
-      patch.imports = value as ProjectImports | undefined;
-      break;
-    }
-    case "add":
-    case "remove": {
-      const key = context.restPathNodes[0];
-      if (op === "add") {
-        context.dataWas.imports![key] = value as string;
-      } else if (op === "remove") {
-        delete context.dataWas.imports![key];
-      }
-      patch.imports = context.dataWas.imports;
-      break;
-    }
+  if (op === "replace") {
+    patch.imports = value as ProjectImports | undefined;
+    return;
   }
+
+  diffApply(context.dataWas.imports!, [
+    { op, path: context.restPathNodes as string[], value },
+  ]);
+
+  patch.imports = context.dataWas.imports;
 }
 
 function buildScopesPatch(
@@ -402,33 +397,16 @@ function buildScopesPatch(
   patch: ProjectPatch,
   context: BuilderContext,
 ): void {
-  switch (op) {
-    case "replace": {
-      patch.scopes = value as ProjectScopes | undefined;
-      break;
-    }
-    case "add":
-    case "remove": {
-      const key = context.restPathNodes[0];
-
-      if (op === "add") {
-        if (context.restPathNodes.length === 2) {
-          context.dataWas.scopes![key][context.restPathNodes[1]] =
-            value as string;
-        } else {
-          context.dataWas.scopes![key] = value as Record<string, string>;
-        }
-      } else if (op === "remove") {
-        if (context.restPathNodes.length === 2) {
-          delete context.dataWas.scopes![key][context.restPathNodes[1]];
-        } else {
-          delete context.dataWas.scopes![key];
-        }
-      }
-
-      patch.scopes = context.dataWas.scopes;
-    }
+  if (op === "replace") {
+    patch.scopes = value as ProjectScopes | undefined;
+    return;
   }
+
+  diffApply(context.dataWas.scopes!, [
+    { op, path: context.restPathNodes as string[], value },
+  ]);
+
+  patch.scopes = context.dataWas.scopes;
 }
 
 export const builder = new BuilderNode().children([