@c4a/context-cli 0.7.80 → 0.7.82

package/cli.js

@@ -89769,18 +89769,11 @@ function sidebar(entries2, label2 = (entry) => entry.title) {
   }));
 }
 function siteSections(entries2) {
-  const directoriesFirst = (siblings) => {
-    const ordered = [
-      ...siblings.filter((entry) => entry.children.length > 0),
-      ...siblings.filter((entry) => entry.children.length === 0)
-    ];
-    return ordered.map((entry) => ({ ...entry, children: directoriesFirst(entry.children) }));
-  };
   const pageLinks = (entry) => [
     ...entry.href ? [entry.href.split("#")[0]] : [],
     ...entry.children.flatMap(pageLinks)
   ];
-  return entries2.map((entry) => ({ ...entry, children: directoriesFirst(entry.children) })).map((entry) => ({
+  return entries2.map((entry) => ({
     key: entry.key,
     title: entry.title,
     entry,
@@ -90008,16 +90001,24 @@ ${localized.body}`);
     for (const section of sections) {
       await writeFile22(join72(temporary, section.href.slice(1).replace(/\.html$/u, ".md")), localizer.variants((tag) => {
         const lines = [`# ${mdLabel(localizer.entryTitle(tag, section.entry))}`, "", '<div class="context-section-grid">', ""];
-        const groups = section.entries.filter((entry) => entry.children.length > 0);
-        const articles = section.entries.filter((entry) => entry.children.length === 0);
-        for (const group of groups) {
-          card(lines, group.href ? `[${mdLabel(localizer.entryTitle(tag, group))}](${group.href})` : mdLabel(localizer.entryTitle(tag, group)), group.children, tag);
-        }
-        if (groups.length === 0)
-          for (const article of articles)
-            card(lines, undefined, [article], tag);
-        else if (articles.length)
-          card(lines, undefined, articles, tag);
+        const grouped = section.entries.some((entry) => entry.children.length > 0);
+        let articles = [];
+        const flush = () => {
+          if (articles.length)
+            card(lines, undefined, articles, tag);
+          articles = [];
+        };
+        for (const entry of section.entries) {
+          if (entry.children.length === 0) {
+            articles.push(entry);
+            if (!grouped)
+              flush();
+            continue;
+          }
+          flush();
+          card(lines, entry.href ? `[${mdLabel(localizer.entryTitle(tag, entry))}](${entry.href})` : mdLabel(localizer.entryTitle(tag, entry)), entry.children, tag);
+        }
+        flush();
         lines.push("</div>");
         return lines.join(`
 `) + `
@@ -94280,6 +94281,35 @@ function normalizeSubpath2(value) {
   const normalized = value.replace(/\\/g, "/").split("/").filter((part) => part.length > 0 && part !== ".").join("/");
   return normalized.length > 0 ? normalized : undefined;
 }
+function explicitSubpath(value, sourceName) {
+  const parts = value.replace(/\\/g, "/").split("/");
+  if (isAbsolute16(value) || /^[A-Za-z]:/.test(value) || parts.includes("..")) {
+    throw new ContextError(ExitCode.UserError, `repo source subpath must stay inside the repository: ${value}`, {
+      category: ErrorCategory.UserInputInvalid,
+      sourceName,
+      subpath: value,
+      next: "Pass --subpath as a repository-relative directory such as apps/web, or . for the repository root."
+    });
+  }
+  return normalizeSubpath2(value);
+}
+function requestedSubpath(input) {
+  if (input.value === undefined)
+    return input.current;
+  const { value, sourceName } = input;
+  const localScope = input.localScoped ? input.current : undefined;
+  const requested = explicitSubpath(value, sourceName);
+  if (localScope !== undefined && localScope !== requested) {
+    throw new ContextError(ExitCode.UserError, `repo source subpath ${requested ?? "."} conflicts with local path scope ${localScope}`, {
+      category: ErrorCategory.UserInputInvalid,
+      sourceName,
+      subpath: value,
+      localSubpath: localScope,
+      next: "Pass --local at the repository root together with --subpath, or pass only --local pointing at the module directory."
+    });
+  }
+  return requested;
+}
 function scopedLocalPath(rootAbs, subpath) {
   return subpath === undefined ? rootAbs : resolve30(rootAbs, subpath);
 }
@@ -94525,6 +94555,12 @@ async function normalizeAddInput(input, existing) {
       }
     }
   }
+  subpath = requestedSubpath({
+    value: input.subpath,
+    sourceName,
+    current: subpath,
+    localScoped: localWasResolvedFromInput && gitRootAbs !== null
+  });
   if (input.local !== undefined && (explicitRemote === null || explicitRef === null)) {
     if (originalLocalAbs === null || !existsSync22(originalLocalAbs)) {
       throw new ContextError(ExitCode.UserError, `repo source local path does not exist: ${input.local}`, {
@@ -115740,7 +115776,7 @@ async function readSourceBatchJournalStatus(input) {
 
 // src/project/sourceBatchRegistration.ts
 var ITEM_KEYS = {
-  repo: new Set(["type", "module", "local", "remote", "ref"]),
+  repo: new Set(["type", "module", "local", "remote", "ref", "subpath"]),
   file: new Set(["type", "module", "local", "include"]),
   lark: new Set(["type", "module", "url", "docToken", "wikiToken", "title"])
 };
@@ -115784,7 +115820,12 @@ function optionalStringArray(record6, field, path3) {
 function assertAllowedKeys(record6, type, path3) {
   const unknown2 = Object.keys(record6).filter((key) => !ITEM_KEYS[type].has(key));
   if (unknown2.length > 0) {
-    throw inputError(`${path3} has unsupported field(s): ${unknown2.join(", ")}`, { path: path3, fields: unknown2 });
+    const allowed = [...ITEM_KEYS[type]].join(", ");
+    throw inputError(`${path3} has unsupported field(s): ${unknown2.join(", ")}; ${type} items accept ${allowed}`, {
+      path: path3,
+      fields: unknown2,
+      allowed: [...ITEM_KEYS[type]]
+    });
   }
 }
 function parseBatchItem(value, index2) {
@@ -115800,12 +115841,14 @@ function parseBatchItem(value, index2) {
     const local = optionalString(record6, "local", path3);
     const remote = optionalString(record6, "remote", path3);
     const ref2 = optionalString(record6, "ref", path3);
+    const subpath = optionalString(record6, "subpath", path3);
     return {
       type,
       module: module2,
       ...local !== undefined ? { local } : {},
       ...remote !== undefined ? { remote } : {},
-      ...ref2 !== undefined ? { ref: ref2 } : {}
+      ...ref2 !== undefined ? { ref: ref2 } : {},
+      ...subpath !== undefined ? { subpath } : {}
     };
   }
   if (type === "file") {
@@ -117636,6 +117679,9 @@ repo.local is resolved from the Context project root. A valid local Git checkout
 lets the CLI infer origin and the current commit; remote/ref are needed only when
 that local identity cannot be resolved. If local is omitted, the CLI also accepts
 one uniquely named Git directory at <project-root>/<module> or ../<module>.
+repo.subpath is an optional repository-relative module directory. Use it with
+remote/ref, or with local pointing at the checkout root; a local module directory
+already sets the subpath.
 The current source-boundary Route requires the completed, presented work-start
 report shown above. A direct maintenance call outside that Route may omit it.
 For long batches, add --checkpoint --progress. Resume with --resume <job-id>;
@@ -117678,7 +117724,7 @@ Resume performs registration only unless --configure is explicitly supplied.
     }
     writeFormatted(result, format2);
   });
-  sourceAdd.command("repo [date]").description("Add or update a repo module under a valid YYYYMMDD batch in sources/repo/index.yaml").option("--configure", "Also select this source in a simple src/index.ts; does not capture").requiredOption("--module <name>", "concrete repo/package module name").option("--remote <url>", "repo remote URL; inferred from local origin when omitted").option("--ref <sha>", "pinned commit/ref; inferred from local HEAD when omitted").option("--local <path>", "local checkout path; may point at a monorepo subdirectory").option("--format <format>", "output format: json | yaml | table", "table").action(async (namespace, ...args) => {
+  sourceAdd.command("repo [date]").description("Add or update a repo module under a valid YYYYMMDD batch in sources/repo/index.yaml").option("--configure", "Also select this source in a simple src/index.ts; does not capture").requiredOption("--module <name>", "concrete repo/package module name").option("--remote <url>", "repo remote URL; inferred from local origin when omitted").option("--ref <sha>", "pinned commit/ref; inferred from local HEAD when omitted").option("--local <path>", "local checkout path; may point at a monorepo subdirectory").option("--subpath <dir>", "repo-relative module directory; use with --remote/--ref or a --local repository root").option("--format <format>", "output format: json | yaml | table", "table").action(async (namespace, ...args) => {
     const options = actionOptions(...args);
     const format2 = assertChoice(options.format, DATA_FORMATS, "--format");
     const projectRoot2 = requireProjectRoot3(process.cwd(), "source add repo");
@@ -117693,13 +117739,15 @@ Resume performs registration only unless --configure is explicitly supplied.
     const local = optionalString2(options.local);
     const remote = optionalString2(options.remote);
     const ref2 = optionalString2(options.ref);
+    const subpath = optionalString2(options.subpath);
     const result = await addRepoSource({
       projectRoot: projectRoot2,
       namespace: sourceNamespace.name,
       module,
       ...local !== undefined ? { local } : {},
       ...remote !== undefined ? { remote } : {},
-      ...ref2 !== undefined ? { ref: ref2 } : {}
+      ...ref2 !== undefined ? { ref: ref2 } : {},
+      ...subpath !== undefined ? { subpath } : {}
     });
     writeFormatted(options.configure ? { ...result, configuration: await configureRegisteredSources(projectRoot2, [{ type: "repo", name: `${sourceNamespace.name}/${module}` }]) } : result, format2);
   });