@patterkit/cli 0.11.4 → 0.12.0

package/dist/cli.js

@@ -55,7 +55,10 @@ import {
   listOpenSuggestions,
   applySuggestionDecisions,
   qualifierNamer,
-  scriptFontLicences
+  scriptFontLicences,
+  findProjectFile,
+  readProjectManifest,
+  detectMergeType
 } from "@patterkit/ops";
 import { createHash } from "crypto";
 import { writeTextFiles, writeBinaryFile, currentUser } from "@wildwinter/simple-vc-lib";
@@ -63,7 +66,7 @@ import { writeTextFiles, writeBinaryFile, currentUser } from "@wildwinter/simple
 // package.json
 var package_default = {
   name: "@patterkit/cli",
-  version: "0.11.4",
+  version: "0.12.0",
   description: "The `patter` CLI: validate, format, export, play, test coverage, localise, and merge Patter projects.",
   type: "module",
   license: "MIT",
@@ -92,8 +95,8 @@ var package_default = {
     "build:standalone:others": "node scripts/build-standalone.mjs --targets=linux-x64,linux-arm64,windows-x64"
   },
   dependencies: {
-    "@patterkit/core": "0.7.1",
-    "@patterkit/ops": "0.18.0",
+    "@patterkit/core": "0.9.0",
+    "@patterkit/ops": "0.20.0",
     "@wildwinter/simple-vc-lib": "^0.5.2"
   }
 };
@@ -109,6 +112,22 @@ function libraryNotices() {
 }
 
 // src/main.ts
+function mergeManifest(ours, path) {
+  let type;
+  try {
+    type = detectMergeType(ours);
+  } catch {
+    return void 0;
+  }
+  if (type !== "extension" || typeof ours["extension"] !== "string") return void 0;
+  let projectFile;
+  try {
+    projectFile = findProjectFile(path);
+  } catch {
+    return void 0;
+  }
+  return readProjectManifest(dirname(projectFile), ours["extension"]);
+}
 var isPatterSource = (path) => SHARD_EXTENSIONS.some((ext) => path.endsWith(ext));
 function writeMergeResult(result, out, realPath, announce) {
   const write = (path, content) => {
@@ -193,8 +212,9 @@ Usage:
   patter pack    [path] -o file   Pack a project (the .patter folder) into a portable .patterpack
   patter unpack  <file> -o dir    Explode a .patterpack into source shards under dir
                  [--merge --base sent.patterpack]  Merge a returned .patterpack into the project
-  patter merge   BASE OURS THEIRS  3-way merge of Patter source by node id (flow/loc/authoring/project)
-                 [-o out] [--type flow|loc|authoring|project] [--json]
+  patter merge   BASE OURS THEIRS  3-way merge of Patter source by node id (flow/loc/authoring/project),
+                                   and of extension data by its manifest (extension)
+                 [-o out] [--type flow|loc|authoring|project|extension] [--json]
                  [--path realfile]  (where the conflict sidecar belongs when -o is a VCS
                                      temporary file: git's %P)
   patter mergetool BASE THEIRS OURS OUT  VCS merge-tool wrapper: Patter source -> structured merge,
@@ -251,7 +271,7 @@ var SHORT = {
   "share-scopes": "share-scopes [path] [--at DIR]",
   pack: "pack [path] -o FILE",
   unpack: "unpack <file> -o DIR [--merge --base SENT.patterpack]",
-  merge: "merge BASE OURS THEIRS [-o out | --json] [--type flow|loc|authoring|project] [--path realfile]",
+  merge: "merge BASE OURS THEIRS [-o out | --json] [--type flow|loc|authoring|project|extension] [--path realfile]",
   mergetool: "mergetool BASE THEIRS OURS OUT [--fallback cmd]"
 };
 var EXCLUSIVE = {
@@ -454,7 +474,7 @@ async function run(cmd, positionals, flags) {
     }
     case "validate": {
       const loaded = loadProject(positionals[0] ?? ".");
-      const { structural, conditions, interpolation, hygiene, staleBundles, unresolvedMerges, orphans, reachability, gameScopes, localisation, ok } = runValidate(loaded);
+      const { structural, conditions, interpolation, hygiene, staleBundles, unresolvedMerges, orphans, reachability, gameScopes, localisation, extensions, ok } = runValidate(loaded);
       const warn = (i) => i.severity === "warning" ? "warning: " : "";
       for (const i of structural) console.error(`  [${i.code}] ${i.severity === "warning" ? "warning: " : ""}${i.message}`);
       for (const i of conditions) console.error(`  [${i.field}] ${i.nodeId}: ${warn(i)}${i.message}  (${i.src})`);
@@ -465,11 +485,12 @@ async function run(cmd, positionals, flags) {
       for (const i of orphans) console.error(`  [not-in-project] ${i.message}`);
       for (const i of gameScopes) console.error(`  [game-scopes] ${i.file}: ${warn(i)}${i.message}`);
       for (const i of localisation) console.error(`  [localisation] ${i.file}: ${warn(i)}${i.message}`);
+      for (const i of extensions) console.error(`  [extension] ${i.file}: ${warn(i)}${i.message}`);
       for (const i of reachability) console.error(`  [unreachable] ${i.nodeId}: ${i.message}  (${i.src})`);
       const isError = (i) => i.severity === "error";
       const structuralWarnings = structural.filter((i) => i.severity === "warning").length;
-      const warnings = reachability.length + structuralWarnings + [...conditions, ...interpolation, ...gameScopes, ...localisation].filter((i) => !isError(i)).length;
-      const count = structural.length - structuralWarnings + [...conditions, ...interpolation, ...gameScopes, ...localisation].filter(isError).length + hygiene.length + staleBundles.length + unresolvedMerges.length + orphans.length;
+      const warnings = reachability.length + structuralWarnings + [...conditions, ...interpolation, ...gameScopes, ...localisation, ...extensions].filter((i) => !isError(i)).length;
+      const count = structural.length - structuralWarnings + [...conditions, ...interpolation, ...gameScopes, ...localisation, ...extensions].filter(isError).length + hygiene.length + staleBundles.length + unresolvedMerges.length + orphans.length;
       const advisory = warnings ? `, ${warnings} warning(s) above` : "";
       if (ok) console.log(`ok - ${loaded.scenes.length} scene(s), no issues${advisory}`);
       else console.error(`
@@ -481,12 +502,15 @@ ${count} issue(s)${advisory}`);
       const check = flags.check === true;
       const results = runFormat(positionals);
       if (results.every((r) => r.skipped)) {
-        console.error("format: no Patter source among the files given (.patterflow, .patterloc, .patterx, .patterproj)");
+        console.error("format: no Patter source among the files given (.patterflow, .patterloc, .patterx, .patterproj, .patterextension)");
         return 0;
       }
       const changed = results.filter((r) => r.changed);
       if (!check && !commitWrites(changed.map((r) => r.write))) return 1;
-      for (const r of changed) console.log(`${check ? "would format" : "formatted"}: ${r.file}`);
+      for (const r of changed) {
+        console.log(`${check ? "would format" : "formatted"}: ${r.file}`);
+        for (const n of r.notes ?? []) console.log(`  ${check ? "would have " : ""}${n}`);
+      }
       if (changed.length === 0) console.log("already canonical");
       return check && changed.length > 0 ? 1 : 0;
     }
@@ -774,6 +798,7 @@ ${count} issue(s)${advisory}`);
         for (const name of res.other) console.error(`warning: not unpacked (not a project file): ${name}`);
         if (res.gameScopes?.error) console.error(`warning: their World properties were not written to ${res.gameScopes.path}: ${res.gameScopes.error}`);
         else if (res.gameScopes) console.log(`game scopes: ${res.gameScopes.path} (their World properties)`);
+        for (const rel of res.manifestsKept ?? []) console.error(`warning: kept this project's ${rel}; the returned pack has a different version of it`);
         const changed = res.shards.filter((sh) => sh.changed).length;
         console.log(`
 ${changed} of ${res.shards.length} shard(s) changed in ${flags.o}; ${res.conflicts} conflict(s), ${res.warnings} warning(s)`);
@@ -793,9 +818,10 @@ ${shards.length} shard(s)${scopes.length ? ` and ${scopes.length} game scopes fi
       const src = parseThree(baseP, oursP, theirsP, "merge");
       if (!src) return 2;
       const typeFlag = typeof flags.type === "string" && flags.type !== "auto" ? flags.type : void 0;
+      const manifest = mergeManifest(src.ours, typeof flags.path === "string" ? flags.path : typeof flags.o === "string" && flags.o !== "-" ? flags.o : oursP);
       let result;
       try {
-        result = runMerge(src.base, src.ours, src.theirs, { type: typeFlag });
+        result = runMerge(src.base, src.ours, src.theirs, { type: typeFlag, ...manifest ? { manifest } : {} });
       } catch (e) {
         if (e instanceof UnsupportedMergeError) {
           console.error(`merge: ${e.message}`);
@@ -826,7 +852,8 @@ ${shards.length} shard(s)${scopes.length ? ` and ${scopes.length} game scopes fi
         const src = parseThree(baseP, oursP, theirsP, "mergetool");
         if (!src) return 2;
         try {
-          return writeMergeResult(runMerge(src.base, src.ours, src.theirs), outP, outP, false);
+          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}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/cli",
-  "version": "0.11.4",
+  "version": "0.12.0",
   "description": "The `patter` CLI: validate, format, export, play, test coverage, localise, and merge Patter projects.",
   "type": "module",
   "license": "MIT",
@@ -29,8 +29,8 @@
     "build:standalone:others": "node scripts/build-standalone.mjs --targets=linux-x64,linux-arm64,windows-x64"
   },
   "dependencies": {
-    "@patterkit/core": "0.7.1",
-    "@patterkit/ops": "0.18.0",
+    "@patterkit/core": "0.9.0",
+    "@patterkit/ops": "0.20.0",
     "@wildwinter/simple-vc-lib": "^0.5.2"
   }
 }