@lukoweb/apitogo 0.1.131 → 0.1.133

package/dist/cli/cli.js

@@ -5809,7 +5809,7 @@ import {
 // package.json
 var package_default = {
   name: "@lukoweb/apitogo",
-  version: "0.1.131",
+  version: "0.1.133",
   type: "module",
   sideEffects: [
     "**/*.css",
@@ -11877,7 +11877,9 @@ var treeToNavigationItems = (node) => {
   return [...docs, ...categories];
 };
 function buildDocumentationItems(routePaths) {
-  return treeToNavigationItems(buildTree(sortDocPaths(routePaths)));
+  return treeToNavigationItems(
+    buildTree(sortDocPaths([...new Set(routePaths)]))
+  );
 }
 function navItemKey(item) {
   if (typeof item === "string") {
@@ -11894,19 +11896,67 @@ function navItemKey(item) {
   }
   return JSON.stringify(item);
 }
+function normalizeDocRoute(value) {
+  const trimmed = value.trim().replace(/^\.?\/+/, "").replace(/\.mdx?$/i, "").replace(/(^|\/)index$/, "");
+  return `/${trimmed}`;
+}
+function docRoutesOf(item) {
+  if (typeof item === "string") return [normalizeDocRoute(item)];
+  if (!isRecord(item)) return [];
+  if (item.type === "doc") {
+    return [item.file, item.path].filter((value) => typeof value === "string").map(normalizeDocRoute);
+  }
+  if (item.type === "link" && typeof item.to === "string") {
+    return item.to.startsWith("/") ? [normalizeDocRoute(item.to)] : [];
+  }
+  if (item.type === "category") {
+    return [
+      ...docRoutesOf(item.link),
+      ...Array.isArray(item.items) ? item.items.flatMap(docRoutesOf) : []
+    ];
+  }
+  return [];
+}
+function collectNavigationDocRoutes(navigation) {
+  return new Set(
+    Array.isArray(navigation) ? navigation.flatMap(docRoutesOf) : []
+  );
+}
+function pruneKnownDocs(items, known) {
+  return items.flatMap((item) => {
+    if (typeof item === "string") {
+      return known.has(normalizeDocRoute(item)) ? [] : [item];
+    }
+    if (item.type !== "category" || !Array.isArray(item.items)) return [item];
+    const children = pruneKnownDocs(item.items, known);
+    return children.length > 0 ? [{ ...item, items: children }] : [];
+  });
+}
 function mergeNavItems(existing, incoming) {
-  const seen = new Set(existing.map(navItemKey));
   const merged = [...existing];
   for (const item of incoming) {
     const key = navItemKey(item);
-    if (seen.has(key)) {
+    const index = merged.findIndex((current2) => navItemKey(current2) === key);
+    if (index === -1) {
+      merged.push(item);
       continue;
     }
-    seen.add(key);
-    merged.push(item);
+    const current = merged[index];
+    if (isRecord(current) && isRecord(item) && current.type === "category" && item.type === "category") {
+      merged[index] = {
+        ...current,
+        items: mergeNavItems(
+          Array.isArray(current.items) ? current.items : [],
+          Array.isArray(item.items) ? item.items : []
+        )
+      };
+    }
   }
   return merged;
 }
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
 function isDocumentationCategory(item) {
   return typeof item === "object" && item.type === "category" && item.label === DOCUMENTATION_NAV_LABEL;
 }
@@ -11919,13 +11969,17 @@ function mergeDocumentationNavigation(navigation, docRoutePaths, options) {
   const rest = existing.filter((item) => !isDocumentationCategory(item));
   const currentDocs = existing.find(isDocumentationCategory);
   const currentItems = Array.isArray(currentDocs?.items) ? currentDocs.items : [];
-  const items = options.force ? generated : mergeNavItems(currentItems, generated);
+  const items = options.force ? generated : mergeNavItems(
+    currentItems,
+    pruneKnownDocs(generated, collectNavigationDocRoutes(existing))
+  );
   const documentation = {
+    ...currentDocs,
     type: "category",
     label: DOCUMENTATION_NAV_LABEL,
     items
   };
-  if (generated.length === 0) {
+  if (generated.length === 0 || !currentDocs && items.length === 0) {
     return existing;
   }
   if (currentDocs) {
@@ -22069,6 +22123,9 @@ async function apply(argv) {
   }
   const platformPlan = argv.platformPlan?.trim();
   const progress = createConsoleProgressReporter();
+  await progress.onStep(
+    `Starting deploy from ${sourceDirectory}... this may take a few minutes.`
+  );
   let effectiveProjectId = argv.projectId?.trim();
   let effectiveProjectName = argv.projectName?.trim();
   let createNewProject = false;
@@ -22262,7 +22319,7 @@ function isInside2(parent, child) {
   const relative = path64.relative(parent, child);
   return relative === "" || !relative.startsWith("..") && !path64.isAbsolute(relative);
 }
-async function collectMarkdownFiles(dir) {
+async function collectMarkdownFiles(dir, excludeDir) {
   const files = [];
   let entries;
   try {
@@ -22276,10 +22333,10 @@ async function collectMarkdownFiles(dir) {
     }
     const full = path64.join(dir, entry.name);
     if (entry.isDirectory()) {
-      if (SKIP_SEARCH_DIRS.has(entry.name) || entry.isSymbolicLink()) {
+      if (SKIP_SEARCH_DIRS.has(entry.name) || entry.isSymbolicLink() || excludeDir && path64.resolve(full) === excludeDir) {
         continue;
       }
-      files.push(...await collectMarkdownFiles(full));
+      files.push(...await collectMarkdownFiles(full, excludeDir));
       continue;
     }
     if ((entry.isFile() || entry.isSymbolicLink()) && /\.mdx?$/i.test(entry.name)) {
@@ -22328,7 +22385,7 @@ async function discoverNearbyDocsDirectories(siteDirectory) {
     if (!await isDirectory(resolved)) {
       return;
     }
-    const files = (await collectMarkdownFiles(resolved)).sort(
+    const files = (await collectMarkdownFiles(resolved, site)).sort(
       (a, b) => a.localeCompare(b)
     );
     if (files.length === 0) {
@@ -22355,7 +22412,15 @@ async function discoverNearbyDocsDirectories(siteDirectory) {
     } catch {
     }
   }
-  return { directories, searchedDirectories };
+  const coveredBy = (outer, inner) => outer !== inner && isInside2(outer, inner) && (!isInside2(site, inner) || isInside2(site, outer));
+  return {
+    directories: directories.filter(
+      (inner) => !directories.some(
+        (outer) => coveredBy(outer.sourceDirectory, inner.sourceDirectory)
+      )
+    ),
+    searchedDirectories
+  };
 }
 function slugifyDirName(name) {
   return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") || "docs";
@@ -22478,6 +22543,15 @@ async function discoverAndWireDocs(siteDirectory) {
         path64.relative(directory.sourceDirectory, sourcePath)
       );
       const linkPath = path64.join(linkDirectory, relativeSource);
+      const relativeLink = toPosix2(path64.relative(site, linkPath));
+      const route = toRoutePath(relativeLink, PAGES_DIR);
+      if (routes.includes(route)) {
+        skipped.push({
+          sourcePath,
+          reason: `route ${route} is already used by another file`
+        });
+        continue;
+      }
       const result = await linkMarkdownFile(sourcePath, linkPath);
       if (result === "skipped") {
         skipped.push({
@@ -22486,8 +22560,6 @@ async function discoverAndWireDocs(siteDirectory) {
         });
         continue;
       }
-      const relativeLink = toPosix2(path64.relative(site, linkPath));
-      const route = toRoutePath(relativeLink, PAGES_DIR);
       linked.push({ sourcePath, linkPath, route, relativeSource });
       routes.push(route);
     }

package/dist/declarations/cli/make-config/json-config.d.ts

@@ -20,6 +20,7 @@ export declare function applyConfigPatches(config: JsonRecord, patches: {
 }): JsonRecord;
 export declare const sortDocPaths: (docPaths: string[]) => string[];
 export declare function buildDocumentationItems(routePaths: string[]): NavItem[];
+export declare function collectNavigationDocRoutes(navigation: unknown): Set<string>;
 export declare function mergeDocumentationNavigation(navigation: unknown, docRoutePaths: string[], options: {
     force: boolean;
 }): NavItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lukoweb/apitogo",
-  "version": "0.1.131",
+  "version": "0.1.133",
   "type": "module",
   "sideEffects": [
     "**/*.css",