@datawheel/bespoke 0.1.27 → 0.1.29

package/dist/server.js

@@ -4717,6 +4717,20 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
   let apiResponse;
   let duration = null;
   let api = null;
+  if (!allowed) {
+    return {
+      outputVariables: {},
+      renderVariables: {},
+      status: {
+        api: null,
+        duration: null,
+        resp: null,
+        log: [],
+        error: null,
+        allowed: false
+      }
+    };
+  }
   if (unswappedAPI) {
     api = swapAPI(unswappedAPI, formatterFunctions, blockContext);
     const isAbsolute = new RegExp("^(?:[a-z+]+:)?//", "i");
@@ -4729,7 +4743,7 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
       return result;
     }, (e) => {
       if (verbose7)
-        console.error(`Error fetching ${api}: ${e.message}`);
+        console.error(`Error fetching ${api} block ${block.id}: ${e.message}`);
       return { data: {}, requestDuration: 0 };
     });
     resp = apiResponse.data;
@@ -4831,7 +4845,7 @@ var isBlockAllowed = (block, blockContext, variables, formatterFunctions) => {
       allowed = false;
     } else {
       const parsedBlockContext = parseBlockContext(blockContext);
-      const { vars, error, output } = mortarEval_default(
+      const { error, output } = mortarEval_default(
         "variables",
         variables,
         block.settings.allowedLogic || "return false;",
@@ -4845,11 +4859,11 @@ var isBlockAllowed = (block, blockContext, variables, formatterFunctions) => {
   }
   return allowed;
 };
-var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialVariables = {}, readMemberFn, mode = "section") => {
+var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section") => {
   if (!bid && !sections)
-    return { variables: { ...initialVariables } };
-  const variablesById = { ...initialVariables };
-  const statusById = {};
+    return { ...initialState4 };
+  const variablesById = { ...initialState4.variables ?? {} };
+  const statusById = { ...initialState4.status ?? {} };
   const parsedBlockContext = parseBlockContext(blockContext);
   const attributes = parsedBlockContext.variables;
   const rootBlocks = bid ? { [bid]: blocks[bid] } : sections.reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
@@ -4871,6 +4885,19 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
       );
       const runningTask = dependenciesDone.then(() => {
         const variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), attributes);
+        const inputNotAllowed = block.inputs.find((iid) => !statusById[iid].allowed || statusById[iid].hiddenByCascade);
+        if (inputNotAllowed) {
+          statusById[bid2] = {
+            api: null,
+            duration: null,
+            resp: null,
+            log: [],
+            error: null,
+            allowed: false,
+            hiddenByCascade: statusById[inputNotAllowed].hiddenByCascade || inputNotAllowed
+          };
+          return;
+        }
         return runSingleBlock(
           block,
           formatterFunctions,
@@ -4889,7 +4916,10 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
     await Promise.all(Array.from(runningBlocks.values()));
   }
   await runTasksInParallel(orderedDAG, blocks);
-  return { variables: { ...initialVariables, ...variablesById }, status: statusById };
+  return {
+    variables: { ...initialState4.variables ?? {}, ...variablesById },
+    status: { ...initialState4.status ?? {}, ...statusById }
+  };
 };
 
 // libs/variables/previewsToAttributes.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -77,7 +77,7 @@
     "fast-glob": "^3.2.12",
     "file-loader": "^6.2.0",
     "file-saver": "^1.3.3",
-    "flickr-sdk": "^6.0.0",
+    "flickr-sdk": "6.1.2",
     "formidable": "^2.1.1",
     "html-react-parser": "^3.0.15",
     "html-to-image": "^1.10.8",