@d10f/asciidoc-astro-loader 0.0.3 → 0.0.5

package/README.md

@@ -179,7 +179,7 @@ Just like regular Asciidoctor.js, any files located here will be used to replace
 
 ### Registering A Templating Engine
 
-By default, only Handlebars and Nunjucks are available for processing templates, but you can create your own as well to leverage whatever other template engine you like. A template engine in the context of this package a class that extends the `AbstractEngine` class.
+Templates can be written as plain functions that return an HTML string, or as templates written in a format supported by one of the registered templating engines. By default, only Handlebars and Nunjucks are supported, but you can create your own. A templating engine in the context of this package is a class that extends the `AbstractEngine` class:
 
 ```ts
 import { Php, Request } from '@platformatic/php-node';
@@ -290,16 +290,33 @@ Custom converters are refined versions of templates. The main difference is that
 
 For maximum flexibility, both custom converters and templates can be used at the same time. You can even define templates that aren't designed to be used to render nodes directly, but called directly from within your custom converters. This is why the use of interfaces when defining custom templates is important, to ensure consistency and type-safety.
 
-In general, prefer using converters for anything that requires heavy use of logic, and templates for simpler HTML output.
+In general, prefer using converters for anything that requires heavy use of logic or that reads configuration options provided by the user, and templates for simpler HTML output.
+
+Custom converters are provided as an array to the `document.converters` option.
+
+```ts
+// src/content.config.ts
+
+const blog = defineCollection({
+    loader: asciidocLoader({
+        base: ".src/content/blog",
+        document: {
+            converters: [
+                myCustomConverter({ /* ... */ })
+            ]
+        },
+    }),
+});
+```
 
 ### Registering a custom converter
 
-A custom converter is declared as a factory function that returns another function. This allows you to provide whatever configuration options you want when registering this converter in the loader configuration.
+A custom converter is declared as a factory function that accepts a configuration object, and returns an inner function that gets called automatically, receiving the options provided to the loader and the instance of the Shiki highlighter.
 
 ```ts
 import type { CustomConverterFactoryFn, NodeContext } from '@d10f/asciidoc-astro-loader';
 
-export const customConverter: CustomConverterFactoryFn = ({ nodeContext }) => {
+export const myCustomConverter: CustomConverterFactoryFn = ({ nodeContext }) => {
     return (options, highlighter) => {
         return {
 
@@ -324,3 +341,4 @@ export const customConverter: CustomConverterFactoryFn = ({ nodeContext }) => {
 }
 ```
 
+In addition, the `convert` method receives the node that is being processed, as well as an instance of the template engine registry. You can use this to render the HTML from a template as well, combining both to get the best of both worlds.

package/dist/{chunk-KZRXEKZK.js → chunk-NC6IZHLR.js}

@@ -4,7 +4,9 @@ import {
 
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
 import { resolve } from "path";
-var sourceCodeConverter = ({ transformers, template }) => {
+var sourceCodeConverter = (converterOptions) => {
+  const transformers = converterOptions?.transformers;
+  const template = converterOptions?.template;
   return (options, highlighter) => {
     return {
       nodeContext: "listing",

package/dist/{index-sFlXF8Qm.d.cts → index-R3g0cYiE.d.cts}

@@ -333,6 +333,22 @@ declare class TemplateEngineRegistry {
     private loadTemplates;
 }
 
+/**
+ * Checks if the given property K is required in object T.
+ *
+ * @credit Chris Cook
+ * @see https://zirkelc.dev/posts/typescript-how-to-check-for-optional-properties
+ */
+type IsRequired<T, K extends keyof T> = undefined extends T[K] ? object extends Pick<T, K> ? false : true : true;
+/**
+ * Checks if any of the properties in T are required.
+ *
+ * @credit Chris Cook
+ * @see https://zirkelc.dev/posts/typescript-how-to-check-for-optional-properties
+ */
+type HasRequiredKeys<T extends object> = keyof {
+    [K in keyof T as IsRequired<T, K> extends true ? K : never]: T[K];
+} extends never ? false : true;
 type CustomConverter = {
     /**
      * The node context, or node type, that this converter will act upon.
@@ -353,9 +369,9 @@ type CustomConverter = {
      */
     convert(node: AbstractNode, templateEngine?: TemplateEngineRegistry): string | null | undefined;
 };
-type CustomConverterFactoryFn<T extends object | undefined> = (converterOptions: T) => CustomConverterFn;
+type CustomConverterFactoryFn<T extends object> = HasRequiredKeys<T> extends true ? (converterOptions: T) => CustomConverterFn : (converterOptions?: T) => CustomConverterFn;
 type CustomConverterFn = (opts: RequiredOptions, highlighter: HighlighterCore) => CustomConverter;
-type ShikiTransformerFactory<T extends object> = (options?: T) => ShikiTransformerFactoryFn;
+type ShikiTransformerFactory<T extends object> = HasRequiredKeys<T> extends true ? (options: T) => ShikiTransformerFactoryFn : (options?: T) => ShikiTransformerFactoryFn;
 type ShikiTransformerFactoryFn = (node: AbstractNode) => ShikiTransformer;
 type CalloutOptions = Partial<{
     /**
@@ -526,4 +542,4 @@ interface RawTemplate {
     renderString(content: string, options?: Record<string, unknown>): string;
 }
 
-export { type AsciidocLoader as A, type CustomConverterFactoryFn as C, type FilesystemTemplate as F, type NodeContext as N, type RawTemplate as R, type ShikiTransformerFactoryFn as S, type TemplateModule as T, type AsciidocTemplate as a, type ShikiTransformerFactory as b, AbstractEngine as c };
+export { type AsciidocLoader as A, type CustomConverterFactoryFn as C, type FilesystemTemplate as F, type NodeContext as N, type RawTemplate as R, type ShikiTransformerFactory as S, type TemplateModule as T, type AsciidocTemplate as a, type ShikiTransformerFactoryFn as b, AbstractEngine as c };

package/dist/{index-sFlXF8Qm.d.ts → index-R3g0cYiE.d.ts}

@@ -333,6 +333,22 @@ declare class TemplateEngineRegistry {
     private loadTemplates;
 }
 
+/**
+ * Checks if the given property K is required in object T.
+ *
+ * @credit Chris Cook
+ * @see https://zirkelc.dev/posts/typescript-how-to-check-for-optional-properties
+ */
+type IsRequired<T, K extends keyof T> = undefined extends T[K] ? object extends Pick<T, K> ? false : true : true;
+/**
+ * Checks if any of the properties in T are required.
+ *
+ * @credit Chris Cook
+ * @see https://zirkelc.dev/posts/typescript-how-to-check-for-optional-properties
+ */
+type HasRequiredKeys<T extends object> = keyof {
+    [K in keyof T as IsRequired<T, K> extends true ? K : never]: T[K];
+} extends never ? false : true;
 type CustomConverter = {
     /**
      * The node context, or node type, that this converter will act upon.
@@ -353,9 +369,9 @@ type CustomConverter = {
      */
     convert(node: AbstractNode, templateEngine?: TemplateEngineRegistry): string | null | undefined;
 };
-type CustomConverterFactoryFn<T extends object | undefined> = (converterOptions: T) => CustomConverterFn;
+type CustomConverterFactoryFn<T extends object> = HasRequiredKeys<T> extends true ? (converterOptions: T) => CustomConverterFn : (converterOptions?: T) => CustomConverterFn;
 type CustomConverterFn = (opts: RequiredOptions, highlighter: HighlighterCore) => CustomConverter;
-type ShikiTransformerFactory<T extends object> = (options?: T) => ShikiTransformerFactoryFn;
+type ShikiTransformerFactory<T extends object> = HasRequiredKeys<T> extends true ? (options: T) => ShikiTransformerFactoryFn : (options?: T) => ShikiTransformerFactoryFn;
 type ShikiTransformerFactoryFn = (node: AbstractNode) => ShikiTransformer;
 type CalloutOptions = Partial<{
     /**
@@ -526,4 +542,4 @@ interface RawTemplate {
     renderString(content: string, options?: Record<string, unknown>): string;
 }
 
-export { type AsciidocLoader as A, type CustomConverterFactoryFn as C, type FilesystemTemplate as F, type NodeContext as N, type RawTemplate as R, type ShikiTransformerFactoryFn as S, type TemplateModule as T, type AsciidocTemplate as a, type ShikiTransformerFactory as b, AbstractEngine as c };
+export { type AsciidocLoader as A, type CustomConverterFactoryFn as C, type FilesystemTemplate as F, type NodeContext as N, type RawTemplate as R, type ShikiTransformerFactory as S, type TemplateModule as T, type AsciidocTemplate as a, type ShikiTransformerFactoryFn as b, AbstractEngine as c };

package/dist/index.cjs

@@ -260,6 +260,15 @@ var AsciidocDocument = class {
     const [preambleBlock] = documentBlock?.getBlocks();
     if (preambleBlock) return preambleBlock.getSourceLines()[0];
   }
+  get description() {
+    return this.document.getAttribute("description", "");
+  }
+  get author() {
+    return this.document.getAuthor();
+  }
+  get authors() {
+    return this.document.getAuthors();
+  }
   get version() {
     return this.document.getRevisionNumber();
   }
@@ -416,6 +425,26 @@ var NunjucksEngine = class extends AbstractEngine {
   }
 };
 
+// src/lib/asciidoc/templates/engines/TemplateStr.ts
+var TemplateStr = class extends AbstractEngine {
+  renderMap;
+  constructor(name = "templateStr", extensions = ["ts", "js"]) {
+    super(name, extensions);
+    this.renderMap = /* @__PURE__ */ new Map();
+  }
+  async load() {
+    for (const [context, path] of this.templateList.entries()) {
+      const templateFn = await import(path);
+      this.renderMap.set(context, templateFn.default);
+    }
+  }
+  renderNode(node, options) {
+    const context = node.getNodeName();
+    const renderFn = this.renderMap.get(context);
+    return renderFn ? renderFn(node, options) : "";
+  }
+};
+
 // src/schemas/index.ts
 var import_zod3 = require("astro/zod");
 
@@ -519,7 +548,9 @@ async function createHighlighter(documents, themes) {
 
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
 var import_node_path2 = require("path");
-var sourceCodeConverter = ({ transformers, template }) => {
+var sourceCodeConverter = (converterOptions) => {
+  const transformers = converterOptions?.transformers;
+  const template = converterOptions?.template;
   return (options, highlighter) => {
     return {
       nodeContext: "listing",
@@ -622,7 +653,8 @@ function asciidocLoader(_options) {
   if (options.document.templateEngines === void 0) {
     options.document.templateEngines = [
       new HandlebarsEngine(),
-      new NunjucksEngine()
+      new NunjucksEngine(),
+      new TemplateStr()
     ];
   }
   let highlighter;
@@ -713,8 +745,16 @@ async function setDocument(doc, converters, templateEngine, { parseData, store }
     id: doc.slug,
     data: {
       title: doc.title,
+      subtitle: doc.subtitle,
+      author: doc.author,
+      authors: doc.authors,
+      version: doc.version,
       createdAt: new Date(doc.createdAt),
-      description: doc.preamble
+      email: doc.authors.at(0)?.getEmail(),
+      description: doc.description,
+      slug: doc.slug,
+      preamble: doc.preamble,
+      keywords: doc.keywords
     }
   });
   store.set({

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { LoaderContext } from 'astro/loaders';
-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 { A as AsciidocLoader } from './index-R3g0cYiE.cjs';
+export { a as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-R3g0cYiE.cjs';
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { LoaderContext } from 'astro/loaders';
-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 { A as AsciidocLoader } from './index-R3g0cYiE.js';
+export { a as AsciidocTemplate, C as CustomConverterFactoryFn, F as FilesystemTemplate, N as NodeContext, R as RawTemplate } from './index-R3g0cYiE.js';
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';

package/dist/index.js

@@ -1,14 +1,15 @@
-import {
-  sourceCodeConverter
-} from "./chunk-KZRXEKZK.js";
 import {
   transformAsciidocCallout
 } from "./chunk-5P6LDJGO.js";
+import {
+  sourceCodeConverter
+} from "./chunk-NC6IZHLR.js";
 import {
   slugify,
   splitFilenameComponents
 } from "./chunk-2UGTFP4R.js";
 import {
+  AbstractEngine,
   HandlebarsEngine,
   NunjucksEngine
 } from "./chunk-2F52PMNV.js";
@@ -222,6 +223,15 @@ var AsciidocDocument = class {
     const [preambleBlock] = documentBlock?.getBlocks();
     if (preambleBlock) return preambleBlock.getSourceLines()[0];
   }
+  get description() {
+    return this.document.getAttribute("description", "");
+  }
+  get author() {
+    return this.document.getAuthor();
+  }
+  get authors() {
+    return this.document.getAuthors();
+  }
   get version() {
     return this.document.getRevisionNumber();
   }
@@ -249,6 +259,26 @@ var AsciidocDocument = class {
   }
 };
 
+// src/lib/asciidoc/templates/engines/TemplateStr.ts
+var TemplateStr = class extends AbstractEngine {
+  renderMap;
+  constructor(name = "templateStr", extensions = ["ts", "js"]) {
+    super(name, extensions);
+    this.renderMap = /* @__PURE__ */ new Map();
+  }
+  async load() {
+    for (const [context, path] of this.templateList.entries()) {
+      const templateFn = await import(path);
+      this.renderMap.set(context, templateFn.default);
+    }
+  }
+  renderNode(node, options) {
+    const context = node.getNodeName();
+    const renderFn = this.renderMap.get(context);
+    return renderFn ? renderFn(node, options) : "";
+  }
+};
+
 // src/schemas/index.ts
 import { z as z3 } from "astro/zod";
 
@@ -359,7 +389,8 @@ function asciidocLoader(_options) {
   if (options.document.templateEngines === void 0) {
     options.document.templateEngines = [
       new HandlebarsEngine(),
-      new NunjucksEngine()
+      new NunjucksEngine(),
+      new TemplateStr()
     ];
   }
   let highlighter;
@@ -450,8 +481,16 @@ async function setDocument(doc, converters, templateEngine, { parseData, store }
     id: doc.slug,
     data: {
       title: doc.title,
+      subtitle: doc.subtitle,
+      author: doc.author,
+      authors: doc.authors,
+      version: doc.version,
       createdAt: new Date(doc.createdAt),
-      description: doc.preamble
+      email: doc.authors.at(0)?.getEmail(),
+      description: doc.description,
+      slug: doc.slug,
+      preamble: doc.preamble,
+      keywords: doc.keywords
     }
   });
   store.set({

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

@@ -38,7 +38,9 @@ function splitFilenameComponents(filename) {
 }
 
 // src/lib/asciidoc/converters/sourceCodeConverter.ts
-var sourceCodeConverter = ({ transformers, template }) => {
+var sourceCodeConverter = (converterOptions) => {
+  const transformers = converterOptions?.transformers;
+  const template = converterOptions?.template;
   return (options, highlighter) => {
     return {
       nodeContext: "listing",

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

@@ -1,12 +1,12 @@
 import { ShikiTransformer } from 'shiki';
-import { C as CustomConverterFactoryFn, S as ShikiTransformerFactoryFn } from '../../../index-sFlXF8Qm.cjs';
+import { C as CustomConverterFactoryFn, b as ShikiTransformerFactoryFn } from '../../../index-R3g0cYiE.cjs';
 import 'asciidoctor';
 import 'astro/zod';
 
-type CodeBlockConverterOptions = {
+type CodeBlockConverterOptions = Partial<{
     transformers: Array<ShikiTransformer | ShikiTransformerFactoryFn>;
     template: string;
-};
-declare const sourceCodeConverter: CustomConverterFactoryFn<Partial<CodeBlockConverterOptions>>;
+}>;
+declare const sourceCodeConverter: CustomConverterFactoryFn<CodeBlockConverterOptions>;
 
 export { sourceCodeConverter };

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

@@ -1,12 +1,12 @@
 import { ShikiTransformer } from 'shiki';
-import { C as CustomConverterFactoryFn, S as ShikiTransformerFactoryFn } from '../../../index-sFlXF8Qm.js';
+import { C as CustomConverterFactoryFn, b as ShikiTransformerFactoryFn } from '../../../index-R3g0cYiE.js';
 import 'asciidoctor';
 import 'astro/zod';
 
-type CodeBlockConverterOptions = {
+type CodeBlockConverterOptions = Partial<{
     transformers: Array<ShikiTransformer | ShikiTransformerFactoryFn>;
     template: string;
-};
-declare const sourceCodeConverter: CustomConverterFactoryFn<Partial<CodeBlockConverterOptions>>;
+}>;
+declare const sourceCodeConverter: CustomConverterFactoryFn<CodeBlockConverterOptions>;
 
 export { sourceCodeConverter };

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

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

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

@@ -1,4 +1,4 @@
-import { c as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-sFlXF8Qm.cjs';
+import { c as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-R3g0cYiE.cjs';
 import { AbstractBlock } from 'asciidoctor';
 import 'shiki';
 import 'astro/zod';

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

@@ -1,4 +1,4 @@
-import { c as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-sFlXF8Qm.js';
+import { c as AbstractEngine, a as AsciidocTemplate, T as TemplateModule, F as FilesystemTemplate, R as RawTemplate } from '../../../../index-R3g0cYiE.js';
 import { AbstractBlock } from 'asciidoctor';
 import 'shiki';
 import 'astro/zod';

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

@@ -21,7 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var transformers_exports = {};
 __export(transformers_exports, {
   transformAsciidocCallout: () => transformAsciidocCallout,
-  transformConsolePrompt: () => transformConsolePrompt
+  transformerPrompt: () => transformerPrompt
 });
 module.exports = __toCommonJS(transformers_exports);
 
@@ -89,42 +89,31 @@ var transformAsciidocCallout = (options) => {
   };
 };
 
-// src/lib/shiki/transformers/transformConsolePrompt.ts
-var transformConsolePrompt = (options) => {
+// src/lib/shiki/transformers/transformerPrompt.ts
+var transformerPrompt = (options) => {
   return (node) => {
     const language = node.getAttribute("language");
-    const cssClasses = options?.cssClasses;
-    const promptChar = options?.promptChar ?? "$";
-    const unselectablePrompt = `<span $1 class="${cssClasses}">${promptChar}</span>`;
-    const linePrefix = '<span class="line[^>]+?>';
-    const splitPrompt = new RegExp(
-      `(?<=${linePrefix})(?:<span (style="[^"]*?")>\\s*?\\${promptChar}\\s+?([^<]))`
-    );
-    const trimWhitespace = new RegExp(
-      `(?<=${linePrefix})(?:<span (style="[^"]*?")>\\s*?\\${promptChar}\\s*?<\\/span>(?:<span>\\s+<\\/span>)?)`
-    );
-    const trimWhitespaceAhead = new RegExp(
-      `(?<=${linePrefix}<span [^>]+?>\\${promptChar}<\\/span>)(<span style="[^"]+?">)\\s+?`
+    const customPrompt = node.getAttribute(
+      options?.promptAttribute ?? "custom-prompt"
     );
+    const promptToAdd = customPrompt ?? (options?.langs && options.langs[language]);
+    const cssClasses = typeof promptToAdd === "object" ? promptToAdd.cssClasses : options?.cssClasses;
     return {
       line(hast) {
-        if (language !== "console") return;
-        const textNode = hast.children.at(0)?.children.at(0);
-        if (textNode && textNode.type === "text") {
-          const leadingChar = textNode.value;
-          if (!leadingChar.startsWith(promptChar)) {
-            textNode.value = promptChar + " " + textNode.value;
-          }
-        }
-      },
-      postprocess: (html) => {
-        if (language !== "console") return;
-        return html.split("\n").map((line) => {
-          return line.replace(
-            splitPrompt,
-            unselectablePrompt + "<span $1>$2"
-          ).replace(trimWhitespace, unselectablePrompt).replace(trimWhitespaceAhead, "$1");
-        }).join("\n");
+        if (!promptToAdd) return;
+        hast.children.unshift({
+          type: "element",
+          tagName: "span",
+          properties: {
+            class: cssClasses
+          },
+          children: [
+            {
+              type: "text",
+              value: typeof promptToAdd === "object" ? promptToAdd.prompt : promptToAdd
+            }
+          ]
+        });
       }
     };
   };
@@ -132,5 +121,5 @@ var transformConsolePrompt = (options) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   transformAsciidocCallout,
-  transformConsolePrompt
+  transformerPrompt
 });

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

@@ -1,4 +1,5 @@
-import { b as ShikiTransformerFactory } from '../../../index-sFlXF8Qm.cjs';
+import { S as ShikiTransformerFactory } from '../../../index-R3g0cYiE.cjs';
+import { BundledLanguage } from 'shiki/types';
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
@@ -8,43 +9,32 @@ type TransformerOptions = Partial<{
 }>;
 declare const transformAsciidocCallout: ShikiTransformerFactory<TransformerOptions>;
 
+type PromptOptions = {
+    prompt: string;
+    cssClasses: string;
+};
 type TransformOptions = {
     /**
      * String of CSS classes to apply to leading prompt character(s) on
      * source code blocks of type console.
      */
-    cssClasses: string;
+    cssClasses?: string;
+    /**
+     * An object mapping each language block to a prompt string. An object
+     * can also be provided specified with two keys, the prompt and the
+     * css classes that modify this prompt in particular. Useful when you
+     * want to style them differently from the
+     * If not provided, it will default to look at the block attribute.
+     */
+    langs?: Partial<Record<BundledLanguage, PromptOptions | string>>;
     /**
-     * The prompt character representing the actual console prompt.
+     * The name of the block attribute on the original document to look
+     * for and use as the prompt for this block.
      *
-     * @default $
+     * @default custom-prompt
      */
-    promptChar?: string;
+    promptAttribute?: string;
 };
-/**
- * For code blocks of language "console", prepends each line with a
- * prompt character(s), where applicable. By default, a "$" is used but
- * this can be controlled via the *promptChar* option.
- * Use the *cssClasses* option to style this prompt for things like
- * making it unselectable, or dimmed..
- *
- * In addition, the leading spaces before the actual command are deleted
- * from the span elements generated by Shiki to avoid accidentally
- * running commands that would not appear in the shell history.
- *
- * @example
- *   before: <span>$ npm run dev</span>
- *   after:  <span>$</span><span>npm run dev</span>
- *
- * @example
- *   before: <span> $ </span><span> </span>
- *   before: <span> $ </span>
- *   after:  <span>$</span>
- *
- * @example
- *   before: <span>$</span><span> npm run dev</span>
- *   after:  <span>$</span><span>npm run dev</span>
- */
-declare const transformConsolePrompt: ShikiTransformerFactory<TransformOptions>;
+declare const transformerPrompt: ShikiTransformerFactory<TransformOptions>;
 
-export { transformAsciidocCallout, transformConsolePrompt };
+export { transformAsciidocCallout, transformerPrompt };

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

@@ -1,4 +1,5 @@
-import { b as ShikiTransformerFactory } from '../../../index-sFlXF8Qm.js';
+import { S as ShikiTransformerFactory } from '../../../index-R3g0cYiE.js';
+import { BundledLanguage } from 'shiki/types';
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
@@ -8,43 +9,32 @@ type TransformerOptions = Partial<{
 }>;
 declare const transformAsciidocCallout: ShikiTransformerFactory<TransformerOptions>;
 
+type PromptOptions = {
+    prompt: string;
+    cssClasses: string;
+};
 type TransformOptions = {
     /**
      * String of CSS classes to apply to leading prompt character(s) on
      * source code blocks of type console.
      */
-    cssClasses: string;
+    cssClasses?: string;
+    /**
+     * An object mapping each language block to a prompt string. An object
+     * can also be provided specified with two keys, the prompt and the
+     * css classes that modify this prompt in particular. Useful when you
+     * want to style them differently from the
+     * If not provided, it will default to look at the block attribute.
+     */
+    langs?: Partial<Record<BundledLanguage, PromptOptions | string>>;
     /**
-     * The prompt character representing the actual console prompt.
+     * The name of the block attribute on the original document to look
+     * for and use as the prompt for this block.
      *
-     * @default $
+     * @default custom-prompt
      */
-    promptChar?: string;
+    promptAttribute?: string;
 };
-/**
- * For code blocks of language "console", prepends each line with a
- * prompt character(s), where applicable. By default, a "$" is used but
- * this can be controlled via the *promptChar* option.
- * Use the *cssClasses* option to style this prompt for things like
- * making it unselectable, or dimmed..
- *
- * In addition, the leading spaces before the actual command are deleted
- * from the span elements generated by Shiki to avoid accidentally
- * running commands that would not appear in the shell history.
- *
- * @example
- *   before: <span>$ npm run dev</span>
- *   after:  <span>$</span><span>npm run dev</span>
- *
- * @example
- *   before: <span> $ </span><span> </span>
- *   before: <span> $ </span>
- *   after:  <span>$</span>
- *
- * @example
- *   before: <span>$</span><span> npm run dev</span>
- *   after:  <span>$</span><span>npm run dev</span>
- */
-declare const transformConsolePrompt: ShikiTransformerFactory<TransformOptions>;
+declare const transformerPrompt: ShikiTransformerFactory<TransformOptions>;
 
-export { transformAsciidocCallout, transformConsolePrompt };
+export { transformAsciidocCallout, transformerPrompt };

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

@@ -3,47 +3,36 @@ import {
 } from "../../../chunk-5P6LDJGO.js";
 import "../../../chunk-2UGTFP4R.js";
 
-// src/lib/shiki/transformers/transformConsolePrompt.ts
-var transformConsolePrompt = (options) => {
+// src/lib/shiki/transformers/transformerPrompt.ts
+var transformerPrompt = (options) => {
   return (node) => {
     const language = node.getAttribute("language");
-    const cssClasses = options?.cssClasses;
-    const promptChar = options?.promptChar ?? "$";
-    const unselectablePrompt = `<span $1 class="${cssClasses}">${promptChar}</span>`;
-    const linePrefix = '<span class="line[^>]+?>';
-    const splitPrompt = new RegExp(
-      `(?<=${linePrefix})(?:<span (style="[^"]*?")>\\s*?\\${promptChar}\\s+?([^<]))`
-    );
-    const trimWhitespace = new RegExp(
-      `(?<=${linePrefix})(?:<span (style="[^"]*?")>\\s*?\\${promptChar}\\s*?<\\/span>(?:<span>\\s+<\\/span>)?)`
-    );
-    const trimWhitespaceAhead = new RegExp(
-      `(?<=${linePrefix}<span [^>]+?>\\${promptChar}<\\/span>)(<span style="[^"]+?">)\\s+?`
+    const customPrompt = node.getAttribute(
+      options?.promptAttribute ?? "custom-prompt"
     );
+    const promptToAdd = customPrompt ?? (options?.langs && options.langs[language]);
+    const cssClasses = typeof promptToAdd === "object" ? promptToAdd.cssClasses : options?.cssClasses;
     return {
       line(hast) {
-        if (language !== "console") return;
-        const textNode = hast.children.at(0)?.children.at(0);
-        if (textNode && textNode.type === "text") {
-          const leadingChar = textNode.value;
-          if (!leadingChar.startsWith(promptChar)) {
-            textNode.value = promptChar + " " + textNode.value;
-          }
-        }
-      },
-      postprocess: (html) => {
-        if (language !== "console") return;
-        return html.split("\n").map((line) => {
-          return line.replace(
-            splitPrompt,
-            unselectablePrompt + "<span $1>$2"
-          ).replace(trimWhitespace, unselectablePrompt).replace(trimWhitespaceAhead, "$1");
-        }).join("\n");
+        if (!promptToAdd) return;
+        hast.children.unshift({
+          type: "element",
+          tagName: "span",
+          properties: {
+            class: cssClasses
+          },
+          children: [
+            {
+              type: "text",
+              value: typeof promptToAdd === "object" ? promptToAdd.prompt : promptToAdd
+            }
+          ]
+        });
       }
     };
   };
 };
 export {
   transformAsciidocCallout,
-  transformConsolePrompt
+  transformerPrompt
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d10f/asciidoc-astro-loader",
-	"version": "0.0.3",
+	"version": "0.0.5",
 	"description": "An Astro collections loader for Asciidoc files",
 	"author": "D10f",
 	"license": "MIT",