@d10f/asciidoc-astro-loader 0.0.1 → 0.0.3

package/dist/index.js

@@ -1,10 +1,13 @@
 import {
   sourceCodeConverter
-} from "./chunk-HAZIHU2Y.js";
+} from "./chunk-KZRXEKZK.js";
+import {
+  transformAsciidocCallout
+} from "./chunk-5P6LDJGO.js";
 import {
   slugify,
   splitFilenameComponents
-} from "./chunk-DDIUST2Z.js";
+} from "./chunk-2UGTFP4R.js";
 import {
   HandlebarsEngine,
   NunjucksEngine
@@ -247,23 +250,23 @@ var AsciidocDocument = class {
 };
 
 // src/schemas/index.ts
-import { z as z3 } from "zod";
+import { z as z3 } from "astro/zod";
 
 // src/schemas/document.ts
 import { resolve } from "path";
-import { z } from "zod";
-var documentOptionsSchema = z.looseObject({
+import { z } from "astro/zod";
+var documentOptionsSchema = z.object({
   mode: z.union([z.literal("safe"), z.literal("unsafe")]).default("safe"),
-  template: z.string().default("").transform((val) => resolve(process.cwd(), val)),
+  template: z.string().default("").transform((val) => val ? resolve(process.cwd(), val) : ""),
   recursive: z.boolean().default(false)
-}).default({
+}).passthrough().default({
   mode: "safe",
   template: "",
   recursive: false
 });
 
 // src/schemas/shiki.ts
-import { z as z2 } from "zod";
+import { z as z2 } from "astro/zod";
 var shikiOptionsSchema = z2.object({
   theme: z2.union([
     z2.string(),
@@ -278,8 +281,19 @@ var shikiOptionsSchema = z2.object({
   defaultColor: z2.string().default("light-dark()"),
   cssVariablePrefix: z2.string().default("--shiki-"),
   mergeWhitespaces: z2.union([z2.boolean(), z2.literal("never")]).default(true),
-  tabindex: z2.union([z2.number(), z2.string(), z2.literal(false)]).default(false)
-}).transform(({ theme, ...rest }) => ({
+  tabindex: z2.union([z2.number(), z2.string(), z2.literal(false)]).default(false),
+  // transformers: z
+  // 	.array(
+  // 		z.object({
+  // 			name: z.string(),
+  // 			enforce: z.union([z.literal('pre'), z.literal('post')]),
+  // 		}),
+  // 	)
+  // 	.optional(),
+  callouts: z2.object({
+    cssClasses: z2.string().optional()
+  }).optional()
+}).passthrough().transform(({ theme, ...rest }) => ({
   themes: theme,
   ...rest
 })).default({
@@ -290,7 +304,9 @@ var shikiOptionsSchema = z2.object({
   theme: {
     light: "catppuccin-latte",
     dark: "catppuccin-macchiato"
-  }
+  },
+  // transformers: undefined,
+  callouts: void 0
 });
 function transformThemeProp(value) {
   return typeof value === "string" ? { light: value, dark: value } : value;
@@ -335,68 +351,117 @@ async function createHighlighter(documents, themes) {
 }
 
 // src/loader.ts
-function asciidocLoader(options) {
-  const parsedOpts = loaderOptionsSchema.parse(options);
-  if (parsedOpts.document.converters === void 0) {
-    parsedOpts.document.converters = [
-      sourceCodeConverter({ nodeContext: "listing" })
-    ];
+function asciidocLoader(_options) {
+  const options = loaderOptionsSchema.parse(_options);
+  if (options.document.converters === void 0) {
+    options.document.converters = [];
   }
-  if (parsedOpts.document.templateEngines === void 0) {
-    parsedOpts.document.templateEngines = [
+  if (options.document.templateEngines === void 0) {
+    options.document.templateEngines = [
       new HandlebarsEngine(),
       new NunjucksEngine()
     ];
   }
+  let highlighter;
+  let templateEngine;
   return {
     name: "asciidoc-loader",
-    async load({ config, parseData, store, logger }) {
+    async load(loaderContext) {
+      const { config, logger, watcher } = loaderContext;
       const root = config.root.pathname;
-      const base = parsedOpts.base.startsWith(".") ? realpathSync(options.base) : root + options.base;
+      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) => new AsciidocDocument(`${base}/${filename}`));
       if (docs.length === 0) {
         logger.warn("No documents found for this collection.");
         return;
       }
-      let templateEngine = void 0;
-      if (parsedOpts.document.template) {
+      if (options.document.template) {
         templateEngine = new TemplateEngineRegistry(
-          parsedOpts.document.templateEngines,
+          options.document.templateEngines,
           {
-            rootDir: parsedOpts.document.template,
-            recursive: parsedOpts.document.recursive
+            rootDir: options.document.template,
+            recursive: options.document.recursive
           }
         );
         await templateEngine.loadEngines();
       }
-      const highlighter = await createHighlighter(
-        docs,
-        parsedOpts.syntaxHighlighting.themes
+      if (!highlighter) {
+        highlighter = await createHighlighter(
+          docs,
+          options.syntaxHighlighting.themes
+        );
+      }
+      const converters = options.document.converters.map(
+        (converter) => converter(options, highlighter)
       );
-      const converters = parsedOpts.document.converters.map(
-        (converter) => converter(parsedOpts, highlighter)
+      const hasSourceCodeConverter = converters.find(
+        (converter) => converter.nodeContext === "listing" && converter?.nodeStyle === "source"
       );
-      docs.forEach(async (doc) => {
-        const data = await parseData({
-          id: doc.slug,
-          data: {
-            title: doc.title,
-            createdAt: new Date(doc.createdAt),
-            description: doc.preamble
-          }
-        });
-        store.set({
-          id: doc.slug,
-          data,
-          rendered: {
-            html: doc.convert(converters, templateEngine)
+      if (!hasSourceCodeConverter) {
+        converters.push(
+          sourceCodeConverter({
+            transformers: [
+              ...options.syntaxHighlighting.transformers ?? [],
+              transformAsciidocCallout(
+                options.syntaxHighlighting.callouts
+              )
+            ]
+          })(options, highlighter)
+        );
+      }
+      await Promise.all(
+        docs.map(
+          (doc) => setDocument(doc, converters, templateEngine, loaderContext)
+        )
+      );
+      if (watcher) {
+        let handle2 = function() {
+          logger.info("Shutting down highlighter instance");
+          highlighter.dispose();
+          process.exit(0);
+        };
+        var handle = handle2;
+        const watchedFileRegExp = new RegExp(
+          `^${base}.*.(a(?:scii)?doc)$`
+        );
+        watcher.on("change", async (changedPath) => {
+          if (changedPath.match(watchedFileRegExp)) {
+            const newDoc = new AsciidocDocument(changedPath);
+            await setDocument(
+              newDoc,
+              converters,
+              templateEngine,
+              loaderContext
+            );
           }
         });
-      });
-      nextTick(highlighter.dispose);
+        if (highlighter) {
+          process.on("SIGINT", handle2);
+          process.on("SIGTERM", handle2);
+        }
+      } else {
+        nextTick(highlighter.dispose);
+      }
     }
   };
 }
+async function setDocument(doc, converters, templateEngine, { parseData, store }) {
+  const data = await parseData({
+    id: doc.slug,
+    data: {
+      title: doc.title,
+      createdAt: new Date(doc.createdAt),
+      description: doc.preamble
+    }
+  });
+  store.set({
+    id: doc.slug,
+    data,
+    rendered: {
+      html: doc.convert(converters, templateEngine)
+    }
+  });
+}
 export {
   asciidocLoader
 };

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

@@ -25,14 +25,9 @@ __export(converters_exports, {
 module.exports = __toCommonJS(converters_exports);
 
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
-var import_transformers = require("@shikijs/transformers");
 var import_node_path = require("path");
 
 // src/lib/utils.ts
-function escapeRegexCharacters(str) {
-  const re = /[-\\^$*+?.()|\[\]{}]/g;
-  return str.replace(re, "\\$&");
-}
 function splitFilenameComponents(filename) {
   const match = filename.match(/^(?<path>.*\/)*(?<name>[^\.]+)\.(?<ext>.*)$/);
   return {
@@ -42,115 +37,21 @@ function splitFilenameComponents(filename) {
   };
 }
 
-// src/lib/shiki/transformers/transformAsciidocCallout.ts
-function transformAsciidocCallout({
-  node,
-  cssClasses = "pointer-events-none select-none ml-2"
-}) {
-  const lineComments = ["//", "#", ";;"];
-  const customLineComment = node.getAttribute("line-comment");
-  if (customLineComment) {
-    lineComments.push(escapeRegexCharacters(customLineComment));
-  }
-  const calloutReList = [
-    // Handles C-style and similar comments like Perl, Python...
-    new RegExp(`(?:${lineComments.join("|")})((?:\\s+<(\\d+)>)+)`),
-    // Handles XML comments
-    new RegExp(/((?:\s*<!--(\d+)-->)+)/)
-  ];
-  const linesWithCallout = {};
-  return {
-    preprocess(code) {
-      return code.split("\n").map((line, idx) => {
-        for (const re of calloutReList) {
-          const match = line.match(re);
-          if (!match) continue;
-          const callouts = match[0].trim().replaceAll(/(?:<!--|-->|[<>])/g, "").split(" ");
-          linesWithCallout[idx + 1] = callouts;
-          return line.replace(re, "");
-        }
-        return line;
-      }).join("\n");
-    },
-    line(hast, line) {
-      const callouts = linesWithCallout[line];
-      if (!callouts) return;
-      callouts.forEach((calloutId) => {
-        hast.properties[`data-callout-${calloutId}`] = "";
-        hast.children.push({
-          type: "element",
-          tagName: "i",
-          properties: {
-            class: `conum ${cssClasses}`,
-            "data-value": calloutId
-          },
-          children: [
-            {
-              type: "element",
-              tagName: "b",
-              properties: {},
-              children: [
-                {
-                  type: "text",
-                  value: calloutId
-                }
-              ]
-            }
-          ]
-        });
-      });
-    }
-  };
-}
-
-// src/lib/shiki/transformers/transformConsoleCodeBlock.ts
-function transformConsoleCodeBlock(options = {
-  cssClasses: "pointer-events-none select-none mr-2 opacity-50"
-}) {
-  const unselectablePrompt = `<span $1 class="${options.cssClasses}">$</span>`;
-  const linePrefix = '<span class="line[^>]+?>';
-  const splitPrompt = new RegExp(
-    `(?<=${linePrefix})(?:<span (style="[^"]*?")>\\s*?\\$\\s+?([^<]))`
-  );
-  const trimWhitespace = new RegExp(
-    `(?<=${linePrefix})(?:<span (style="[^"]*?")>\\s*?\\$\\s*?<\\/span>(?:<span>\\s+<\\/span>)?)`
-  );
-  const trimWhitespaceAhead = new RegExp(
-    `(?<=${linePrefix}<span [^>]+?>\\$<\\/span>)(<span style="[^"]+?">)\\s+?`
-  );
-  return {
-    postprocess: (html, { lang }) => {
-      if (lang === "console") {
-        return html.split("\n").map((line) => {
-          return line.replace(
-            splitPrompt,
-            unselectablePrompt + "<span $1>$2"
-          ).replace(trimWhitespace, unselectablePrompt).replace(trimWhitespaceAhead, "$1");
-        }).join("\n");
-      }
-    }
-  };
-}
-
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
-var sourceCodeConverter = ({ nodeContext, transformers, template }) => {
+var sourceCodeConverter = ({ transformers, template }) => {
   return (options, highlighter) => {
     return {
-      nodeContext: nodeContext ?? "listing",
+      nodeContext: "listing",
+      nodeStyle: "source",
       convert(node, templateEngine) {
         const input = node.getSourceLines().join("\n");
         const lang = node.getAttribute("language");
         const output = highlighter.codeToHtml(input, {
           ...options.syntaxHighlighting,
           lang,
-          transformers: [
-            ...transformers ?? [],
-            (0, import_transformers.transformerNotationDiff)(),
-            (0, import_transformers.transformerNotationHighlight)(),
-            (0, import_transformers.transformerNotationFocus)(),
-            transformAsciidocCallout({ node }),
-            transformConsoleCodeBlock()
-          ]
+          transformers: (transformers ?? []).map((transformer) => {
+            return typeof transformer === "function" ? transformer(node) : transformer;
+          })
         });
         if (templateEngine && template) {
           const { extension } = splitFilenameComponents(template);

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

@@ -1,11 +1,10 @@
 import { ShikiTransformer } from 'shiki';
-import { C as CustomConverterFactoryFn, N as NodeContext } from '../../../index-Cf7MF6tZ.cjs';
+import { C as CustomConverterFactoryFn, S as ShikiTransformerFactoryFn } from '../../../index-sFlXF8Qm.cjs';
 import 'asciidoctor';
-import 'zod';
+import 'astro/zod';
 
 type CodeBlockConverterOptions = {
-    nodeContext: NodeContext;
-    transformers: ShikiTransformer[];
+    transformers: Array<ShikiTransformer | ShikiTransformerFactoryFn>;
     template: string;
 };
 declare const sourceCodeConverter: CustomConverterFactoryFn<Partial<CodeBlockConverterOptions>>;

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

@@ -1,11 +1,10 @@
 import { ShikiTransformer } from 'shiki';
-import { C as CustomConverterFactoryFn, N as NodeContext } from '../../../index-Cf7MF6tZ.js';
+import { C as CustomConverterFactoryFn, S as ShikiTransformerFactoryFn } from '../../../index-sFlXF8Qm.js';
 import 'asciidoctor';
-import 'zod';
+import 'astro/zod';
 
 type CodeBlockConverterOptions = {
-    nodeContext: NodeContext;
-    transformers: ShikiTransformer[];
+    transformers: Array<ShikiTransformer | ShikiTransformerFactoryFn>;
     template: string;
 };
 declare const sourceCodeConverter: CustomConverterFactoryFn<Partial<CodeBlockConverterOptions>>;

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

@@ -1,7 +1,7 @@
 import {
   sourceCodeConverter
-} from "../../../chunk-HAZIHU2Y.js";
-import "../../../chunk-DDIUST2Z.js";
+} from "../../../chunk-KZRXEKZK.js";
+import "../../../chunk-2UGTFP4R.js";
 export {
   sourceCodeConverter
 };

package/dist/lib/asciidoc/templates/engines/index.cjs

@@ -32,8 +32,7 @@ var engines_exports = {};
 __export(engines_exports, {
   AbstractEngine: () => AbstractEngine,
   HandlebarsEngine: () => HandlebarsEngine,
-  NunjucksEngine: () => NunjucksEngine,
-  PhpEngine: () => PhpEngine
+  NunjucksEngine: () => NunjucksEngine
 });
 module.exports = __toCommonJS(engines_exports);
 
@@ -163,29 +162,9 @@ var NunjucksEngine = class extends AbstractEngine {
     return this.render(str, options);
   }
 };
-
-// src/lib/asciidoc/templates/engines/Php.ts
-var import_php_node = require("@platformatic/php-node");
-var PhpEngine = class extends AbstractEngine {
-  server;
-  constructor(name = "php", extensions = ["php"], docroot) {
-    super(name, extensions);
-    this.server = new import_php_node.Php({ docroot });
-  }
-  renderFile(filepath, options) {
-    const request = new import_php_node.Request({
-      method: "POST",
-      url: "http://localhost/" + filepath,
-      body: Buffer.from(JSON.stringify(options))
-    });
-    const response = this.server.handleRequestSync(request);
-    return response.body.toString();
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AbstractEngine,
   HandlebarsEngine,
-  NunjucksEngine,
-  PhpEngine
+  NunjucksEngine
 });

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

@@ -1,13 +1,13 @@
-import { b as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-Cf7MF6tZ.cjs';
-import { AbstractNode } from 'asciidoctor';
+import { c as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-sFlXF8Qm.cjs';
+import { AbstractBlock } from 'asciidoctor';
 import 'shiki';
-import 'zod';
+import 'astro/zod';
 
 declare class HandlebarsEngine extends AbstractEngine implements AsciidocTemplate, TemplateModule, FilesystemTemplate, RawTemplate {
     private render;
     constructor(name?: string, extensions?: string[]);
     load(): Promise<void>;
-    renderNode(node: AbstractNode, options?: Record<string, unknown>): string;
+    renderNode(node: AbstractBlock, options?: Record<string, unknown>): string;
     renderFile(filepath: string, options?: Record<string, unknown>): string;
     renderString(str: string, options?: Record<string, unknown>): string;
 }
@@ -16,15 +16,9 @@ declare class NunjucksEngine extends AbstractEngine implements AsciidocTemplate,
     private render;
     constructor(name?: string, extensions?: string[]);
     load(): Promise<void>;
-    renderNode(node: AbstractNode, options?: Record<string, unknown>): string;
+    renderNode(node: AbstractBlock, options?: Record<string, unknown>): string;
     renderFile(filepath: string, options?: Record<string, unknown>): string;
     renderString(str: string, options?: Record<string, unknown>): string;
 }
 
-declare class PhpEngine extends AbstractEngine implements FilesystemTemplate {
-    private server;
-    constructor(name: string | undefined, extensions: string[] | undefined, docroot: string);
-    renderFile(filepath: string, options?: Record<string, unknown>): string;
-}
-
-export { AbstractEngine, HandlebarsEngine, NunjucksEngine, PhpEngine };
+export { AbstractEngine, HandlebarsEngine, NunjucksEngine };

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

@@ -1,13 +1,13 @@
-import { b as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-Cf7MF6tZ.js';
-import { AbstractNode } from 'asciidoctor';
+import { c as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-sFlXF8Qm.js';
+import { AbstractBlock } from 'asciidoctor';
 import 'shiki';
-import 'zod';
+import 'astro/zod';
 
 declare class HandlebarsEngine extends AbstractEngine implements AsciidocTemplate, TemplateModule, FilesystemTemplate, RawTemplate {
     private render;
     constructor(name?: string, extensions?: string[]);
     load(): Promise<void>;
-    renderNode(node: AbstractNode, options?: Record<string, unknown>): string;
+    renderNode(node: AbstractBlock, options?: Record<string, unknown>): string;
     renderFile(filepath: string, options?: Record<string, unknown>): string;
     renderString(str: string, options?: Record<string, unknown>): string;
 }
@@ -16,15 +16,9 @@ declare class NunjucksEngine extends AbstractEngine implements AsciidocTemplate,
     private render;
     constructor(name?: string, extensions?: string[]);
     load(): Promise<void>;
-    renderNode(node: AbstractNode, options?: Record<string, unknown>): string;
+    renderNode(node: AbstractBlock, options?: Record<string, unknown>): string;
     renderFile(filepath: string, options?: Record<string, unknown>): string;
     renderString(str: string, options?: Record<string, unknown>): string;
 }
 
-declare class PhpEngine extends AbstractEngine implements FilesystemTemplate {
-    private server;
-    constructor(name: string | undefined, extensions: string[] | undefined, docroot: string);
-    renderFile(filepath: string, options?: Record<string, unknown>): string;
-}
-
-export { AbstractEngine, HandlebarsEngine, NunjucksEngine, PhpEngine };
+export { AbstractEngine, HandlebarsEngine, NunjucksEngine };

package/dist/lib/asciidoc/templates/engines/index.js

@@ -3,28 +3,8 @@ import {
   HandlebarsEngine,
   NunjucksEngine
 } from "../../../../chunk-2F52PMNV.js";
-
-// src/lib/asciidoc/templates/engines/Php.ts
-import { Php, Request } from "@platformatic/php-node";
-var PhpEngine = class extends AbstractEngine {
-  server;
-  constructor(name = "php", extensions = ["php"], docroot) {
-    super(name, extensions);
-    this.server = new Php({ docroot });
-  }
-  renderFile(filepath, options) {
-    const request = new Request({
-      method: "POST",
-      url: "http://localhost/" + filepath,
-      body: Buffer.from(JSON.stringify(options))
-    });
-    const response = this.server.handleRequestSync(request);
-    return response.body.toString();
-  }
-};
 export {
   AbstractEngine,
   HandlebarsEngine,
-  NunjucksEngine,
-  PhpEngine
+  NunjucksEngine
 };