@opengeoweb/store 8.3.0 → 8.4.0

package/index.esm.js

@@ -1577,6 +1577,65 @@ function isPlainObject(value) {
     }
     return proto === baseProto;
 }
+// src/tsHelpers.ts
+var hasMatchFunction = function (v) {
+    return v && typeof v.match === "function";
+};
+// src/createAction.ts
+function createAction(type, prepareAction) {
+    function actionCreator() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        if (prepareAction) {
+            var prepared = prepareAction.apply(void 0, args);
+            if (!prepared) {
+                throw new Error("prepareAction did not return an object");
+            }
+            return __spreadValues(__spreadValues({
+                type: type,
+                payload: prepared.payload
+            }, "meta" in prepared && { meta: prepared.meta }), "error" in prepared && { error: prepared.error });
+        }
+        return { type: type, payload: args[0] };
+    }
+    actionCreator.toString = function () { return "" + type; };
+    actionCreator.type = type;
+    actionCreator.match = function (action) { return action.type === type; };
+    return actionCreator;
+}
+function isAction(action) {
+    return isPlainObject(action) && "type" in action;
+}
+function isActionCreator(action) {
+    return typeof action === "function" && "type" in action && hasMatchFunction(action);
+}
+function isFSA(action) {
+    return isAction(action) && typeof action.type === "string" && Object.keys(action).every(isValidKey);
+}
+function isValidKey(key) {
+    return ["type", "payload", "error", "meta"].indexOf(key) > -1;
+}
+// src/actionCreatorInvariantMiddleware.ts
+function getMessage(type) {
+    var splitType = type ? ("" + type).split("/") : [];
+    var actionName = splitType[splitType.length - 1] || "actionCreator";
+    return "Detected an action creator with type \"" + (type || "unknown") + "\" being dispatched. \nMake sure you're calling the action creator before dispatching, i.e. `dispatch(" + actionName + "())` instead of `dispatch(" + actionName + ")`. This is necessary even if the action has no payload.";
+}
+function createActionCreatorInvariantMiddleware(options) {
+    if (options === void 0) { options = {}; }
+    if (process.env.NODE_ENV === "production") {
+        return function () { return function (next) { return function (action) { return next(action); }; }; };
+    }
+    var _c = options.isActionCreator, isActionCreator2 = _c === void 0 ? isActionCreator : _c;
+    return function () { return function (next) { return function (action) {
+        if (isActionCreator2(action)) {
+            console.warn(getMessage(action.type));
+        }
+        return next(action);
+    }; }; };
+}
 function getTimeMeasureUtils(maxDelay, fnName) {
     var elapsed = 0;
     return {
@@ -1722,11 +1781,13 @@ function trackForMutations(isImmutable, ignorePaths, obj) {
         }
     };
 }
-function trackProperties(isImmutable, ignorePaths, obj, path) {
+function trackProperties(isImmutable, ignorePaths, obj, path, checkedObjects) {
     if (ignorePaths === void 0) { ignorePaths = []; }
     if (path === void 0) { path = ""; }
+    if (checkedObjects === void 0) { checkedObjects = new Set(); }
     var tracked = { value: obj };
-    if (!isImmutable(obj)) {
+    if (!isImmutable(obj) && !checkedObjects.has(obj)) {
+        checkedObjects.add(obj);
         tracked.children = {};
         for (var key in obj) {
             var childPath = path ? path + "." + key : key;
@@ -1931,7 +1992,7 @@ function curryGetDefaultMiddleware() {
 }
 function getDefaultMiddleware(options) {
     if (options === void 0) { options = {}; }
-    var _c = options.thunk, thunk = _c === void 0 ? true : _c, _d = options.immutableCheck, immutableCheck = _d === void 0 ? true : _d, _e = options.serializableCheck, serializableCheck = _e === void 0 ? true : _e;
+    var _c = options.thunk, thunk = _c === void 0 ? true : _c, _d = options.immutableCheck, immutableCheck = _d === void 0 ? true : _d, _e = options.serializableCheck, serializableCheck = _e === void 0 ? true : _e, _f = options.actionCreatorCheck, actionCreatorCheck = _f === void 0 ? true : _f;
     var middlewareArray = new MiddlewareArray();
     if (thunk) {
         if (isBoolean(thunk)) {
@@ -1956,6 +2017,13 @@ function getDefaultMiddleware(options) {
             }
             middlewareArray.push(createSerializableStateInvariantMiddleware(serializableOptions));
         }
+        if (actionCreatorCheck) {
+            var actionCreatorOptions = {};
+            if (!isBoolean(actionCreatorCheck)) {
+                actionCreatorOptions = actionCreatorCheck;
+            }
+            middlewareArray.unshift(createActionCreatorInvariantMiddleware(actionCreatorOptions));
+        }
     }
     return middlewareArray;
 }
@@ -2002,39 +2070,6 @@ function configureStore(options) {
     var composedEnhancer = finalCompose.apply(void 0, storeEnhancers);
     return createStore(rootReducer, preloadedState, composedEnhancer);
 }
-// src/createAction.ts
-function createAction(type, prepareAction) {
-    function actionCreator() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        if (prepareAction) {
-            var prepared = prepareAction.apply(void 0, args);
-            if (!prepared) {
-                throw new Error("prepareAction did not return an object");
-            }
-            return __spreadValues(__spreadValues({
-                type: type,
-                payload: prepared.payload
-            }, "meta" in prepared && { meta: prepared.meta }), "error" in prepared && { error: prepared.error });
-        }
-        return { type: type, payload: args[0] };
-    }
-    actionCreator.toString = function () { return "" + type; };
-    actionCreator.type = type;
-    actionCreator.match = function (action) { return action.type === type; };
-    return actionCreator;
-}
-function isAction(action) {
-    return isPlainObject(action) && "type" in action;
-}
-function isFSA(action) {
-    return isAction(action) && typeof action.type === "string" && Object.keys(action).every(isValidKey);
-}
-function isValidKey(key) {
-    return ["type", "payload", "error", "meta"].indexOf(key) > -1;
-}
 // src/mapBuilders.ts
 function executeReducerBuilderCallback(builderCallback) {
     var actionsMap = {};
@@ -2051,8 +2086,11 @@ function executeReducerBuilderCallback(builderCallback) {
                 }
             }
             var type = typeof typeOrActionCreator === "string" ? typeOrActionCreator : typeOrActionCreator.type;
+            if (!type) {
+                throw new Error("`builder.addCase` cannot be called with an empty action type");
+            }
             if (type in actionsMap) {
-                throw new Error("addCase cannot be called with two reducers for the same action type");
+                throw new Error("`builder.addCase` cannot be called with two reducers for the same action type");
             }
             actionsMap[type] = reducer;
             return builder;
@@ -9560,9 +9598,10 @@ var produceDraftStateForAllLayersForDimensionWithinMap = function produceDraftSt
  * @param dimensions Dimension[]
  */
 var filterNonTimeDimensions = function filterNonTimeDimensions(dimensions) {
-  return dimensions && dimensions.length ? dimensions.filter(function (dim) {
+  var _a;
+  return (_a = dimensions === null || dimensions === void 0 ? void 0 : dimensions.filter(function (dim) {
     return dim.name !== 'time';
-  }) : [];
+  })) !== null && _a !== void 0 ? _a : [];
 };
 
 var utils$2 = /*#__PURE__*/Object.freeze({
@@ -9995,62 +10034,55 @@ var slice$9 = createSlice({
       var _action$payload14 = action.payload,
         layerStyle = _action$payload14.layerStyle,
         layerDimensions = _action$payload14.layerDimensions;
-      /* Set style */
       if (layerStyle && draft.byId[layerStyle.layerId]) {
         draft.byId[layerStyle.layerId].style = layerStyle === null || layerStyle === void 0 ? void 0 : layerStyle.style;
       }
-      /* Set layer dimensions */
-      if (layerDimensions) {
-        /* Find the corresponding layer we want to update */
-        var currentLayer = draft.byId[layerDimensions.layerId];
-        /* Find all other layers with the same name and service, and update these at once (atomic update) */
-        Object.values(draft.byId).filter(function (draftLayer) {
-          return draftLayer.name === currentLayer.name && draftLayer.service === currentLayer.service;
-        }).forEach(function (draftLayer) {
-          var layerId = draftLayer.id;
-          if (layerId && draft.byId[layerId]) {
-            if (!draft.byId[layerId].dimensions) {
-              draft.byId[layerId].dimensions = [];
+      if (!layerDimensions) {
+        return;
+      }
+      var layer = draft.byId[layerDimensions.layerId];
+      var incomingDimensionNames = layerDimensions.dimensions.map(function (dimension) {
+        return dimension.name;
+      });
+      /* Find all other layers with the same name and service, and update these at once (atomic update) */
+      var layersToUpdate = Object.values(draft.byId).filter(function (otherLayer) {
+        return otherLayer.name === layer.name && otherLayer.service === layer.service && otherLayer.id;
+      });
+      layersToUpdate.forEach(function (layerToUpdate) {
+        var _a;
+        var layerId = layerToUpdate.id;
+        var reduxLayer = draft.byId[layerId];
+        (_a = reduxLayer.dimensions) !== null && _a !== void 0 ? _a : reduxLayer.dimensions = [];
+        // remove dimensions not in incoming list of dimensions
+        reduxLayer.dimensions = reduxLayer.dimensions.filter(function (dimension) {
+          return incomingDimensionNames.includes(dimension.name);
+        });
+        var reduxDimensions = reduxLayer.dimensions;
+        /* Now update or insert the dimension for each layer */
+        layerDimensions.dimensions.forEach(function (newLayerDimension) {
+          /* Find the wmLayer */
+          var wmLayer = webmapUtils.getWMLayerById(layerId);
+          /* Find the wmDimension */
+          var wmDimension = wmLayer === null || wmLayer === void 0 ? void 0 : wmLayer.getDimension(newLayerDimension.name);
+          /* This will set the new range of start/stop values for this dimension, making getClosestValue work properly */
+          wmDimension === null || wmDimension === void 0 ? void 0 : wmDimension.reInitializeValues(newLayerDimension.values);
+          var existingDimension = reduxDimensions.find(function (d) {
+            return d.name === newLayerDimension.name;
+          });
+          if (existingDimension) {
+            /* If found update only minValue, maxValue and values */
+            existingDimension.maxValue = newLayerDimension.maxValue;
+            existingDimension.minValue = newLayerDimension.minValue;
+            existingDimension.values = newLayerDimension.values;
+            if (!existingDimension.units) {
+              existingDimension.units = newLayerDimension.units;
             }
-            var draftLayerDimensions = draft.byId[layerId].dimensions;
-            /* Now update the dimension for each layer */
-            layerDimensions.dimensions.forEach(function (newLayerDimension) {
-              /* Find the wmLayer */
-              var wmLayer = webmapUtils.getWMLayerById(layerId);
-              /* Find the wmDimension */
-              var wmDimension = wmLayer && wmLayer.getDimension(newLayerDimension.name);
-              /* This will set the new range of start/stop values for this dimension, making getClosestValue work properly */
-              wmDimension && wmDimension.reInitializeValues(newLayerDimension.values);
-              /* Find corresponding draftLayerDimensions */
-              var draftLayerDimension = draftLayerDimensions === null || draftLayerDimensions === void 0 ? void 0 : draftLayerDimensions.find(function (d) {
-                return d.name === newLayerDimension.name;
-              });
-              if (draftLayerDimension) {
-                /* If found update only minValue, maxValue and values */
-                draftLayerDimension.maxValue = newLayerDimension.maxValue;
-                draftLayerDimension.minValue = newLayerDimension.minValue;
-                draftLayerDimension.values = newLayerDimension.values;
-                if (!draftLayerDimension.units) {
-                  draftLayerDimension.units = newLayerDimension.units;
-                }
-              } else if (layerId === layerDimensions.layerId) {
-                /* Otherwise add a new one, but only for this layer. */
-                draftLayerDimensions.push({
-                  name: newLayerDimension.name,
-                  units: newLayerDimension.units,
-                  currentValue: newLayerDimension.currentValue,
-                  minValue: newLayerDimension.minValue,
-                  maxValue: newLayerDimension.maxValue,
-                  validSyncSelection: newLayerDimension.validSyncSelection,
-                  values: newLayerDimension.values,
-                  timeInterval: newLayerDimension.timeInterval,
-                  synced: newLayerDimension.synced
-                });
-              }
-            });
+          } else if (layerId === layerDimensions.layerId) {
+            /* Otherwise add a new one, but only for this layer. */
+            reduxDimensions.push(Object.assign({}, newLayerDimension));
           }
         });
-      }
+      });
     },
     // feature layer actions
     setSelectedFeature: function setSelectedFeature(draft, action) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,13 +12,13 @@
   "main": "./index.esm.js",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/shared": "8.3.0",
-    "@opengeoweb/webmap": "8.3.0",
-    "@opengeoweb/webmap-react": "8.3.0",
+    "@opengeoweb/shared": "8.4.0",
+    "@opengeoweb/webmap": "8.4.0",
+    "@opengeoweb/webmap-react": "8.4.0",
     "@redux-eggs/core": "2.2.0",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
-    "@reduxjs/toolkit": "1.9.5",
+    "@reduxjs/toolkit": "1.9.7",
     "@turf/turf": "6.5.0",
     "date-fns": "2.30.0",
     "immer": "9.0.21",