@datawheel/bespoke 0.1.12 → 0.1.13

package/dist/index.js

@@ -306,12 +306,12 @@ var init_stats = __esm({
     };
   }
 });
-var libs, libs_default;
+var libraries;
 var init_libs = __esm({
   "libs/libs.ts"() {
     init_esm_shims();
     init_stats();
-    libs = {
+    libraries = {
       d3: {
         ...d3Array,
         ...d3Collection,
@@ -329,7 +329,6 @@ var init_libs = __esm({
       },
       stats: stats_default
     };
-    libs_default = libs;
   }
 });
 function mortarEval(varInnerName, varOuterValue, logic, formatterFunctions, attributes = void 0, blockContext) {
@@ -353,10 +352,10 @@ function mortarEval(varInnerName, varOuterValue, logic, formatterFunctions, attr
       let output;
       if (attributes) {
         const fn = new Function(varInnerName, "console", "libs", "formatters", "locale", "variables", logic);
-        output = fn(varOuterValue, pConsole, libs_default, formatterFunctions, locale, attributes);
+        output = fn(varOuterValue, pConsole, libraries, formatterFunctions, locale, attributes);
       } else {
         const fn = new Function(varInnerName, "console", "libs", "formatters", "locale", logic);
-        output = fn(varOuterValue, pConsole, libs_default, formatterFunctions, locale);
+        output = fn(varOuterValue, pConsole, libraries, formatterFunctions, locale);
       }
       if (typeof output === "object" && Object.keys(output).length > 0) {
         Object.assign(vars, output);
@@ -591,7 +590,7 @@ function varSwap(sourceString, formatterFunctions, blockContext, passive = false
       return passive ? match2 : "N/A";
     }
     try {
-      return formatter(value, libs, formatterFunctions);
+      return formatter(value, libraries, formatterFunctions);
     } catch (err) {
       console.error(
         `Error using formatter ${formatter.name}
@@ -1077,7 +1076,7 @@ var init_runConsumers = __esm({
         }
       };
       const crawlDown = async (bid2, cascader = false) => {
-        if (cascader === false) {
+        if (cascader) {
           variablesById[bid2] = {};
           statusById[bid2] = { hiddenByCascade: cascader };
           for (let i = 0; i < blocks[bid2].consumers.length; i += 1) {
@@ -1311,7 +1310,7 @@ var init_FUNC = __esm({
         setVariables: actions.onSetVariables ? actions.onSetVariables : (d) => d,
         openModal: actions.onOpenModal ? actions.onOpenModal : (d) => d,
         formatters,
-        libs: libs_default,
+        libs: libraries,
         locale
       };
       function parseFunction(obj) {
@@ -1363,7 +1362,16 @@ var init_lib2 = __esm({
     init_FUNC();
     init_getLocales();
     ({ localeDefault: localeDefault4 } = getLocales_default());
-    blockSchema = new schema.Entity("block" /* BLOCKS */);
+    blockSchema = new schema.Entity("block" /* BLOCKS */, {}, {
+      mergeStrategy(a, b) {
+        if (b.block_input)
+          return a || {};
+        return {
+          ...a,
+          ...b
+        };
+      }
+    });
     blockSchema.define({
       consumers: [blockSchema],
       inputs: [blockSchema]

package/dist/server.js

@@ -39,7 +39,6 @@ var BlockModel = class extends Model {
   }
   toJSON() {
     const attributes = this.get({ plain: true });
-    delete attributes.block_input;
     const { inputs = [], consumers = [], contentByLocale = [] } = this;
     return {
       ...attributes,
@@ -362,7 +361,7 @@ var stats_default = {
 };
 
 // libs/libs.ts
-var libs = {
+var libraries = {
   d3: {
     ...d3Array,
     ...d3Collection,
@@ -382,7 +381,7 @@ var libs = {
 };
 var declaredFormatters = {};
 function declareFormatter(manifest) {
-  const func = manifest.logicFactory(libs);
+  const func = manifest.logicFactory(libraries);
   declaredFormatters[manifest.name] = {
     description: manifest.description,
     inputType: manifest.inputType,
@@ -474,8 +473,8 @@ __export(formatters_exports, {
 var abbreviate_default = declareFormatter({
   name: "abbreviate",
   description: "Abbreviates a number into a smaller more human-readable number.",
-  logicFactory(libs2) {
-    return (n) => libs2.d3plus.formatAbbreviate(n);
+  logicFactory(libs) {
+    return (n) => libs.d3plus.formatAbbreviate(n);
   },
   inputType: "number",
   testValue: "123456",
@@ -486,7 +485,7 @@ var abbreviate_default = declareFormatter({
 var abs_default = declareFormatter({
   name: "abs",
   description: "Simple Absolute Value.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => Math.abs(n);
   },
   inputType: "number",
@@ -532,8 +531,8 @@ var bucket_default = declareFormatter({
 var commas_default = declareFormatter({
   name: "commas",
   description: "* Rounds to nearest whole number and adds commas.",
-  logicFactory(libs2) {
-    return (n) => libs2.d3.format(",")(Math.round(n));
+  logicFactory(libs) {
+    return (n) => libs.d3.format(",")(Math.round(n));
   },
   inputType: "number",
   testValue: "1234.6",
@@ -544,12 +543,12 @@ var commas_default = declareFormatter({
 var date_default = declareFormatter({
   name: "date",
   description: "Formats a date into '%B %d, %Y' format.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => {
       if (typeof n === "string") {
-        n = libs2.d3plus.date(n);
+        n = libs.d3plus.date(n);
       }
-      return libs2.d3.timeFormat("%B %d, %Y")(n);
+      return libs.d3.timeFormat("%B %d, %Y")(n);
     };
   },
   inputType: "date",
@@ -559,12 +558,12 @@ var date_default = declareFormatter({
 
 // libs/formatters/dollar.js
 var dollar_default = declareFormatter({
-  name: "date",
+  name: "dollar",
   description: "Adds a US dollar sign to the beginning of a String or Number.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => {
       if (typeof n === "number")
-        n = libs2.d3plus.formatAbbreviate(n);
+        n = libs.d3plus.formatAbbreviate(n);
       return n.charAt(0) === "-" ? n.replace("-", "-$") : `$${n}`;
     };
   },
@@ -577,7 +576,7 @@ var dollar_default = declareFormatter({
 var formatFieldName_default = declareFormatter({
   name: "formatFieldName",
   description: "Based on field name returns a string",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => {
       if (n.contentType.toLowerCase() === "stat") {
         if (n.field === "title")
@@ -609,7 +608,7 @@ var formatFieldName_default = declareFormatter({
 var grewTo_default = declareFormatter({
   name: "grewTo",
   description: "Returns the text with grow direction: 'declined from', 'grew to' o 'stayed at'",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "declined from" : n > 0 ? "grew to" : "stayed at";
   },
   inputType: "number",
@@ -621,7 +620,7 @@ var grewTo_default = declareFormatter({
 var grewWord_default = declareFormatter({
   name: "grewWord",
   description: "Returns either 'grew', 'declined', or 'stayed' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "declined" : n > 0 ? "grew" : "stayed";
   },
   inputType: "number",
@@ -633,7 +632,7 @@ var grewWord_default = declareFormatter({
 var growing_default = declareFormatter({
   name: "growing",
   description: "Returns either 'declining', 'growing' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "declining" : "growing";
   },
   inputType: "number",
@@ -671,8 +670,8 @@ var growth_default = declareFormatter({
 var growthPct_default = declareFormatter({
   name: "growthPct",
   description: "Abbreviates a growth value, turns it absolute, and adds a percent sign.",
-  logicFactory(libs2) {
-    return (n) => `${libs2.d3plus.formatAbbreviate(Math.abs(n))}%`;
+  logicFactory(libs) {
+    return (n) => `${libs.d3plus.formatAbbreviate(Math.abs(n))}%`;
   },
   inputType: "number",
   testValue: "12345",
@@ -683,7 +682,7 @@ var growthPct_default = declareFormatter({
 var growthWord_default = declareFormatter({
   name: "growthWord",
   description: "Returns either 'growth' or 'decline' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "decline" : "growth";
   },
   inputType: "number",
@@ -695,7 +694,7 @@ var growthWord_default = declareFormatter({
 var highWord_default = declareFormatter({
   name: "highWord",
   description: "Returns either 'higher than', 'lower than', or 'approximately the same as' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "lower than" : n > 0 ? "higher than" : "approximately the same as";
   },
   inputType: "number",
@@ -707,7 +706,7 @@ var highWord_default = declareFormatter({
 var increaseWord_default = declareFormatter({
   name: "increaseWord",
   description: "Returns either 'increase', 'decrease', or 'change' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "decrease" : n > 0 ? "increase" : "change";
   },
   inputType: "number",
@@ -719,7 +718,7 @@ var increaseWord_default = declareFormatter({
 var increasedWord_default = declareFormatter({
   name: "increasedWord",
   description: "Returns either 'increased', 'decreased', or 'remained the same' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "decreased" : n > 0 ? "increased" : "remained the same";
   },
   inputType: "number",
@@ -731,7 +730,7 @@ var increasedWord_default = declareFormatter({
 var increasing_default = declareFormatter({
   name: "increasing",
   description: "Returns either 'decreasing', 'increasing' or 'maintaining' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "decreasing" : n > 0 ? "increasing" : "maintaining";
   },
   inputType: "number",
@@ -743,7 +742,7 @@ var increasing_default = declareFormatter({
 var largerThan_default = declareFormatter({
   name: "largerThan",
   description: "Returns either 'higher than', 'lower than', or 'approximately the same as' depending on the provided number's sign",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "smaller than" : n > 0 ? "larger than" : "the same as";
   },
   inputType: "number",
@@ -755,7 +754,7 @@ var largerThan_default = declareFormatter({
 var list_default = declareFormatter({
   name: "list",
   description: "Joins an array of strings together, adding commas and 'and' when necessary.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n.reduce((str, item, i) => {
       if (!i)
         str += item;
@@ -777,7 +776,7 @@ var list_default = declareFormatter({
 var longWord_default = declareFormatter({
   name: "longWord",
   description: "",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "shorter" : n > 0 ? "longer" : "similar";
   },
   inputType: "number",
@@ -789,7 +788,7 @@ var longWord_default = declareFormatter({
 var lowerCaseFirst_default = declareFormatter({
   name: "lowerCaseFirst",
   description: "Converts the first letter of a string to lowercase",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => typeof n === "string" ? n.charAt(0).toLowerCase() + n.slice(1) : n;
   },
   inputType: "string",
@@ -801,7 +800,7 @@ var lowerCaseFirst_default = declareFormatter({
 var moreFewerWord_default = declareFormatter({
   name: "moreFewerWord",
   description: "",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "fewer" : "more";
   },
   inputType: "number",
@@ -813,7 +812,7 @@ var moreFewerWord_default = declareFormatter({
 var moreLess_default = declareFormatter({
   name: "moreLess",
   description: "Returns either 'more' or 'less' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "less" : "more";
   },
   inputType: "number",
@@ -825,7 +824,7 @@ var moreLess_default = declareFormatter({
 var moreWord_default = declareFormatter({
   name: "moreLess",
   description: "Returns either 'more than', 'less than', or 'approximately the same' depending on the provided number's sign.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "less than" : n > 0 ? "more than" : "approximately the same";
   },
   inputType: "number",
@@ -837,7 +836,7 @@ var moreWord_default = declareFormatter({
 var olderWord_default = declareFormatter({
   name: "olderWord",
   description: "",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "getting younger" : n > 0 ? "getting older" : "staying the same age";
   },
   inputType: "number",
@@ -849,7 +848,7 @@ var olderWord_default = declareFormatter({
 var olderYounger_default = declareFormatter({
   name: "olderYounger",
   description: "",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n < 0 ? "younger than" : n > 0 ? "older than" : "the same age as";
   },
   inputType: "number",
@@ -861,7 +860,7 @@ var olderYounger_default = declareFormatter({
 var plural_default = declareFormatter({
   name: "plural",
   description: "Pluralizes a word.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n.replace(/\w$/g, (chr) => chr === "y" ? "ies" : `${chr}s`);
   },
   inputType: "string",
@@ -873,7 +872,7 @@ var plural_default = declareFormatter({
 var pxToInt_default = declareFormatter({
   name: "pxToInt",
   description: "Takes a pixel value and converts it to an integer",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => parseInt(n.replace(/\D+/g, ""), 10);
   },
   inputType: "string",
@@ -885,13 +884,13 @@ var pxToInt_default = declareFormatter({
 var salary_default = declareFormatter({
   name: "salary",
   description: "Displays salary values with proper precision (ie. '$74,200' instead of '$74.2k')",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => {
       let str;
       if (n < 1e6) {
-        str = libs2.d3.format(",")(n.toFixed(0));
+        str = libs.d3.format(",")(n.toFixed(0));
       } else
-        str = libs2.d3plus.formatAbbreviate(n);
+        str = libs.d3plus.formatAbbreviate(n);
       return `$${str}`;
     };
   },
@@ -904,7 +903,7 @@ var salary_default = declareFormatter({
 var stripEntities_default = declareFormatter({
   name: "stripEntities",
   description: "Removes non breaking spaces & other html entities from a string",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => typeof n === "string" ? String(n).replace(/&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});/ig, " ") : n;
   },
   inputType: "string",
@@ -916,7 +915,7 @@ var stripEntities_default = declareFormatter({
 var stripHTML_default = declareFormatter({
   name: "stripHTML",
   description: "Converts html tags to spaces, then removes redundant spaces",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => {
       const entities = {
         "&amp;": "&",
@@ -943,7 +942,7 @@ var stripHTML_default = declareFormatter({
 var stripOL_default = declareFormatter({
   name: "stripOL",
   description: "Removes ordered list wrapper tags from a string.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n.replace(/<ol>/g, "").replace(/<\/ol>/g, "");
   },
   inputType: "string",
@@ -955,7 +954,7 @@ var stripOL_default = declareFormatter({
 var stripP_default = declareFormatter({
   name: "stripP",
   description: "Removes all paragraph tags from a string.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n.replace(/<p>/g, "").replace(/<\/p>/g, "");
   },
   inputType: "string",
@@ -967,7 +966,7 @@ var stripP_default = declareFormatter({
 var stripUL_default = declareFormatter({
   name: "stripUL",
   description: "Removes unordered list wrapper tags from a string.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n.replace(/<ul>/g, "").replace(/<\/ul>/g, "");
   },
   inputType: "string",
@@ -979,7 +978,7 @@ var stripUL_default = declareFormatter({
 var toKebabCase_default = declareFormatter({
   name: "toKebabCase",
   description: "Takes a camelCase or PascalCase string and converts it to kebab-case.",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => {
       if (typeof n === "string") {
         n = n.charAt(0).toLowerCase() + n.substring(1);
@@ -997,7 +996,7 @@ var toKebabCase_default = declareFormatter({
 var toSpacedCase_default = declareFormatter({
   name: "toSpacedCase",
   description: "Takes a camelCase or PascalCase string and adds spaces (I know Spaced Case isn't a thing, deal with it).",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => {
       if (typeof n === "string") {
         return n.replace(/([A-Z])/g, " $1").toLowerCase().trim();
@@ -1014,7 +1013,7 @@ var toSpacedCase_default = declareFormatter({
 var upperCaseFirst_default = declareFormatter({
   name: "upperCaseFirst",
   description: "Converts the first letter of a string to uppercase",
-  logicFactory(libs2) {
+  logicFactory(libs) {
     return (n) => n.charAt(0).toUpperCase() + n.slice(1);
   },
   inputType: "string",
@@ -3745,37 +3744,39 @@ async function endpointNextJsHandlerFactory(req, res) {
       const key = endpointKey(method, pathString);
       return map[key];
     });
-    const session = await getAuth_default.getSession(req, res);
-    if (handlerObj.roleRequired) {
-      if (!session) {
-        return res.status(401).json({ error: "Unauthorized. Must be logged in." });
-      }
-      const userRoles = session && session.user && session.user.bespoke_roles && Array.isArray(session.user.bespoke_roles) ? session.user.bespoke_roles : [];
-      if (!userRoles.includes(handlerObj.roleRequired)) {
-        return res.status(402).json({ error: "Forbidden. Not enough roles." });
-      }
-    }
-    if (handlerObj.handler) {
-      if (["POST", "DELETE"].includes(method)) {
-        req.body = await parseBody(req);
+    if (handlerObj) {
+      const session = await getAuth_default.getSession(req, res);
+      if (handlerObj.roleRequired) {
+        if (!session) {
+          return res.status(401).json({ error: "Unauthorized. Must be logged in." });
+        }
+        const userRoles = session && session.user && session.user.bespoke_roles && Array.isArray(session.user.bespoke_roles) ? session.user.bespoke_roles : [];
+        if (!userRoles.includes(handlerObj.roleRequired)) {
+          return res.status(402).json({ error: "Forbidden. Not enough roles." });
+        }
       }
-      return Promise.resolve(req).then((req2) => handlerObj.handler(req2, res, session ? session : void 0)).then((result) => {
-        if (result && "error" in result) {
-          throw new BackendError(result.status, result.error);
+      if (handlerObj.handler) {
+        if (["POST", "DELETE"].includes(method)) {
+          req.body = await parseBody(req);
         }
-        if (result.ok) {
-          if (result.data instanceof Buffer) {
-            const image = result.data;
-            res.writeHead(result.status, { "Content-Type": "image/png" }).end(image, "binary");
-          } else {
-            res.status(result.status).json({ data: result.data });
+        return Promise.resolve(req).then((req2) => handlerObj.handler(req2, res, session ? session : void 0)).then((result) => {
+          if (result && "error" in result) {
+            throw new BackendError(result.status, result.error);
           }
-        }
-      }).catch((err) => {
-        if (verbose4)
-          console.trace("Backend Error", err);
-        res.status(err.code).json({ error: err.message });
-      });
+          if (result.ok) {
+            if (result.data instanceof Buffer) {
+              const image = result.data;
+              res.writeHead(result.status, { "Content-Type": "image/png" }).end(image, "binary");
+            } else {
+              res.status(result.status).json({ data: result.data });
+            }
+          }
+        }).catch((err) => {
+          if (verbose4)
+            console.trace("Backend Error", err);
+          res.status(err.code).json({ error: err.message });
+        });
+      }
     }
   } else if (!path) {
     await endpointMap.then(console.log);

package/package.json

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