@datawheel/bespoke 0.1.29 → 0.1.30

package/dist/index.js

@@ -1224,21 +1224,26 @@ var init_runConsumers = __esm({
     getDependencies = (bid, blocks, acc = [], crawlUp = true, crawlDown = true, withinSection = true, visited = []) => {
       if (visited.includes(bid))
         return [];
-      visited.push(bid);
+      if (crawlDown)
+        visited.push(bid);
+      if (verbose2)
+        console.log("%cpassing through block", "color:green", bid);
       const rootBlock = blocks[bid];
       if (rootBlock.inputs.length && crawlUp) {
         rootBlock.inputs.forEach((iid) => {
           const rel = `${iid}-${bid}`;
-          if (!acc.includes(rel))
+          if (!acc.includes(rel)) {
             acc.push(rel);
+          }
           rootBlock.inputs.forEach((iid2) => getDependencies(iid2, blocks, acc, crawlUp, false, withinSection, visited));
         });
       }
       if (rootBlock.consumers.length && crawlDown) {
         rootBlock.consumers.forEach((cid) => {
           const rel = `${bid}-${cid}`;
-          if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection))
+          if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection)) {
             acc.push(rel);
+          }
           rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id || !withinSection).forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown, withinSection, visited));
         });
       }
@@ -1273,8 +1278,12 @@ var init_runConsumers = __esm({
       const parsedBlockContext = parseBlockContext(blockContext);
       const attributes = parsedBlockContext.variables;
       const rootBlocks = bid ? { [bid]: blocks[bid] } : sections.reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
+      if (verbose2)
+        console.log("%crunConsumers: running root blocks", "color:blue", Object.keys(rootBlocks));
       const withinSection = mode === "section";
       const blockDeps = Object.keys(rootBlocks).reduce((deps, id) => {
+        if (verbose2)
+          console.log("%cresolving dependencies for", "color:red", id);
         const dependencies = getDependencies(Number(id), blocks, [], !bid, true, withinSection).map((rel) => rel.split("-"));
         return [...deps, ...dependencies];
       }, []);
@@ -1282,6 +1291,8 @@ var init_runConsumers = __esm({
         (orderedDAG2, bid2) => orderedDAG2.includes(bid2) ? [...orderedDAG2] : [bid2, ...orderedDAG2],
         toposort(blockDeps)
       );
+      if (verbose2)
+        console.log("resolved DAG: ", orderedDAG);
       async function runTasksInParallel(executionOrder, blocks2) {
         const runningBlocks = /* @__PURE__ */ new Map();
         for (const bid2 of executionOrder) {

package/dist/server.js

@@ -4818,21 +4818,26 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
 var getDependencies = (bid, blocks, acc = [], crawlUp = true, crawlDown2 = true, withinSection = true, visited = []) => {
   if (visited.includes(bid))
     return [];
-  visited.push(bid);
+  if (crawlDown2)
+    visited.push(bid);
+  if (verbose7)
+    console.log("%cpassing through block", "color:green", bid);
   const rootBlock = blocks[bid];
   if (rootBlock.inputs.length && crawlUp) {
     rootBlock.inputs.forEach((iid) => {
       const rel = `${iid}-${bid}`;
-      if (!acc.includes(rel))
+      if (!acc.includes(rel)) {
         acc.push(rel);
+      }
       rootBlock.inputs.forEach((iid2) => getDependencies(iid2, blocks, acc, crawlUp, false, withinSection, visited));
     });
   }
   if (rootBlock.consumers.length && crawlDown2) {
     rootBlock.consumers.forEach((cid) => {
       const rel = `${bid}-${cid}`;
-      if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection))
+      if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection)) {
         acc.push(rel);
+      }
       rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id || !withinSection).forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown2, withinSection, visited));
     });
   }
@@ -4867,8 +4872,12 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
   const parsedBlockContext = parseBlockContext(blockContext);
   const attributes = parsedBlockContext.variables;
   const rootBlocks = bid ? { [bid]: blocks[bid] } : sections.reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
+  if (verbose7)
+    console.log("%crunConsumers: running root blocks", "color:blue", Object.keys(rootBlocks));
   const withinSection = mode === "section";
   const blockDeps = Object.keys(rootBlocks).reduce((deps, id) => {
+    if (verbose7)
+      console.log("%cresolving dependencies for", "color:red", id);
     const dependencies = getDependencies(Number(id), blocks, [], !bid, true, withinSection).map((rel) => rel.split("-"));
     return [...deps, ...dependencies];
   }, []);
@@ -4876,6 +4885,8 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
     (orderedDAG2, bid2) => orderedDAG2.includes(bid2) ? [...orderedDAG2] : [bid2, ...orderedDAG2],
     toposort(blockDeps)
   );
+  if (verbose7)
+    console.log("resolved DAG: ", orderedDAG);
   async function runTasksInParallel(executionOrder, blocks2) {
     const runningBlocks = /* @__PURE__ */ new Map();
     for (const bid2 of executionOrder) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {