garaje 0.1.3 → 0.1.4

package/dist/host/sync.js

@@ -5,17 +5,34 @@ import { readManifest } from "../manifest.js";
 function git(args) {
     return spawnSync("git", args, { stdio: "inherit" }).status ?? 1;
 }
-/** Cross the manifest with what is actually checked out under bays/. */
-export function bayStatuses(root) {
-    return readManifest(root).map((bay) => {
-        const dest = join(root, "bays", bay.name);
-        if (!existsSync(join(dest, ".git")))
-            return { ...bay, synced: false };
-        const rev = spawnSync("git", ["-C", dest, "rev-parse", "--short", "HEAD"], {
-            encoding: "utf8",
-        });
-        return { ...bay, synced: true, head: rev.status === 0 ? rev.stdout.trim() : "?" };
+/** Read the manifest, reporting a bad one as an error rather than a stack
+ *  trace. A `bays: []` line followed by list items is the common way to get
+ *  here — it looks like an append but is not valid YAML. */
+function readOrReport(root) {
+    try {
+        return readManifest(root);
+    }
+    catch (e) {
+        const first = e.message.split("\n")[0];
+        process.stderr.write(`error: garaje.yaml: ${first}\n`);
+        process.stderr.write("hint: bays must be a YAML list; an empty `bays: []` cannot be followed by `- name:` items\n");
+        return undefined;
+    }
+}
+/** Whether one manifest bay is materialized, and at which commit. */
+function bayStatus(root, bay) {
+    const dest = join(root, "bays", bay.name);
+    if (!existsSync(join(dest, ".git")))
+        return { ...bay, synced: false };
+    const rev = spawnSync("git", ["-C", dest, "rev-parse", "--short", "HEAD"], {
+        encoding: "utf8",
     });
+    return { ...bay, synced: true, head: rev.status === 0 ? rev.stdout.trim() : "?" };
+}
+/** Cross the manifest with what is actually checked out under bays/. Throws on
+ *  a bad manifest; doctor reports that as a failed check. */
+export function bayStatuses(root) {
+    return readManifest(root).map((bay) => bayStatus(root, bay));
 }
 /** One human-readable line per bay. Pure — doctor reuses this. */
 export function statusLine(b) {
@@ -34,7 +51,10 @@ export function renderList(rows) {
 }
 /** `garaje list` — show the manifest and which bays are materialized. */
 export function runList(root) {
-    process.stdout.write(renderList(bayStatuses(root)));
+    const entries = readOrReport(root);
+    if (!entries)
+        return 1;
+    process.stdout.write(renderList(entries.map((b) => bayStatus(root, b))));
     return 0;
 }
 /** `garaje sync [name...]` — clone/update the manifest's bays into bays/. */
@@ -43,7 +63,9 @@ export function runSync(root, names) {
         process.stderr.write("error: git not found in PATH\n");
         return 1;
     }
-    const entries = readManifest(root);
+    const entries = readOrReport(root);
+    if (!entries)
+        return 1;
     const unknown = names.filter((n) => !entries.some((b) => b.name === n));
     if (unknown.length) {
         process.stderr.write(`error: not in garaje.yaml: ${unknown.join(", ")} (declare the bay in the manifest first)\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "garaje",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "MIT",
   "repository": {
     "type": "git",