@datawheel/bespoke 0.5.6 → 0.5.8

package/dist/index.js

@@ -1267,18 +1267,18 @@ var init_selectorQueryToVariable = __esm({
     init_cms();
     selectorQueryToVariable = (id, query, config) => {
       const accessor = `selector${id}id`;
-      const queryObject = new URLSearchParams(
-        typeof location !== "undefined" && location?.search ? location.search : query
-      );
+      const locationValue = new URLSearchParams(typeof location !== "undefined" && location?.search ? location.search : "").get(accessor);
+      const queryValue = new URLSearchParams(query).get(accessor);
+      const selectorValue = locationValue || queryValue;
       if (config.type === SELECTOR_TYPES.MULTI) {
-        const queryIds = queryObject.get(accessor) ? queryObject.get(accessor).split(",") : config.defaultValue;
+        const queryIds = selectorValue ? selectorValue.split(",") : config.defaultValue;
         const options = config.options.filter((d2) => queryIds.includes(d2.id));
         return {
           [`selector${id}id`]: queryIds,
           [`selector${id}label`]: (options || []).map((d2) => d2.label)
         };
       }
-      const queryId = queryObject.get(accessor) && config.options.find((d2) => d2.id === queryObject.get(accessor)) ? queryObject.get(accessor) : config.defaultValue;
+      const queryId = selectorValue && config.options.find((d2) => d2.id === selectorValue) ? selectorValue : config.defaultValue;
       const option = config.options.find((d2) => d2.id === queryId);
       return {
         [`selector${id}id`]: queryId,

package/dist/server.js

@@ -4881,18 +4881,18 @@ function runSelector(id, logic, formatterFunctions, blockContext, replaceQuery =
 // libs/selectors/selectorQueryToVariable.js
 var selectorQueryToVariable = (id, query, config) => {
   const accessor = `selector${id}id`;
-  const queryObject = new URLSearchParams(
-    typeof location !== "undefined" && location?.search ? location.search : query
-  );
+  const locationValue = new URLSearchParams(typeof location !== "undefined" && location?.search ? location.search : "").get(accessor);
+  const queryValue = new URLSearchParams(query).get(accessor);
+  const selectorValue = locationValue || queryValue;
   if (config.type === SELECTOR_TYPES.MULTI) {
-    const queryIds = queryObject.get(accessor) ? queryObject.get(accessor).split(",") : config.defaultValue;
+    const queryIds = selectorValue ? selectorValue.split(",") : config.defaultValue;
     const options = config.options.filter((d2) => queryIds.includes(d2.id));
     return {
       [`selector${id}id`]: queryIds,
       [`selector${id}label`]: (options || []).map((d2) => d2.label)
     };
   }
-  const queryId = queryObject.get(accessor) && config.options.find((d2) => d2.id === queryObject.get(accessor)) ? queryObject.get(accessor) : config.defaultValue;
+  const queryId = selectorValue && config.options.find((d2) => d2.id === selectorValue) ? selectorValue : config.defaultValue;
   const option = config.options.find((d2) => d2.id === queryId);
   return {
     [`selector${id}id`]: queryId,

package/package.json

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