eleventy-plugin-asciidoc 4.0.3 → 5.0.0-alpha.1

package/lib/eleventy-asciidoc.js

@@ -7,14 +7,19 @@ const fs = require("fs");
 const matter = require("gray-matter");
 const path = require("path");
 const nunjucks = require("nunjucks");
-const { parseDocumentAttributes } = require("./utils.js");
+const { parseDocumentAttributes, pickByKeyPrefix } = require("./utils.js");
 
 // @ts-ignore
 const processor = asciidoctor();
 
-/** @typedef {import('@asciidoctor/core').ProcessorOptions} ProcessorOptions */
 /** @typedef {import('gray-matter').GrayMatterFile}  GrayMatterFile */
 
+/**
+ * @typedef {Object} ExtraProcessorOptions
+ * @property {string=} eleventyAttributesPrefix
+ * @typedef {import('@asciidoctor/core').ProcessorOptions & ExtraProcessorOptions} EleventyAsciidocOptions
+ */
+
 /**
  * Reads a file synchronously.
  *
@@ -30,26 +35,46 @@ const readFileSync = (inputPath) => {
  */
 
 /**
- * Creates getData function with options initialised.
+ * Creates generateGetDataFromInputPath function with options initialised.
  *
- * @param      {ProcessorOptions}  converterOptions  The converter options
+ * @param      {EleventyAsciidocOptions}  converterOptions  The converter options
  * @return     {GetDataFn}
  */
-const generateGetData = (converterOptions) => (inputPath) => {
-  const { data, content } = readFileSync(inputPath);
+
+const generateGetDataFromInputPath = (converterOptions) => (inputPath) => {
+  const { content } = readFileSync(inputPath);
+  const { eleventyAttributesPrefix = "eleventy-" } = converterOptions;
+
   const doc = processor.load(content, {
     ...converterOptions,
     base_dir: getBaseDir(inputPath, converterOptions.base_dir),
   });
-  const attributes = doc.getAttributes();
+
   const title = doc.getDocumentTitle();
+  const attributes = doc.getAttributes();
+  const eleventyAttributes = pickByKeyPrefix(
+    attributes,
+    eleventyAttributesPrefix,
+  );
+
   debug(`Document title ${title}`);
   debug(`Document attributes: ${JSON.stringify(attributes)}`);
+  debug(`Document Eleventy attributes: ${JSON.stringify(eleventyAttributes)}`);
 
-  return {
+  let data = {
     title,
     asciidocAttributes: attributes,
-    ...data,
+    ...eleventyAttributes,
+  };
+
+  // Removes undefined or null values
+  // that may override Eleventy page data.
+  data = Object.entries(data)
+    .filter((v) => Boolean(v[1]))
+    .reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {});
+
+  return {
+    data,
   };
 };
 
@@ -67,7 +92,7 @@ function getBaseDir(inputPath, base_dir) {
 /**
  * Generates Eleventy template renderer for AsciiDoctor
  *
- * @param      {ProcessorOptions=}  convertOptions Options for Asciidoctor.converter()
+ * @param      {EleventyAsciidocOptions=}  convertOptions Options for Asciidoctor.converter()
  * @return     {Object}             Eleventy data processor object
  */
 function eleventyAsciidoctor(convertOptions = {}) {
@@ -139,12 +164,12 @@ function eleventyAsciidoctor(convertOptions = {}) {
     return contents;
   };
 
-  const getData = generateGetData(options);
+  const getInstanceFromInputPath = generateGetDataFromInputPath(options);
 
   return {
-    read: false,
-    getData,
     compile,
+    getData: ["data"],
+    getInstanceFromInputPath,
     compileOptions: {
       permalink,
     },

package/lib/utils.js

@@ -20,6 +20,49 @@ function parseDocumentAttributes(attrs) {
   return attrs;
 }
 
+/**
+ * Return a copy of the object, filtered to only have values for the allowed keys (or array of valid keys). Alternatively accepts a predicate indicating which keys to pick.
+ *
+ * @param      {object}  obj  The object
+ * @param      {(key: string, value: any, obj: object ) => boolean | Array<string>}  keys    The keys
+ * @return     {object}  Copy of the object with filtered values
+ */
+function pick(obj, keys = (k) => Boolean(k)) {
+  if (Array.isArray(keys)) {
+    return pick(obj, (key) => keys.includes(key));
+  }
+
+  return Object.keys(obj).reduce((acc, k) => {
+    if (keys(k, obj[k], obj)) {
+      return {
+        [k]: obj[k],
+        ...acc,
+      };
+    }
+
+    return acc;
+  }, {});
+}
+
+/**
+ * Picks keys with matching prefix and removes prefix from keys
+ *
+ * @param      {object}  obj  The objec
+ * @param      {string}  prefix  The key prefix
+ * @return     {object}  Copy of the object with filtered values
+ */
+function pickByKeyPrefix(obj, prefix) {
+  const filteredObj = pick(obj, (k) => k.startsWith(prefix));
+  return Object.entries(filteredObj).reduce((acc, [k, v]) => {
+    return {
+      [k.slice(prefix.length)]: v,
+      ...acc,
+    };
+  }, {});
+}
+
 module.exports = {
   parseDocumentAttributes,
+  pickByKeyPrefix,
+  pick,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eleventy-plugin-asciidoc",
-  "version": "4.0.3",
+  "version": "5.0.0-alpha.1",
   "description": "Adds support for AsciiDoc to Eleventy",
   "main": ".eleventy.js",
   "funding": "https://github.com/sponsors/saneef/",