@fumadocs/cli 0.0.2 → 0.0.4

package/dist/build/index.d.ts

@@ -79,17 +79,22 @@ interface DependencyInfo {
     version?: string;
 }
 interface ComponentBuilder {
-    rootDir: string;
     registryDir: string;
     resolveDep: (specifier: string) => DependencyInfo & {
         name: string;
     };
-    resolveOutputPath: (path: string) => string;
+    resolveOutputPath: (path: string, namespace?: string) => string;
     getSubComponent: (path: string) => {
         component: Component;
     } | undefined;
 }
-declare function createComponentBuilder(registry: Registry, packageJson: PackageJson | undefined, registryDir: string, rootDir: string): ComponentBuilder;
+/**
+ * @param registry registry object
+ * @param packageJson parsed package json object
+ * @param registryDir directory of registry config file
+ * @param sourceDir source directory of project (e.g. `/src`), used to resolve the output paths of component files
+ */
+declare function createComponentBuilder(registry: Registry, packageJson: PackageJson | undefined, registryDir: string, sourceDir: string): ComponentBuilder;
 
 declare function writeOutput(dir: string, out: Output, options?: {
     /**

package/dist/build/index.js

@@ -102,7 +102,7 @@ function merge(to, from) {
 
 // src/build/component-builder.ts
 import path2 from "node:path";
-function createComponentBuilder(registry, packageJson, registryDir, rootDir) {
+function createComponentBuilder(registry, packageJson, registryDir, sourceDir) {
   const fileToComponent = /* @__PURE__ */ new Map();
   for (const comp of registry.components) {
     for (const file of comp.files) {
@@ -115,7 +115,6 @@ function createComponentBuilder(registry, packageJson, registryDir, rootDir) {
   }
   return {
     registryDir,
-    rootDir,
     resolveDep(specifier) {
       const name = specifier.startsWith("@") ? specifier.split("/").slice(0, 2).join("/") : specifier.split("/")[0];
       if (registry.dependencies && name in registry.dependencies)
@@ -139,16 +138,19 @@ function createComponentBuilder(registry, packageJson, registryDir, rootDir) {
       }
       return { type: "runtime", name };
     },
-    resolveOutputPath(file) {
+    resolveOutputPath(file, forcedNamespace) {
       const relativeFile = path2.relative(registryDir, file);
+      if (forcedNamespace) {
+        return `${forcedNamespace}:${path2.relative(sourceDir, file)}`;
+      }
       if (registry.namespaces)
         for (const namespace of Object.keys(registry.namespaces)) {
           const relativePath = path2.relative(namespace, relativeFile);
-          if (relativePath.startsWith("../") || path2.isAbsolute(relativePath))
-            continue;
-          return `${registry.namespaces[namespace]}:${relativePath}`;
+          if (!relativePath.startsWith("../") && !path2.isAbsolute(relativePath)) {
+            return `${registry.namespaces[namespace]}:${relativePath}`;
+          }
         }
-      return path2.relative(rootDir, file);
+      return path2.relative(sourceDir, file);
     },
     getSubComponent(file) {
       const relativeFile = path2.relative(registryDir, file);
@@ -161,10 +163,18 @@ function createComponentBuilder(registry, packageJson, registryDir, rootDir) {
   };
 }
 
+// src/build/get-path-namespace.ts
+function getFileNamespace(file) {
+  const parsed = file.split(":", 2);
+  if (parsed.length > 1) return { namespace: parsed[0], path: parsed[1] };
+  return { path: file };
+}
+
 // src/build/build-registry.ts
 async function build(registry) {
   const registryDir = path3.dirname(registry.path);
   const rootDir = path3.join(registryDir, registry.rootDir);
+  const useSrc = await exists(path3.join(rootDir, "src"));
   const output = {
     index: [],
     components: []
@@ -172,14 +182,19 @@ async function build(registry) {
   const project = new Project({
     tsConfigFilePath: registry.tsconfigPath ? path3.join(registryDir, registry.tsconfigPath) : path3.join(rootDir, "tsconfig.json")
   });
-  const packageJson = typeof registry.packageJson !== "string" && registry.packageJson ? registry.packageJson : await fs.readFile(
-    registry.packageJson ? path3.join(registryDir, registry.packageJson) : path3.join(rootDir, "package.json")
-  ).then((res) => JSON.parse(res.toString())).catch(() => void 0);
+  function readPackageJson() {
+    if (typeof registry.packageJson !== "string" && registry.packageJson)
+      return registry.packageJson;
+    return fs.readFile(
+      registry.packageJson ? path3.join(registryDir, registry.packageJson) : path3.join(rootDir, "package.json")
+    ).then((res) => JSON.parse(res.toString())).catch(() => void 0);
+  }
+  const packageJson = await readPackageJson();
   const builder = createComponentBuilder(
     registry,
     packageJson,
     registryDir,
-    rootDir
+    useSrc ? path3.join(rootDir, "src") : rootDir
   );
   const buildExtendRegistries = Object.values(registry.on ?? {}).map(
     async (schema) => {
@@ -201,12 +216,21 @@ async function build(registry) {
       devDependencies: /* @__PURE__ */ new Map(),
       dependencies: /* @__PURE__ */ new Map()
     };
-    const read = component.files.map((file) => path3.join(registryDir, file)).map(async (file) => {
-      const content = await fs.readFile(file);
-      const sourceFile = project.createSourceFile(file, content.toString(), {
-        overwrite: true
-      });
-      const outputPath = builder.resolveOutputPath(sourceFile.getFilePath());
+    const read = component.files.map(async (sourcePath) => {
+      const parsed = getFileNamespace(sourcePath);
+      parsed.path = path3.join(registryDir, parsed.path);
+      const content = await fs.readFile(parsed.path);
+      const sourceFile = project.createSourceFile(
+        parsed.path,
+        content.toString(),
+        {
+          overwrite: true
+        }
+      );
+      const outputPath = builder.resolveOutputPath(
+        parsed.path,
+        parsed.namespace
+      );
       if (processedFiles.has(outputPath)) return;
       return buildFile(
         outputPath,

package/dist/index.js

@@ -125,7 +125,7 @@ function toReferencePath(sourceFile, referenceFile) {
         typescriptExtensions.includes(extname) ? extname : void 0
       )
     )
-  );
+  ).replaceAll(path2.sep, "/");
   return importPath.startsWith("../") ? importPath : `./${importPath}`;
 }
 function resolveReference(ref, resolver) {
@@ -432,7 +432,7 @@ var ogImagePlugin = {
     const route = await isI18nEnabled(ctx) ? "app/[lang]/docs-og/[...slug]/route.tsx" : "app/docs-og/[...slug]/route.tsx";
     return {
       "lib/metadata.ts": generated["lib/metadata"],
-      [route]: generated["app/docs-og/[...slug]/route"]
+      [ctx.src ? `src/${route}` : route]: generated["app/docs-og/[...slug]/route"]
     };
   },
   dependencies: [],
@@ -641,9 +641,9 @@ function runTransform(sourceFile) {
 
 // src/plugins/i18n.ts
 var i18nPlugin = {
-  files: () => ({
+  files: ({ src: src2 }) => ({
     "lib/i18n.ts": generated["lib/i18n"],
-    "middleware.ts": generated.middleware
+    [src2 ? "src/middleware.ts" : "middleware.ts"]: generated.middleware
   }),
   dependencies: [],
   instructions: () => [
@@ -894,7 +894,7 @@ async function runTree(args) {
 // package.json
 var package_default = {
   name: "@fumadocs/cli",
-  version: "0.0.2",
+  version: "0.0.4",
   description: "The CLI tool for Fumadocs",
   keywords: [
     "NextJs",
@@ -928,21 +928,21 @@ var package_default = {
     "types:check": "tsc --noEmit"
   },
   dependencies: {
-    "@clack/prompts": "^0.7.0",
+    "@clack/prompts": "^0.8.2",
     commander: "^12.1.0",
-    execa: "^9.4.1",
-    "package-manager-detector": "^0.2.2",
+    execa: "^9.5.1",
+    "package-manager-detector": "^0.2.4",
     picocolors: "^1.1.1",
     "ts-morph": "^24.0.0"
   },
   devDependencies: {
     "@types/cross-spawn": "^6.0.6",
-    "@types/node": "22.7.8",
-    "@types/react": "^18.3.11",
+    "@types/node": "22.9.3",
+    "@types/react": "^18.3.12",
     "eslint-config-custom": "workspace:*",
     "fast-glob": "^3.3.1",
     tsconfig: "workspace:*",
-    tsx: "^4.19.1"
+    tsx: "^4.19.2"
   },
   publishConfig: {
     access: "public"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fumadocs/cli",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "The CLI tool for Fumadocs",
   "keywords": [
     "NextJs",
@@ -26,19 +26,19 @@
     "dist/*"
   ],
   "dependencies": {
-    "@clack/prompts": "^0.7.0",
+    "@clack/prompts": "^0.8.2",
     "commander": "^12.1.0",
-    "execa": "^9.4.1",
-    "package-manager-detector": "^0.2.2",
+    "execa": "^9.5.1",
+    "package-manager-detector": "^0.2.4",
     "picocolors": "^1.1.1",
     "ts-morph": "^24.0.0"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
-    "@types/node": "22.7.8",
-    "@types/react": "^18.3.11",
+    "@types/node": "22.9.3",
+    "@types/react": "^18.3.12",
     "fast-glob": "^3.3.1",
-    "tsx": "^4.19.1",
+    "tsx": "^4.19.2",
     "eslint-config-custom": "0.0.0",
     "tsconfig": "0.0.0"
   },