@d10f/asciidoc-astro-loader 0.0.15 → 0.0.16

package/dist/{chunk-4JCAN3ZN.js → chunk-TCLZUBH3.js}

@@ -61,43 +61,57 @@ var transformAsciidocCallout = (options) => {
 };
 
 // src/lib/shiki/transformers/transformerPrompt.ts
-var transformerPrompt = (options) => {
+var DEFAULT_OPTS = {
+  breakOn: "\\",
+  cssClasses: "",
+  hideBreak: false,
+  prompt: "",
+  promptAttribute: "custom-prompt"
+};
+var transformerPrompt = (opts) => {
   return (node) => {
-    const language = node.getAttribute("language");
-    const customPrompt = node.getAttribute(
-      options?.promptAttribute ?? "custom-prompt"
+    const config = {
+      breakOn: opts?.breakOn ?? DEFAULT_OPTS.breakOn,
+      cssClasses: opts?.cssClasses ?? DEFAULT_OPTS.cssClasses,
+      hideBreak: opts?.hideBreak ?? DEFAULT_OPTS.hideBreak,
+      prompt: opts?.prompt ?? DEFAULT_OPTS.prompt
+    };
+    if (opts && opts.langs) {
+      const lang = node.getAttribute("language");
+      const langOpts = opts.langs[lang];
+      Object.assign(
+        config,
+        typeof langOpts === "object" ? langOpts : { prompt: langOpts }
+      );
+    }
+    const promptAttr = node.getAttribute(
+      opts?.promptAttribute ?? DEFAULT_OPTS.promptAttribute
     );
-    const promptToAdd = customPrompt ?? (options?.langs && options.langs[language]);
-    let cssClasses = typeof promptToAdd === "object" ? promptToAdd.cssClasses : options?.cssClasses;
-    const breakOn = typeof promptToAdd === "object" ? promptToAdd.breakOn ?? "\\" : "\\";
+    if (promptAttr) {
+      Object.assign(config, {
+        prompt: promptAttr
+      });
+    }
     const breakOnRe = new RegExp(
-      `\\s+${escapeRegexCharacters(breakOn)}\\s*$`
+      `\\s+${escapeRegexCharacters(config.breakOn)}\\s*$`
     );
-    const hideBreak = options?.langs && options.langs[language] && typeof options.langs[language] === "object" && options.langs[language].hideBreak;
-    if (customPrompt && options?.langs && typeof options.langs[language] === "object") {
-      cssClasses = options.langs[language].cssClasses;
-    }
     let skipNext = false;
+    let skipCurrent = false;
     return {
       enforce: "pre",
       line(hast) {
-        if (!promptToAdd) return;
-        const skipCurrent = skipNext;
+        if (!config.prompt || !config.prompt.trim()) return;
+        skipCurrent = skipNext;
         skipNext = false;
         const lastChild = hast.children.at(-1);
-        const lastToken = lastChild.children[0];
-        if (lastChild && lastToken) {
+        const lastToken = lastChild?.children[0];
+        if (lastToken) {
           skipNext = breakOnRe.test(lastToken.value);
-          lastToken.value = lastToken.value.replace(breakOnRe, "");
-          if (lastChild.children[0].value.match(breakOnRe)) {
-            skipNext = true;
-            if (hideBreak) {
-              lastChild.children[0].value = // @ts-expect-error property "children" does exist
-              lastChild.children[0].value.replace(
-                breakOnRe,
-                ""
-              );
-            }
+          if (skipNext && config.hideBreak) {
+            lastToken.value = lastToken.value.replace(
+              breakOnRe,
+              ""
+            );
           }
         }
         if (skipCurrent) return;
@@ -105,12 +119,12 @@ var transformerPrompt = (options) => {
           type: "element",
           tagName: "span",
           properties: {
-            class: cssClasses
+            class: config.cssClasses
           },
           children: [
             {
               type: "text",
-              value: typeof promptToAdd === "object" ? promptToAdd.prompt : promptToAdd
+              value: config.prompt
             }
           ]
         });

package/dist/index.cjs

@@ -785,43 +785,57 @@ async function setDocument(doc, converters, templateEngine, { parseData, store }
 }
 
 // src/lib/shiki/transformers/transformerPrompt.ts
-var transformerPrompt = (options) => {
+var DEFAULT_OPTS = {
+  breakOn: "\\",
+  cssClasses: "",
+  hideBreak: false,
+  prompt: "",
+  promptAttribute: "custom-prompt"
+};
+var transformerPrompt = (opts) => {
   return (node) => {
-    const language = node.getAttribute("language");
-    const customPrompt = node.getAttribute(
-      options?.promptAttribute ?? "custom-prompt"
+    const config = {
+      breakOn: opts?.breakOn ?? DEFAULT_OPTS.breakOn,
+      cssClasses: opts?.cssClasses ?? DEFAULT_OPTS.cssClasses,
+      hideBreak: opts?.hideBreak ?? DEFAULT_OPTS.hideBreak,
+      prompt: opts?.prompt ?? DEFAULT_OPTS.prompt
+    };
+    if (opts && opts.langs) {
+      const lang = node.getAttribute("language");
+      const langOpts = opts.langs[lang];
+      Object.assign(
+        config,
+        typeof langOpts === "object" ? langOpts : { prompt: langOpts }
+      );
+    }
+    const promptAttr = node.getAttribute(
+      opts?.promptAttribute ?? DEFAULT_OPTS.promptAttribute
     );
-    const promptToAdd = customPrompt ?? (options?.langs && options.langs[language]);
-    let cssClasses = typeof promptToAdd === "object" ? promptToAdd.cssClasses : options?.cssClasses;
-    const breakOn = typeof promptToAdd === "object" ? promptToAdd.breakOn ?? "\\" : "\\";
+    if (promptAttr) {
+      Object.assign(config, {
+        prompt: promptAttr
+      });
+    }
     const breakOnRe = new RegExp(
-      `\\s+${escapeRegexCharacters(breakOn)}\\s*$`
+      `\\s+${escapeRegexCharacters(config.breakOn)}\\s*$`
     );
-    const hideBreak = options?.langs && options.langs[language] && typeof options.langs[language] === "object" && options.langs[language].hideBreak;
-    if (customPrompt && options?.langs && typeof options.langs[language] === "object") {
-      cssClasses = options.langs[language].cssClasses;
-    }
     let skipNext = false;
+    let skipCurrent = false;
     return {
       enforce: "pre",
       line(hast) {
-        if (!promptToAdd) return;
-        const skipCurrent = skipNext;
+        if (!config.prompt || !config.prompt.trim()) return;
+        skipCurrent = skipNext;
         skipNext = false;
         const lastChild = hast.children.at(-1);
-        const lastToken = lastChild.children[0];
-        if (lastChild && lastToken) {
+        const lastToken = lastChild?.children[0];
+        if (lastToken) {
           skipNext = breakOnRe.test(lastToken.value);
-          lastToken.value = lastToken.value.replace(breakOnRe, "");
-          if (lastChild.children[0].value.match(breakOnRe)) {
-            skipNext = true;
-            if (hideBreak) {
-              lastChild.children[0].value = // @ts-expect-error property "children" does exist
-              lastChild.children[0].value.replace(
-                breakOnRe,
-                ""
-              );
-            }
+          if (skipNext && config.hideBreak) {
+            lastToken.value = lastToken.value.replace(
+              breakOnRe,
+              ""
+            );
           }
         }
         if (skipCurrent) return;
@@ -829,12 +843,12 @@ var transformerPrompt = (options) => {
           type: "element",
           tagName: "span",
           properties: {
-            class: cssClasses
+            class: config.cssClasses
           },
           children: [
             {
               type: "text",
-              value: typeof promptToAdd === "object" ? promptToAdd.prompt : promptToAdd
+              value: config.prompt
             }
           ]
         });

package/dist/index.d.cts

@@ -5,7 +5,6 @@ export { transformAsciidocCallout, transformerPrompt } from './lib/shiki/transfo
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
-import 'shiki/types';
 
 declare function asciidocLoader(_options: AsciidocLoader): {
     name: string;

package/dist/index.d.ts

@@ -5,7 +5,6 @@ export { transformAsciidocCallout, transformerPrompt } from './lib/shiki/transfo
 import 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
-import 'shiki/types';
 
 declare function asciidocLoader(_options: AsciidocLoader): {
     name: string;

package/dist/index.js

@@ -4,7 +4,7 @@ import {
 import {
   transformAsciidocCallout,
   transformerPrompt
-} from "./chunk-4JCAN3ZN.js";
+} from "./chunk-TCLZUBH3.js";
 import {
   slugify,
   splitFilenameComponents

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

@@ -90,43 +90,57 @@ var transformAsciidocCallout = (options) => {
 };
 
 // src/lib/shiki/transformers/transformerPrompt.ts
-var transformerPrompt = (options) => {
+var DEFAULT_OPTS = {
+  breakOn: "\\",
+  cssClasses: "",
+  hideBreak: false,
+  prompt: "",
+  promptAttribute: "custom-prompt"
+};
+var transformerPrompt = (opts) => {
   return (node) => {
-    const language = node.getAttribute("language");
-    const customPrompt = node.getAttribute(
-      options?.promptAttribute ?? "custom-prompt"
+    const config = {
+      breakOn: opts?.breakOn ?? DEFAULT_OPTS.breakOn,
+      cssClasses: opts?.cssClasses ?? DEFAULT_OPTS.cssClasses,
+      hideBreak: opts?.hideBreak ?? DEFAULT_OPTS.hideBreak,
+      prompt: opts?.prompt ?? DEFAULT_OPTS.prompt
+    };
+    if (opts && opts.langs) {
+      const lang = node.getAttribute("language");
+      const langOpts = opts.langs[lang];
+      Object.assign(
+        config,
+        typeof langOpts === "object" ? langOpts : { prompt: langOpts }
+      );
+    }
+    const promptAttr = node.getAttribute(
+      opts?.promptAttribute ?? DEFAULT_OPTS.promptAttribute
     );
-    const promptToAdd = customPrompt ?? (options?.langs && options.langs[language]);
-    let cssClasses = typeof promptToAdd === "object" ? promptToAdd.cssClasses : options?.cssClasses;
-    const breakOn = typeof promptToAdd === "object" ? promptToAdd.breakOn ?? "\\" : "\\";
+    if (promptAttr) {
+      Object.assign(config, {
+        prompt: promptAttr
+      });
+    }
     const breakOnRe = new RegExp(
-      `\\s+${escapeRegexCharacters(breakOn)}\\s*$`
+      `\\s+${escapeRegexCharacters(config.breakOn)}\\s*$`
     );
-    const hideBreak = options?.langs && options.langs[language] && typeof options.langs[language] === "object" && options.langs[language].hideBreak;
-    if (customPrompt && options?.langs && typeof options.langs[language] === "object") {
-      cssClasses = options.langs[language].cssClasses;
-    }
     let skipNext = false;
+    let skipCurrent = false;
     return {
       enforce: "pre",
       line(hast) {
-        if (!promptToAdd) return;
-        const skipCurrent = skipNext;
+        if (!config.prompt || !config.prompt.trim()) return;
+        skipCurrent = skipNext;
         skipNext = false;
         const lastChild = hast.children.at(-1);
-        const lastToken = lastChild.children[0];
-        if (lastChild && lastToken) {
+        const lastToken = lastChild?.children[0];
+        if (lastToken) {
           skipNext = breakOnRe.test(lastToken.value);
-          lastToken.value = lastToken.value.replace(breakOnRe, "");
-          if (lastChild.children[0].value.match(breakOnRe)) {
-            skipNext = true;
-            if (hideBreak) {
-              lastChild.children[0].value = // @ts-expect-error property "children" does exist
-              lastChild.children[0].value.replace(
-                breakOnRe,
-                ""
-              );
-            }
+          if (skipNext && config.hideBreak) {
+            lastToken.value = lastToken.value.replace(
+              breakOnRe,
+              ""
+            );
           }
         }
         if (skipCurrent) return;
@@ -134,12 +148,12 @@ var transformerPrompt = (options) => {
           type: "element",
           tagName: "span",
           properties: {
-            class: cssClasses
+            class: config.cssClasses
           },
           children: [
             {
               type: "text",
-              value: typeof promptToAdd === "object" ? promptToAdd.prompt : promptToAdd
+              value: config.prompt
             }
           ]
         });

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

@@ -1,57 +1,19 @@
 import { c as ShikiTransformerFactory } from '../../../index-C1F2jTPD.cjs';
-import { BundledLanguage } from 'shiki/types';
-import 'shiki';
+import { BundledLanguage } from 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
 
-type PromptOptions = {
+type PromptOptions = Partial<{
     prompt: string;
     cssClasses: string;
-    /**
-     * The character sequence used at the end of each line to indicate a
-     * line break. This is used to break down long commands that won't fit
-     * in a single line, like shell commands. Without a line break, every
-     * newline will be prefixed with the prompt, which might not always be
-     * desirable. Defaults to a backslash.
-     *
-     * @default \
-     */
-    breakOn?: string;
-    /**
-     * This option is used to control whether the `breakOn` character
-     * sequence should be removed from the output code block. This can be
-     * useful to control multiline blocks that are intrinsically based on
-     * newline characters which aren't visible, as opposed to other type
-     * of breaks like shell console that rely on visible characters like
-     * the backslash.
-     *
-     * @default false
-     */
-    hideBreak?: boolean;
-};
-type TransformOptions = {
-    /**
-     * String of CSS classes to apply to leading prompt character(s) on
-     * source code blocks of type console.
-     */
-    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 name of the block attribute on the original document to look
-     * for and use as the prompt for this block.
-     *
-     * @default custom-prompt
-     */
-    promptAttribute?: string;
-};
-declare const transformerPrompt: ShikiTransformerFactory<TransformOptions>;
+    breakOn: string;
+    hideBreak: boolean;
+}>;
+type TransformerOptions$1 = PromptOptions & Partial<{
+    langs: Partial<Record<BundledLanguage, PromptOptions | string>>;
+    promptAttribute: string;
+}>;
+declare const transformerPrompt: ShikiTransformerFactory<TransformerOptions$1>;
 
 type TransformerOptions = Partial<{
     cssClasses?: string;

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

@@ -1,57 +1,19 @@
 import { c as ShikiTransformerFactory } from '../../../index-C1F2jTPD.js';
-import { BundledLanguage } from 'shiki/types';
-import 'shiki';
+import { BundledLanguage } from 'shiki';
 import 'asciidoctor';
 import 'astro/zod';
 
-type PromptOptions = {
+type PromptOptions = Partial<{
     prompt: string;
     cssClasses: string;
-    /**
-     * The character sequence used at the end of each line to indicate a
-     * line break. This is used to break down long commands that won't fit
-     * in a single line, like shell commands. Without a line break, every
-     * newline will be prefixed with the prompt, which might not always be
-     * desirable. Defaults to a backslash.
-     *
-     * @default \
-     */
-    breakOn?: string;
-    /**
-     * This option is used to control whether the `breakOn` character
-     * sequence should be removed from the output code block. This can be
-     * useful to control multiline blocks that are intrinsically based on
-     * newline characters which aren't visible, as opposed to other type
-     * of breaks like shell console that rely on visible characters like
-     * the backslash.
-     *
-     * @default false
-     */
-    hideBreak?: boolean;
-};
-type TransformOptions = {
-    /**
-     * String of CSS classes to apply to leading prompt character(s) on
-     * source code blocks of type console.
-     */
-    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 name of the block attribute on the original document to look
-     * for and use as the prompt for this block.
-     *
-     * @default custom-prompt
-     */
-    promptAttribute?: string;
-};
-declare const transformerPrompt: ShikiTransformerFactory<TransformOptions>;
+    breakOn: string;
+    hideBreak: boolean;
+}>;
+type TransformerOptions$1 = PromptOptions & Partial<{
+    langs: Partial<Record<BundledLanguage, PromptOptions | string>>;
+    promptAttribute: string;
+}>;
+declare const transformerPrompt: ShikiTransformerFactory<TransformerOptions$1>;
 
 type TransformerOptions = Partial<{
     cssClasses?: string;

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

@@ -1,7 +1,7 @@
 import {
   transformAsciidocCallout,
   transformerPrompt
-} from "../../../chunk-4JCAN3ZN.js";
+} from "../../../chunk-TCLZUBH3.js";
 import "../../../chunk-2UGTFP4R.js";
 export {
   transformAsciidocCallout,

package/package.json

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