@haniffalab/cherita-react 0.1.12 → 0.2.0-dev.2024-02-12.4d768f57

package/dist/context/DatasetContext.js

@@ -9,6 +9,12 @@ exports.DatasetProvider = DatasetProvider;
 exports.useDataset = useDataset;
 exports.useDatasetDispatch = useDatasetDispatch;
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = _interopRequireDefault(require("lodash"));
+var _reactQuery = require("@tanstack/react-query");
+var _reactQueryPersistClient = require("@tanstack/react-query-persist-client");
+var _querySyncStoragePersister = require("@tanstack/query-sync-storage-persister");
+var _constants = require("../constants/constants");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -30,36 +36,96 @@ var DatasetContext = /*#__PURE__*/(0, _react.createContext)(null);
 exports.DatasetContext = DatasetContext;
 var DatasetDispatchContext = /*#__PURE__*/(0, _react.createContext)(null);
 exports.DatasetDispatchContext = DatasetDispatchContext;
-function DatasetProvider(_ref) {
-  var dataset_url = _ref.dataset_url,
-    children = _ref.children;
-  var _useReducer = (0, _react.useReducer)(datasetReducer, {
-      url: dataset_url,
-      selectedObs: null,
-      selectedVar: null,
-      selectedMultiObs: [],
-      selectedMultiVar: [],
-      controls: {
-        colorScale: "Viridis",
-        colorAxis: {
-          dmin: 0,
-          dmax: 1,
-          cmin: 0,
-          cmax: 1
-        },
-        standardScale: null,
-        meanOnlyExpressed: false,
-        expressionCutoff: 0.0
-      }
-    }),
+var queryClient = new _reactQuery.QueryClient({
+  defaultOptions: {
+    queries: {
+      gcTime: 1000 * 60 * 60 * 24 * 7 // store for a week
+    }
+  },
+
+  queryCache: new _reactQuery.QueryCache({
+    onError: function onError(error, query) {
+      console.error(error);
+    }
+  })
+});
+// Type of queries to store responses
+var persistKeys = ["obs/cols", "var/names", "obsm/keys"];
+var persistOptions = {
+  persister: (0, _querySyncStoragePersister.createSyncStoragePersister)({
+    storage: window.localStorage
+  }),
+  dehydrateOptions: {
+    shouldDehydrateQuery: function shouldDehydrateQuery(_ref) {
+      var queryKey = _ref.queryKey,
+        state = _ref.state;
+      if (state.status === "success") {
+        return persistKeys.includes(queryKey === null || queryKey === void 0 ? void 0 : queryKey[0]);
+      }
+      return false;
+    }
+  }
+  // @TODO: add maxAge and buster (app and api version numbers as busters)
+};
+
+var initialDataset = {
+  obs: {},
+  selectedObs: null,
+  selectedObsm: null,
+  selectedVar: null,
+  selectedMultiObs: [],
+  selectedMultiVar: [],
+  colorEncoding: null,
+  controls: {
+    colorScale: "Viridis",
+    colorAxis: {
+      dmin: 0,
+      dmax: 1,
+      cmin: 0,
+      cmax: 1
+    },
+    standardScale: null,
+    meanOnlyExpressed: false,
+    expressionCutoff: 0.0
+  },
+  state: {
+    obs: {}
+  }
+};
+var initializer = function initializer(initialState) {
+  var localObj = (JSON.parse(localStorage.getItem(_constants.LOCAL_STORAGE_KEY)) || {})[initialState.url] || {};
+  var keys = _lodash.default.keys(initialState);
+  var localValues = _lodash.default.pick(localObj, keys);
+  return _lodash.default.assign(initialState, localValues);
+};
+function DatasetProvider(_ref2) {
+  var dataset_url = _ref2.dataset_url,
+    children = _ref2.children;
+  var _useReducer = (0, _react.useReducer)(datasetReducer, _objectSpread({
+      url: dataset_url
+    }, initialDataset), initializer),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     dataset = _useReducer2[0],
     dispatch = _useReducer2[1];
+  (0, _react.useEffect)(function () {
+    try {
+      localStorage.setItem(_constants.LOCAL_STORAGE_KEY, JSON.stringify(_defineProperty({}, dataset.url, dataset)));
+    } catch (err) {
+      if (err.code === 22 || err.code === 1014 || err.name === "QuotaExceededError" || err.name === "NS_ERROR_DOM_QUOTA_REACHED") {
+        console.log("Browser storage quota exceeded");
+      } else {
+        console.log(err);
+      }
+    }
+  }, [dataset]);
   return /*#__PURE__*/_react.default.createElement(DatasetContext.Provider, {
     value: dataset
   }, /*#__PURE__*/_react.default.createElement(DatasetDispatchContext.Provider, {
     value: dispatch
-  }, children));
+  }, /*#__PURE__*/_react.default.createElement(_reactQueryPersistClient.PersistQueryClientProvider, {
+    client: queryClient,
+    persistOptions: persistOptions
+  }, children)));
 }
 function useDataset() {
   return (0, _react.useContext)(DatasetContext);
@@ -73,12 +139,24 @@ function datasetReducer(dataset, action) {
       {
         return action.dataset;
       }
+    case "set.obs":
+      {
+        return _objectSpread(_objectSpread({}, dataset), {}, {
+          obs: action.value
+        });
+      }
     case "obsSelected":
       {
         return _objectSpread(_objectSpread({}, dataset), {}, {
           selectedObs: action.obs
         });
       }
+    case "obsmSelected":
+      {
+        return _objectSpread(_objectSpread({}, dataset), {}, {
+          selectedObsm: action.obsm
+        });
+      }
     case "varSelected":
       {
         return _objectSpread(_objectSpread({}, dataset), {}, {
@@ -87,9 +165,15 @@ function datasetReducer(dataset, action) {
       }
     case "multiVarSelected":
       {
-        return _objectSpread(_objectSpread({}, dataset), {}, {
-          selectedMultiVar: [].concat(_toConsumableArray(dataset.selectedMultiVar), [action.var])
-        });
+        if (dataset.selectedMultiVar.find(function (i) {
+          return i === action.var;
+        })) {
+          return dataset;
+        } else {
+          return _objectSpread(_objectSpread({}, dataset), {}, {
+            selectedMultiVar: [].concat(_toConsumableArray(dataset.selectedMultiVar), [action.var])
+          });
+        }
       }
     case "multiVarDeselected":
       {
@@ -99,10 +183,16 @@ function datasetReducer(dataset, action) {
           })
         });
       }
-    case "embeddingSelected":
+    case "set.colorEncoding":
+      {
+        return _objectSpread(_objectSpread({}, dataset), {}, {
+          colorEncoding: action.value
+        });
+      }
+    case "multiVarReset":
       {
         return _objectSpread(_objectSpread({}, dataset), {}, {
-          embedding: action.embedding
+          selectedMultiVar: []
         });
       }
     case "set.controls.colorScale":

package/dist/helpers/color.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ColorHelper = void 0;
+var _chromaJs = _interopRequireDefault(require("chroma-js"));
+var _lodash = _interopRequireDefault(require("lodash"));
+var _constants = require("../constants/constants");
+var _DatasetContext = require("../context/DatasetContext");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var ColorHelper = /*#__PURE__*/_createClass(function ColorHelper() {
+  _classCallCheck(this, ColorHelper);
+  _defineProperty(this, "getScale", function (dataset, values) {
+    return _chromaJs.default.scale(_constants.CHROMA_COLORSCALES[dataset.controls.colorScale]).domain([_lodash.default.min(values), _lodash.default.max(values)]);
+  });
+  _defineProperty(this, "getColor", function (dataset, value) {
+    var scale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _chromaJs.default.scale();
+    if (dataset.colorEncoding === "var") {
+      return scale(value).rgb();
+    } else if (dataset.colorEncoding === "obs") {
+      //console.log(dataset.obs[dataset.selectedObs.name].state[value]["color"]);
+      return dataset.obs[dataset.selectedObs.name].state.hasOwnProperty(value) ? dataset.obs[dataset.selectedObs.name].state[value]["color"] : null;
+    }
+  });
+});
+exports.ColorHelper = ColorHelper;

package/dist/helpers/map.js

@@ -12,7 +12,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-window.deck.log.level = 1;
 var MapHelper = /*#__PURE__*/_createClass(function MapHelper() {
   _classCallCheck(this, MapHelper);
   _defineProperty(this, "fitBounds", function (coords) {
@@ -30,8 +29,8 @@ var MapHelper = /*#__PURE__*/_createClass(function MapHelper() {
     var lonMin = 180;
     var lonMax = -180;
     coords.forEach(function (coord) {
-      var RECT_LAT_INDEX = '0';
-      var RECT_LON_INDEX = '1';
+      var RECT_LAT_INDEX = "0";
+      var RECT_LON_INDEX = "1";
       if (coord[RECT_LAT_INDEX] < latMin) latMin = coord[RECT_LAT_INDEX];
       if (coord[RECT_LAT_INDEX] > latMax) latMax = coord[RECT_LAT_INDEX];
       if (coord[RECT_LON_INDEX] < lonMin) lonMin = coord[RECT_LON_INDEX];

package/dist/index.js

@@ -51,6 +51,12 @@ Object.defineProperty(exports, "ObsColsList", {
     return _ObsList.ObsColsList;
   }
 });
+Object.defineProperty(exports, "ObsmKeysList", {
+  enumerable: true,
+  get: function get() {
+    return _ObsmList.ObsmKeysList;
+  }
+});
 Object.defineProperty(exports, "PLOTLY_COLORSCALES", {
   enumerable: true,
   get: function get() {
@@ -100,6 +106,7 @@ Object.defineProperty(exports, "ViolinControls", {
   }
 });
 var _ObsList = require("./components/obs-list/ObsList");
+var _ObsmList = require("./components/obsm-list/ObsmList");
 var _VarList = require("./components/var-list/VarList");
 var _Heatmap = require("./components/heatmap/Heatmap");
 var _Dotplot = require("./components/dotplot/Dotplot");

package/dist/utils/LoadingSpinner.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LoadingSpinner = LoadingSpinner;
+require("bootstrap/dist/css/bootstrap.min.css");
+var _reactBootstrap = require("react-bootstrap");
+function LoadingSpinner(_ref) {
+  var _ref$type = _ref.type,
+    type = _ref$type === void 0 ? "icon" : _ref$type,
+    _ref$text = _ref.text,
+    text = _ref$text === void 0 ? "Loading..." : _ref$text;
+  if (type === "message") {
+    return /*#__PURE__*/React.createElement("div", {
+      className: " h-100 w-100 d-flex z-1 bg-light opacity-75 position-absolute justify-content-center align-items-center "
+    }, /*#__PURE__*/React.createElement(_reactBootstrap.Button, {
+      variant: "primary",
+      disabled: true
+    }, /*#__PURE__*/React.createElement(_reactBootstrap.Spinner, {
+      as: "span",
+      animation: "border",
+      size: "sm",
+      role: "status",
+      "aria-hidden": "true"
+    }), text));
+  } else {
+    return /*#__PURE__*/React.createElement("div", {
+      className: " h-100 w-100 d-flex z-1 bg-light opacity-75 position-absolute justify-content-center align-items-center "
+    }, /*#__PURE__*/React.createElement(_reactBootstrap.Spinner, {
+      animation: "border",
+      variant: "primary",
+      role: "status"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "visually-hidden"
+    }, text)));
+  }
+}

package/dist/utils/errors.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseError = void 0;
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var parseError = function parseError(err) {
+  if (err === DOMException.TIMEOUT_ERR) {
+    return {
+      message: "Timeout error",
+      name: err
+    };
+  }
+  switch (err === null || err === void 0 ? void 0 : err.name) {
+    case "TypeError":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Failed to fetch data from server"
+      });
+    case "ReadZarrError":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Failed to read AnnData-Zarr"
+      });
+    case "InvalidObs":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Observation not found in dataset"
+      });
+    case "InvalidVar":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Feature not found in dataset"
+      });
+    case "InvalidKey":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Key not found in datset"
+      });
+    case "BadRequest":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Invalid request to server"
+      });
+    case "InternalServerError":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Server error"
+      });
+    default:
+      return err;
+  }
+};
+exports.parseError = parseError;

package/dist/utils/requests.js

@@ -1,11 +1,20 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchData = fetchData;
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+exports.useFetch = exports.useDebouncedFetch = void 0;
+var _usehooks = require("@uidotdev/usehooks");
+var _reactQuery = require("@tanstack/react-query");
+var _errors = require("./errors");
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function fetchData(_x, _x2) {
@@ -14,15 +23,26 @@ function fetchData(_x, _x2) {
 function _fetchData() {
   _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(endpoint, params) {
     var signal,
+      ms,
       apiUrl,
+      controller,
+      timeout,
       response,
       _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           signal = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
+          ms = _args.length > 3 && _args[3] !== undefined ? _args[3] : 300000;
           apiUrl = process.env.REACT_APP_API_URL;
-          _context.next = 4;
+          controller = new AbortController();
+          timeout = setTimeout(function () {
+            controller.abort(DOMException.TIMEOUT_ERR);
+          }, ms || 300000);
+          if (signal) signal.addEventListener("abort", function () {
+            return controller.abort();
+          });
+          _context.next = 8;
           return fetch(new URL(endpoint, apiUrl), {
             method: "POST",
             mode: "cors",
@@ -31,25 +51,76 @@ function _fetchData() {
               Accept: "application/json"
             },
             body: JSON.stringify(params),
-            signal: signal
+            signal: controller.signal
+          }).catch(function (err) {
+            // Manual check as fetch returns an AbortError regardless of the reason set to the signal
+            if (controller.signal.aborted && controller.signal.reason === DOMException.TIMEOUT_ERR) {
+              throw DOMException.TIMEOUT_ERR;
+            }
+            throw err;
+          }).finally(function () {
+            return clearTimeout(timeout);
           });
-        case 4:
+        case 8:
           response = _context.sent;
           if (response.ok) {
-            _context.next = 7;
+            _context.next = 13;
             break;
           }
-          throw response;
-        case 7:
-          _context.next = 9;
+          _context.next = 12;
+          return response.json();
+        case 12:
+          throw _context.sent;
+        case 13:
+          _context.next = 15;
           return response.json();
-        case 9:
+        case 15:
           return _context.abrupt("return", _context.sent);
-        case 10:
+        case 16:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
   return _fetchData.apply(this, arguments);
-}
+}
+var useFetch = function useFetch(endpoint, params) {
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var _useQuery = (0, _reactQuery.useQuery)(_objectSpread({
+      queryKey: [endpoint, params],
+      queryFn: function queryFn(_ref) {
+        var signal = _ref.signal;
+        return fetchData(endpoint, params, signal);
+      }
+    }, opts)),
+    fetchedData = _useQuery.data,
+    isPending = _useQuery.isPending,
+    serverError = _useQuery.error;
+  return {
+    fetchedData: fetchedData,
+    isPending: isPending,
+    serverError: (0, _errors.parseError)(serverError)
+  };
+};
+exports.useFetch = useFetch;
+var useDebouncedFetch = function useDebouncedFetch(endpoint, params) {
+  var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 500;
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  var debouncedParams = (0, _usehooks.useDebounce)(params, delay);
+  var _useQuery2 = (0, _reactQuery.useQuery)(_objectSpread({
+      queryKey: [endpoint, debouncedParams],
+      queryFn: function queryFn(_ref2) {
+        var signal = _ref2.signal;
+        return fetchData(endpoint, debouncedParams, signal);
+      }
+    }, opts)),
+    fetchedData = _useQuery2.data,
+    isPending = _useQuery2.isPending,
+    serverError = _useQuery2.error;
+  return {
+    fetchedData: fetchedData,
+    isPending: isPending,
+    serverError: (0, _errors.parseError)(serverError)
+  };
+};
+exports.useDebouncedFetch = useDebouncedFetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "0.1.12",
+  "version": "0.2.0-dev.2024-02-12.4d768f57",
   "author": "",
   "license": "",
   "main": "dist/index.js",
@@ -14,6 +14,10 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@nebula.gl/editor": "^1.0.4",
     "@nebula.gl/layers": "^1.0.4",
+    "@tanstack/query-sync-storage-persister": "^5.20.2",
+    "@tanstack/react-query": "^5.20.2",
+    "@tanstack/react-query-persist-client": "^5.20.2",
+    "@uidotdev/usehooks": "^2.4.1",
     "bootstrap": "^5.3.0",
     "chroma-js": "^2.4.2",
     "deck.gl": "^8.9.19",
@@ -73,5 +77,6 @@
   "bugs": {
     "url": "https://github.com/haniffalab/cherita-react/issues"
   },
-  "homepage": "https://github.com/haniffalab/cherita-react#readme"
+  "homepage": "https://github.com/haniffalab/cherita-react#readme",
+  "prereleaseSha": "4d768f575d9a470480c5ca11df01c08dc4ae7918"
 }