@d10f/asciidoc-astro-loader 0.0.10 → 0.0.12

package/README.md

@@ -35,10 +35,9 @@ const blog = defineCollection({
         base: ".src/content/blog",
     }),
     schema: z.object({
-        title: z.string(),
-        preamble: z.string().optional(),
-        createdAt: z.coerce.date(),
-        updatedAt: z.coerce.date().optional(),
+        doctitle: z.string(),
+		description: z.string(),
+        revdate: z.coerce.date(),
     }),
 });
 ```
@@ -317,7 +316,12 @@ A custom converter is declared as a factory function that accepts a configuratio
 ```ts
 import type { CustomConverterFactoryFn, NodeContext } from '@d10f/asciidoc-astro-loader';
 
-export const myCustomConverter: CustomConverterFactoryFn = ({ nodeContext }) => {
+type MyConverterOpts = {
+    name?: string;
+    description?: string;
+};
+
+export const myCustomConverter: CustomConverterFactoryFn<MyConverterOpts> = ({ name, description }) => {
     return (options, highlighter) => {
         return {
 
@@ -325,7 +329,7 @@ export const myCustomConverter: CustomConverterFactoryFn = ({ nodeContext }) =>
              * The type of node that this converter will act upon. It
              * can either be hard-coded here, or passed as an option.
              */
-            nodeContext,
+            nodeContext: 'admonition',
 
             /**
              * The convert function that will produce the HTML output.
@@ -343,3 +347,44 @@ export const myCustomConverter: 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.
+
+Using a converter might make more sense if you need to keep some state as the document is being processed. With templates, each invocation is a brand-new state for each block. A converter encapsulates variables declared within it and this can be used to do things like count how many blocks of a given type there are in the whole document. A more practical example might be if you need to position (through CSS styles) an element left or right based on whether it's even or odd. This can be tricky to do with CSS alone because the `:nth-child()` selector accounts only for elements under the same parent, and not the whole document.
+
+## Example
+
+This is an example taken from my own website to showcase how to use it in a real world setting. This configuration uses a custom converter, a custom Shiki transformer and points to a folder where custom templates are found:
+
+```ts
+const blog = defineCollection({
+	loader: asciidocLoader({
+		base: 'src/content/blog',
+		document: {
+			template: './src/templates',
+			converters: [admonitionConverter()],
+		},
+		syntaxHighlighting: {
+			theme: 'catppuccin-frappe',
+			transformers: [
+				transformerNotationDiff(),
+				transformerNotationErrorLevel(),
+				transformerNotationFocus(),
+				transformerNotationHighlight(),
+				transformerPrompt({
+					langs: {
+						console: '$',
+					},
+					cssClasses: 'unselectable mr-2 opacity-50',
+				}),
+			],
+			callouts: {
+				cssClasses: 'conum unselectable',
+			},
+		},
+	}),
+	schema: z.object({
+		doctitle: z.string(),
+		description: z.string(),
+		revdate: z.coerce.date(),
+	}),
+});
+```

package/dist/{chunk-IWQC3MJM.js → chunk-AZCYI3XV.js}

@@ -5,14 +5,14 @@ import {
 // src/lib/shiki/transformers/transformAsciidocCallout.ts
 var transformAsciidocCallout = (options) => {
   return (node) => {
-    const lineComments = ["//", "#", ";;"];
+    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+)>)+)`),
+      new RegExp(`\\s*(?:${lineComments.join("|")})((?:\\s+<(\\d+)>)+)`),
       // Handles XML comments
       new RegExp(/((?:\s*<!--(\d+)-->)+)/)
     ];
@@ -61,6 +61,7 @@ var transformAsciidocCallout = (options) => {
 };
 
 // src/lib/shiki/transformers/transformerPrompt.ts
+import "test";
 var transformerPrompt = (options) => {
   return (node) => {
     const language = node.getAttribute("language");
@@ -72,9 +73,26 @@ var transformerPrompt = (options) => {
     if (customPrompt && options?.langs && typeof options.langs[language] === "object") {
       cssClasses = options.langs[language].cssClasses;
     }
+    let skipNext = false;
     return {
+      enforce: "pre",
       line(hast) {
         if (!promptToAdd) return;
+        const skipCurrent = skipNext;
+        skipNext = false;
+        const lastChild = hast.children.at(-1);
+        if (lastChild) {
+          if (lastChild.children[0].value.match(/\s+\\(?:\\)?\s*$/)) {
+            skipNext = true;
+          } else if (
+            // @ts-expect-error property "children" does exist
+            lastChild.children[0].value.match(/\s+\\n\s*$/)
+          ) {
+            skipNext = true;
+            lastChild.children[0].value = "";
+          }
+        }
+        if (skipCurrent) return;
         hast.children.unshift({
           type: "element",
           tagName: "span",

package/dist/{index-C8nJcG2h.d.cts → index-C1F2jTPD.d.cts}

@@ -1,4 +1,4 @@
-import { HighlighterCore, CodeToHastOptions, CodeOptionsMultipleThemes, ThemeRegistrationAny, StringLiteralUnion, BundledTheme, ShikiTransformer } from 'shiki';
+import { HighlighterCore, CodeToHastOptions, CodeOptionsMultipleThemes, StringLiteralUnion, BundledTheme, ShikiTransformer } from 'shiki';
 import { AbstractNode, AbstractBlock } from 'asciidoctor';
 import { z } from 'astro/zod';
 
@@ -474,7 +474,7 @@ type AsciidocLoader = {
          *
          * @default 'light-dark()'
          */
-        defaultColor: Partial<Record<string, ThemeRegistrationAny | StringLiteralUnion<string>>>;
+        defaultColor?: StringLiteralUnion<'light' | 'dark'> | 'light-dark()' | false;
         /**
          * The syntax highlighter theme to use. It can be either a
          * string that will apply for both light and dark mode by

package/dist/{index-C8nJcG2h.d.ts → index-C1F2jTPD.d.ts}

@@ -1,4 +1,4 @@
-import { HighlighterCore, CodeToHastOptions, CodeOptionsMultipleThemes, ThemeRegistrationAny, StringLiteralUnion, BundledTheme, ShikiTransformer } from 'shiki';
+import { HighlighterCore, CodeToHastOptions, CodeOptionsMultipleThemes, StringLiteralUnion, BundledTheme, ShikiTransformer } from 'shiki';
 import { AbstractNode, AbstractBlock } from 'asciidoctor';
 import { z } from 'astro/zod';
 
@@ -474,7 +474,7 @@ type AsciidocLoader = {
          *
          * @default 'light-dark()'
          */
-        defaultColor: Partial<Record<string, ThemeRegistrationAny | StringLiteralUnion<string>>>;
+        defaultColor?: StringLiteralUnion<'light' | 'dark'> | 'light-dark()' | false;
         /**
          * The syntax highlighter theme to use. It can be either a
          * string that will apply for both light and dark mode by

package/dist/index.cjs

@@ -255,6 +255,9 @@ var AsciidocDocument = class {
       partition: true
     });
   }
+  get attributes() {
+    return this.document.getAttributes();
+  }
   get title() {
     return this.documentTitle.getMain();
   }
@@ -603,14 +606,14 @@ var sourceCodeConverter = (converterOptions) => {
 // src/lib/shiki/transformers/transformAsciidocCallout.ts
 var transformAsciidocCallout = (options) => {
   return (node) => {
-    const lineComments = ["//", "#", ";;"];
+    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+)>)+)`),
+      new RegExp(`\\s*(?:${lineComments.join("|")})((?:\\s+<(\\d+)>)+)`),
       // Handles XML comments
       new RegExp(/((?:\s*<!--(\d+)-->)+)/)
     ];
@@ -757,19 +760,20 @@ function asciidocLoader(_options) {
 async function setDocument(doc, converters, templateEngine, { parseData, store }) {
   const data = await parseData({
     id: doc.slug,
-    data: {
-      title: doc.title,
-      subtitle: doc.subtitle,
-      author: doc.author,
-      authors: doc.authors,
-      version: doc.version,
-      createdAt: new Date(doc.createdAt),
-      email: doc.authors.at(0)?.getEmail(),
-      description: doc.description,
-      slug: doc.slug,
-      preamble: doc.preamble,
-      keywords: doc.keywords
-    }
+    data: doc.attributes
+    // data: {
+    // 	title: doc.title,
+    // 	subtitle: doc.subtitle,
+    // 	author: doc.author,
+    // 	authors: doc.authors,
+    // 	version: doc.version,
+    // 	createdAt: new Date(doc.createdAt),
+    // 	email: doc.authors.at(0)?.getEmail(),
+    // 	description: doc.description,
+    // 	slug: doc.slug,
+    // 	preamble: doc.preamble,
+    // 	keywords: doc.keywords,
+    // },
   });
   store.set({
     id: doc.slug,
@@ -781,6 +785,7 @@ async function setDocument(doc, converters, templateEngine, { parseData, store }
 }
 
 // src/lib/shiki/transformers/transformerPrompt.ts
+var import_node_test = require("test");
 var transformerPrompt = (options) => {
   return (node) => {
     const language = node.getAttribute("language");
@@ -792,9 +797,26 @@ var transformerPrompt = (options) => {
     if (customPrompt && options?.langs && typeof options.langs[language] === "object") {
       cssClasses = options.langs[language].cssClasses;
     }
+    let skipNext = false;
     return {
+      enforce: "pre",
       line(hast) {
         if (!promptToAdd) return;
+        const skipCurrent = skipNext;
+        skipNext = false;
+        const lastChild = hast.children.at(-1);
+        if (lastChild) {
+          if (lastChild.children[0].value.match(/\s+\\(?:\\)?\s*$/)) {
+            skipNext = true;
+          } else if (
+            // @ts-expect-error property "children" does exist
+            lastChild.children[0].value.match(/\s+\\n\s*$/)
+          ) {
+            skipNext = true;
+            lastChild.children[0].value = "";
+          }
+        }
+        if (skipCurrent) return;
         hast.children.unshift({
           type: "element",
           tagName: "span",

package/dist/index.d.cts

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

package/dist/index.js

@@ -4,7 +4,7 @@ import {
 import {
   transformAsciidocCallout,
   transformerPrompt
-} from "./chunk-IWQC3MJM.js";
+} from "./chunk-AZCYI3XV.js";
 import {
   slugify,
   splitFilenameComponents
@@ -217,6 +217,9 @@ var AsciidocDocument = class {
       partition: true
     });
   }
+  get attributes() {
+    return this.document.getAttributes();
+  }
   get title() {
     return this.documentTitle.getMain();
   }
@@ -467,19 +470,20 @@ function asciidocLoader(_options) {
 async function setDocument(doc, converters, templateEngine, { parseData, store }) {
   const data = await parseData({
     id: doc.slug,
-    data: {
-      title: doc.title,
-      subtitle: doc.subtitle,
-      author: doc.author,
-      authors: doc.authors,
-      version: doc.version,
-      createdAt: new Date(doc.createdAt),
-      email: doc.authors.at(0)?.getEmail(),
-      description: doc.description,
-      slug: doc.slug,
-      preamble: doc.preamble,
-      keywords: doc.keywords
-    }
+    data: doc.attributes
+    // data: {
+    // 	title: doc.title,
+    // 	subtitle: doc.subtitle,
+    // 	author: doc.author,
+    // 	authors: doc.authors,
+    // 	version: doc.version,
+    // 	createdAt: new Date(doc.createdAt),
+    // 	email: doc.authors.at(0)?.getEmail(),
+    // 	description: doc.description,
+    // 	slug: doc.slug,
+    // 	preamble: doc.preamble,
+    // 	keywords: doc.keywords,
+    // },
   });
   store.set({
     id: doc.slug,

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

@@ -1,5 +1,5 @@
 import { ShikiTransformer } from 'shiki';
-import { C as CustomConverterFactoryFn, S as ShikiTransformerFactoryFn } from '../../../index-C8nJcG2h.cjs';
+import { C as CustomConverterFactoryFn, S as ShikiTransformerFactoryFn } from '../../../index-C1F2jTPD.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, S as ShikiTransformerFactoryFn } from '../../../index-C8nJcG2h.js';
+import { C as CustomConverterFactoryFn, S as ShikiTransformerFactoryFn } from '../../../index-C1F2jTPD.js';
 import 'asciidoctor';
 import 'astro/zod';
 

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

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

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

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

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

@@ -34,14 +34,14 @@ function escapeRegexCharacters(str) {
 // src/lib/shiki/transformers/transformAsciidocCallout.ts
 var transformAsciidocCallout = (options) => {
   return (node) => {
-    const lineComments = ["//", "#", ";;"];
+    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+)>)+)`),
+      new RegExp(`\\s*(?:${lineComments.join("|")})((?:\\s+<(\\d+)>)+)`),
       // Handles XML comments
       new RegExp(/((?:\s*<!--(\d+)-->)+)/)
     ];
@@ -90,6 +90,7 @@ var transformAsciidocCallout = (options) => {
 };
 
 // src/lib/shiki/transformers/transformerPrompt.ts
+var import_node_test = require("test");
 var transformerPrompt = (options) => {
   return (node) => {
     const language = node.getAttribute("language");
@@ -101,9 +102,26 @@ var transformerPrompt = (options) => {
     if (customPrompt && options?.langs && typeof options.langs[language] === "object") {
       cssClasses = options.langs[language].cssClasses;
     }
+    let skipNext = false;
     return {
+      enforce: "pre",
       line(hast) {
         if (!promptToAdd) return;
+        const skipCurrent = skipNext;
+        skipNext = false;
+        const lastChild = hast.children.at(-1);
+        if (lastChild) {
+          if (lastChild.children[0].value.match(/\s+\\(?:\\)?\s*$/)) {
+            skipNext = true;
+          } else if (
+            // @ts-expect-error property "children" does exist
+            lastChild.children[0].value.match(/\s+\\n\s*$/)
+          ) {
+            skipNext = true;
+            lastChild.children[0].value = "";
+          }
+        }
+        if (skipCurrent) return;
         hast.children.unshift({
           type: "element",
           tagName: "span",

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

@@ -1,4 +1,4 @@
-import { c as ShikiTransformerFactory } from '../../../index-C8nJcG2h.cjs';
+import { c as ShikiTransformerFactory } from '../../../index-C1F2jTPD.cjs';
 import { BundledLanguage } from 'shiki/types';
 import 'shiki';
 import 'asciidoctor';

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

@@ -1,4 +1,4 @@
-import { c as ShikiTransformerFactory } from '../../../index-C8nJcG2h.js';
+import { c as ShikiTransformerFactory } from '../../../index-C1F2jTPD.js';
 import { BundledLanguage } from 'shiki/types';
 import 'shiki';
 import 'asciidoctor';

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

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

package/package.json

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