@zeropress/build-core 0.6.3 → 0.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeropress/build-core",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "Shared ZeroPress build core",
   "type": "module",
   "license": "MIT",
@@ -35,9 +35,9 @@
   "dependencies": {
     "@zeropress/slug-policy": "0.1.0",
     "@zeropress/preview-data-validator": "0.6.3",
-    "@zeropress/theme-validator": "0.6.3",
+    "@zeropress/theme-validator": "0.6.5",
     "highlight.js": "11.11.1",
-    "markdown-it": "^14.1.0",
-    "markdown-it-anchor": "^9.2.0"
+    "markdown-it": "14.2.0",
+    "markdown-it-anchor": "9.2.0"
   }
 }

package/src/api/build-site.js

@@ -1019,8 +1019,12 @@ function attachCollectionCursors(posts, pages, collections) {
         return;
       }
 
+      const cursor = buildCollectionCursor(collectionId, collection, items, index);
       target.collection_cursors = target.collection_cursors || {};
-      target.collection_cursors[collectionId] = buildCollectionCursor(collectionId, collection, items, index);
+      target.collection_cursors[collectionId] = cursor;
+      if (!target.collection_cursor) {
+        target.collection_cursor = cursor;
+      }
     });
   }
 }

package/src/render/content-renderer.js

@@ -71,6 +71,7 @@ function createMarkdownRenderer(toc) {
 
   markdown.use(markdownTaskLists);
   markdown.use(markdownAlerts);
+  markdown.use(markdownTableAlignmentClasses);
   markdown.use(anchor, {
     slugify: slugify,
     callback(token, { slug, title }) {
@@ -91,6 +92,25 @@ function createMarkdownRenderer(toc) {
   return markdown;
 }
 
+function markdownTableAlignmentClasses(markdown) {
+  for (const tokenName of ['th_open', 'td_open']) {
+    markdown.renderer.rules[tokenName] = (tokens, index, options, env, self) => {
+      const token = tokens[index];
+      const styleIndex = token.attrIndex('style');
+      if (styleIndex >= 0) {
+        const styleValue = token.attrs[styleIndex][1] || '';
+        const match = /(?:^|;)\s*text-align\s*:\s*(left|center|right)\s*;?\s*$/i.exec(styleValue);
+        if (match) {
+          token.attrs.splice(styleIndex, 1);
+          addTokenClass(token, `zp-align-${match[1].toLowerCase()}`);
+        }
+      }
+
+      return self.renderToken(tokens, index, options);
+    };
+  }
+}
+
 function markdownTaskLists(markdown) {
   markdown.core.ruler.after('inline', 'zeropress_task_lists', (state) => {
     const listStack = [];

package/src/render/control-flow-renderer.js

@@ -370,10 +370,11 @@ export class ControlFlowRenderer {
     let alternate = [];
     let nextIndex = startIndex;
     let currentBranch = initialBranch;
-    const elseIfTag = `else_${tagName}`;
+    const comparisonStopTags = new Set(['else', 'if', tagName, ...COMPARISON_ELSE_IF_TAGS]);
+    const comparisonCloseTags = new Set(['if', tagName]);
 
     while (true) {
-      const branchResult = this.parseNodes(source, nextIndex, new Set(['else', elseIfTag, tagName]), partialArgScope);
+      const branchResult = this.parseNodes(source, nextIndex, comparisonStopTags, partialArgScope);
       branches.push({
         operator: currentBranch.operator,
         left: currentBranch.left,
@@ -382,8 +383,8 @@ export class ControlFlowRenderer {
       });
 
       if (branchResult.stopTag === 'else') {
-        const elseResult = this.parseNodes(source, branchResult.nextIndex, new Set([tagName]), partialArgScope);
-        if (elseResult.stopTag !== tagName) {
+        const elseResult = this.parseNodes(source, branchResult.nextIndex, comparisonCloseTags, partialArgScope);
+        if (!comparisonCloseTags.has(elseResult.stopTag)) {
           throw new Error(`Unclosed ${tagName} block after else`);
         }
         alternate = elseResult.nodes;
@@ -391,16 +392,19 @@ export class ControlFlowRenderer {
         break;
       }
 
-      if (typeof branchResult.stopTag === 'string' && branchResult.stopTag.startsWith(`#${elseIfTag} `)) {
+      const comparisonElseIfTag = typeof branchResult.stopTag === 'string'
+        ? getComparisonElseIfTag(branchResult.stopTag)
+        : '';
+      if (comparisonElseIfTag) {
         currentBranch = this.parseComparisonBranchExpression(
-          branchResult.stopTag.slice(`#${elseIfTag} `.length).trim(),
-          elseIfTag,
+          branchResult.stopTag.slice(`#${comparisonElseIfTag} `.length).trim(),
+          comparisonElseIfTag,
         );
         nextIndex = branchResult.nextIndex;
         continue;
       }
 
-      if (branchResult.stopTag === tagName) {
+      if (comparisonCloseTags.has(branchResult.stopTag)) {
         nextIndex = branchResult.nextIndex;
         break;
       }