@patterkit/cli 0.13.1 → 0.13.3

package/dist/cli.js

@@ -2,7 +2,6 @@
 
 // src/main.ts
 import { readFileSync as readFileSync2, existsSync, mkdirSync, writeFileSync, rmSync } from "fs";
-import { spawnSync } from "child_process";
 import { dirname, join, resolve } from "path";
 import { canonicalStringify, parseSource } from "@patterkit/core";
 import {
@@ -63,11 +62,12 @@ import {
 } from "@patterkit/ops";
 import { createHash } from "crypto";
 import { writeTextFiles, writeBinaryFile, currentUser } from "@wildwinter/simple-vc-lib";
+import { runMergetool } from "@wildwinter/toolkit/vcs";
 
 // package.json
 var package_default = {
   name: "@patterkit/cli",
-  version: "0.13.1",
+  version: "0.13.3",
   description: "The `patter` CLI: validate, format, export, play, test coverage, localise, and merge Patter projects.",
   type: "module",
   license: "MIT",
@@ -96,9 +96,10 @@ var package_default = {
     "build:standalone:others": "node scripts/build-standalone.mjs --targets=linux-x64,linux-arm64,windows-x64"
   },
   dependencies: {
-    "@patterkit/core": "0.9.3",
-    "@patterkit/ops": "0.22.0",
-    "@wildwinter/simple-vc-lib": "^0.5.2"
+    "@patterkit/core": "0.9.5",
+    "@patterkit/ops": "0.24.0",
+    "@wildwinter/simple-vc-lib": "^0.5.2",
+    "@wildwinter/toolkit": "^0.3.0"
   }
 };
 
@@ -852,33 +853,30 @@ ${shards.length} shard(s)${scopes.length ? ` and ${scopes.length} game scopes fi
     case "mergetool": {
       const [baseP, theirsP, oursP, outP] = positionals;
       if (!baseP || !theirsP || !oursP || !outP) return usage("mergetool", "needs BASE THEIRS OURS OUT");
-      const fallback = typeof flags.fallback === "string" ? flags.fallback : void 0;
-      if (isPatterSource(outP) || isPatterSource(oursP)) {
-        const src = parseThree(baseP, oursP, theirsP, "mergetool");
-        if (!src) return 2;
-        try {
-          const manifest = mergeManifest(src.ours, outP);
-          return writeMergeResult(runMerge(src.base, src.ours, src.theirs, manifest ? { manifest } : void 0), outP, outP, false);
-        } catch (e) {
-          if (e instanceof UnsupportedMergeError) {
-            console.error(`mergetool: ${e.message}`);
-            return 2;
+      return runMergetool({
+        base: baseP,
+        theirs: theirsP,
+        ours: oursP,
+        out: outP,
+        fallback: typeof flags.fallback === "string" ? flags.fallback : void 0,
+        isSource: isPatterSource,
+        merge: () => {
+          const src = parseThree(baseP, oursP, theirsP, "mergetool");
+          if (!src) return 2;
+          try {
+            const manifest = mergeManifest(src.ours, outP);
+            return writeMergeResult(runMerge(src.base, src.ours, src.theirs, manifest ? { manifest } : void 0), outP, outP, false);
+          } catch (e) {
+            if (e instanceof UnsupportedMergeError) {
+              console.error(`mergetool: ${e.message}`);
+              return 2;
+            }
+            throw e;
           }
-          throw e;
-        }
-      }
-      if (!fallback) {
-        console.error(`mergetool: ${outP} is not Patter source and no --fallback configured`);
-        return 2;
-      }
-      const [cmd2, ...pre] = fallback.split(/\s+/).filter(Boolean);
-      if (!cmd2) return usage("mergetool", "empty --fallback");
-      const r = spawnSync(cmd2, [...pre, baseP, theirsP, oursP, outP], { stdio: "inherit" });
-      if (r.error) {
-        console.error(`mergetool: could not run the fallback '${cmd2}': ${r.error.message}`);
-        return 1;
-      }
-      return r.status ?? 1;
+        },
+        error: (message) => console.error(message),
+        tool: "patter"
+      });
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/cli",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "description": "The `patter` CLI: validate, format, export, play, test coverage, localise, and merge Patter projects.",
   "type": "module",
   "license": "MIT",
@@ -29,8 +29,9 @@
     "build:standalone:others": "node scripts/build-standalone.mjs --targets=linux-x64,linux-arm64,windows-x64"
   },
   "dependencies": {
-    "@patterkit/core": "0.9.3",
-    "@patterkit/ops": "0.22.0",
-    "@wildwinter/simple-vc-lib": "^0.5.2"
+    "@patterkit/core": "0.9.5",
+    "@patterkit/ops": "0.24.0",
+    "@wildwinter/simple-vc-lib": "^0.5.2",
+    "@wildwinter/toolkit": "^0.3.0"
   }
 }