starlight-cannoli-plugins 1.0.4 → 1.0.5

package/dist/{chunk-DMZXDINW.js → chunk-HRUZQZ5L.js}

@@ -1,32 +1,18 @@
 // src/plugins/rehype-validate-links.ts
 import { existsSync } from "fs";
 import { sync as globSync } from "glob";
-import { dirname as dirname2, join, relative, resolve as resolve2 } from "path";
+import { dirname, join, relative, resolve } from "path";
 import { visit } from "unist-util-visit";
 
 // src/plugins/utils/path-utils.ts
-import { dirname, resolve } from "path";
 import { minimatch } from "minimatch";
 var PROJECT_DOCS_DIR = "src/content/docs";
-function isExternalPath(path) {
-  return path.startsWith("http") || path.startsWith("data:") || path.startsWith("/");
-}
 function matchesSkipPattern(path, patterns) {
   if (!patterns || patterns.length === 0) {
     return false;
   }
   return patterns.some((pattern) => minimatch(path, pattern));
 }
-function normalizePath(path, fromFilePath, siteRootPath) {
-  if (isExternalPath(path)) {
-    return null;
-  }
-  const fileDir = dirname(fromFilePath);
-  const resolvedPath = resolve(fileDir, path);
-  const siteRoot = resolve(siteRootPath);
-  const relativePath = resolve(resolvedPath).slice(siteRoot.length).replace(/\\/g, "/").replace(/^\/+/, "");
-  return "/" + relativePath;
-}
 
 // src/plugins/rehype-validate-links.ts
 function getResolvedLink(href, currentFilePath) {
@@ -56,10 +42,10 @@ function getResolvedLink(href, currentFilePath) {
     relativePath = withoutFragment.slice(1);
     projectAbsolute = join(PROJECT_DOCS_DIR, relativePath);
   } else {
-    const currentFileDir = dirname2(currentFilePath);
-    const resolvedAbsPath = resolve2(currentFileDir, withoutFragment);
+    const currentFileDir = dirname(currentFilePath);
+    const resolvedAbsPath = resolve(currentFileDir, withoutFragment);
     projectAbsolute = resolvedAbsPath;
-    const docsRootAbsolute = resolve2(PROJECT_DOCS_DIR);
+    const docsRootAbsolute = resolve(PROJECT_DOCS_DIR);
     relativePath = relative(docsRootAbsolute, resolvedAbsPath);
   }
   const hasExtension = /\.[a-z0-9]+$/i.test(projectAbsolute);
@@ -130,7 +116,6 @@ function rehypeValidateLinks(options) {
 var rehype_validate_links_default = rehypeValidateLinks;
 
 export {
-  normalizePath,
   rehypeValidateLinks,
   rehype_validate_links_default
 };

package/dist/index.d.ts

@@ -8,6 +8,9 @@ import 'vfile';
 /**
  * Astro integration that normalizes img src and anchor href attributes to absolute paths in HTML files after build.
  * This processes resources in Starlight docs that aren't handled by the rehype plugin.
+ *
+ * Handles the case where Astro converts markdown files into index.html files in subdirectories,
+ * which changes the relative path structure.
  */
 declare function astroNormalizePaths(): AstroIntegration;
 

package/dist/index.js

@@ -2,13 +2,13 @@ import {
   starlightIndexOnlySidebar
 } from "./chunk-NTIYGHZG.js";
 import {
-  normalizePath,
   rehypeValidateLinks
-} from "./chunk-DMZXDINW.js";
+} from "./chunk-HRUZQZ5L.js";
 
 // src/plugins/astro-normalize-paths.ts
-import { readFileSync, writeFileSync } from "fs";
+import { readFileSync, writeFileSync, existsSync } from "fs";
 import { sync as globSync } from "glob";
+import { dirname, resolve } from "path";
 function astroNormalizePaths() {
   return {
     name: "astro-normalize-paths",
@@ -23,8 +23,12 @@ function astroNormalizePaths() {
           while ((match = imgRegex.exec(content)) !== null) {
             const attrs = match[1];
             const src = match[2];
-            const normalized = normalizePath(src, htmlFile, dir.pathname);
+            const normalized = normalizeAssetPath(src, htmlFile, dir.pathname);
             if (normalized && src !== normalized) {
+              console.log(`[astro-normalize-paths] Img path resolution:`);
+              console.log(`  Original: ${src}`);
+              console.log(`  HTML file: ${htmlFile}`);
+              console.log(`  Normalized: ${normalized}`);
               const oldTag = `<img${attrs}src="${src}"`;
               const newTag = `<img${attrs}src="${normalized}"`;
               content = content.replace(oldTag, newTag);
@@ -34,7 +38,7 @@ function astroNormalizePaths() {
           while ((match = anchorRegex.exec(content)) !== null) {
             const attrs = match[1];
             const href = match[2];
-            const normalized = normalizePath(href, htmlFile, dir.pathname);
+            const normalized = normalizeAssetPath(href, htmlFile, dir.pathname);
             if (normalized && href !== normalized) {
               const oldTag = `<a${attrs}href="${href}"`;
               const newTag = `<a${attrs}href="${normalized}"`;
@@ -49,6 +53,24 @@ function astroNormalizePaths() {
     }
   };
 }
+function normalizeAssetPath(path, htmlFile, siteRootPath) {
+  if (path.startsWith("http") || path.startsWith("data:") || path.startsWith("/")) {
+    return null;
+  }
+  const htmlDir = dirname(htmlFile);
+  const resolvedPath = resolve(htmlDir, path);
+  const siteRoot = resolve(siteRootPath);
+  let absolutePath = resolvedPath.slice(siteRoot.length).replace(/\\/g, "/");
+  if (!existsSync(resolvedPath)) {
+    const parentDir = dirname(htmlDir);
+    const alternativePath = resolve(parentDir, path);
+    if (existsSync(alternativePath)) {
+      absolutePath = alternativePath.slice(siteRoot.length).replace(/\\/g, "/");
+    }
+  }
+  const finalPath = "/" + absolutePath.replace(/^\/+/, "");
+  return finalPath;
+}
 export {
   astroNormalizePaths,
   rehypeValidateLinks,

package/dist/plugins/rehype-validate-links.js

@@ -1,7 +1,7 @@
 import {
   rehypeValidateLinks,
   rehype_validate_links_default
-} from "../chunk-DMZXDINW.js";
+} from "../chunk-HRUZQZ5L.js";
 export {
   rehype_validate_links_default as default,
   rehypeValidateLinks

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "starlight-cannoli-plugins",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Starlight plugins for automatic sidebar generation and link validation",
   "license": "ISC",
   "main": "./dist/index.js",