@d10f/asciidoc-astro-loader 0.2.1 → 0.3.1

package/dist/{chunk-2UGTFP4R.js → chunk-37PTJDHV.js}

@@ -1,4 +1,6 @@
-// src/lib/utils.ts
+// src/utils.ts
+import { resolve } from "path";
+import { glob } from "tinyglobby";
 function slugify(text) {
   return text.trim().normalize().toLowerCase().replace(/\s+/g, "-").replace(/[^\w-]+/g, "").replace(/--+/g, "-").replace(/^-+/, "").replace(/-+$/, "");
 }
@@ -14,9 +16,19 @@ function splitFilenameComponents(filename) {
     extension: match?.groups?.ext ?? null
   };
 }
+function walk(root, pattern) {
+  const dirPath = resolve(root);
+  return glob(pattern, {
+    cwd: dirPath,
+    absolute: true,
+    expandDirectories: false,
+    followSymbolicLinks: true
+  });
+}
 
 export {
   slugify,
   escapeRegexCharacters,
-  splitFilenameComponents
+  splitFilenameComponents,
+  walk
 };

package/dist/{chunk-KPBQHX55.js → chunk-FVYBQ3D5.js}

@@ -1,6 +1,6 @@
 import {
   escapeRegexCharacters
-} from "./chunk-2UGTFP4R.js";
+} from "./chunk-37PTJDHV.js";
 
 // src/lib/shiki/transformers/transformAsciidocCallout.ts
 var transformAsciidocCallout = (options) => {

package/dist/{chunk-SUQERYPQ.js → chunk-YJTKOSBY.js}

@@ -1,6 +1,6 @@
 import {
   splitFilenameComponents
-} from "./chunk-2UGTFP4R.js";
+} from "./chunk-37PTJDHV.js";
 
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
 import { resolve } from "path";

package/dist/{index-Bbw2Lfb5.d.ts → index-CA5P6VBa.d.cts}

@@ -7,6 +7,7 @@ type DocumentOptions = RequiredOptions['document'];
 type PreambleOptions = RequiredOptions['preamble'];
 declare const loaderOptionsSchema: z.ZodObject<{
     base: z.ZodString;
+    pattern: z.ZodDefault<z.ZodString>;
     images: z.ZodOptional<z.ZodObject<{
         imageDir: z.ZodOptional<z.ZodString>;
         imageUrl: z.ZodOptional<z.ZodString>;
@@ -239,9 +240,18 @@ type CalloutOptions = Partial<{
 }>;
 type AsciidocLoader = {
     /**
-     * Path to the Asciidoc documents to parse.
+     * Path to the directory containing the AsciiDoc files to parse.
+     * It resolves relative to the root of the project.
+     *
+     * @example ./src/content/blog
+     * @example src/content/blog
      */
     base: string;
+    /**
+     * A glob pattern to match files against. Can be used to recursively
+     * descent.
+     */
+    pattern?: string;
     /**
      * Options for the Asciidoctor parser.
      */

package/dist/{index-Bbw2Lfb5.d.cts → index-CA5P6VBa.d.ts}

@@ -7,6 +7,7 @@ type DocumentOptions = RequiredOptions['document'];
 type PreambleOptions = RequiredOptions['preamble'];
 declare const loaderOptionsSchema: z.ZodObject<{
     base: z.ZodString;
+    pattern: z.ZodDefault<z.ZodString>;
     images: z.ZodOptional<z.ZodObject<{
         imageDir: z.ZodOptional<z.ZodString>;
         imageUrl: z.ZodOptional<z.ZodString>;
@@ -239,9 +240,18 @@ type CalloutOptions = Partial<{
 }>;
 type AsciidocLoader = {
     /**
-     * Path to the Asciidoc documents to parse.
+     * Path to the directory containing the AsciiDoc files to parse.
+     * It resolves relative to the root of the project.
+     *
+     * @example ./src/content/blog
+     * @example src/content/blog
      */
     base: string;
+    /**
+     * A glob pattern to match files against. Can be used to recursively
+     * descent.
+     */
+    pattern?: string;
     /**
      * Options for the Asciidoctor parser.
      */

package/dist/index.cjs

@@ -37,13 +37,15 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/loader.ts
-var import_node_fs4 = require("fs");
+var import_node_path4 = require("path");
 var import_node_process = require("process");
 
 // src/lib/asciidoc/AsciidocDocument.ts
 var import_asciidoctor = __toESM(require("asciidoctor"), 1);
 
-// src/lib/utils.ts
+// src/utils.ts
+var import_node_path = require("path");
+var import_tinyglobby = require("tinyglobby");
 function slugify(text) {
   return text.trim().normalize().toLowerCase().replace(/\s+/g, "-").replace(/[^\w-]+/g, "").replace(/--+/g, "-").replace(/^-+/, "").replace(/-+$/, "");
 }
@@ -59,6 +61,15 @@ function splitFilenameComponents(filename) {
     extension: match?.groups?.ext ?? null
   };
 }
+function walk(root, pattern) {
+  const dirPath = (0, import_node_path.resolve)(root);
+  return (0, import_tinyglobby.glob)(pattern, {
+    cwd: dirPath,
+    absolute: true,
+    expandDirectories: false,
+    followSymbolicLinks: true
+  });
+}
 
 // src/lib/asciidoc/BaseConverter.ts
 var BaseConverter = class {
@@ -471,11 +482,11 @@ var TemplateStr = class extends AbstractEngine {
 var import_zod3 = require("astro/zod");
 
 // src/schemas/document.ts
-var import_node_path = require("path");
+var import_node_path2 = require("path");
 var import_zod = require("astro/zod");
 var documentOptionsSchema = import_zod.z.object({
   mode: import_zod.z.union([import_zod.z.literal("safe"), import_zod.z.literal("unsafe")]).default("safe"),
-  template: import_zod.z.string().default("").transform((val) => val ? (0, import_node_path.resolve)(process.cwd(), val) : ""),
+  template: import_zod.z.string().default("").transform((val) => val ? (0, import_node_path2.resolve)(process.cwd(), val) : ""),
   recursive: import_zod.z.boolean().default(false)
 }).passthrough().default({
   mode: "safe",
@@ -546,6 +557,7 @@ var imagesOptionsSchema = import_zod3.z.object({
 }).optional();
 var loaderOptionsSchema = import_zod3.z.object({
   base: import_zod3.z.string(),
+  pattern: import_zod3.z.string().default("**/*.{adoc,asciidoc}"),
   images: imagesOptionsSchema,
   document: documentOptionsSchema,
   syntaxHighlighting: shikiOptionsSchema,
@@ -563,10 +575,16 @@ async function createHighlighter(documents, themes) {
   }, /* @__PURE__ */ new Set());
   const highlighter = await (0, import_shiki2.createHighlighterCore)({
     themes: Object.values(themes).map((theme) => {
-      return import(`@shikijs/themes/${theme}`);
+      return import(
+        /* @vite-ignore */
+        `@shikijs/themes/${theme}`
+      );
     }),
     langs: Array.from(langs).map((lang) => {
-      return import(`@shikijs/langs/${lang}`);
+      return import(
+        /* @vite-ignore */
+        `@shikijs/langs/${lang}`
+      );
     }),
     engine: (0, import_shiki2.createJavaScriptRegexEngine)()
   });
@@ -574,7 +592,7 @@ async function createHighlighter(documents, themes) {
 }
 
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
-var import_node_path2 = require("path");
+var import_node_path3 = require("path");
 var sourceCodeConverter = (converterOptions) => {
   const transformers = converterOptions?.transformers;
   const template = converterOptions?.template;
@@ -598,7 +616,7 @@ var sourceCodeConverter = (converterOptions) => {
           );
           const engine = extension ? templateEngine.getEngineByExtension(extension ?? "") : templateEngine.getEngineByContext(this.nodeContext);
           if (template) {
-            const templateFile = (0, import_node_path2.resolve)(process.cwd(), template);
+            const templateFile = (0, import_node_path3.resolve)(process.cwd(), template);
             engine?.addContext(this.nodeContext, templateFile);
           }
           if (engine) {
@@ -691,10 +709,19 @@ function asciidocLoader(_options) {
     name: "asciidoc-loader",
     async load(loaderContext) {
       const { config, logger, watcher } = loaderContext;
-      const root = config.root.pathname;
-      const base = options.base.startsWith(".") ? (0, import_node_fs4.realpathSync)(options.base) : root + options.base;
-      const docs = (0, import_node_fs4.readdirSync)(base, "utf8").filter((file) => file.match(/(?:\.a(?:scii)?doc)$/)).map((filename) => {
-        const doc = new AsciidocDocument(`${base}/${filename}`);
+      if (options.base.includes("../")) {
+        throw new Error(
+          "Base path cannot traverse outwards of project directory."
+        );
+      }
+      if (options.base.startsWith("/") && !options.base.includes(config.root.pathname)) {
+        throw new Error(
+          "Base path must be contained within project directory."
+        );
+      }
+      const root = (0, import_node_path4.resolve)(config.root.pathname, options.base);
+      const docs = (await walk(root, options.pattern)).map((file) => {
+        const doc = new AsciidocDocument(file);
         if (options.images?.imageUrl) {
           doc.setAttribute("imagesdir", options.images.imageUrl);
         }
@@ -751,7 +778,7 @@ function asciidocLoader(_options) {
         };
         var handle = handle2;
         const watchedFileRegExp = new RegExp(
-          `^${base}.*.(a(?:scii)?doc)$`
+          `^${root}.*.(a(?:scii)?doc)$`
         );
         watcher.on("change", async (changedPath) => {
           if (changedPath.match(watchedFileRegExp)) {

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { LoaderContext } from 'astro/loaders';
-import { a as AsciidocLoader } from './index-Bbw2Lfb5.cjs';
-export { b as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-Bbw2Lfb5.cjs';
+import { a as AsciidocLoader } from './index-CA5P6VBa.cjs';
+export { b as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-CA5P6VBa.cjs';
 export { transformAsciidocCallout, transformerPrompt } from './lib/shiki/transformers/index.cjs';
 import 'shiki';
 import 'asciidoctor';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { LoaderContext } from 'astro/loaders';
-import { a as AsciidocLoader } from './index-Bbw2Lfb5.js';
-export { b as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-Bbw2Lfb5.js';
+import { a as AsciidocLoader } from './index-CA5P6VBa.js';
+export { b as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-CA5P6VBa.js';
 export { transformAsciidocCallout, transformerPrompt } from './lib/shiki/transformers/index.js';
 import 'shiki';
 import 'asciidoctor';

package/dist/index.js

@@ -1,22 +1,23 @@
-import {
-  transformAsciidocCallout,
-  transformerPrompt
-} from "./chunk-KPBQHX55.js";
 import {
   sourceCodeConverter
-} from "./chunk-SUQERYPQ.js";
-import {
-  slugify,
-  splitFilenameComponents
-} from "./chunk-2UGTFP4R.js";
+} from "./chunk-YJTKOSBY.js";
 import {
   HandlebarsEngine,
   NunjucksEngine,
   TemplateStr
 } from "./chunk-S7W7VGV4.js";
+import {
+  transformAsciidocCallout,
+  transformerPrompt
+} from "./chunk-FVYBQ3D5.js";
+import {
+  slugify,
+  splitFilenameComponents,
+  walk
+} from "./chunk-37PTJDHV.js";
 
 // src/loader.ts
-import { readdirSync as readdirSync2, realpathSync } from "fs";
+import { resolve as resolve2 } from "path";
 import { nextTick } from "process";
 
 // src/lib/asciidoc/AsciidocDocument.ts
@@ -353,6 +354,7 @@ var imagesOptionsSchema = z3.object({
 }).optional();
 var loaderOptionsSchema = z3.object({
   base: z3.string(),
+  pattern: z3.string().default("**/*.{adoc,asciidoc}"),
   images: imagesOptionsSchema,
   document: documentOptionsSchema,
   syntaxHighlighting: shikiOptionsSchema,
@@ -370,10 +372,16 @@ async function createHighlighter(documents, themes) {
   }, /* @__PURE__ */ new Set());
   const highlighter = await createHighlighterCore({
     themes: Object.values(themes).map((theme) => {
-      return import(`@shikijs/themes/${theme}`);
+      return import(
+        /* @vite-ignore */
+        `@shikijs/themes/${theme}`
+      );
     }),
     langs: Array.from(langs).map((lang) => {
-      return import(`@shikijs/langs/${lang}`);
+      return import(
+        /* @vite-ignore */
+        `@shikijs/langs/${lang}`
+      );
     }),
     engine: createJavaScriptRegexEngine()
   });
@@ -399,10 +407,19 @@ function asciidocLoader(_options) {
     name: "asciidoc-loader",
     async load(loaderContext) {
       const { config, logger, watcher } = loaderContext;
-      const root = config.root.pathname;
-      const base = options.base.startsWith(".") ? realpathSync(options.base) : root + options.base;
-      const docs = readdirSync2(base, "utf8").filter((file) => file.match(/(?:\.a(?:scii)?doc)$/)).map((filename) => {
-        const doc = new AsciidocDocument(`${base}/${filename}`);
+      if (options.base.includes("../")) {
+        throw new Error(
+          "Base path cannot traverse outwards of project directory."
+        );
+      }
+      if (options.base.startsWith("/") && !options.base.includes(config.root.pathname)) {
+        throw new Error(
+          "Base path must be contained within project directory."
+        );
+      }
+      const root = resolve2(config.root.pathname, options.base);
+      const docs = (await walk(root, options.pattern)).map((file) => {
+        const doc = new AsciidocDocument(file);
         if (options.images?.imageUrl) {
           doc.setAttribute("imagesdir", options.images.imageUrl);
         }
@@ -459,7 +476,7 @@ function asciidocLoader(_options) {
         };
         var handle = handle2;
         const watchedFileRegExp = new RegExp(
-          `^${base}.*.(a(?:scii)?doc)$`
+          `^${root}.*.(a(?:scii)?doc)$`
         );
         watcher.on("change", async (changedPath) => {
           if (changedPath.match(watchedFileRegExp)) {

package/dist/lib/asciidoc/converters/index.cjs

@@ -25,9 +25,11 @@ __export(converters_exports, {
 module.exports = __toCommonJS(converters_exports);
 
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
-var import_node_path = require("path");
+var import_node_path2 = require("path");
 
-// src/lib/utils.ts
+// src/utils.ts
+var import_node_path = require("path");
+var import_tinyglobby = require("tinyglobby");
 function splitFilenameComponents(filename) {
   const match = filename.match(/^(?<path>.*\/)*(?<name>[^\.]+)\.(?<ext>.*)$/);
   return {
@@ -61,7 +63,7 @@ var sourceCodeConverter = (converterOptions) => {
           );
           const engine = extension ? templateEngine.getEngineByExtension(extension ?? "") : templateEngine.getEngineByContext(this.nodeContext);
           if (template) {
-            const templateFile = (0, import_node_path.resolve)(process.cwd(), template);
+            const templateFile = (0, import_node_path2.resolve)(process.cwd(), template);
             engine?.addContext(this.nodeContext, templateFile);
           }
           if (engine) {

package/dist/lib/asciidoc/converters/index.d.cts

@@ -1,5 +1,5 @@
 import { ShikiTransformer } from 'shiki';
-import { C as CustomConverterFactoryFn, c as ShikiTransformerFactoryFn } from '../../../index-Bbw2Lfb5.cjs';
+import { C as CustomConverterFactoryFn, c as ShikiTransformerFactoryFn } from '../../../index-CA5P6VBa.cjs';
 import 'asciidoctor';
 import 'astro/zod';
 

package/dist/lib/asciidoc/converters/index.d.ts

@@ -1,5 +1,5 @@
 import { ShikiTransformer } from 'shiki';
-import { C as CustomConverterFactoryFn, c as ShikiTransformerFactoryFn } from '../../../index-Bbw2Lfb5.js';
+import { C as CustomConverterFactoryFn, c as ShikiTransformerFactoryFn } from '../../../index-CA5P6VBa.js';
 import 'asciidoctor';
 import 'astro/zod';
 

package/dist/lib/asciidoc/converters/index.js

@@ -1,7 +1,7 @@
 import {
   sourceCodeConverter
-} from "../../../chunk-SUQERYPQ.js";
-import "../../../chunk-2UGTFP4R.js";
+} from "../../../chunk-YJTKOSBY.js";
+import "../../../chunk-37PTJDHV.js";
 export {
   sourceCodeConverter
 };

package/dist/lib/asciidoc/templates/engines/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AbstractEngine, b as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-Bbw2Lfb5.cjs';
+import { A as AbstractEngine, b as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-CA5P6VBa.cjs';
 import { AbstractBlock } from 'asciidoctor';
 import 'shiki';
 import 'astro/zod';

package/dist/lib/asciidoc/templates/engines/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AbstractEngine, b as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-Bbw2Lfb5.js';
+import { A as AbstractEngine, b as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-CA5P6VBa.js';
 import { AbstractBlock } from 'asciidoctor';
 import 'shiki';
 import 'astro/zod';

package/dist/lib/shiki/transformers/index.cjs

@@ -25,7 +25,9 @@ __export(transformers_exports, {
 });
 module.exports = __toCommonJS(transformers_exports);
 
-// src/lib/utils.ts
+// src/utils.ts
+var import_node_path = require("path");
+var import_tinyglobby = require("tinyglobby");
 function escapeRegexCharacters(str) {
   const re = /[-\\^$*+?.()|\[\]{}]/g;
   return str.replace(re, "\\$&");

package/dist/lib/shiki/transformers/index.d.cts

@@ -1,4 +1,4 @@
-import { S as ShikiTransformerFactory } from '../../../index-Bbw2Lfb5.cjs';
+import { S as ShikiTransformerFactory } from '../../../index-CA5P6VBa.cjs';
 import { BundledLanguage } from 'shiki';
 import 'asciidoctor';
 import 'astro/zod';

package/dist/lib/shiki/transformers/index.d.ts

@@ -1,4 +1,4 @@
-import { S as ShikiTransformerFactory } from '../../../index-Bbw2Lfb5.js';
+import { S as ShikiTransformerFactory } from '../../../index-CA5P6VBa.js';
 import { BundledLanguage } from 'shiki';
 import 'asciidoctor';
 import 'astro/zod';

package/dist/lib/shiki/transformers/index.js

@@ -1,8 +1,8 @@
 import {
   transformAsciidocCallout,
   transformerPrompt
-} from "../../../chunk-KPBQHX55.js";
-import "../../../chunk-2UGTFP4R.js";
+} from "../../../chunk-FVYBQ3D5.js";
+import "../../../chunk-37PTJDHV.js";
 export {
   transformAsciidocCallout,
   transformerPrompt

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d10f/asciidoc-astro-loader",
-	"version": "0.2.1",
+	"version": "0.3.1",
 	"description": "An Astro collections loader for Asciidoc files",
 	"author": "D10f",
 	"license": "MIT",
@@ -52,7 +52,8 @@
 	"dependencies": {
 		"@shikijs/transformers": "^4.5.0",
 		"asciidoctor": "^3.0.4",
-		"shiki": "^4.5.0"
+		"shiki": "^4.5.0",
+		"tinyglobby": "^0.2.17"
 	},
 	"peerDependencies": {
 		"astro": "^6.3.1"