@anydigital/eleventy-bricks 0.28.0-alpha.2 → 0.28.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anydigital/eleventy-bricks",
-  "version": "0.28.0-alpha.2",
+  "version": "0.28.0-alpha.4",
   "description": "A collection of helpful utilities and filters for Eleventy (11ty)",
   "type": "module",
   "main": "./src/index.js",
@@ -11,8 +11,7 @@
     }
   },
   "scripts": {
-    "test": "node --test src/**/*.test.js",
-    "prepublishOnly": "npm run test"
+    "test": "node --test src/**/*.test.js"
   },
   "keywords": [
     "11ty",

package/src/do/package.json

@@ -9,7 +9,7 @@
     "11ty": "cd ../ && NODE_OPTIONS='--preserve-symlinks' eleventy",
     "11ty:clean": "rm -r ../_site",
     "11ty:debug": "DEBUG=* npm run 11ty --",
-    "tw": "tailwindcss -i ../src/_theme/styles.css -o ../_site/styles.css",
+    "tw": "tailwindcss -i ../_includes/styles.css -o ../_site/styles.css",
     "tw:debug": "DEBUG=* npm run tw --"
   }
 }

package/src/eleventy.config.js

@@ -1,5 +1,3 @@
-/* CLI */
-import minimist from "minimist";
 /* Plugins */
 import { RenderPlugin } from "@11ty/eleventy";
 import eleventyBricksPlugin from "@anydigital/eleventy-bricks";
@@ -46,9 +44,13 @@ import yaml from "js-yaml";
  * @returns {Object} The Eleventy configuration object
  */
 export default function (eleventyConfig) {
-  /* CLI support */
-  const argv = minimist(process.argv.slice(2));
-  const inputDir = argv.input || ".";
+  const inputDir = eleventyConfig.directories.input;
+
+  /* Jekyll parity */
+  eleventyConfig.addPassthroughCopy("assets");
+  eleventyConfig.addGlobalData("layout", "default");
+  eleventyConfig.setLiquidOptions({ dynamicPartials: false }); // allows unquoted Jekyll-style includes
+  eleventyConfig.addFilter("relative_url", (content) => content);
 
   /* Plugins */
   eleventyConfig.addPlugin(RenderPlugin);
@@ -58,7 +60,18 @@ export default function (eleventyConfig) {
     mdAutoRawTags: true,
     autoLinkFavicons: true,
     siteData: true,
-    filters: ["attr_set", "attr_includes", "merge", "remove_tag", "if", "attr_concat", "fetch", "section", "strip_tag"],
+    filters: [
+      "attr_set",
+      "attr_includes",
+      "merge",
+      "remove_tag",
+      "if",
+      "attr_concat",
+      "fetch",
+      "section",
+      "strip_tag",
+      "unindent",
+    ],
   });
   if (pluginTOC) {
     eleventyConfig.addPlugin(pluginTOC, {
@@ -68,9 +81,6 @@ export default function (eleventyConfig) {
   }
 
   /* Libraries */
-  eleventyConfig.setLiquidOptions({
-    dynamicPartials: false, // This allows unquoted includes like Jekyll
-  });
   let md = markdownIt({
     html: true,
     linkify: true,
@@ -86,14 +96,13 @@ export default function (eleventyConfig) {
   eleventyConfig.addFilter("markdownify", (content) => md.render(String(content ?? "")));
 
   /* Data */
-  eleventyConfig.addGlobalData("layout", "default"); // Jekyll parity
   eleventyConfig.addDataExtension("yml", (contents) => yaml.load(contents));
 
   /* Build */
   eleventyConfig.addPassthroughCopy(
     {
-      "src/_public": ".",
-      ...(inputDir !== "src" && { [`${inputDir}/_public`]: "." }),
+      _public: ".",
+      ...(inputDir !== "." && { [`${inputDir}/_public`]: "." }),
     },
     { expand: true }, // This follows/resolves symbolic links
   );
@@ -101,12 +110,4 @@ export default function (eleventyConfig) {
   /* Dev tools */
   // Follow symlinks in Chokidar used by 11ty to watch files
   eleventyConfig.setChokidarConfig({ followSymlinks: true });
-
-  /* Config */
-  return {
-    dir: {
-      input: inputDir,
-      // includes: "_theme",
-    },
-  };
 }

package/src/filters/fetch.js

@@ -18,7 +18,7 @@ export function fetchFilter(eleventyConfig) {
     }
 
     // Get the input directory from Eleventy config
-    const inputDir = eleventyConfig.dir?.input || ".";
+    const inputDir = this.eleventy.directories.input;
 
     // Check if it's a URL or local path
     const isUrl = url.startsWith("http://") || url.startsWith("https://");

package/src/filters/unindent.js

@@ -0,0 +1,29 @@
+/**
+ * Remove the minimal common indentation from a multi-line string
+ *
+ * Finds the smallest leading-whitespace count across all non-empty lines
+ * and strips that many characters from the beginning of every line.
+ *
+ * @param {string} content - The input string
+ * @returns {string} The unindented string
+ */
+export function unindent(content) {
+  const lines = String(content ?? "").split("\n");
+  const minIndent = Math.min(...lines.filter((l) => l.trim()).map((l) => l.match(/^(\s*)/)[1].length));
+  return lines.map((l) => l.slice(minIndent)).join("\n");
+}
+
+/**
+ * unindent filter - Remove minimal common indentation
+ *
+ * Strips the smallest leading-whitespace indent shared by all non-empty
+ * lines, useful for dedenting captured or indented template blocks.
+ *
+ * Usage in templates:
+ *   {{ content | unindent }}
+ *
+ * @param {Object} eleventyConfig - The Eleventy configuration object
+ */
+export function unindentFilter(eleventyConfig) {
+  eleventyConfig.addFilter("unindent", unindent);
+}

package/src/filters/unindent.test.js

@@ -0,0 +1,49 @@
+import { test } from "node:test";
+import assert from "node:assert";
+import { unindent } from "./unindent.js";
+
+test("unindent - removes common leading spaces", () => {
+  const input = "    hello\n    world";
+  assert.strictEqual(unindent(input), "hello\nworld");
+});
+
+test("unindent - removes common leading tabs", () => {
+  const input = "\tfoo\n\tbar";
+  assert.strictEqual(unindent(input), "foo\nbar");
+});
+
+test("unindent - preserves relative indentation", () => {
+  const input = "    if true\n      inner\n    end";
+  assert.strictEqual(unindent(input), "if true\n  inner\nend");
+});
+
+test("unindent - ignores blank lines when computing min indent", () => {
+  const input = "    line1\n\n    line2";
+  assert.strictEqual(unindent(input), "line1\n\nline2");
+});
+
+test("unindent - does nothing when already at zero indent", () => {
+  const input = "hello\nworld";
+  assert.strictEqual(unindent(input), "hello\nworld");
+});
+
+test("unindent - handles single line", () => {
+  assert.strictEqual(unindent("  hello"), "hello");
+});
+
+test("unindent - handles null input", () => {
+  assert.strictEqual(unindent(null), "");
+});
+
+test("unindent - handles undefined input", () => {
+  assert.strictEqual(unindent(undefined), "");
+});
+
+test("unindent - handles empty string", () => {
+  assert.strictEqual(unindent(""), "");
+});
+
+test("unindent - mixed indent levels, strips only the minimum", () => {
+  const input = "  a\n    b\n  c";
+  assert.strictEqual(unindent(input), "a\n  b\nc");
+});

package/src/index.js

@@ -15,6 +15,7 @@ import { stripTagFilter, stripTag } from "./filters/strip_tag.js";
 import { ifFilter, iff } from "./filters/if.js";
 import { attrConcatFilter, attrConcat } from "./filters/attr_concat.js";
 import { sectionFilter, section as sectionFn } from "./filters/section.js";
+import { unindentFilter, unindent } from "./filters/unindent.js";
 import { siteData } from "./siteData.js";
 
 // Conditionally import fetchFilter only if @11ty/eleventy-fetch is available
@@ -58,6 +59,7 @@ export default function eleventyBricksPlugin(eleventyConfig, options = {}) {
     if: ifFilter,
     attr_concat: attrConcatFilter,
     section: sectionFilter,
+    unindent: unindentFilter,
     ...(fetchFilter && { fetch: fetchFilter }),
   };
 
@@ -92,6 +94,7 @@ export {
   ifFilter,
   attrConcatFilter,
   sectionFilter,
+  unindentFilter,
   fetchFilter,
   siteData,
 };
@@ -112,4 +115,5 @@ export {
   attrConcat,
   attrSet,
   sectionFn as section,
+  unindent,
 };

package/src/processors/autoLinkFavicons.js

@@ -36,21 +36,12 @@ export function cleanLinkText(linkText, domain) {
 export function buildFaviconLink(attrs, domain, text) {
   let updatedAttrs = attrs;
 
-  // Check if attrs already contains a class attribute
-  if (/class\s*=\s*["']/.test(attrs)) {
-    // Append whitespace-nowrap to existing class
-    updatedAttrs = attrs.replace(/class\s*=\s*["']([^"']*)["']/i, 'class="$1 whitespace-nowrap"');
-  } else {
-    // Add new class attribute
-    updatedAttrs = attrs + ' class="whitespace-nowrap"';
-  }
-
   // Check if attrs already contains a target attribute
   if (!/target\s*=/.test(attrs)) {
     updatedAttrs = updatedAttrs + ' target="_blank"';
   }
 
-  return `<a ${updatedAttrs}><i><img src="https://www.google.com/s2/favicons?domain=${domain}&sz=32"></i><span>${text}</span></a>`;
+  return `<a ${updatedAttrs}><i><img src="https://www.google.com/s2/favicons?domain=${domain}&sz=64"></i><span>${text}</span></a>`;
 }
 
 /**

package/src/processors/autoLinkFavicons.test.js

@@ -90,7 +90,7 @@ describe("buildFaviconLink", () => {
     const result = buildFaviconLink('href="https://example.com/docs"', "example.com", "/docs");
     assert.equal(
       result,
-      '<a href="https://example.com/docs" class="whitespace-nowrap" target="_blank"><i><img src="https://www.google.com/s2/favicons?domain=example.com&sz=32"></i><span>/docs</span></a>',
+      '<a href="https://example.com/docs" class="whitespace-nowrap" target="_blank"><i><img src="https://www.google.com/s2/favicons?domain=example.com&sz=64"></i><span>/docs</span></a>',
     );
   });
 
@@ -98,13 +98,13 @@ describe("buildFaviconLink", () => {
     const result = buildFaviconLink('href="https://example.com" class="link"', "example.com", "text");
     assert.equal(
       result,
-      '<a href="https://example.com" class="link whitespace-nowrap" target="_blank"><i><img src="https://www.google.com/s2/favicons?domain=example.com&sz=32"></i><span>text</span></a>',
+      '<a href="https://example.com" class="link whitespace-nowrap" target="_blank"><i><img src="https://www.google.com/s2/favicons?domain=example.com&sz=64"></i><span>text</span></a>',
     );
   });
 
-  it("should use sz=32 parameter for favicon size", () => {
+  it("should use sz=64 parameter for favicon size", () => {
     const result = buildFaviconLink('href="https://example.com"', "example.com", "text");
-    assert.match(result, /sz=32/);
+    assert.match(result, /sz=64/);
   });
 
   it("should wrap img in <i> tag", () => {
@@ -116,7 +116,7 @@ describe("buildFaviconLink", () => {
     const result = buildFaviconLink('href="https://github.com/repo"', "github.com", "/repo");
     assert.equal(
       result,
-      '<a href="https://github.com/repo" class="whitespace-nowrap" target="_blank"><i><img src="https://www.google.com/s2/favicons?domain=github.com&sz=32"></i><span>/repo</span></a>',
+      '<a href="https://github.com/repo" class="whitespace-nowrap" target="_blank"><i><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64"></i><span>/repo</span></a>',
     );
   });
 
@@ -136,7 +136,7 @@ describe("transformLink", () => {
     );
     assert.match(
       result,
-      /<i><img src="https:\/\/www\.google\.com\/s2\/favicons\?domain=example\.com&sz=32"><\/i><span>\/docs<\/span>/,
+      /<i><img src="https:\/\/www\.google\.com\/s2\/favicons\?domain=example\.com&sz=64"><\/i><span>\/docs<\/span>/,
     );
   });
 
@@ -395,7 +395,7 @@ describe("replaceLinksInHtml", () => {
     const html = '<a href="https://example.com/docs">https://example.com/docs</a>';
     const result = replaceLinksInHtml(html, transformLink);
     // transformLink should add favicon for plain URL links
-    assert.match(result, /<img src="https:\/\/www\.google\.com\/s2\/favicons\?domain=example\.com&sz=32">/);
+    assert.match(result, /<img src="https:\/\/www\.google\.com\/s2\/favicons\?domain=example\.com&sz=64">/);
     assert.match(result, /<span>\/docs<\/span><\/a>/);
   });