openchs-models 1.30.62 → 1.30.64

package/dist/CustomDashboardCache.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
-var _ParseUtil = _interopRequireDefault(require("./utility/ParseUtil"));
+var _structuredClone = require("@ungap/structured-clone");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -107,21 +107,21 @@ class CustomDashboardCache extends _BaseEntity.default {
   }
 
   getSelectedValues() {
-    return this.selectedValuesJSON && _ParseUtil.default.parse(this.selectedValuesJSON) || {};
+    return this.selectedValuesJSON && (0, _structuredClone.deserialize)(JSON.parse(this.selectedValuesJSON)) || {};
   }
 
   getFilterErrors() {
-    return this.filterErrorsJSON && _ParseUtil.default.parse(this.filterErrorsJSON) || {};
+    return this.filterErrorsJSON && (0, _structuredClone.deserialize)(JSON.parse(this.filterErrorsJSON)) || {};
   }
 
   getRuleInput() {
-    return this.ruleInputJSON && _ParseUtil.default.parse(this.ruleInputJSON) || {
+    return this.ruleInputJSON && (0, _structuredClone.deserialize)(JSON.parse(this.ruleInputJSON)) || {
       ruleInputArray: null
     };
   }
 
   getTransformedFilters() {
-    return this.transformedFiltersJSON && _ParseUtil.default.parse(this.transformedFiltersJSON) || {
+    return this.transformedFiltersJSON && (0, _structuredClone.deserialize)(JSON.parse(this.transformedFiltersJSON)) || {
       date: new Date(),
       applied: false,
       selectedLocations: [],

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.30.62",
+    "version": "1.30.64",
     "private": false,
     "repository": {
         "type": "git",
@@ -27,8 +27,8 @@
         ]
     },
     "license": "AGPL-3.0",
-    "dependencies": {},
     "peerDependencies": {
+        "@ungap/structured-clone": "*",
         "lodash": "*",
         "moment": "*"
     },
@@ -39,6 +39,7 @@
         "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
         "@babel/preset-env": "^7.4.5",
         "@babel/preset-typescript": "^7.7.7",
+        "@ungap/structured-clone": "1.2.0",
         "babel-jest": "^24.8.0",
         "babel-loader": "^8.0.0-beta.4",
         "babel-plugin-istanbul": "^5.1.0",

package/yarn.lock

@@ -1029,6 +1029,11 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@ungap/structured-clone@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"

package/dist/utility/ParseUtil.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-class ParseUtil {
-  static parse(jsonValue) {
-    const iso8061 = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/;
-    return JSON.parse(jsonValue, function (key, value) {
-      if (typeof value != 'string') {
-        return value;
-      }
-
-      if (iso8061 && value.match(iso8061)) {
-        return new Date(value);
-      }
-
-      return value;
-    });
-  }
-
-}
-
-var _default = ParseUtil;
-exports.default = _default;