create-zudo-doc 5.17.1 → 5.18.0

package/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to `create-zudo-doc` are documented in this file.
 
 The format is based on Keep a Changelog, and release notes are generated from the changelog MDX pages.
 
+## [5.18.0] - 2026-09-06
+
+### Other Changes
+
+- A generated project now pins `@takazudo/zdtp` at `0.5.0` (was `0.4.14`), matching the peer requirement of the `@takazudo/zudo-doc` released alongside it (`a55182f9c`).
+
+## [5.17.2] - 2026-09-05
+
+### Bug Fixes
+
+- Prevent generated documentation-skill setup scripts from overwriting real files or directories when creating symlinks (`559e7a1`)
+- Detect locale settings inside spread `zudoDoc(...)` configurations when generating documentation skills (`c1658c9`)
+
 ## [5.17.1] - 2026-09-04
 
 ### Other Changes

package/dist/scaffold.d.ts

@@ -31,5 +31,5 @@ export declare function deriveDocSkillName(projectName: string): string;
  *
  * Bumped in lockstep by scripts/release-create-zudo-doc.sh.
  */
-export declare const ZUDO_DOC_PIN = "^5.17.1";
+export declare const ZUDO_DOC_PIN = "^5.18.0";
 export declare function scaffold(choices: UserChoices): Promise<void>;

package/dist/scaffold.js

@@ -47,7 +47,7 @@ export function deriveDocSkillName(projectName) {
  *
  * Bumped in lockstep by scripts/release-create-zudo-doc.sh.
  */
-export const ZUDO_DOC_PIN = "^5.17.1";
+export const ZUDO_DOC_PIN = "^5.18.0";
 /**
  * Files in `templates/base/**` that must not be copied by the unconditional
  * base mirror. Each entry is matched against the path relative to
@@ -840,7 +840,7 @@ function generatePackageJson(choices, localePlan) {
         // same reason. This is the ACCEPTED, permanent contract per #2668 — see
         // the "@takazudo/zdtp dep implication" note in
         // packages/zudo-doc/docs/adr/route-injection-seam.md.
-        "@takazudo/zdtp": "0.4.14",
+        "@takazudo/zdtp": "0.5.0",
         // (@takazudo/zudo-doc-history-server is NOT here — it is gated on the
         // docHistory or assetViewer features, see the block below. It was briefly unconditional
         // (#3080) to work around doc-history-area importing its `/exclude` subpath
@@ -889,7 +889,7 @@ function generatePackageJson(choices, localePlan) {
         // `/exclude` at module scope from the always-bundled chrome graph; #3110
         // moved compileExclude into @takazudo/zudo-doc, so projects with both
         // docHistory and assetViewer off no longer need the package at all.
-        deps["@takazudo/zudo-doc-history-server"] = "^5.17.1";
+        deps["@takazudo/zudo-doc-history-server"] = "^5.18.0";
         // tsx is no longer needed here: the relocated package plugin imports the
         // runner directly (no `tsx -e` spawn) since the package ships compiled
         // dist/ — package-first migration #2321 (#2337).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-zudo-doc",
-  "version": "5.17.1",
+  "version": "5.18.0",
   "description": "Create a new zudo-doc documentation site",
   "license": "MIT",
   "author": "Takeshi Takatsudo",

package/templates/base/scripts/setup-doc-skill.sh

@@ -298,15 +298,38 @@ function matchingBrace(masked, open) {
   return -1;
 }
 
+function spreadZudoDocObjectRanges(masked, depths) {
+  const ranges = [];
+  const spreadPattern = /\.\.\.\s*zudoDoc\s*\(\s*/g;
+  let match;
+  while ((match = spreadPattern.exec(masked)) !== null) {
+    const open = match.index + match[0].length;
+    if (masked[open] !== "{") continue;
+    const close = matchingBrace(masked, open);
+    if (close < 0) continue;
+    ranges.push({ open, close, propertyDepth: depths[open] + 1 });
+  }
+  return ranges;
+}
+
+function isTopLevelSetting(index, depths, spreadRanges) {
+  if (depths[index] === 1) return true;
+  return spreadRanges.some(
+    ({ open, close, propertyDepth }) =>
+      index > open && index < close && depths[index] === propertyDepth,
+  );
+}
+
 function topLevelObject(source, property) {
   const masked = maskSource(source);
   const depths = braceDepths(masked);
+  const spreadRanges = spreadZudoDocObjectRanges(masked, depths);
   const propertyPattern = new RegExp(`\\b${property}\\s*:`, "g");
   let match;
   while ((match = propertyPattern.exec(masked)) !== null) {
-    // Direct fields of the settings/zudoDoc object are at depth 1. Nested
-    // `versions[].locales` and nav-label locales are intentionally ignored.
-    if (depths[match.index] !== 1) continue;
+    // Direct settings objects use depth 1; spread zudoDoc settings use their
+    // explicitly identified object depth. Nested locale maps stay ignored.
+    if (!isTopLevelSetting(match.index, depths, spreadRanges)) continue;
     let open = match.index + match[0].length;
     while (/\s/.test(masked[open] ?? "")) open += 1;
     if (masked[open] !== "{") continue;
@@ -320,10 +343,11 @@ function topLevelObject(source, property) {
 function topLevelString(source, property) {
   const masked = maskSource(source);
   const depths = braceDepths(masked);
+  const spreadRanges = spreadZudoDocObjectRanges(masked, depths);
   const propertyPattern = new RegExp(`\\b${property}\\s*:`, "g");
   let match;
   while ((match = propertyPattern.exec(masked)) !== null) {
-    if (depths[match.index] !== 1) continue;
+    if (!isTopLevelSetting(match.index, depths, spreadRanges)) continue;
     const tail = source.slice(match.index + match[0].length).trimStart();
     const quote = tail[0];
     if (quote !== "\"" && quote !== "'") continue;
@@ -407,6 +431,12 @@ for (const { source } of sources) {
   if (localeObject === null) localeObject = topLevelObject(source, "locales");
 }
 
+if (defaultLocale === null && docsDir === null && localeObject === null) {
+  console.error(
+    "no explicit locale settings found in zfb.config.ts; assuming defaults (en, src/content/docs, no additional locales)",
+  );
+}
+
 console.log(`default\t${defaultLocale ?? "en"}`);
 console.log(`docs\t${docsDir ?? "src/content/docs"}`);
 if (localeObject) {
@@ -470,12 +500,15 @@ physical_dir() {
   fi
 }
 
-# Helper: replace a symlink or file at the given path
+# Helper: replace a symlink at the given path; refuse to remove real files or directories
 ensure_symlink() {
   local link_path="$1"
   local target="$2"
-  if [ -L "$link_path" ] || [ -e "$link_path" ]; then
-    rm -rf "$link_path"
+  if [ -L "$link_path" ]; then
+    rm "$link_path"
+  elif [ -e "$link_path" ]; then
+    echo "Error: '$link_path' already exists and is not a symlink. Move or remove it and rerun setup:doc-skill." >&2
+    exit 1
   fi
   ln -s "$target" "$link_path"
 }