jekyll-dice-tray 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee11a49a55ee16f40ee46a91b01a40d3074da6b6bc1cdde28b7bbe36b41386d
-  data.tar.gz: a35ce460b6c0181c03acc99d38916407eac12d1c6d89feae6412335302cedd64
+  metadata.gz: d9bd0677666a51acbbbb3ca6bf5b67d1f5bb1ef638fa4ba2fc86a3ea5a0f4cc9
+  data.tar.gz: 8832cb5174a2d58f10f7aa8534a91b8865b296323d81a097e6d476422b2b1e31
 SHA512:
-  metadata.gz: c754090c423cbd76a96b532e0bccc16d2cd2e76db5006fae17ed1766b5c8e19305a8838346640117de26bc6793e7c41021dbcf05ce61541095b97bd1dfde5edd
-  data.tar.gz: 03d2e7cdfaa42614d46fba9fac3eebf0722b6ba324def7a5c40d6f53576aadc0b4f73a17354218aa7ad508b002818c93e49db65f9b1170a37ce389ddbc26e3ea
+  metadata.gz: 558222307d26787647131df280b6e35055d644a9dfe2c97b9f2ce752e5ff179a56b21b96467dcea47633b4fb6a3128536931b2a0600a2b935dabdb5946867ba7
+  data.tar.gz: 5e69d92fe00836cef6d4aa013a3f4e320cbed50e4a082a7826f8085ef4ec68b6f9a4b4d96829e4348ff95aa7ce5706e03c336fd8dd81924366343b21dd73dd1b

data/README.md

@@ -4,7 +4,7 @@ A Jekyll plugin gem that:
 
 - Adds an overlay dice tray that accepts dice rolling input
 - Recognizes dice expressions in rendered pages like `d4`, `1d6`, `1d20+1` and turns them into clickable links that roll in the tray
-- Clicking a lookup-table die (any `dN`) rolls and shows the matching entry — supports any number of side-by-side key/value column groups, ranges like `3–12`, and tables with or without headers. One die in the header searches the whole table; multiple dice each search their own column group
+- Clicking a lookup-table die (any `dN`) rolls and shows the matching entry — supports any number of side-by-side key/value column groups, ranges like `3–12`, and tables with or without headers. Header dice always search the whole table (side-by-side column groups included)
 - Persists input history, result history, minimize status
 
 https://github.com/user-attachments/assets/6ef8d788-a1ee-49d4-ab26-f63899bb4a10

data/assets/jekyll-dice-tray/dice_tray.js

@@ -46,8 +46,9 @@
   function parseExpr(input) {
     var s = String(input || "").trim();
     if (!s) return { kind: "empty" };
-    if (s === "/help") return { kind: "help" };
-    if (s === "/clear") return { kind: "clear" };
+    if (s === "/help" || s === "/h") return { kind: "help" };
+    if (s === "/clear" || s === "/c") return { kind: "clear" };
+    if (s === "/version" || s === "/v") return { kind: "version" };
 
     // Allow whitespace variations like "d20 + 2"
     var compact = s.replace(/\s+/g, "");
@@ -178,14 +179,6 @@
       return Array.prototype.slice.call(row.querySelectorAll("td, th"));
     }
 
-    function cellColumnIndex(row, cell) {
-      var cells = rowCells(row);
-      for (var i = 0; i < cells.length; i++) {
-        if (cells[i] === cell) return i;
-      }
-      return -1;
-    }
-
     function rowLooksLikeHeader(row) {
       if (!row) return false;
       if (row.querySelector("th")) return true;
@@ -268,13 +261,11 @@
       return max;
     }
 
-    function collectRowEntriesForGroups(row, groups, allowedKeyIndices) {
+    function collectRowEntriesForGroups(row, groups) {
       var cells = rowCells(row);
       var entries = [];
-      var allowAll = !allowedKeyIndices || !allowedKeyIndices.length;
       for (var g = 0; g < groups.length; g++) {
         var group = groups[g];
-        if (!allowAll && allowedKeyIndices.indexOf(group.keyIndex) === -1) continue;
         var keyCell = cells[group.keyIndex];
         if (!keyCell) continue;
         var key = parseKeyEntry(normalizeCellText(keyCell));
@@ -301,16 +292,17 @@
       if (!table || !groups || !groups.length) return false;
       var matches = 0;
       eachDataRow(table, headerRow, function (row) {
-        matches += collectRowEntriesForGroups(row, groups, null).length;
+        matches += collectRowEntriesForGroups(row, groups).length;
       });
       return matches >= 2;
     }
 
-    function findLookupMatch(table, headerRow, groups, rollTotal, allowedKeyIndices) {
+    // Header dice (one or many side-by-side) always search every key column in the table.
+    function findLookupMatch(table, headerRow, groups, rollTotal) {
       var exact = null;
       var range = null;
       eachDataRow(table, headerRow, function (row) {
-        var entries = collectRowEntriesForGroups(row, groups, allowedKeyIndices);
+        var entries = collectRowEntriesForGroups(row, groups);
         for (var e = 0; e < entries.length; e++) {
           var entry = entries[e];
           if (entry.key.kind === "exact" && entry.key.value === rollTotal) {
@@ -328,74 +320,27 @@
       return exact || range;
     }
 
-    function headerDiceCount(headerRow) {
-      if (!headerRow) return 0;
-      return headerRow.querySelectorAll('a[data-dice]').length;
-    }
-
-    function groupForColumn(groups, columnIndex) {
-      for (var g = 0; g < groups.length; g++) {
-        var group = groups[g];
-        if (columnIndex === group.keyIndex) return group;
-        if (group.valueIndices.indexOf(columnIndex) !== -1) return group;
-      }
-      return null;
-    }
-
-    // One die in the header (e.g. d100 over many pairs) => search every group.
-    // Several dice (e.g. d10 | Weather | d10 | Terrain | d6 | Mood) => only the clicked group.
-    function allowedKeyIndicesForClick(headerRow, clickCell, groups) {
-      if (!headerRow || !clickCell || !groups.length) return null;
-      if (headerDiceCount(headerRow) <= 1) return null;
-      var col = cellColumnIndex(headerRow, clickCell);
-      if (col < 0) return null;
-      var group = groupForColumn(groups, col);
-      return group ? [group.keyIndex] : null;
-    }
-
-    function findFollowingTable(node) {
-      var elNode = node;
-      while (elNode && elNode !== document.body) {
-        var sib = elNode.nextElementSibling;
-        while (sib) {
-          if (sib.tagName === "TABLE") return sib;
-          var nested = sib.querySelector && sib.querySelector("table");
-          if (nested) return nested;
-          sib = sib.nextElementSibling;
-        }
-        elNode = elNode.parentElement;
-      }
-      return null;
-    }
-
     function getLookupTableContext(anchor, rollTotal) {
       if (!anchor || !anchor.closest || rollTotal == null) return null;
 
       var cell = null;
       var table = null;
       var headerRow = null;
-      var allowedKeys = null;
       var sourceTable = anchor._jdtSourceTable;
 
       if (sourceTable && sourceTable.querySelector) {
         // Re-roll from a previous table result in the tray.
         table = sourceTable;
         headerRow = findTableHeaderRow(table);
-        allowedKeys = anchor._jdtAllowedKeyIndices || null;
       } else {
         cell = anchor.closest("td, th");
-        if (cell) {
-          table = cell.closest("table");
-          if (!table) return null;
-          headerRow = findTableHeaderRow(table);
-          // With a header, only header-cell dice trigger lookup (data cells may contain other dice).
-          // Without a header, any in-table die can trigger lookup.
-          if (headerRow && !headerRow.contains(cell)) return null;
-        } else {
-          table = findFollowingTable(anchor);
-          if (!table) return null;
-          headerRow = findTableHeaderRow(table);
-        }
+        if (!cell) return null;
+        table = cell.closest("table");
+        if (!table) return null;
+        headerRow = findTableHeaderRow(table);
+        // With a header, only header-cell dice trigger lookup (data cells may contain other dice).
+        // Without a header, any in-table die can trigger lookup.
+        if (headerRow && !headerRow.contains(cell)) return null;
       }
 
       var keyColumns = inferKeyColumns(table, headerRow);
@@ -403,10 +348,7 @@
       var groups = buildColumnGroups(keyColumns, tableColumnCount(table, headerRow));
       if (!isLookupTable(table, headerRow, groups)) return null;
 
-      if (allowedKeys == null && cell && headerRow) {
-        allowedKeys = allowedKeyIndicesForClick(headerRow, cell, groups);
-      }
-      var matched = findLookupMatch(table, headerRow, groups, rollTotal, allowedKeys);
+      var matched = findLookupMatch(table, headerRow, groups, rollTotal);
       if (!matched) return null;
 
       var headerCells = headerRow ? rowCells(headerRow) : [];
@@ -439,9 +381,7 @@
         });
       }
 
-      return columns.length
-        ? { columns: columns, _sourceTable: table, _allowedKeyIndices: allowedKeys }
-        : null;
+      return columns.length ? { columns: columns, _sourceTable: table } : null;
     }
 
     function serializableTableContext(tableContext) {
@@ -478,9 +418,6 @@
             if (tableContext._sourceTable && tableContext._sourceTable.querySelector) {
               reroll._jdtSourceTable = tableContext._sourceTable;
             }
-            if (tableContext._allowedKeyIndices) {
-              reroll._jdtAllowedKeyIndices = tableContext._allowedKeyIndices;
-            }
             headerSpan.appendChild(reroll);
           } else if (col.header_html) {
             headerSpan.innerHTML = col.header_html;
@@ -773,11 +710,17 @@
     function showHelp() {
       addSystemEntry(
         "Usage: 1d6, d4, 2d8+1, 2-in-6",
-        "Click linked dice like 1d20+5, chance like 2-in-6 (roll d6, 1-2 succeed), or bracket modifiers like [+1] (rolls d20+1). Clicking a table die (any dN) shows the matching entry (number or range; any number of side-by-side key/value column groups; headers optional). Commands: /help, /clear",
+        "Type the dice you want to roll, without a prefix. Click linked dice notation in a table to show the matching entry (number or range).",
+        "Commands: /help, /clear, /version",
         nowTime()
       );
     }
 
+    function showVersion() {
+      var version = root.getAttribute("data-version") || "unknown";
+      addSystemEntry("dice tray " + version, "", nowTime());
+    }
+
     function doRoll(raw, meta) {
       meta = meta || {};
       var anchor = meta.anchor || null;
@@ -785,6 +728,7 @@
       if (p.kind === "empty") return;
       if (p.kind === "help") return showHelp();
       if (p.kind === "clear") return clearStorageAndUi();
+      if (p.kind === "version") return showVersion();
       if (p.kind !== "roll" && p.kind !== "bestof2" && p.kind !== "chance") {
         addSystemEntry("Unrecognized roll: " + p.raw, "Try: 1d6, d4, 2-in-6, 2d8+1 or /help", nowTime());
         return;

data/lib/jekyll/dice_tray/html_rewriter.rb

@@ -200,7 +200,7 @@ module Jekyll
         return html if html.include?('data-dice-tray-root="true"')
 
         tray = <<~HTML
-          <div id="jekyll-dice-tray" data-dice-tray-root="true" aria-live="polite">
+          <div id="jekyll-dice-tray" data-dice-tray-root="true" data-version="#{VERSION}" aria-live="polite">
             <div class="jdt-header">
               <button type="button" class="jdt-toggle" aria-expanded="false" title="Toggle dice tray">Dice</button>
             </div>

data/lib/jekyll/dice_tray/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module DiceTray
-    VERSION = "0.4.0"
+    VERSION = "0.5.1"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-dice-tray
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - directsun