rig-create 1.2.0 → 1.2.2

package/docs/CHECKS.md

@@ -1541,7 +1541,7 @@ and known regressions under `ledger`.
 | `RESTART_NOT_A_PROJECT` | the folder has no readable `rig-create/project@0` `project.json` | run restart on a create project folder |
 | `RESTART_NOT_IN_GIT` | the project folder is not inside a git work tree, so git history cannot hold the record restart replaces | put the project under git, commit `project.json`, then restart |
 | `RESTART_RECORD_UNCOMMITTED` | `project.json` is untracked, staged but never committed, or differs from its version at HEAD | commit `project.json`, then restart |
-| `RESTART_INPUT_INVALID` | a kept input fails the input writer's checks, including a legacy record without writer metadata | restore the file, or register it again with `input add` |
+| `RESTART_INPUT_INVALID` | a kept input fails the input writer's checks, or a left-out legacy entry is the declared `painting` without a writer-valid twin for the same bytes | restore the file, or register it again with `input add` (`input add --painting` for the painting) |
 | `RESTART_PART_SET_INCOMPLETE` | a kept part set (inputs under `<set>/parts/*.png` or `<set>/parts.json`) lacks `<set>/parts.json`, a part PNG, or its rig: `rig.json` and `mesh_report.json` at `<set>/rig/` or `<set>/` | register the missing files with `input add`, or stop keeping the set |
 | `RESTART_MALFORMED` | `restarts` is not a list, or an entry lacks `{ at, by, reason, previous_record_sha256 }` | restore the entry `restart` wrote |
 | `RESTART_SOURCE_CHANGED` | `project.json` changed while `restart` was validating | retry against the current record |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rig-create",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "type": "module",
   "description": "Create a rig project: its folder, decision record, repository and pinned rig-c packages",
   "license": "MIT",

package/src/parts-sections.ts

@@ -46,8 +46,13 @@ export class PartsUnreadable extends Error {
   }
 }
 
-/** The create repository's own install, used when a project has none (running the check in this repo, or before `bun install` in a project). */
-export const OWN_NODE_MODULES = join(import.meta.dir, '..', 'node_modules');
+const load = createRequire(import.meta.url);
+
+/** Create's runtime-resolved dependency install, used when a project has none (running the check in this repo, or before `bun install` in a project). */
+const checkoutNodeModules = join(import.meta.dir, '..', 'node_modules');
+export const OWN_NODE_MODULES = existsSync(join(checkoutNodeModules, PARTS_PACKAGE, 'package.json'))
+  ? checkoutNodeModules
+  : dirname(dirname(dirname(load.resolve(`${PARTS_PACKAGE}/package.json`))));
 
 /**
  * Where the installed package is looked for, in order: the project's own
@@ -67,8 +72,6 @@ export function locateParts(projectDir: string): string | null {
   return null;
 }
 
-const load = createRequire(import.meta.url);
-
 function isSections(v: unknown): v is Sections {
   return Array.isArray(v) && v.length > 0 && v.every((s) => typeof s === 'string');
 }

package/src/restart.ts

@@ -110,16 +110,36 @@ export function restartCommand(args: string[], now: number): { stdout: string; e
     } catch { return notProject(`is not a ${PROJECT_SCHEMA} record`); }
     const inputs = { dir, project, refusals: [] as Finding[], warnings: [] as Finding[] };
     checkInputs(inputs);
-    const input = inputs.refusals[0] ?? inputs.warnings[0];
-    if (input !== undefined) refuse('RESTART_INPUT_INVALID', `${input.path}: ${input.code}: ${input.message}; a restart keeps only inputs the input writer would record, so restore the file or register it again with input add`);
-    const gaps = partSetGaps(project.inputs);
+    const invalidInput = (finding: Finding): never => refuse('RESTART_INPUT_INVALID', `${finding.path}: ${finding.code}: ${finding.message}; a restart keeps only inputs the input writer would record, so restore the file or register it again with input add`);
+    const firstRefusal = inputs.refusals[0] ?? inputs.warnings.find(finding => finding.code !== 'INPUT_WRITER_MISSING');
+    if (firstRefusal !== undefined) invalidInput(firstRefusal);
+    const legacyPaths = new Set(inputs.warnings.filter(finding => finding.code === 'INPUT_WRITER_MISSING').map(finding => finding.path));
+    const keptInputs: Json[] = [];
+    const leftOut: { index: number; entry: JsonObject }[] = [];
+    asArray(project.inputs).forEach((raw, index) => {
+      if (legacyPaths.has(`inputs[${index}]`)) leftOut.push({ index, entry: isObject(raw) ? raw : {} });
+      else keptInputs.push(raw);
+    });
+    let painting = project.painting;
+    if (typeof painting === 'string' && !keptInputs.some(entry => isObject(entry) && entry.path === painting)) {
+      const legacyPainting = leftOut.find(({ entry }) => entry.path === painting)?.entry;
+      const twin = legacyPainting !== undefined && typeof legacyPainting.sha256 === 'string' && typeof legacyPainting.bytes === 'number'
+        ? keptInputs.filter(isObject).find(entry => entry.sha256 === legacyPainting.sha256 && entry.bytes === legacyPainting.bytes && typeof entry.path === 'string')
+        : undefined;
+      if (twin !== undefined) painting = twin.path;
+    }
+    const keptCheck = { dir, project: { ...project, ...(painting !== undefined ? { painting } : {}), inputs: keptInputs }, refusals: [] as Finding[], warnings: [] as Finding[] };
+    checkInputs(keptCheck);
+    const keptFinding = keptCheck.refusals[0] ?? keptCheck.warnings[0];
+    if (keptFinding !== undefined) invalidInput(keptFinding);
+    const gaps = partSetGaps(keptInputs);
     if (gaps.length) refuse('RESTART_PART_SET_INCOMPLETE', `inputs: a kept part set needs its parts.json and its rig with its PNGs, missing ${gaps.join('; ')}; register the missing files with input add, or stop keeping the set`);
     const candidate = freshProjectRecord(typeof project.name === 'string' ? project.name : '', now);
     if (project.name !== undefined) candidate.name = project.name;
     if (project.title !== undefined) candidate.title = project.title;
-    if (project.painting !== undefined) candidate.painting = project.painting;
+    if (painting !== undefined) candidate.painting = painting;
     if (project.same_artwork !== undefined) candidate.same_artwork = project.same_artwork;
-    candidate.inputs = project.inputs ?? [];
+    candidate.inputs = keptInputs;
     candidate.fix_ledger = project.fix_ledger ?? [];
     const entry: JsonObject = { at: new Date(now).toISOString(), by: opts['--by'], reason, previous_record_sha256: createHash('sha256').update(original).digest('hex') };
     candidate.restarts = [...asArray(project.restarts), entry];
@@ -132,9 +152,12 @@ export function restartCommand(args: string[], now: number): { stdout: string; e
     if (rejected !== undefined) refuse(rejected.code, rejected.message);
     writeRecord(file, original, candidate, 'restart');
     const rows = asArray(candidate.fix_ledger).length;
+    const leftOutText = leftOut.length
+      ? `; left out legacy input(s) ${leftOut.map(({ index, entry: item }) => typeof item.path === 'string' && item.path.trim() !== '' ? `inputs[${index}] (${item.path})` : `inputs[${index}]`).join(', ')}`
+      : '';
     return {
       stdout: json ? JSON.stringify(entry, null, 2)
-        : `restart: project record restarted at stage ${String(candidate.stage)}; kept ${asArray(candidate.inputs).length} input(s) and ${rows} ledger row(s); the earlier record (sha256 ${String(entry.previous_record_sha256)}) is in git history`,
+        : `restart: project record restarted at stage ${String(candidate.stage)}; kept ${asArray(candidate.inputs).length} input(s) and ${rows} ledger row(s)${leftOutText}; the earlier record (sha256 ${String(entry.previous_record_sha256)}) is in git history`,
       exit: 0,
     };
   } finally { release(); }