@patterkit/cli 0.13.4 → 0.14.1

package/dist/cli.js

@@ -34,6 +34,8 @@ import {
   extractLoc,
   applyLoc,
   describeLocExport,
+  describeLocImport,
+  importLocale,
   catalogToJson,
   jsonToCatalog,
   catalogToPo,
@@ -67,7 +69,7 @@ import { runMergetool } from "@wildwinter/toolkit/vcs";
 // package.json
 var package_default = {
   name: "@patterkit/cli",
-  version: "0.13.4",
+  version: "0.14.1",
   description: "The `patter` CLI: validate, format, export, play, test coverage, localise, and merge Patter projects.",
   type: "module",
   license: "MIT",
@@ -96,10 +98,10 @@ var package_default = {
     "build:standalone:others": "node scripts/build-standalone.mjs --targets=linux-x64,linux-arm64,windows-x64"
   },
   dependencies: {
-    "@patterkit/core": "0.9.6",
-    "@patterkit/ops": "0.24.1",
+    "@patterkit/core": "0.10.0",
+    "@patterkit/ops": "0.25.1",
     "@wildwinter/simple-vc-lib": "^0.5.2",
-    "@wildwinter/toolkit": "^0.3.1"
+    "@wildwinter/toolkit": "^0.4.0"
   }
 };
 
@@ -187,13 +189,14 @@ Usage:
                  [--propose]   (print auto-proposed @world input drivers instead of running)
   patter resolve <query> [path]   Find a line by id, Game ID, or name: shows where it lives + what it says
   patter usage   <query> [path]   Find where a property is used (conditions / effects / text)
-                 [--json]   (query: @gold \xB7 world.threat \xB7 "faction rebels"; quote a value)
+                 [--json]   (query: @gold, world.threat, or "faction rebels"; quote a value)
   patter report  [path]           Production report: status, burndown, recording coverage (alias: stats)
                  [--xlsx file] [--json]  Also write the spreadsheet / emit JSON (for pipelines)
   patter loc-export [path] -o file  Export strings for translation (-o - streams json or po)
                  --format json|xlsx|po  [--locale xx]   (no --locale = a blank template / POT)
   patter loc-import <file> [path]  Import translated strings back into the project
-                 [--locale xx]     (format by extension; --locale overrides the file's)
+                 [--locale xx] [--force-locale]   (format by extension; a file for another
+                 language is refused unless --force-locale imports it as --locale)
   patter export-script [path] [-o file.pdf|.docx]  Readable screenplay of the script + flow
                  (dialogue, text, choices, jumps). Format from the extension; default
                  beside the bundle, as .pdf. The PDF embeds its fonts and covers any script or emoji.
@@ -238,7 +241,7 @@ var FLAGS = {
   usage: { boolean: ["json"], valued: [], positionals: 2 },
   report: { boolean: ["json"], valued: ["xlsx"], positionals: 1 },
   "loc-export": { boolean: [], valued: ["format", "o", "locale"], positionals: 1 },
-  "loc-import": { boolean: [], valued: ["locale"], positionals: 2 },
+  "loc-import": { boolean: ["force-locale"], valued: ["locale"], positionals: 2 },
   "voice-export": { boolean: ["all"], valued: ["o"], positionals: 1 },
   "export-script": { boolean: [], valued: ["o"], positionals: 1 },
   "export-editable": { boolean: ["status", "cast", "all-notes"], valued: ["o", "recipient", "by"], repeatable: ["scene"], positionals: 1 },
@@ -264,7 +267,7 @@ var SHORT = {
   usage: "usage <query> [path] [--json]",
   report: "report [path] [--xlsx FILE] [--json]",
   "loc-export": "loc-export [path] -o FILE --format json|xlsx|po [--locale xx]",
-  "loc-import": "loc-import <file> [path] [--locale xx]",
+  "loc-import": "loc-import <file> [path] [--locale xx] [--force-locale]",
   "voice-export": "voice-export [path] -o FILE.xlsx [--all]",
   "export-script": "export-script [path] [-o FILE.pdf|FILE.docx]",
   "export-editable": "export-editable [path] -o FILE.docx [--scene name]... [--recipient X] [--status] [--cast] [--all-notes] [--by name]",
@@ -742,17 +745,25 @@ ${count} issue(s)${advisory}`);
       else if (ext === ".po" || ext === ".pot") catalog = poToCatalog(readFileSync2(file, "utf8"));
       else if (ext === ".xlsx") catalog = await xlsxToCatalog(readFileSync2(file));
       else return usage("loc-import", `unknown format '${ext}' (.json | .po | .xlsx)`);
-      const locale = typeof flags.locale === "string" ? flags.locale : catalog.locale;
-      if (!locale) return usage("loc-import", "no locale (the file carries none; pass --locale xx)");
+      const chosen = typeof flags.locale === "string" ? flags.locale : void 0;
+      const picked = importLocale(catalog.locale, chosen, { force: flags["force-locale"] === true });
+      if (!picked.ok) {
+        return usage("loc-import", picked.reason === "mismatch" ? `${picked.error} Pass --locale ${catalog.locale}, or add --force-locale to import it as '${chosen}' anyway.` : `${picked.error} Pass --locale xx.`);
+      }
+      const locale = picked.locale;
       if (locale === loaded.project.locales.default) return usage("loc-import", `'${locale}' is the source locale - nothing to import`);
-      const { writes, stats } = applyLoc(loaded, { ...catalog, locale });
+      if (picked.warning) console.log(picked.warning);
+      const { writes, stats, report } = applyLoc(loaded, { ...catalog, locale });
+      const told = describeLocImport(loaded, report);
       if (writes.length === 0) {
         console.log("no translations to import");
+        for (const l of told) console.log(l);
         return 0;
       }
       if (!commitWrites(writes)) return 1;
       console.log(`imported ${stats.updated} string(s) for ${locale} across ${stats.files} scene(s)`);
       if (stats.dropped) console.log(`dropped ${stats.dropped} translation(s) of action text, which isn't localised while "Localise text lines in dialogue scenes" (localiseDialogueText) is off`);
+      for (const l of told) console.log(l);
       return 0;
     }
     case "share-scopes": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/cli",
-  "version": "0.13.4",
+  "version": "0.14.1",
   "description": "The `patter` CLI: validate, format, export, play, test coverage, localise, and merge Patter projects.",
   "type": "module",
   "license": "MIT",
@@ -29,9 +29,9 @@
     "build:standalone:others": "node scripts/build-standalone.mjs --targets=linux-x64,linux-arm64,windows-x64"
   },
   "dependencies": {
-    "@patterkit/core": "0.9.6",
-    "@patterkit/ops": "0.24.1",
+    "@patterkit/core": "0.10.0",
+    "@patterkit/ops": "0.25.1",
     "@wildwinter/simple-vc-lib": "^0.5.2",
-    "@wildwinter/toolkit": "^0.3.1"
+    "@wildwinter/toolkit": "^0.4.0"
   }
 }