@lukoweb/apitogo 0.1.82 → 0.1.83

package/dist/cli/cli.js

@@ -5633,7 +5633,7 @@ import {
 // package.json
 var package_default = {
   name: "@lukoweb/apitogo",
-  version: "0.1.82",
+  version: "0.1.83",
   type: "module",
   sideEffects: [
     "**/*.css",
@@ -10937,6 +10937,17 @@ export default buildApitogoConfig({
 function isThinConfigWrapper(source) {
   return /export\s+default\s+buildApitogoConfig\s*\(/.test(source);
 }
+function isManagedConfigWrapper(source) {
+  if (isThinConfigWrapper(source)) {
+    return true;
+  }
+  return /from\s+["']\.\/apitogo\.config\.json["']/.test(source) && /buildApitogoConfig\s*\(/.test(source) && /type:\s*["']custom-page["']/.test(source);
+}
+function labelFromRoutePath(routePath) {
+  const slug = routePath.replace(/^\/+/, "");
+  const leaf = slug.split("/").filter(Boolean).pop() ?? slug;
+  return titleFromDirectoryName(leaf);
+}
 function buildThinWrapperWithCustomPages(tsxRoutePaths) {
   if (tsxRoutePaths.length === 0) {
     return THIN_WRAPPER_SOURCE;
@@ -10949,9 +10960,11 @@ function buildThinWrapperWithCustomPages(tsxRoutePaths) {
   const customPages = tsxRoutePaths.map((routePath) => {
     const slug = routePath.replace(/^\//, "");
     const name = pageComponentName(slug);
+    const label = labelFromRoutePath(routePath);
     return `        {
           type: "custom-page",
           path: ${JSON.stringify(routePath)},
+          label: ${JSON.stringify(label)},
           element: <${name} />,
         },`;
   }).join("\n");
@@ -10973,13 +10986,17 @@ export default {
       label: ${JSON.stringify(DOCUMENTATION_NAV_LABEL)},
       items: [
 ${customPages}
-        ...(((config.navigation ?? []).find(
+        ...((((config.navigation ?? []).find(
           (item) =>
             typeof item === "object" &&
             item !== null &&
             "label" in item &&
             item.label === ${JSON.stringify(DOCUMENTATION_NAV_LABEL)},
-        ) as { items?: unknown[] } | undefined)?.items ?? []),
+        ) as { items?: unknown[] } | undefined)?.items ?? []).filter(
+          (item) =>
+            typeof item !== "string" ||
+            !${JSON.stringify(tsxRoutePaths)}.includes(item),
+        )),
       ],
     },
     ...(config.navigation ?? []).filter(
@@ -11519,7 +11536,8 @@ async function persistConfig(config2, ctx) {
     (file) => toRoutePath(file, ctx.pagesDir)
   );
   const tsxRoutes = tsxFiles.map((file) => toRoutePath(file, ctx.pagesDir));
-  if (markdownRoutes.length === 0 && tsxRoutes.length === 0) {
+  const docRoutes = [.../* @__PURE__ */ new Set([...markdownRoutes, ...tsxRoutes])];
+  if (docRoutes.length === 0) {
     printDiagnosticsToConsole(
       `No docs pages under '${ctx.pagesDir}/' \u2014 skipping documentation nav scan.`
     );
@@ -11528,7 +11546,7 @@ async function persistConfig(config2, ctx) {
     ...config2,
     navigation: mergeDocumentationNavigation(
       config2.navigation,
-      markdownRoutes,
+      docRoutes,
       { force: ctx.force }
     )
   };
@@ -11537,7 +11555,7 @@ async function persistConfig(config2, ctx) {
   const tsxPath = path36.join(ctx.dir, "apitogo.config.tsx");
   if (await fileExists3(tsxPath) && tsxRoutes.length > 0) {
     const tsxSource = await readFile5(tsxPath, "utf8");
-    if (isThinConfigWrapper(tsxSource)) {
+    if (isManagedConfigWrapper(tsxSource)) {
       await writeFile7(
         tsxPath,
         buildThinWrapperWithCustomPages(tsxRoutes),
@@ -11636,50 +11654,17 @@ async function makeConfig(argv) {
       interactiveHasPaidPlans = prompted.hasPaidPlans;
     } else {
       config2 = applyConfigPatches(config2, flagPatches);
-      const pageFiles = await glob5(`${pagesDir}/**/*.{md,mdx,tsx,jsx}`, {
-        cwd: dir,
-        ignore: ["**/node_modules/**", "**/.git/**", "**/dist/**"],
-        posix: true
-      });
-      const markdownFiles = pageFiles.filter((file) => /\.mdx?$/i.test(file));
-      const tsxFiles = pageFiles.filter((file) => /\.(tsx|jsx)$/i.test(file));
-      const markdownRoutes = markdownFiles.map(
-        (file) => toRoutePath(file, pagesDir)
-      );
-      const tsxRoutes = tsxFiles.map((file) => toRoutePath(file, pagesDir));
-      if (markdownRoutes.length === 0 && tsxRoutes.length === 0) {
-        printDiagnosticsToConsole(
-          `No docs pages under '${pagesDir}/' \u2014 skipping documentation nav scan.`
-        );
-      }
-      config2.navigation = mergeDocumentationNavigation(
-        config2.navigation,
-        markdownRoutes,
-        { force: argv.force === true }
-      );
       if (discoveredOpenApi) {
         config2 = applyOpenApiToJsonConfig(
           config2,
           openapiInputForConfig(discoveredOpenApi)
         );
       }
-      await writeFile7(jsonPath, `${JSON.stringify(config2, null, 2)}
-`, "utf8");
-      const tsxPath = path36.join(dir, "apitogo.config.tsx");
-      if (await fileExists3(tsxPath) && tsxRoutes.length > 0) {
-        const tsxSource = await readFile5(tsxPath, "utf8");
-        if (isThinConfigWrapper(tsxSource)) {
-          await writeFile7(
-            tsxPath,
-            buildThinWrapperWithCustomPages(tsxRoutes),
-            "utf8"
-          );
-        }
-      }
+      config2 = await persistConfig(config2, persistCtx);
     }
     const action = createdJson ? "Initialized" : "Updated";
     printResultToConsole(
-      `${action} ${APITOGO_JSON_FILENAME} (site/auth/navigation/OpenAPI/plans as applicable; redirects unchanged).`
+      `${action} ${APITOGO_JSON_FILENAME}.`
     );
     if (createdPackageJson) {
       printDiagnosticsToConsole(
@@ -12163,10 +12148,36 @@ var dev_default = {
 };
 
 // src/cli/init/handler.ts
+import { mkdir as mkdir8, readdir, stat as stat4 } from "node:fs/promises";
 import path40 from "node:path";
+var IGNORED_TARGET_ENTRIES = /* @__PURE__ */ new Set([".DS_Store", "Thumbs.db"]);
+async function ensureEmptyTargetDir(dir) {
+  try {
+    const existing = await stat4(dir);
+    if (!existing.isDirectory()) {
+      throw new Error(`${dir} exists and is not a directory.`);
+    }
+  } catch (err) {
+    const code = err.code;
+    if (code !== "ENOENT") {
+      throw err;
+    }
+    await mkdir8(dir, { recursive: true });
+    return;
+  }
+  const entries = (await readdir(dir)).filter(
+    (name) => !IGNORED_TARGET_ENTRIES.has(name)
+  );
+  if (entries.length > 0) {
+    throw new Error(
+      `Directory '${dir}' is not empty. Choose a new directory or remove existing files.`
+    );
+  }
+}
 async function init2(argv) {
   const dir = path40.resolve(process.cwd(), argv.dir ?? ".");
   try {
+    await ensureEmptyTargetDir(dir);
     const createdPackageJson = await ensurePackageJson(dir);
     const createdTsconfig = await ensureTsconfigJson(dir);
     await ensurePortalStubFiles(dir);

package/package.json

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