@aics/vole-app 3.4.4 → 3.6.0

package/es/aics-image-viewer/state/reset.js

@@ -11,8 +11,8 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { getDefaultCameraState, getDefaultChannelColor, getDefaultChannelState, getDefaultViewerState } from "../shared/constants";
-import { ViewMode } from "../shared/enums";
 import { getEnabledChannelIndices, initializeOneChannelSetting } from "../shared/utils/viewerState";
+import { ViewMode } from "./types";
 import { validateState } from "./util";
 var resetState = function resetState(currentState, newState, newChannelStates) {
   var channelSettings = currentState.channelSettings,

package/es/aics-image-viewer/state/serialize.js

@@ -1,15 +1,29 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { isEqual } from "lodash";
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { identity, isEqual } from "lodash";
 import { getDefaultCameraState, getDefaultChannelState, getDefaultViewerState } from "../shared/constants";
-import { ViewMode } from "../shared/enums";
 import { removeMatchingProperties, removeUndefinedProperties } from "../shared/utils/datatypes";
-import { CameraTransformKeys, ViewerChannelSettingKeys, ViewerStateKeys } from "./types";
+import { CameraTransformKeys, ChannelStateSnapshotKeys, ImageType, ImageTypeSnapshot, RenderMode, RenderModeSnapshot, ViewerStateSnapshotKeys, ViewMode, ViewModeSnapshot } from "./types";
 var ENCODED_COLON_REGEX = /%3A/g;
 var DEFAULT_CONTROL_POINT_COLOR = [255, 255, 255];
 var DEFAULT_CONTROL_POINT_COLOR_CODE = "1";
+
+/**
+ * Serializes an object with `string` keys to a compact `string` representation, where keys and values are separated
+ * by colons (`:`) and entries are separated by commas (`,`).
+ */
 export function objectToKeyValueList(obj) {
   var keyValuePairs = [];
   for (var key in obj) {
@@ -23,11 +37,98 @@ export function objectToKeyValueList(obj) {
   }
   return keyValuePairs.join(",");
 }
+
+// MARK: Snapshot
+
 function colorArrayToHex(color) {
   return color.map(function (c) {
     return c.toString(16).padStart(2, "0");
   }).join("").toLowerCase();
 }
+var xyzToArray = function xyzToArray(_ref) {
+  var x = _ref.x,
+    y = _ref.y,
+    z = _ref.z;
+  return [x, y, z];
+};
+
+/**
+ * Converts a `CameraState` to a `CameraStateSnapshot`, suitable for serialization.
+ * @param cameraState The camera state to serialize.
+ * @param removeDefaults Whether to remove default values.
+ * @param viewMode The current view mode. Default `ViewMode.threeD`.
+ * @returns The resulting `CameraStateSnapshot`, or `undefined` if all values are default.
+ */
+export function cameraStateToSnapshot(cameraState, removeDefaults) {
+  var viewMode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ViewMode.threeD;
+  if (cameraState === undefined) {
+    return undefined;
+  }
+
+  // Note that we use the `getDefaultCameraState()` to get the defaults here,
+  // instead of `getDefaultViewerState().cameraState`. The latter is undefined, which signals
+  // that the camera should not be modified for URLs that don't specify it.
+  var modifiedState = removeDefaults ? removeMatchingProperties(cameraState, getDefaultCameraState(viewMode)) : cameraState;
+  var snapshot = removeUndefinedProperties(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, CameraTransformKeys.Position, modifiedState.position && _toConsumableArray(modifiedState.position)), CameraTransformKeys.Target, modifiedState.target && _toConsumableArray(modifiedState.target)), CameraTransformKeys.Up, modifiedState.up && _toConsumableArray(modifiedState.up)), CameraTransformKeys.OrthoScale, modifiedState.orthoScale), CameraTransformKeys.Fov, modifiedState.fov));
+  if (Object.keys(snapshot).length === 0) {
+    return undefined;
+  }
+  return snapshot;
+}
+function controlPointToSnapshot(controlPoint) {
+  return {
+    x: controlPoint.x,
+    opacity: controlPoint.opacity,
+    color: isEqual(controlPoint.color, DEFAULT_CONTROL_POINT_COLOR) ? DEFAULT_CONTROL_POINT_COLOR_CODE : colorArrayToHex(controlPoint.color)
+  };
+}
+var VIEW_MODE_TO_SNAPSHOT = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ViewMode.threeD, ViewModeSnapshot.threeD), ViewMode.xy, ViewModeSnapshot.xy), ViewMode.xz, ViewModeSnapshot.xz), ViewMode.yz, ViewModeSnapshot.yz);
+var RENDER_MODE_TO_SNAPSHOT = _defineProperty(_defineProperty(_defineProperty({}, RenderMode.volumetric, RenderModeSnapshot.volumetric), RenderMode.maxProject, RenderModeSnapshot.maxProject), RenderMode.pathTrace, RenderModeSnapshot.pathTrace);
+var IMAGE_TYPE_TO_SNAPSHOT = _defineProperty(_defineProperty({}, ImageType.segmentedCell, ImageTypeSnapshot.segmentedCell), ImageType.fullField, ImageTypeSnapshot.fullField);
+
+/**
+ * Converts a `ViewerState` to a `ViewerStateSnapshot`, suitable for serialization.
+ */
+export function viewerStateToSnapshot(state, removeDefaults) {
+  var _result;
+  var s = state;
+  if (removeDefaults) {
+    s = removeMatchingProperties(state, getDefaultViewerState());
+    // special case: if there's an explicit scale level but it's not being used, no reason to include it
+    if (s.scaleLevelIndex !== undefined && state.useExactScaleLevel === undefined) {
+      delete s.scaleLevelIndex;
+    }
+  }
+  var result = (_result = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_result, ViewerStateSnapshotKeys.View, s.viewMode && VIEW_MODE_TO_SNAPSHOT[s.viewMode]), ViewerStateSnapshotKeys.Mode, s.renderMode && RENDER_MODE_TO_SNAPSHOT[s.renderMode]), ViewerStateSnapshotKeys.MaskOpacity, s.maskAlpha), ViewerStateSnapshotKeys.ImageType, s.imageType && IMAGE_TYPE_TO_SNAPSHOT[s.imageType]), ViewerStateSnapshotKeys.ShowAxes, s.showAxes), ViewerStateSnapshotKeys.ShowBoundingBox, s.showBoundingBox), ViewerStateSnapshotKeys.BoundingBoxColor, s.boundingBoxColor && colorArrayToHex(s.boundingBoxColor)), ViewerStateSnapshotKeys.BackgroundColor, s.backgroundColor && colorArrayToHex(s.backgroundColor)), ViewerStateSnapshotKeys.Autorotate, s.autorotate), ViewerStateSnapshotKeys.Brightness, s.brightness), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_result, ViewerStateSnapshotKeys.Density, s.density), ViewerStateSnapshotKeys.Interpolation, s.interpolationEnabled), ViewerStateSnapshotKeys.Region, s.region && xyzToArray(s.region)), ViewerStateSnapshotKeys.Slice, s.slice && xyzToArray(s.slice)), ViewerStateSnapshotKeys.Levels, s.levels && _toConsumableArray(s.levels)), ViewerStateSnapshotKeys.Time, s.time), ViewerStateSnapshotKeys.Scene, s.scene), ViewerStateSnapshotKeys.SingleChannelMode, s.singleChannelMode), ViewerStateSnapshotKeys.SingleChannelIndex, s.singleChannelIndex), ViewerStateSnapshotKeys.UseExactScaleLevel, s.useExactScaleLevel), _defineProperty(_defineProperty(_result, ViewerStateSnapshotKeys.ScaleLevelIndex, s.scaleLevelIndex), ViewerStateSnapshotKeys.CameraState, cameraStateToSnapshot(s.cameraState, removeDefaults, s.viewMode)));
+  return removeUndefinedProperties(result);
+}
+export function channelStateToSnapshot(state, removeDefaults) {
+  var _result2;
+  var s = removeDefaults ? removeMatchingProperties(state, getDefaultChannelState()) : state;
+  var result = (_result2 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_result2, ChannelStateSnapshotKeys.VolumeEnabled, s.volumeEnabled), ChannelStateSnapshotKeys.SurfaceEnabled, s.isosurfaceEnabled), ChannelStateSnapshotKeys.IsosurfaceValue, s.isovalue), ChannelStateSnapshotKeys.IsosurfaceAlpha, s.opacity), ChannelStateSnapshotKeys.Colorize, s.colorizeEnabled), ChannelStateSnapshotKeys.ColorizeAlpha, s.colorizeAlpha), ChannelStateSnapshotKeys.Color, s.color && colorArrayToHex(s.color)), ChannelStateSnapshotKeys.ControlPoints, s.controlPoints && s.controlPoints.map(controlPointToSnapshot)), ChannelStateSnapshotKeys.ControlPointsEnabled, s.useControlPoints), ChannelStateSnapshotKeys.Ramp, s.ramp && _toConsumableArray(s.ramp)), _defineProperty(_result2, ChannelStateSnapshotKeys.KeepRange, s.keepIntensityRange));
+  return removeUndefinedProperties(result);
+}
+
+// MARK: Stringify
+
+/**
+ * Helper function for converting all keys of an object to `string` representations.
+ *
+ * Accepts an object of the input type, and a map of stringifiers for each of the input type's properties.
+ */
+var stringify = function stringify(record, stringifiers) {
+  var result = {};
+  for (var _i = 0, _Object$keys = Object.keys(record); _i < _Object$keys.length; _i++) {
+    var k = _Object$keys[_i];
+    var key = k;
+    var value = record[key];
+    var stringifier = stringifiers[key];
+    if (value !== undefined && stringifier !== undefined) {
+      result[key] = stringifier(value);
+    }
+  }
+  return result;
+};
 
 /**
  * Formats a float or integer value to a string with a maximum precision for float values.
@@ -53,93 +154,82 @@ function formatFloat(value) {
   }
   return Number(value.toPrecision(maxPrecision)).toString();
 }
-function perAxisToArray(perAxis) {
-  return [perAxis.x, perAxis.y, perAxis.z];
-}
-
-/** Serializes a region into a `x1:x2,y1:y2,z1:z2` string format. */
-function serializeRegion(region) {
-  return perAxisToArray(region).map(function (axis) {
-    return axis.map(function (val) {
-      return formatFloat(val);
-    }).join(":");
-  }).join(",");
-}
-
-/** Serializes a slice parameter into a `x,y,z` string format. */
-function serializeSlice(slice) {
-  return perAxisToArray(slice).map(function (val) {
-    return formatFloat(val);
-  }).join(",");
-}
-function serializeBoolean(value) {
-  if (value === undefined) {
-    return undefined;
-  }
+var stringifyBoolean = function stringifyBoolean(value) {
   return value ? "1" : "0";
-}
-export function serializeCameraState(cameraState, removeDefaults) {
-  var viewMode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ViewMode.threeD;
-  if (removeDefaults) {
-    // Note that we use the `getDefaultCameraState()` to get the defaults here,
-    // instead of `getDefaultViewerState().cameraState`. The latter is undefined, which signals
-    // that the camera should not be modified for URLs that don't specify it.
-    cameraState = removeMatchingProperties(cameraState, getDefaultCameraState(viewMode));
-    if (Object.keys(cameraState).length === 0) {
-      return undefined;
-    }
-  }
-  var cameraString = objectToKeyValueList(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, CameraTransformKeys.Position, cameraState.position && cameraState.position.map(function (value) {
-    return formatFloat(value);
-  }).join(":")), CameraTransformKeys.Target, cameraState.target && cameraState.target.map(function (value) {
+};
+var stringifyNumberList = function stringifyNumberList(list) {
+  var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ":";
+  return list.map(function (value) {
     return formatFloat(value);
-  }).join(":")), CameraTransformKeys.Up, cameraState.up && cameraState.up.map(function (value) {
-    return formatFloat(value);
-  }).join(":")), CameraTransformKeys.OrthoScale, cameraState.orthoScale === undefined ? undefined : formatFloat(cameraState.orthoScale)), CameraTransformKeys.Fov, cameraState.fov === undefined ? undefined : formatFloat(cameraState.fov)));
-  return cameraString === "" ? undefined : cameraString;
-}
-function serializeControlPoints(controlPoints) {
+  }).join(separator);
+};
+function stringifyControlPointSnapshots(controlPoints) {
   return controlPoints.map(function (cp) {
-    var x = formatFloat(cp.x);
-    var opacity = formatFloat(cp.opacity);
-    // Default control-point color is encoded as DEFAULT_CONTROL_POINT_COLOR_CODE ("1").
-    var color = isEqual(cp.color, DEFAULT_CONTROL_POINT_COLOR) ? DEFAULT_CONTROL_POINT_COLOR_CODE : colorArrayToHex(cp.color);
-    return "".concat(x, ":").concat(opacity, ":").concat(color);
+    return "".concat(formatFloat(cp.x), ":").concat(formatFloat(cp.opacity), ":").concat(cp.color);
   }).join(":");
 }
 
 /**
- * Serializes a single viewer channel setting into a dictionary of URL parameters
- * (`ViewerChannelStateParams`).
+ * Converts all keys of a `CameraStateSnapshot` to compact `string` representations,
+ * for serialization to `string` formats.
+ */
+export var stringifyCameraStateSnapshot = function stringifyCameraStateSnapshot(snapshot) {
+  return stringify(snapshot, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, CameraTransformKeys.Position, stringifyNumberList), CameraTransformKeys.Target, stringifyNumberList), CameraTransformKeys.Up, stringifyNumberList), CameraTransformKeys.OrthoScale, formatFloat), CameraTransformKeys.Fov, formatFloat));
+};
+
+/**
+ * Converts all keys of a `ViewerStateSnapshot` to compact `string` representations,
+ * for serialization to `string` formats.
+ */
+export var stringifyViewerStateSnapshot = function stringifyViewerStateSnapshot(snapshot) {
+  var _stringify2;
+  return stringify(snapshot, (_stringify2 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_stringify2, ViewerStateSnapshotKeys.View, identity), ViewerStateSnapshotKeys.Mode, identity), ViewerStateSnapshotKeys.MaskOpacity, formatFloat), ViewerStateSnapshotKeys.ImageType, identity), ViewerStateSnapshotKeys.ShowAxes, stringifyBoolean), ViewerStateSnapshotKeys.ShowBoundingBox, stringifyBoolean), ViewerStateSnapshotKeys.BoundingBoxColor, identity), ViewerStateSnapshotKeys.BackgroundColor, identity), ViewerStateSnapshotKeys.Autorotate, stringifyBoolean), ViewerStateSnapshotKeys.Brightness, formatFloat), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_stringify2, ViewerStateSnapshotKeys.Density, formatFloat), ViewerStateSnapshotKeys.Interpolation, stringifyBoolean), ViewerStateSnapshotKeys.Region, function (value) {
+    return value.map(function (axis) {
+      return stringifyNumberList(axis);
+    }).join(",");
+  }), ViewerStateSnapshotKeys.Slice, function (value) {
+    return stringifyNumberList(value, ",");
+  }), ViewerStateSnapshotKeys.Levels, function (value) {
+    return stringifyNumberList(value, ",");
+  }), ViewerStateSnapshotKeys.Time, formatFloat), ViewerStateSnapshotKeys.Scene, formatFloat), ViewerStateSnapshotKeys.SingleChannelMode, stringifyBoolean), ViewerStateSnapshotKeys.SingleChannelIndex, formatFloat), ViewerStateSnapshotKeys.UseExactScaleLevel, stringifyBoolean), _defineProperty(_defineProperty(_stringify2, ViewerStateSnapshotKeys.ScaleLevelIndex, formatFloat), ViewerStateSnapshotKeys.CameraState, function (value) {
+    return objectToKeyValueList(stringifyCameraStateSnapshot(value));
+  })));
+};
+
+/**
+ * Converts all keys of a `ChannelStateSnapshot` to compact `string` representations,
+ * for serialization to `string` formats.
+ */
+export var stringifyChannelStateSnapshot = function stringifyChannelStateSnapshot(snapshot) {
+  var _stringify3;
+  return stringify(snapshot, (_stringify3 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_stringify3, ChannelStateSnapshotKeys.Color, identity), ChannelStateSnapshotKeys.Colorize, stringifyBoolean), ChannelStateSnapshotKeys.ColorizeAlpha, formatFloat), ChannelStateSnapshotKeys.IsosurfaceAlpha, formatFloat), ChannelStateSnapshotKeys.Lut, function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+      min = _ref3[0],
+      max = _ref3[1];
+    return "".concat(min, ":").concat(max);
+  }), ChannelStateSnapshotKeys.ControlPoints, stringifyControlPointSnapshots), ChannelStateSnapshotKeys.ControlPointsLegacy, stringifyControlPointSnapshots), ChannelStateSnapshotKeys.Ramp, stringifyNumberList), ChannelStateSnapshotKeys.RampLegacy, stringifyNumberList), ChannelStateSnapshotKeys.ControlPointsEnabled, stringifyBoolean), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_stringify3, ChannelStateSnapshotKeys.VolumeEnabled, stringifyBoolean), ChannelStateSnapshotKeys.SurfaceEnabled, stringifyBoolean), ChannelStateSnapshotKeys.IsosurfaceValue, formatFloat), ChannelStateSnapshotKeys.KeepRange, stringifyBoolean)));
+};
+
+/**
+ * Converts a single viewer channel setting into a `ChannelStateStringified`.
+ *
+ * This is equivalent to (and implemented by) applying `channelStateToSnapshot`, then `stringifyChannelStateSnapshot`.
  * @param channelSetting The channel state object to serialize.
  * @param removeDefaults Whether to remove properties that match the output of `getDefaultChannelState`.
- * @returns A `ViewerChannelSettingParams` object with the serialized parameters. Undefined values are removed.
+ * @returns A `ChannelStateStringified` object with the serialized parameters. `undefined` values are removed.
  */
-export function serializeViewerChannelSetting(channelSetting, removeDefaults) {
-  var _channelSetting$isova, _channelSetting$opaci, _channelSetting$color, _channelSetting$ramp, _removeUndefinedPrope;
-  if (removeDefaults) {
-    channelSetting = removeMatchingProperties(channelSetting, getDefaultChannelState());
-  }
-  return removeUndefinedProperties((_removeUndefinedPrope = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_removeUndefinedPrope, ViewerChannelSettingKeys.VolumeEnabled, serializeBoolean(channelSetting.volumeEnabled)), ViewerChannelSettingKeys.SurfaceEnabled, serializeBoolean(channelSetting.isosurfaceEnabled)), ViewerChannelSettingKeys.IsosurfaceValue, (_channelSetting$isova = channelSetting.isovalue) === null || _channelSetting$isova === void 0 ? void 0 : _channelSetting$isova.toString()), ViewerChannelSettingKeys.IsosurfaceAlpha, (_channelSetting$opaci = channelSetting.opacity) === null || _channelSetting$opaci === void 0 ? void 0 : _channelSetting$opaci.toString()), ViewerChannelSettingKeys.Colorize, serializeBoolean(channelSetting.colorizeEnabled)), ViewerChannelSettingKeys.ColorizeAlpha, (_channelSetting$color = channelSetting.colorizeAlpha) === null || _channelSetting$color === void 0 ? void 0 : _channelSetting$color.toString()), ViewerChannelSettingKeys.Color, channelSetting.color && colorArrayToHex(channelSetting.color)), ViewerChannelSettingKeys.ControlPoints, channelSetting.controlPoints && serializeControlPoints(channelSetting.controlPoints)), ViewerChannelSettingKeys.ControlPointsEnabled, serializeBoolean(channelSetting.useControlPoints)), ViewerChannelSettingKeys.Ramp, (_channelSetting$ramp = channelSetting.ramp) === null || _channelSetting$ramp === void 0 ? void 0 : _channelSetting$ramp.join(":")), _defineProperty(_removeUndefinedPrope, ViewerChannelSettingKeys.KeepRange, serializeBoolean(channelSetting.keepIntensityRange))));
-}
+export var channelStateToStringSnapshot = function channelStateToStringSnapshot(channelSetting, removeDefaults) {
+  return stringifyChannelStateSnapshot(channelStateToSnapshot(channelSetting, removeDefaults));
+};
 
 /**
- * Serializes a `ViewerState` object into a dictionary of URL parameters.
+ * Serializes a `ViewerState` object into a `ViewerStateStringified`.
+ *
+ * This is equivalent to (and implemented by) applying `viewerStateToSnapshot`, then `stringifyViewerStateSnapshot`.
  * @param state The `ViewerState` to serialize.
  * @param removeDefaults If true, remove properties that match the output of `getDefaultViewerState`.
- * @returns A `ViewerStateParams` object with the serialized parameters. Undefined values are removed.
+ * @returns A `ViewerStateStringified` object with the serialized parameters. `undefined` values are removed.
  */
-export function serializeViewerState(state, removeDefaults) {
-  var _state$maskAlpha, _state$brightness, _state$density, _state$levels, _state$time, _state$scene, _state$singleChannelI, _state$scaleLevelInde, _result;
-  if (removeDefaults) {
-    state = removeMatchingProperties(state, getDefaultViewerState());
-    // special case: if there's an explicit scale level but it's not being used, no reason to include it
-    if (state.scaleLevelIndex !== undefined && state.useExactScaleLevel === undefined) {
-      delete state.scaleLevelIndex;
-    }
-  }
-  var result = (_result = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_result, ViewerStateKeys.Mode, state.renderMode), ViewerStateKeys.Mask, (_state$maskAlpha = state.maskAlpha) === null || _state$maskAlpha === void 0 ? void 0 : _state$maskAlpha.toString()), ViewerStateKeys.Image, state.imageType), ViewerStateKeys.Axes, serializeBoolean(state.showAxes)), ViewerStateKeys.BoundingBox, serializeBoolean(state.showBoundingBox)), ViewerStateKeys.BoundingBoxColor, state.boundingBoxColor && colorArrayToHex(state.boundingBoxColor)), ViewerStateKeys.BackgroundColor, state.backgroundColor && colorArrayToHex(state.backgroundColor)), ViewerStateKeys.Autorotate, serializeBoolean(state.autorotate)), ViewerStateKeys.Brightness, (_state$brightness = state.brightness) === null || _state$brightness === void 0 ? void 0 : _state$brightness.toString()), ViewerStateKeys.Density, (_state$density = state.density) === null || _state$density === void 0 ? void 0 : _state$density.toString()), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_result, ViewerStateKeys.Interpolation, serializeBoolean(state.interpolationEnabled)), ViewerStateKeys.Region, state.region && serializeRegion(state.region)), ViewerStateKeys.Slice, state.slice && serializeSlice(state.slice)), ViewerStateKeys.Levels, (_state$levels = state.levels) === null || _state$levels === void 0 ? void 0 : _state$levels.join(",")), ViewerStateKeys.Time, (_state$time = state.time) === null || _state$time === void 0 ? void 0 : _state$time.toString()), ViewerStateKeys.Scene, (_state$scene = state.scene) === null || _state$scene === void 0 ? void 0 : _state$scene.toString()), ViewerStateKeys.SingleChannelMode, serializeBoolean(state.singleChannelMode)), ViewerStateKeys.SingleChannelIndex, (_state$singleChannelI = state.singleChannelIndex) === null || _state$singleChannelI === void 0 ? void 0 : _state$singleChannelI.toString()), ViewerStateKeys.UseExactScaleLevel, serializeBoolean(state.useExactScaleLevel)), ViewerStateKeys.ScaleLevelIndex, (_state$scaleLevelInde = state.scaleLevelIndex) === null || _state$scaleLevelInde === void 0 ? void 0 : _state$scaleLevelInde.toString()), _defineProperty(_result, ViewerStateKeys.CameraState, state.cameraState && serializeCameraState(state.cameraState, removeDefaults, state.viewMode)));
-  var viewModeToViewParam = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ViewMode.threeD, "3D"), ViewMode.xy, "Z"), ViewMode.xz, "Y"), ViewMode.yz, "X");
-  result[ViewerStateKeys.View] = state.viewMode && viewModeToViewParam[state.viewMode];
-  return removeUndefinedProperties(result);
-}
+export var viewerStateToStringSnapshot = function viewerStateToStringSnapshot(state, removeDefaults) {
+  return stringifyViewerStateSnapshot(viewerStateToSnapshot(state, removeDefaults));
+};

package/es/aics-image-viewer/state/subscribers.js

@@ -6,11 +6,11 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { RENDERMODE_PATHTRACE, RENDERMODE_RAYMARCH } from "@aics/vole-core";
 import { shallow } from "zustand/shallow";
-import { RenderMode, ViewMode } from "../shared/enums";
 import { activeAxisMap } from "../shared/types";
 import { colorArrayToFloats } from "../shared/utils/colorRepresentations";
 import { alphaSliderToImageValue, brightnessSliderToImageValue, densitySliderToImageValue, gammaSliderToImageValues } from "../shared/utils/sliderValuesToImageValues";
 import { select } from "./store";
+import { RenderMode, ViewMode } from "./types";
 var REF_EQ = {
   fireImmediately: true
 };

package/es/aics-image-viewer/state/test/deserialize.test.js

@@ -10,11 +10,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { describe, expect, it } from "@jest/globals";
-import { RenderMode, ViewMode } from "../../shared/enums";
-import { CONTROL_POINTS_REGEX, deserializeChannelState, deserializeViewerChannelSetting, deserializeViewerState, LEGACY_CONTROL_POINTS_REGEX, parseHexColorAsColorArray, parseKeyValueList, parseStringEnum, parseStringFloat, parseStringInt } from "../deserialize";
-import { serializeViewerState } from "../serialize";
-import { CUSTOM_TEST_VIEWER_STATE, DEFAULT_TEST_VIEWER_CHANNEL_SETTING, DEFAULT_TEST_VIEWER_STATE, SERIALIZED_CUSTOM_TEST_VIEWER_STATE, SERIALIZED_DEFAULT_TEST_VIEWER_STATE } from "./test_data";
+import { describe, expect, it } from "vitest";
+import { CONTROL_POINTS_REGEX, enumParser, LEGACY_CONTROL_POINTS_REGEX, parseHexColorAsColorArray, parseKeyValueList, stringSnapshotToChannelState, stringSnapshotToViewerChannelSetting, stringSnapshotToViewerState, validateInt, validateNumber } from "../deserialize";
+import { viewerStateToStringSnapshot } from "../serialize";
+import { RenderMode, ViewMode } from "../types";
+import { CUSTOM_TEST_VIEWER_STATE, DEFAULT_TEST_VIEWER_CHANNEL_SETTING, DEFAULT_TEST_VIEWER_STATE, STRINGIFIED_CUSTOM_TEST_VIEWER_STATE, STRINGIFIED_DEFAULT_TEST_VIEWER_STATE } from "./test_data";
 
 //// VALUE PARSING ////////////////////////////////////////
 
@@ -129,67 +129,53 @@ describe("parseHexColorAsColorArray", function () {
     expect(parseHexColorAsColorArray("1")).toEqual([255, 255, 255]);
   });
 });
-describe("parseStringEnum", function () {
+describe("enumParser", function () {
   var TestEnum = /*#__PURE__*/function (TestEnum) {
-    TestEnum["SOME_VALUE"] = "some_value";
-    TestEnum["ANOTHER_VALUE"] = "another_value";
+    TestEnum["SOME_VALUE"] = "someValue";
+    TestEnum["ANOTHER_VALUE"] = "anotherValue";
     return TestEnum;
   }({});
+  var parseTestEnum = enumParser(TestEnum);
   it("recognizes enum values", function () {
-    expect(parseStringEnum("some_value", TestEnum)).toEqual(TestEnum.SOME_VALUE);
-    expect(parseStringEnum("another_value", TestEnum)).toEqual(TestEnum.ANOTHER_VALUE);
+    expect(parseTestEnum("someValue")).toEqual(TestEnum.SOME_VALUE);
+    expect(parseTestEnum("anotherValue")).toEqual(TestEnum.ANOTHER_VALUE);
   });
-  it("returns default values for unrecognized enum values", function () {
-    expect(parseStringEnum("unexpected", TestEnum, undefined)).toEqual(undefined);
-    expect(parseStringEnum("unexpected", TestEnum, TestEnum.SOME_VALUE)).toEqual(TestEnum.SOME_VALUE);
+  it("recognizes lowercase enum values", function () {
+    expect(parseTestEnum("somevalue")).toEqual(TestEnum.SOME_VALUE);
+    expect(parseTestEnum("anothervalue")).toEqual(TestEnum.ANOTHER_VALUE);
   });
 });
-describe("parseStringInt", function () {
-  it("parses int and undefined values", function () {
-    expect(parseStringInt("0", 0, 1000)).toEqual(0);
-    expect(parseStringInt("1", 0, 1000)).toEqual(1);
-    expect(parseStringInt("100", 0, 1000)).toEqual(100);
-    expect(parseStringInt("255", 0, 1000)).toEqual(255);
-    expect(parseStringInt("-1", -1000, 1000)).toEqual(-1);
-  });
+describe("validateInt", function () {
   it("returns undefined for undefined and NaN values", function () {
-    expect(parseStringInt("bad", -1000, 1000)).toEqual(undefined);
-    expect(parseStringInt("NaN", -1000, 1000)).toEqual(undefined);
-    expect(parseStringInt(undefined, -1000, 1000)).toEqual(undefined);
+    expect(validateInt("bad", -1000, 1000)).toEqual(undefined);
+    expect(validateInt(NaN, -1000, 1000)).toEqual(undefined);
+    expect(validateInt(undefined, -1000, 1000)).toEqual(undefined);
   });
   it("casts float values to integers", function () {
-    expect(parseStringInt("0.5", 0, 1000)).toEqual(0);
-    expect(parseStringInt("99.5", 0, 1000)).toEqual(99);
-    expect(parseStringInt("-10.5", -1000, 1000)).toEqual(-10);
+    expect(validateInt(0.5, 0, 1000)).toEqual(0);
+    expect(validateInt(99.5, 0, 1000)).toEqual(99);
+    expect(validateInt(-10.5, -1000, 1000)).toEqual(-10);
   });
   it("applies clamping", function () {
-    expect(parseStringInt("0", 0, 255)).toEqual(0);
-    expect(parseStringInt("-1", 0, 255)).toEqual(0);
-    expect(parseStringInt("128", 0, 255)).toEqual(128);
-    expect(parseStringInt("255", 0, 255)).toEqual(255);
-    expect(parseStringInt("256", 0, 255)).toEqual(255);
+    expect(validateInt(0, 0, 255)).toEqual(0);
+    expect(validateInt(-1, 0, 255)).toEqual(0);
+    expect(validateInt(128, 0, 255)).toEqual(128);
+    expect(validateInt(255, 0, 255)).toEqual(255);
+    expect(validateInt(256, 0, 255)).toEqual(255);
   });
 });
-describe("parseStringFloat", function () {
-  it("parses strings to float values", function () {
-    expect(parseStringFloat("0", -1000, 1000)).toEqual(0);
-    expect(parseStringFloat("1.0", -1000, 1000)).toEqual(1.0);
-    expect(parseStringFloat("0.5", -1000, 1000)).toEqual(0.5);
-    expect(parseStringFloat("128.5", -1000, 1000)).toEqual(128.5);
-    expect(parseStringFloat("495.344", -1000, 1000)).toEqual(495.344);
-    expect(parseStringFloat("-1", -1000, 1000)).toEqual(-1);
-  });
+describe("validateNumber", function () {
   it("returns undefined for NaN or undefined values", function () {
-    expect(parseStringFloat("bad", -1000, 1000)).toEqual(undefined);
-    expect(parseStringFloat("NaN", -1000, 1000)).toEqual(undefined);
-    expect(parseStringFloat(undefined, -1000, 1000)).toEqual(undefined);
+    expect(validateNumber("bad", -1000, 1000)).toEqual(undefined);
+    expect(validateNumber(NaN, -1000, 1000)).toEqual(undefined);
+    expect(validateNumber(undefined, -1000, 1000)).toEqual(undefined);
   });
   it("applies clamping", function () {
-    expect(parseStringFloat("0.5", 0, 1.0)).toEqual(0.5);
-    expect(parseStringFloat("1.0", 0, 1.0)).toEqual(1.0);
-    expect(parseStringFloat("1.1", 0, 1.0)).toEqual(1.0);
-    expect(parseStringFloat("0", 0, 1.0)).toEqual(0);
-    expect(parseStringFloat("-0.1", 0, 1.0)).toEqual(0);
+    expect(validateNumber(0.5, 0, 1.0)).toEqual(0.5);
+    expect(validateNumber(1.0, 0, 1.0)).toEqual(1.0);
+    expect(validateNumber(1.1, 0, 1.0)).toEqual(1.0);
+    expect(validateNumber(0, 0, 1.0)).toEqual(0);
+    expect(validateNumber(-0.1, 0, 1.0)).toEqual(0);
   });
 });
 
@@ -203,10 +189,10 @@ describe("parseStringFloat", function () {
 // input into the viewer and support grouping/matching to multiple channels.
 // TODO: refactor these to all be the same state?
 
-describe("deserializeViewerChannelSetting", function () {
+describe("stringSnapshotToViewerChannelSetting", function () {
   it("returns default settings for empty objects", function () {
     var data = {};
-    var result = deserializeViewerChannelSetting(0, data);
+    var result = stringSnapshotToViewerChannelSetting(0, data);
     expect(result).toEqual(DEFAULT_TEST_VIEWER_CHANNEL_SETTING);
   });
   it("ignores unexpected keys", function () {
@@ -215,7 +201,7 @@ describe("deserializeViewerChannelSetting", function () {
       ven: "1",
       sen: "1"
     };
-    var result = deserializeViewerChannelSetting(0, data);
+    var result = stringSnapshotToViewerChannelSetting(0, data);
     expect(result).toEqual(_objectSpread(_objectSpread({}, DEFAULT_TEST_VIEWER_CHANNEL_SETTING), {}, {
       enabled: true,
       surfaceEnabled: true
@@ -232,7 +218,7 @@ describe("deserializeViewerChannelSetting", function () {
       isv: "128",
       lut: "0:255"
     };
-    expect(deserializeViewerChannelSetting(0, data)).toEqual({
+    expect(stringSnapshotToViewerChannelSetting(0, data)).toEqual({
       match: 0,
       color: "FF0000",
       enabled: true,
@@ -257,7 +243,7 @@ describe("deserializeViewerChannelSetting", function () {
       var data = {
         lut: encodedLut
       };
-      var result = deserializeViewerChannelSetting(0, data);
+      var result = stringSnapshotToViewerChannelSetting(0, data);
       expect((_result$intensity = result.intensity) === null || _result$intensity === void 0 ? void 0 : _result$intensity.lut).toEqual(decodedLut);
     }
   });
@@ -268,7 +254,7 @@ describe("deserializeViewerChannelSetting", function () {
       var data = {
         lut: lut
       };
-      var result = deserializeViewerChannelSetting(0, data);
+      var result = stringSnapshotToViewerChannelSetting(0, data);
       expect(result.lut).toBeUndefined();
     }
   });
@@ -279,7 +265,7 @@ describe("deserializeViewerChannelSetting", function () {
       var data = {
         col: color
       };
-      var result = deserializeViewerChannelSetting(0, data);
+      var result = stringSnapshotToViewerChannelSetting(0, data);
       expect(result.color).toEqual(color);
     }
   });
@@ -290,7 +276,7 @@ describe("deserializeViewerChannelSetting", function () {
       var data = {
         col: color
       };
-      var result = deserializeViewerChannelSetting(0, data);
+      var result = stringSnapshotToViewerChannelSetting(0, data);
       expect(result.color).toBeUndefined();
     }
   });
@@ -300,15 +286,15 @@ describe("deserializeViewerChannelSetting", function () {
       isa: "bad",
       isv: "f8"
     };
-    var result = deserializeViewerChannelSetting(0, data);
+    var result = stringSnapshotToViewerChannelSetting(0, data);
     expect(result.colorizeAlpha).toBeUndefined();
     expect(result.surfaceOpacity).toBeUndefined();
     expect(result.isovalue).toBeUndefined();
   });
 });
-describe("deserializeChannelState", function () {
+describe("stringSnapshotToChannelState", function () {
   it("returns an empty object for empty input", function () {
-    expect(deserializeChannelState({})).toEqual({});
+    expect(stringSnapshotToChannelState({})).toEqual({});
   });
   it("parses channel state fields", function () {
     var data = {
@@ -323,7 +309,7 @@ describe("deserializeChannelState", function () {
       cpe: "1",
       pin: "1"
     };
-    expect(deserializeChannelState(data)).toEqual({
+    expect(stringSnapshotToChannelState(data)).toEqual({
       color: [255, 0, 0],
       colorizeEnabled: true,
       colorizeAlpha: 0.5,
@@ -343,7 +329,7 @@ describe("deserializeChannelState", function () {
       ram: "1:2",
       rmp: "3:4"
     };
-    expect(deserializeChannelState(data)).toEqual({
+    expect(stringSnapshotToChannelState(data)).toEqual({
       controlPoints: [{
         x: 0,
         opacity: 0,
@@ -357,17 +343,17 @@ describe("deserializeChannelState", function () {
     });
   });
 });
-describe("deserializeViewerState", function () {
+describe("stringSnapshotToViewerState", function () {
   it("returns an empty object for empty input", function () {
-    expect(deserializeViewerState({})).toEqual({});
+    expect(stringSnapshotToViewerState({})).toEqual({});
   });
   it("deserializes the default viewer settings", function () {
-    var params = SERIALIZED_DEFAULT_TEST_VIEWER_STATE;
-    expect(deserializeViewerState(params)).toEqual(DEFAULT_TEST_VIEWER_STATE);
+    var params = STRINGIFIED_DEFAULT_TEST_VIEWER_STATE;
+    expect(stringSnapshotToViewerState(params)).toEqual(DEFAULT_TEST_VIEWER_STATE);
   });
   it("deserializes custom viewer settings", function () {
-    var params = SERIALIZED_CUSTOM_TEST_VIEWER_STATE;
-    expect(deserializeViewerState(params)).toEqual(CUSTOM_TEST_VIEWER_STATE);
+    var params = STRINGIFIED_CUSTOM_TEST_VIEWER_STATE;
+    expect(stringSnapshotToViewerState(params)).toEqual(CUSTOM_TEST_VIEWER_STATE);
   });
   it("handles all ViewMode values", function () {
     var viewModes = Object.values(ViewMode);
@@ -376,7 +362,7 @@ describe("deserializeViewerState", function () {
       var state = _objectSpread(_objectSpread({}, DEFAULT_TEST_VIEWER_STATE), {}, {
         viewMode: viewMode
       });
-      expect(deserializeViewerState(serializeViewerState(state, false)).viewMode).toEqual(viewMode);
+      expect(stringSnapshotToViewerState(viewerStateToStringSnapshot(state, false)).viewMode).toEqual(viewMode);
     }
   });
   it("handles all RenderMode values", function () {
@@ -386,7 +372,7 @@ describe("deserializeViewerState", function () {
       var state = _objectSpread(_objectSpread({}, DEFAULT_TEST_VIEWER_STATE), {}, {
         renderMode: renderMode
       });
-      expect(deserializeViewerState(serializeViewerState(state, false)).renderMode).toEqual(renderMode);
+      expect(stringSnapshotToViewerState(viewerStateToStringSnapshot(state, false)).renderMode).toEqual(renderMode);
     }
   });
   it("deserializes partial camera settings", function () {
@@ -398,7 +384,7 @@ describe("deserializeViewerState", function () {
       }
     };
     var serializedState = "pos:1:-1.4:45,up:0:1:0,fov:43.5";
-    expect(deserializeViewerState({
+    expect(stringSnapshotToViewerState({
       cam: serializedState
     })).toEqual(state);
   });
@@ -426,19 +412,19 @@ var DEFAULT_CONTROL_POINTS = [{
 }];
 describe("legacy control points", function () {
   it("parses comma-separated control points", function () {
-    var result = deserializeViewerChannelSetting(0, {
+    var result = stringSnapshotToViewerChannelSetting(0, {
       cps: "-10:0:000000,50:0:000000,100:0.3:0010ff,140:0.8:00ffff,260:1:00ffb4"
     });
     expect(result.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
   });
   it("parses colon-separated control points", function () {
-    var result = deserializeViewerChannelSetting(0, {
+    var result = stringSnapshotToViewerChannelSetting(0, {
       cps: "-10:0:000000:50:0:000000:100:0.3:0010ff:140:0.8:00ffff:260:1:00ffb4"
     });
     expect(result.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
   });
   it("replaces '1' color strings with default color #ffffff", function () {
-    var result = deserializeViewerChannelSetting(0, {
+    var result = stringSnapshotToViewerChannelSetting(0, {
       cps: "0:0:1:50:1:1"
     });
     expect(result.controlPoints).toEqual([{
@@ -454,21 +440,21 @@ describe("legacy control points", function () {
 });
 it("parses comma-separated control points", function () {
   var _result$intensity2;
-  var result = deserializeViewerChannelSetting(0, {
+  var result = stringSnapshotToViewerChannelSetting(0, {
     cpt: "-10:0:000000,50:0:000000,100:0.3:0010ff,140:0.8:00ffff,260:1:00ffb4"
   });
   expect((_result$intensity2 = result.intensity) === null || _result$intensity2 === void 0 ? void 0 : _result$intensity2.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
 });
 it("parses colon-separated control points", function () {
   var _result$intensity3;
-  var result = deserializeViewerChannelSetting(0, {
+  var result = stringSnapshotToViewerChannelSetting(0, {
     cpt: "-10:0:000000:50:0:000000:100:0.3:0010ff:140:0.8:00ffff:260:1:00ffb4"
   });
   expect((_result$intensity3 = result.intensity) === null || _result$intensity3 === void 0 ? void 0 : _result$intensity3.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
 });
 it("replaces '1' color strings with default color #ffffff", function () {
   var _result$intensity4;
-  var result = deserializeViewerChannelSetting(0, {
+  var result = stringSnapshotToViewerChannelSetting(0, {
     cpt: "0:0:1:50:1:1"
   });
   expect((_result$intensity4 = result.intensity) === null || _result$intensity4 === void 0 ? void 0 : _result$intensity4.controlPoints).toEqual([{