@d10f/asciidoc-astro-loader 0.0.2 → 0.0.3

package/dist/index.cjs

@@ -287,233 +287,6 @@ var AsciidocDocument = class {
   }
 };
 
-// src/schemas/index.ts
-var import_zod3 = require("astro/zod");
-
-// src/schemas/document.ts
-var import_node_path = 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) : ""),
-  recursive: import_zod.z.boolean().default(false)
-}).passthrough().default({
-  mode: "safe",
-  template: "",
-  recursive: false
-});
-
-// src/schemas/shiki.ts
-var import_zod2 = require("astro/zod");
-var shikiOptionsSchema = import_zod2.z.object({
-  theme: import_zod2.z.union([
-    import_zod2.z.string(),
-    import_zod2.z.object({
-      light: import_zod2.z.string(),
-      dark: import_zod2.z.string()
-    }).catchall(import_zod2.z.string())
-  ]).transform(transformThemeProp).default({
-    light: "catppuccin-latte",
-    dark: "catppuccin-macchiato"
-  }),
-  defaultColor: import_zod2.z.string().default("light-dark()"),
-  cssVariablePrefix: import_zod2.z.string().default("--shiki-"),
-  mergeWhitespaces: import_zod2.z.union([import_zod2.z.boolean(), import_zod2.z.literal("never")]).default(true),
-  tabindex: import_zod2.z.union([import_zod2.z.number(), import_zod2.z.string(), import_zod2.z.literal(false)]).default(false),
-  transformers: import_zod2.z.array(
-    import_zod2.z.object({
-      name: import_zod2.z.string(),
-      enforce: import_zod2.z.union([import_zod2.z.literal("pre"), import_zod2.z.literal("post")])
-    })
-  ).optional()
-}).transform(({ theme, ...rest }) => ({
-  themes: theme,
-  ...rest
-})).default({
-  mergeWhitespaces: true,
-  cssVariablePrefix: "--shiki-",
-  defaultColor: "light-dark()",
-  tabindex: false,
-  theme: {
-    light: "catppuccin-latte",
-    dark: "catppuccin-macchiato"
-  },
-  transformers: void 0
-});
-function transformThemeProp(value) {
-  return typeof value === "string" ? { light: value, dark: value } : value;
-}
-
-// src/schemas/index.ts
-var preambleOptionsSchema = import_zod3.z.object({
-  tableOfContents: import_zod3.z.boolean().default(true),
-  maxLevel: import_zod3.z.number().max(6).min(1).default(3),
-  position: import_zod3.z.union([import_zod3.z.literal("before"), import_zod3.z.literal("after")]).default("after")
-}).default({
-  tableOfContents: true,
-  maxLevel: 3,
-  position: "after"
-});
-var loaderOptionsSchema = import_zod3.z.object({
-  base: import_zod3.z.string(),
-  document: documentOptionsSchema,
-  syntaxHighlighting: shikiOptionsSchema,
-  preamble: preambleOptionsSchema
-});
-
-// src/lib/shiki/Highlighter.ts
-var import_shiki2 = require("shiki");
-async function createHighlighter(documents, themes) {
-  const langs = documents.reduce((acc, cur) => {
-    cur.languages.forEach((lang) => {
-      acc.add(lang);
-    });
-    return acc;
-  }, /* @__PURE__ */ new Set());
-  const highlighter = await (0, import_shiki2.createHighlighterCore)({
-    themes: Object.values(themes).map((theme) => {
-      return import(`@shikijs/themes/${theme}`);
-    }),
-    langs: Array.from(langs).map((lang) => {
-      return import(`@shikijs/langs/${lang}`);
-    }),
-    engine: (0, import_shiki2.createJavaScriptRegexEngine)()
-  });
-  return Object.freeze(highlighter);
-}
-
-// src/lib/asciidoc/converters/sourceCodeConverter.ts
-var import_node_path2 = require("path");
-
-// 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 = ({ transformers, template }) => {
-  return (options, highlighter) => {
-    return {
-      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 ?? [],
-            transformAsciidocCallout({ node }),
-            transformConsoleCodeBlock()
-          ]
-        });
-        if (templateEngine && template) {
-          const { extension } = splitFilenameComponents(template);
-          const engine = templateEngine.getEngineByExtension(
-            extension || ""
-          );
-          if (engine) {
-            const templateFile = (0, import_node_path2.resolve)(process.cwd(), template);
-            if (engine.canRenderFile) {
-              return engine.renderFile(templateFile, {
-                content: output,
-                lang
-              });
-            }
-          }
-        }
-        return output;
-      }
-    };
-  };
-};
-
 // src/lib/asciidoc/templates/engines/Handlebars.ts
 var import_node_fs2 = require("fs");
 
@@ -643,14 +416,211 @@ var NunjucksEngine = class extends AbstractEngine {
   }
 };
 
+// src/schemas/index.ts
+var import_zod3 = require("astro/zod");
+
+// src/schemas/document.ts
+var import_node_path = 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) : ""),
+  recursive: import_zod.z.boolean().default(false)
+}).passthrough().default({
+  mode: "safe",
+  template: "",
+  recursive: false
+});
+
+// src/schemas/shiki.ts
+var import_zod2 = require("astro/zod");
+var shikiOptionsSchema = import_zod2.z.object({
+  theme: import_zod2.z.union([
+    import_zod2.z.string(),
+    import_zod2.z.object({
+      light: import_zod2.z.string(),
+      dark: import_zod2.z.string()
+    }).catchall(import_zod2.z.string())
+  ]).transform(transformThemeProp).default({
+    light: "catppuccin-latte",
+    dark: "catppuccin-macchiato"
+  }),
+  defaultColor: import_zod2.z.string().default("light-dark()"),
+  cssVariablePrefix: import_zod2.z.string().default("--shiki-"),
+  mergeWhitespaces: import_zod2.z.union([import_zod2.z.boolean(), import_zod2.z.literal("never")]).default(true),
+  tabindex: import_zod2.z.union([import_zod2.z.number(), import_zod2.z.string(), import_zod2.z.literal(false)]).default(false),
+  // transformers: z
+  // 	.array(
+  // 		z.object({
+  // 			name: z.string(),
+  // 			enforce: z.union([z.literal('pre'), z.literal('post')]),
+  // 		}),
+  // 	)
+  // 	.optional(),
+  callouts: import_zod2.z.object({
+    cssClasses: import_zod2.z.string().optional()
+  }).optional()
+}).passthrough().transform(({ theme, ...rest }) => ({
+  themes: theme,
+  ...rest
+})).default({
+  mergeWhitespaces: true,
+  cssVariablePrefix: "--shiki-",
+  defaultColor: "light-dark()",
+  tabindex: false,
+  theme: {
+    light: "catppuccin-latte",
+    dark: "catppuccin-macchiato"
+  },
+  // transformers: undefined,
+  callouts: void 0
+});
+function transformThemeProp(value) {
+  return typeof value === "string" ? { light: value, dark: value } : value;
+}
+
+// src/schemas/index.ts
+var preambleOptionsSchema = import_zod3.z.object({
+  tableOfContents: import_zod3.z.boolean().default(true),
+  maxLevel: import_zod3.z.number().max(6).min(1).default(3),
+  position: import_zod3.z.union([import_zod3.z.literal("before"), import_zod3.z.literal("after")]).default("after")
+}).default({
+  tableOfContents: true,
+  maxLevel: 3,
+  position: "after"
+});
+var loaderOptionsSchema = import_zod3.z.object({
+  base: import_zod3.z.string(),
+  document: documentOptionsSchema,
+  syntaxHighlighting: shikiOptionsSchema,
+  preamble: preambleOptionsSchema
+});
+
+// src/lib/shiki/Highlighter.ts
+var import_shiki2 = require("shiki");
+async function createHighlighter(documents, themes) {
+  const langs = documents.reduce((acc, cur) => {
+    cur.languages.forEach((lang) => {
+      acc.add(lang);
+    });
+    return acc;
+  }, /* @__PURE__ */ new Set());
+  const highlighter = await (0, import_shiki2.createHighlighterCore)({
+    themes: Object.values(themes).map((theme) => {
+      return import(`@shikijs/themes/${theme}`);
+    }),
+    langs: Array.from(langs).map((lang) => {
+      return import(`@shikijs/langs/${lang}`);
+    }),
+    engine: (0, import_shiki2.createJavaScriptRegexEngine)()
+  });
+  return Object.freeze(highlighter);
+}
+
+// src/lib/asciidoc/converters/sourceCodeConverter.ts
+var import_node_path2 = require("path");
+var sourceCodeConverter = ({ transformers, template }) => {
+  return (options, highlighter) => {
+    return {
+      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 ?? []).map((transformer) => {
+            return typeof transformer === "function" ? transformer(node) : transformer;
+          })
+        });
+        if (templateEngine && template) {
+          const { extension } = splitFilenameComponents(template);
+          const engine = templateEngine.getEngineByExtension(
+            extension || ""
+          );
+          if (engine) {
+            const templateFile = (0, import_node_path2.resolve)(process.cwd(), template);
+            if (engine.canRenderFile) {
+              return engine.renderFile(templateFile, {
+                content: output,
+                lang
+              });
+            }
+          }
+        }
+        return output;
+      }
+    };
+  };
+};
+
+// src/lib/shiki/transformers/transformAsciidocCallout.ts
+var transformAsciidocCallout = (options) => {
+  return (node) => {
+    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(`\\s+(?:${lineComments.join("|")})((?:\\s+<(\\d+)>)+)`),
+      // Handles XML comments
+      new RegExp(/((?:\s*<!--(\d+)-->)+)/)
+    ];
+    const commentTokensRe = new RegExp(
+      `(?:${lineComments.join("|")}|<!--|-->|[<>])`,
+      "g"
+    );
+    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].replaceAll(commentTokensRe, "").trim().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: "span",
+            properties: {
+              class: options?.cssClasses ?? "conum",
+              style: options?.cssClasses ? "" : "user-select:none; pointer-events:none; opacity:0.5; margin-inline:8px;",
+              "data-value": calloutId
+            },
+            children: [
+              {
+                type: "text",
+                value: calloutId
+              }
+            ]
+          });
+        });
+      }
+    };
+  };
+};
+
 // src/loader.ts
-function asciidocLoader(options) {
-  const parsedOpts = loaderOptionsSchema.parse(options);
-  if (parsedOpts.document.converters === void 0) {
-    parsedOpts.document.converters = [];
+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()
     ];
@@ -662,18 +632,18 @@ function asciidocLoader(options) {
     async load(loaderContext) {
       const { config, logger, watcher } = loaderContext;
       const root = config.root.pathname;
-      const base = parsedOpts.base.startsWith(".") ? (0, import_node_fs4.realpathSync)(options.base) : root + options.base;
+      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) => new AsciidocDocument(`${base}/${filename}`));
       if (docs.length === 0) {
         logger.warn("No documents found for this collection.");
         return;
       }
-      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();
@@ -681,11 +651,11 @@ function asciidocLoader(options) {
       if (!highlighter) {
         highlighter = await createHighlighter(
           docs,
-          parsedOpts.syntaxHighlighting.themes
+          options.syntaxHighlighting.themes
         );
       }
-      const converters = parsedOpts.document.converters.map(
-        (converter) => converter(parsedOpts, highlighter)
+      const converters = options.document.converters.map(
+        (converter) => converter(options, highlighter)
       );
       const hasSourceCodeConverter = converters.find(
         (converter) => converter.nodeContext === "listing" && converter?.nodeStyle === "source"
@@ -693,18 +663,18 @@ function asciidocLoader(options) {
       if (!hasSourceCodeConverter) {
         converters.push(
           sourceCodeConverter({
-            transformers: parsedOpts.syntaxHighlighting.transformers
-          })(parsedOpts, highlighter)
+            transformers: [
+              ...options.syntaxHighlighting.transformers ?? [],
+              transformAsciidocCallout(
+                options.syntaxHighlighting.callouts
+              )
+            ]
+          })(options, highlighter)
         );
       }
       await Promise.all(
         docs.map(
-          (doc) => syncDocument(
-            doc,
-            converters,
-            templateEngine,
-            loaderContext
-          )
+          (doc) => setDocument(doc, converters, templateEngine, loaderContext)
         )
       );
       if (watcher) {
@@ -717,11 +687,10 @@ function asciidocLoader(options) {
         const watchedFileRegExp = new RegExp(
           `^${base}.*.(a(?:scii)?doc)$`
         );
-        console.log(this.name);
         watcher.on("change", async (changedPath) => {
           if (changedPath.match(watchedFileRegExp)) {
             const newDoc = new AsciidocDocument(changedPath);
-            await syncDocument(
+            await setDocument(
               newDoc,
               converters,
               templateEngine,
@@ -729,15 +698,17 @@ function asciidocLoader(options) {
             );
           }
         });
-        process.on("SIGINT", handle2);
-        process.on("SIGTERM", handle2);
+        if (highlighter) {
+          process.on("SIGINT", handle2);
+          process.on("SIGTERM", handle2);
+        }
       } else {
         (0, import_node_process.nextTick)(highlighter.dispose);
       }
     }
   };
 }
-async function syncDocument(doc, converters, templateEngine, { parseData, store }) {
+async function setDocument(doc, converters, templateEngine, { parseData, store }) {
   const data = await parseData({
     id: doc.slug,
     data: {

package/dist/index.d.cts

@@ -1,11 +1,11 @@
 import { LoaderContext } from 'astro/loaders';
-import { A as AsciidocLoader } from './index-BNxO58s3.cjs';
-export { a as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-BNxO58s3.cjs';
+import { A as AsciidocLoader } from './index-sFlXF8Qm.cjs';
+export { a as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-sFlXF8Qm.cjs';
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
 
-declare function asciidocLoader(options: AsciidocLoader): {
+declare function asciidocLoader(_options: AsciidocLoader): {
     name: string;
     load(loaderContext: LoaderContext): Promise<void>;
 };

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 import { LoaderContext } from 'astro/loaders';
-import { A as AsciidocLoader } from './index-BNxO58s3.js';
-export { a as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-BNxO58s3.js';
+import { A as AsciidocLoader } from './index-sFlXF8Qm.js';
+export { a as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-sFlXF8Qm.js';
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
 
-declare function asciidocLoader(options: AsciidocLoader): {
+declare function asciidocLoader(_options: AsciidocLoader): {
     name: string;
     load(loaderContext: LoaderContext): Promise<void>;
 };