@wdprlib/render 1.2.1 → 1.3.0

package/dist/index.cjs

@@ -44,12 +44,15 @@ var __export = (target, all) => {
 var exports_src = {};
 __export(exports_src, {
   renderToHtml: () => renderToHtml,
-  createSettings: () => import_ast3.createSettings,
-  DEFAULT_SETTINGS: () => import_ast3.DEFAULT_SETTINGS,
+  createSettings: () => import_ast4.createSettings,
+  DEFAULT_SETTINGS: () => import_ast4.DEFAULT_SETTINGS,
   DEFAULT_EMBED_ALLOWLIST: () => DEFAULT_EMBED_ALLOWLIST
 });
 module.exports = __toCommonJS(exports_src);
 
+// packages/render/src/render.ts
+var import_ast3 = require("@wdprlib/ast");
+
 // packages/render/src/context.ts
 var import_ast = require("@wdprlib/ast");
 
@@ -424,6 +427,9 @@ function sanitizeAttributes(attributes) {
 // packages/render/src/context.ts
 class RenderContext {
   chunks = [];
+  renderInlineStyles = false;
+  _styleSlotId = null;
+  _styleSlotContents = new Map;
   _tocIndex = 0;
   _footnoteIndex = 0;
   _equationIndex = 0;
@@ -479,6 +485,26 @@ class RenderContext {
   getOutput() {
     return this.chunks.join("");
   }
+  enterStyleSlot(slotId) {
+    this._styleSlotId = slotId;
+    if (!this._styleSlotContents.has(slotId)) {
+      this._styleSlotContents.set(slotId, []);
+    }
+  }
+  exitStyleSlot() {
+    this._styleSlotId = null;
+  }
+  hasActiveStyleSlot() {
+    return this._styleSlotId !== null;
+  }
+  pushToStyleSlot(css) {
+    if (this._styleSlotId !== null) {
+      this._styleSlotContents.get(this._styleSlotId).push(css);
+    }
+  }
+  getStyleSlotContents(slotId) {
+    return this._styleSlotContents.get(slotId) ?? [];
+  }
   nextTocIndex() {
     return this._tocIndex++;
   }
@@ -4616,13 +4642,20 @@ function evaluateIfTagsCondition(condition, pageTags) {
   const optional = [];
   for (const token of tokens) {
     if (token.startsWith("+")) {
-      required.push(token.slice(1).toLowerCase());
+      const tag = token.slice(1).toLowerCase();
+      if (tag)
+        required.push(tag);
     } else if (token.startsWith("-")) {
-      excluded.push(token.slice(1).toLowerCase());
+      const tag = token.slice(1).toLowerCase();
+      if (tag)
+        excluded.push(tag);
     } else {
       optional.push(token.toLowerCase());
     }
   }
+  if (required.length === 0 && excluded.length === 0 && optional.length === 0) {
+    return false;
+  }
   for (const tag of required) {
     if (!pageTagSet.has(tag))
       return false;
@@ -4641,7 +4674,17 @@ function evaluateIfTagsCondition(condition, pageTags) {
 function renderIfTags(ctx, data) {
   const pageTags = ctx.page?.tags ?? [];
   if (evaluateIfTagsCondition(data.condition, pageTags)) {
+    const prev = ctx.renderInlineStyles;
+    ctx.renderInlineStyles = true;
+    const slotId = data._styleSlot;
+    if (slotId !== undefined) {
+      ctx.enterStyleSlot(slotId);
+    }
     renderElements(ctx, data.elements);
+    if (slotId !== undefined) {
+      ctx.exitStyleSlot();
+    }
+    ctx.renderInlineStyles = prev;
   }
 }
 
@@ -5085,7 +5128,14 @@ function renderToHtml(tree, options = {}) {
   renderElements(ctx, tree.elements);
   if (ctx.settings.allowStyleElements && tree.styles?.length) {
     for (const style of tree.styles) {
-      ctx.push(`<style>${escapeStyleContent(style)}</style>`);
+      if (style.startsWith(import_ast3.STYLE_SLOT_PREFIX)) {
+        const slotId = parseInt(style.slice(import_ast3.STYLE_SLOT_PREFIX.length), 10);
+        for (const css of ctx.getStyleSlotContents(slotId)) {
+          ctx.push(`<style>${escapeStyleContent(css)}</style>`);
+        }
+      } else {
+        ctx.push(`<style>${escapeStyleContent(style)}</style>`);
+      }
     }
   }
   return ctx.getOutput();
@@ -5197,6 +5247,13 @@ function renderElement(ctx, element) {
       renderIfTags(ctx, element.data);
       break;
     case "style":
+      if (ctx.renderInlineStyles && ctx.settings.allowStyleElements) {
+        if (ctx.hasActiveStyleSlot()) {
+          ctx.pushToStyleSlot(element.data);
+        } else {
+          ctx.push(`<style>${escapeStyleContent(element.data)}</style>`);
+        }
+      }
       break;
     case "line-break":
       ctx.push("<br />");
@@ -5229,4 +5286,4 @@ function renderElement(ctx, element) {
 }
 
 // packages/render/src/index.ts
-var import_ast3 = require("@wdprlib/ast");
+var import_ast4 = require("@wdprlib/ast");

package/dist/index.js

@@ -1,3 +1,6 @@
+// packages/render/src/render.ts
+import { STYLE_SLOT_PREFIX } from "@wdprlib/ast";
+
 // packages/render/src/context.ts
 import { DEFAULT_SETTINGS } from "@wdprlib/ast";
 
@@ -372,6 +375,9 @@ function sanitizeAttributes(attributes) {
 // packages/render/src/context.ts
 class RenderContext {
   chunks = [];
+  renderInlineStyles = false;
+  _styleSlotId = null;
+  _styleSlotContents = new Map;
   _tocIndex = 0;
   _footnoteIndex = 0;
   _equationIndex = 0;
@@ -427,6 +433,26 @@ class RenderContext {
   getOutput() {
     return this.chunks.join("");
   }
+  enterStyleSlot(slotId) {
+    this._styleSlotId = slotId;
+    if (!this._styleSlotContents.has(slotId)) {
+      this._styleSlotContents.set(slotId, []);
+    }
+  }
+  exitStyleSlot() {
+    this._styleSlotId = null;
+  }
+  hasActiveStyleSlot() {
+    return this._styleSlotId !== null;
+  }
+  pushToStyleSlot(css) {
+    if (this._styleSlotId !== null) {
+      this._styleSlotContents.get(this._styleSlotId).push(css);
+    }
+  }
+  getStyleSlotContents(slotId) {
+    return this._styleSlotContents.get(slotId) ?? [];
+  }
   nextTocIndex() {
     return this._tocIndex++;
   }
@@ -4564,13 +4590,20 @@ function evaluateIfTagsCondition(condition, pageTags) {
   const optional = [];
   for (const token of tokens) {
     if (token.startsWith("+")) {
-      required.push(token.slice(1).toLowerCase());
+      const tag = token.slice(1).toLowerCase();
+      if (tag)
+        required.push(tag);
     } else if (token.startsWith("-")) {
-      excluded.push(token.slice(1).toLowerCase());
+      const tag = token.slice(1).toLowerCase();
+      if (tag)
+        excluded.push(tag);
     } else {
       optional.push(token.toLowerCase());
     }
   }
+  if (required.length === 0 && excluded.length === 0 && optional.length === 0) {
+    return false;
+  }
   for (const tag of required) {
     if (!pageTagSet.has(tag))
       return false;
@@ -4589,7 +4622,17 @@ function evaluateIfTagsCondition(condition, pageTags) {
 function renderIfTags(ctx, data) {
   const pageTags = ctx.page?.tags ?? [];
   if (evaluateIfTagsCondition(data.condition, pageTags)) {
+    const prev = ctx.renderInlineStyles;
+    ctx.renderInlineStyles = true;
+    const slotId = data._styleSlot;
+    if (slotId !== undefined) {
+      ctx.enterStyleSlot(slotId);
+    }
     renderElements(ctx, data.elements);
+    if (slotId !== undefined) {
+      ctx.exitStyleSlot();
+    }
+    ctx.renderInlineStyles = prev;
   }
 }
 
@@ -5033,7 +5076,14 @@ function renderToHtml(tree, options = {}) {
   renderElements(ctx, tree.elements);
   if (ctx.settings.allowStyleElements && tree.styles?.length) {
     for (const style of tree.styles) {
-      ctx.push(`<style>${escapeStyleContent(style)}</style>`);
+      if (style.startsWith(STYLE_SLOT_PREFIX)) {
+        const slotId = parseInt(style.slice(STYLE_SLOT_PREFIX.length), 10);
+        for (const css of ctx.getStyleSlotContents(slotId)) {
+          ctx.push(`<style>${escapeStyleContent(css)}</style>`);
+        }
+      } else {
+        ctx.push(`<style>${escapeStyleContent(style)}</style>`);
+      }
     }
   }
   return ctx.getOutput();
@@ -5145,6 +5195,13 @@ function renderElement(ctx, element) {
       renderIfTags(ctx, element.data);
       break;
     case "style":
+      if (ctx.renderInlineStyles && ctx.settings.allowStyleElements) {
+        if (ctx.hasActiveStyleSlot()) {
+          ctx.pushToStyleSlot(element.data);
+        } else {
+          ctx.push(`<style>${escapeStyleContent(element.data)}</style>`);
+        }
+      }
       break;
     case "line-break":
       ctx.push("<br />");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdprlib/render",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "HTML renderer for Wikidot markup",
   "keywords": [
     "html",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@wdprlib/ast": "1.1.0",
+    "@wdprlib/ast": "1.2.0",
     "domhandler": "^5.0.3",
     "htmlparser2": "^10.0.0",
     "sanitize-html": "^2.14.0",