@patterkit/cli 0.9.1 → 0.9.3

package/dist/cli.js

@@ -198054,6 +198054,7 @@ function validateProject(input) {
       }
     }
   };
+  const addressOf = (node) => effectiveGameId({ gameId: node.gameId, name: typeof node.name === "string" ? node.name : "" });
   const seeId = (id, kind, where) => {
     if (typeof id !== "string" || id.length === 0) {
       issues.push({ code: "missing-id", message: `${kind} in ${where} has no id` });
@@ -198078,7 +198079,7 @@ function validateProject(input) {
     if (scene.gameId && !isValidGameId(scene.gameId)) {
       issues.push({ code: "invalid-gameid", message: `${where} address '${scene.gameId}' is invalid (lowercase letters, digits, hyphens; no leading/trailing hyphen)`, id: scene.id });
     }
-    const sgid = effectiveGameId(scene);
+    const sgid = addressOf(scene);
     if (sgid) {
       const prev = sceneGameIds.get(sgid);
       if (prev && prev !== scene.id) issues.push({ code: "duplicate-gameid", message: `${where} address '${sgid}' is already used by scene '${prev}'`, id: scene.id });
@@ -198113,7 +198114,7 @@ function validateProject(input) {
       if (block.gameId && !isValidGameId(block.gameId)) {
         issues.push({ code: "invalid-gameid", message: `block '${block.id}' address '${block.gameId}' is invalid (lowercase letters, digits, hyphens; no leading/trailing hyphen)`, id: block.id });
       }
-      const bgid = effectiveGameId(block);
+      const bgid = addressOf(block);
       if (bgid) {
         const prev = blockGameIds.get(bgid);
         if (prev && prev !== block.id) issues.push({ code: "duplicate-gameid", message: `block '${block.id}' address '${bgid}' is already used by block '${prev}' in ${where}`, id: block.id });
@@ -247164,8 +247165,8 @@ function planEditableImport(loaded, returned, opts) {
     const { text: proposedRaw, notes } = takeNotes(b.rowDeleted ? "" : b.text.proposed, sent.baseline);
     const proposed = tidy(proposedRaw);
     const textChanged = normalise(proposed, !!opts.strictQuotes) !== normalise(sent.baseline, !!opts.strictQuotes);
-    const tracked = b.text.changes.length > 0;
-    if (tracked && normalise(b.text.original, !!opts.strictQuotes) !== normalise(sent.baseline, !!opts.strictQuotes)) {
+    const tracked2 = b.text.changes.length > 0;
+    if (tracked2 && normalise(b.text.original, !!opts.strictQuotes) !== normalise(sent.baseline, !!opts.strictQuotes)) {
       problems.push({ severity: "info", kind: "untracked-edits", marker: code, anchor: sent.id, message: "This line has tracked changes and some untracked ones too, so the credit may be incomplete." });
     }
     const cue = sent.kind === "line" ? readLead(b.lead.proposed) : void 0;
@@ -248612,15 +248613,61 @@ function cmAsync(args) {
   return runCommandAsync("cm", args);
 }
 function isTracked$1(filePath) {
-  return trackedFromShortStatus(cm(["status", "--short", filePath]));
+  return tracked(localState(filePath));
 }
 async function isTrackedAsync$1(filePath) {
-  return trackedFromShortStatus(await cmAsync(["status", "--short", filePath]));
+  return tracked(await localStateAsync(filePath));
 }
-function trackedFromShortStatus(result) {
-  if (result.exitCode !== 0) return false;
-  const lines = result.output.split("\n").filter((l2) => l2.trim());
-  return lines.length > 0 && !lines[0].startsWith("?");
+function tracked(state) {
+  return state === "controlled" || state === "checkedOut";
+}
+function localStateArgs(filePath) {
+  return plasticStatusArgs([filePath]);
+}
+function localState(filePath) {
+  return localStateFrom(cm(localStateArgs(filePath)), filePath);
+}
+async function localStateAsync(filePath) {
+  return localStateFrom(await cmAsync(localStateArgs(filePath)), filePath);
+}
+function localStateFrom(result, filePath) {
+  if (result.exitCode !== 0) return "outside";
+  const info = findStatusInfo(result.output, filePath);
+  if (!info) return "controlled";
+  if (!info.tracked) return info.ignored ? "ignored" : "private";
+  return info.checkedOut ? "checkedOut" : "controlled";
+}
+function findStatusInfo(output, filePath) {
+  const key2 = pathKey(filePath);
+  const sameName = [];
+  for (const line2 of output.split("\n")) {
+    const parsed = parseCmStatusLine(line2);
+    if (!parsed) continue;
+    for (const p of parsed.paths) {
+      if (pathKey(p) === key2) return parsed.info;
+      if (basename7(resolve8(p)) === basename7(resolve8(filePath))) sameName.push(parsed.info);
+    }
+  }
+  return sameName.length === 1 ? sameName[0] : void 0;
+}
+function pathKey(p) {
+  const abs = resolve8(p);
+  return process.platform === "win32" ? abs.toLowerCase() : abs;
+}
+function checkoutResult(filePath, result) {
+  if (result.exitCode === 0) return okResult();
+  const combined = (result.output + " " + result.error).toLowerCase();
+  if (combined.includes("locked") || combined.includes("exclusive")) {
+    return errorResult("locked", `'${filePath}' is locked`);
+  }
+  if (combined.includes("out of date") || combined.includes("not latest")) {
+    return errorResult("outOfDate", `'${filePath}' is out of date \u2014 update before editing`);
+  }
+  return errorResult("error", `Cannot check out '${filePath}': ${result.error || result.output}`);
+}
+function addResult(filePath, result) {
+  if (result.exitCode === 0) return okResult("File added to Plastic SCM");
+  return errorResult("error", `Cannot add '${filePath}' to Plastic SCM: ${result.error || result.output}`);
 }
 function undoCheckoutResult(filePath, result) {
   if (result.exitCode === 0) return okResult("Checkout undone in Plastic SCM");
@@ -248640,67 +248687,36 @@ var PlasticProvider = class {
     const u = await plasticWhoamiAsync();
     return u === "" ? void 0 : u;
   }
+  /**
+   * Check a controlled file out before it is written. A file already checked out (or
+   * otherwise pending) in this workspace is not checked out again: a second `cm co` on
+   * it fails, and under lock rules it fails as "locked" by our own checkout. Private,
+   * ignored, and out-of-workspace files only need to be writable.
+   */
   prepareToWrite(filePath) {
     if (!existsSync7(filePath)) return okResult();
-    if (!isTracked$1(filePath)) {
-      return fs$1.prepareToWrite(filePath);
-    }
-    const result = cm(["co", filePath]);
-    if (result.exitCode === 0) return okResult();
-    const combined = (result.output + " " + result.error).toLowerCase();
-    if (combined.includes("locked") || combined.includes("exclusive")) {
-      return errorResult("locked", `'${filePath}' is locked`);
-    }
-    if (combined.includes("out of date") || combined.includes("not latest")) {
-      return errorResult("outOfDate", `'${filePath}' is out of date \u2014 update before editing`);
-    }
-    return errorResult("error", `Cannot check out '${filePath}': ${result.error || result.output}`);
+    if (localState(filePath) !== "controlled") return fs$1.prepareToWrite(filePath);
+    return checkoutResult(filePath, cm(["co", filePath]));
   }
+  /** Add a new private file to Plastic SCM after it is written. */
   finishedWrite(filePath) {
     if (!existsSync7(filePath))
       return errorResult("error", `'${filePath}' does not exist after write`);
-    const statusResult = cm(["status", "--short", filePath]);
-    if (statusResult.exitCode !== 0)
-      return fs$1.finishedWrite(filePath);
-    const lines = statusResult.output.split("\n").filter((l2) => l2.trim());
-    const tracked = lines.length > 0 && !lines[0].startsWith("?");
-    if (tracked) return okResult();
-    const result = cm(["add", filePath]);
-    if (result.exitCode === 0) return okResult("File added to Plastic SCM");
-    const combined = (result.output + " " + result.error).toLowerCase();
-    if (combined.includes("ignored")) return fs$1.finishedWrite(filePath);
-    return errorResult("error", `Cannot add '${filePath}' to Plastic SCM: ${result.error || result.output}`);
+    if (localState(filePath) !== "private") return fs$1.finishedWrite(filePath);
+    return addResult(filePath, cm(["add", filePath]));
   }
   /** Async twin of {@link prepareToWrite}. */
   async prepareToWriteAsync(filePath) {
     if (!existsSync7(filePath)) return okResult();
-    if (!await isTrackedAsync$1(filePath)) {
-      return fs$1.prepareToWriteAsync(filePath);
-    }
-    const result = await cmAsync(["co", filePath]);
-    if (result.exitCode === 0) return okResult();
-    const combined = (result.output + " " + result.error).toLowerCase();
-    if (combined.includes("locked") || combined.includes("exclusive")) {
-      return errorResult("locked", `'${filePath}' is locked`);
-    }
-    if (combined.includes("out of date") || combined.includes("not latest")) {
-      return errorResult("outOfDate", `'${filePath}' is out of date \u2014 update before editing`);
-    }
-    return errorResult("error", `Cannot check out '${filePath}': ${result.error || result.output}`);
+    if (await localStateAsync(filePath) !== "controlled") return fs$1.prepareToWriteAsync(filePath);
+    return checkoutResult(filePath, await cmAsync(["co", filePath]));
   }
   /** Async twin of {@link finishedWrite}. */
   async finishedWriteAsync(filePath) {
     if (!existsSync7(filePath))
       return errorResult("error", `'${filePath}' does not exist after write`);
-    const statusResult = await cmAsync(["status", "--short", filePath]);
-    if (statusResult.exitCode !== 0)
-      return fs$1.finishedWriteAsync(filePath);
-    if (trackedFromShortStatus(statusResult)) return okResult();
-    const result = await cmAsync(["add", filePath]);
-    if (result.exitCode === 0) return okResult("File added to Plastic SCM");
-    const combined = (result.output + " " + result.error).toLowerCase();
-    if (combined.includes("ignored")) return fs$1.finishedWriteAsync(filePath);
-    return errorResult("error", `Cannot add '${filePath}' to Plastic SCM: ${result.error || result.output}`);
+    if (await localStateAsync(filePath) !== "private") return fs$1.finishedWriteAsync(filePath);
+    return addResult(filePath, await cmAsync(["add", filePath]));
   }
   /**
    * Undo what {@link prepareToWrite} did, for an all-or-nothing batch that has to back
@@ -248876,7 +248892,7 @@ function buildPlasticBase(result, filePaths) {
       if (!parsed) continue;
       for (const p of parsed.paths) {
         const abs = resolve8(p);
-        byPath.set(abs, parsed.info);
+        byPath.set(pathKey(abs), parsed.info);
         const base = basename7(abs);
         if (!byBase.has(base)) byBase.set(base, []);
         byBase.get(base).push(parsed.info);
@@ -248886,7 +248902,7 @@ function buildPlasticBase(result, filePaths) {
   return filePaths.map((filePath) => {
     const abs = resolve8(filePath);
     const status = { filePath: abs, system: "plastic", writable: writableBit(abs) };
-    let info = byPath.get(abs);
+    let info = byPath.get(pathKey(abs));
     if (!info) {
       const sameName = byBase.get(basename7(abs));
       if (sameName && sameName.length === 1) info = sameName[0];
@@ -248960,18 +248976,20 @@ var PLASTIC_DIRTY_CODES = /* @__PURE__ */ new Set([
   "LM"
 ]);
 var PLASTIC_UNTRACKED_CODES = /* @__PURE__ */ new Set(["PR", "IG"]);
+var PLASTIC_CHECKED_OUT_CODES = /* @__PURE__ */ new Set(["CO", "AD", "CP", "RP", "MV"]);
 function parseCmStatusLine(line2) {
   const trimmed = line2.trim();
   const space = trimmed.indexOf(" ");
   if (space === -1) return null;
-  const code = trimmed.slice(0, space);
-  const dirty = PLASTIC_DIRTY_CODES.has(code);
-  const untracked = PLASTIC_UNTRACKED_CODES.has(code);
+  const codes = trimmed.slice(0, space).split("+");
+  const dirty = codes.some((c2) => PLASTIC_DIRTY_CODES.has(c2));
+  const untracked = codes.some((c2) => PLASTIC_UNTRACKED_CODES.has(c2));
   if (!dirty && !untracked) return null;
   const rest = trimmed.slice(space + 1).trim();
   const quoted = [...rest.matchAll(/"([^"]*)"/g)].map((m) => m[1]);
   const paths = quoted.length > 0 ? quoted : [rest];
-  return { info: { tracked: !untracked, dirty }, paths };
+  const checkedOut = !untracked && codes.some((c2) => PLASTIC_CHECKED_OUT_CODES.has(c2));
+  return { info: { tracked: !untracked, dirty, checkedOut, ignored: codes.includes("IG") }, paths };
 }
 var fs3 = new FilesystemProvider();
 function svn(args) {
@@ -249543,7 +249561,7 @@ function fileStatus(filePaths, options = {}) {
 // package.json
 var package_default = {
   name: "@patterkit/cli",
-  version: "0.9.1",
+  version: "0.9.3",
   description: "The `patter` CLI: validate, format, export, play, test coverage, localise, and merge Patter projects.",
   type: "module",
   license: "MIT",
@@ -249572,9 +249590,9 @@ var package_default = {
     "build:standalone:others": "node scripts/build-standalone.mjs --targets=linux-x64,linux-arm64,windows-x64"
   },
   dependencies: {
-    "@patterkit/core": "0.4.0",
-    "@patterkit/ops": "0.14.1",
-    "@wildwinter/simple-vc-lib": "^0.5.0"
+    "@patterkit/core": "0.4.1",
+    "@patterkit/ops": "0.14.2",
+    "@wildwinter/simple-vc-lib": "^0.5.1"
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/cli",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "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.4.0",
-    "@patterkit/ops": "0.14.1",
-    "@wildwinter/simple-vc-lib": "^0.5.0"
+    "@patterkit/core": "0.4.1",
+    "@patterkit/ops": "0.14.2",
+    "@wildwinter/simple-vc-lib": "^0.5.1"
   }
 }