@dhis2/app-service-data 3.7.0 → 3.9.0

package/build/cjs/react/hooks/useQueryExecutor.test.js

@@ -6,9 +6,10 @@ var _useQueryExecutor = require("./useQueryExecutor");
 
 const testError = new Error('TEST ERROR');
 let theSignal;
-const execute = jest.fn(async ({
-  signal
-}) => {
+const execute = jest.fn(async (_ref) => {
+  let {
+    signal
+  } = _ref;
   theSignal = signal;
   return 42;
 });
@@ -116,15 +117,18 @@ describe('useQueryExecutor', () => {
       result,
       waitForNextUpdate,
       rerender
-    } = (0, _reactHooks.renderHook)(({
-      onComplete
-    }) => (0, _useQueryExecutor.useQueryExecutor)({
-      execute,
-      immediate: true,
-      singular: true,
-      variables: {},
-      onComplete
-    }), {
+    } = (0, _reactHooks.renderHook)((_ref2) => {
+      let {
+        onComplete
+      } = _ref2;
+      return (0, _useQueryExecutor.useQueryExecutor)({
+        execute,
+        immediate: true,
+        singular: true,
+        variables: {},
+        onComplete
+      });
+    }, {
       initialProps: {
         onComplete: () => null
       }

package/build/cjs/react/hooks/useStaticInput.js

@@ -7,16 +7,17 @@ exports.useStaticInput = void 0;
 
 var _react = require("react");
 
-const useStaticInput = (staticValue, {
-  warn = false,
-  name = 'input'
-} = {}) => {
+const useStaticInput = function (staticValue) {
+  let {
+    warn = false,
+    name = 'input'
+  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const originalValue = (0, _react.useRef)(staticValue);
   const [value, setValue] = (0, _react.useState)(() => originalValue.current);
-  (0, _react.useDebugValue)(value, debugValue => "".concat(name, ": ").concat(JSON.stringify(debugValue)));
+  (0, _react.useDebugValue)(value, debugValue => `${name}: ${JSON.stringify(debugValue)}`);
   (0, _react.useEffect)(() => {
     if (warn && originalValue.current !== staticValue) {
-      console.warn("The ".concat(name, " should be static, don't create it within the render loop!"));
+      console.warn(`The ${name} should be static, don't create it within the render loop!`);
     }
   }, [warn, staticValue, originalValue, name]);
   return [value, setValue];

package/build/cjs/react/hooks/useStaticInput.test.js

@@ -23,9 +23,12 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)(({
-      value
-    }) => (0, _useStaticInput.useStaticInput)(value), {
+    } = (0, _reactHooks.renderHook)((_ref) => {
+      let {
+        value
+      } = _ref;
+      return (0, _useStaticInput.useStaticInput)(value);
+    }, {
       initialProps: {
         value: 42
       }
@@ -41,11 +44,14 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)(({
-      value
-    }) => (0, _useStaticInput.useStaticInput)(value, {
-      warn: true
-    }), {
+    } = (0, _reactHooks.renderHook)((_ref2) => {
+      let {
+        value
+      } = _ref2;
+      return (0, _useStaticInput.useStaticInput)(value, {
+        warn: true
+      });
+    }, {
       initialProps: {
         value: 42
       }
@@ -55,19 +61,26 @@ describe('useStaticInput', () => {
       value: 54
     });
     expect(mockWarn).toHaveBeenCalled();
-    expect(mockWarn.mock.calls.pop()).toMatchInlineSnapshot("\n            Array [\n              \"The input should be static, don't create it within the render loop!\",\n            ]\n        ");
+    expect(mockWarn.mock.calls.pop()).toMatchInlineSnapshot(`
+            Array [
+              "The input should be static, don't create it within the render loop!",
+            ]
+        `);
     expect(result.current[0]).toBe(42);
   });
   it('Should show custom name in warning if supplied', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)(({
-      value
-    }) => (0, _useStaticInput.useStaticInput)(value, {
-      warn: true,
-      name: 'TESTING THING'
-    }), {
+    } = (0, _reactHooks.renderHook)((_ref3) => {
+      let {
+        value
+      } = _ref3;
+      return (0, _useStaticInput.useStaticInput)(value, {
+        warn: true,
+        name: 'TESTING THING'
+      });
+    }, {
       initialProps: {
         value: 42
       }
@@ -84,11 +97,14 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)(({
-      value
-    }) => (0, _useStaticInput.useStaticInput)(value, {
-      warn: true
-    }), {
+    } = (0, _reactHooks.renderHook)((_ref4) => {
+      let {
+        value
+      } = _ref4;
+      return (0, _useStaticInput.useStaticInput)(value, {
+        warn: true
+      });
+    }, {
       initialProps: {
         value: 42
       }
@@ -117,11 +133,14 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)(({
-      value
-    }) => (0, _useStaticInput.useStaticInput)(value, {
-      warn: true
-    }), {
+    } = (0, _reactHooks.renderHook)((_ref5) => {
+      let {
+        value
+      } = _ref5;
+      return (0, _useStaticInput.useStaticInput)(value, {
+        warn: true
+      });
+    }, {
       initialProps: {
         value: fn
       }

package/build/cjs/react/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "CustomDataProvider", {
     return _CustomDataProvider.CustomDataProvider;
   }
 });
+Object.defineProperty(exports, "DataContext", {
+  enumerable: true,
+  get: function () {
+    return _DataContext.DataContext;
+  }
+});
 Object.defineProperty(exports, "DataMutation", {
   enumerable: true,
   get: function () {
@@ -27,12 +33,6 @@ Object.defineProperty(exports, "DataQuery", {
     return _DataQuery.DataQuery;
   }
 });
-Object.defineProperty(exports, "DataContext", {
-  enumerable: true,
-  get: function () {
-    return _DataContext.DataContext;
-  }
-});
 Object.defineProperty(exports, "defaultContext", {
   enumerable: true,
   get: function () {

package/build/es/__tests__/integration.test.js

@@ -7,11 +7,14 @@ describe('<DataQuery />', () => {
       answer: 42
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref) => {
+      let {
+        children
+      } = _ref;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const renderFunction = jest.fn(() => null);
     render( /*#__PURE__*/React.createElement(DataQuery, {
@@ -45,11 +48,14 @@ describe('<DataQuery />', () => {
       }
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref2) => {
+      let {
+        children
+      } = _ref2;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const renderFunction = jest.fn(() => null);
     render( /*#__PURE__*/React.createElement(DataQuery, {

package/build/es/__tests__/mutations.test.js

@@ -15,11 +15,14 @@ describe('<DataMutation />', () => {
       answer: endpointSpy
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref) => {
+      let {
+        children
+      } = _ref;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const renderSpy = jest.fn(() => null);
     render( /*#__PURE__*/React.createElement(DataMutation, {

package/build/es/engine/DataEngine.js

@@ -16,12 +16,13 @@ export class DataEngine {
     this.link = link;
   }
 
-  query(query, {
-    variables = {},
-    signal,
-    onComplete,
-    onError
-  } = {}) {
+  query(query) {
+    let {
+      variables = {},
+      signal,
+      onComplete,
+      onError
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     const names = Object.keys(query);
     const queries = names.map(name => query[name]).map(q => resolveDynamicQuery(q, variables));
     validateResourceQueries(queries, names);
@@ -39,12 +40,13 @@ export class DataEngine {
     });
   }
 
-  mutate(mutation, {
-    variables = {},
-    signal,
-    onComplete,
-    onError
-  } = {}) {
+  mutate(mutation) {
+    let {
+      variables = {},
+      signal,
+      onComplete,
+      onError
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     const query = resolveDynamicQuery(mutation, variables);
     const type = getMutationFetchType(mutation);
     validateResourceQuery(type, query);

package/build/es/engine/helpers/resolveDynamicQuery.js

@@ -1,11 +1,14 @@
-export const resolveDynamicQuery = ({
-  resource,
-  id,
-  data,
-  params
-}, variables) => ({
-  resource,
-  id: typeof id === 'function' ? id(variables) : id,
-  data: typeof data === 'function' ? data(variables) : data,
-  params: typeof params === 'function' ? params(variables) : params
-});
+export const resolveDynamicQuery = (_ref, variables) => {
+  let {
+    resource,
+    id,
+    data,
+    params
+  } = _ref;
+  return {
+    resource,
+    id: typeof id === 'function' ? id(variables) : id,
+    data: typeof data === 'function' ? data(variables) : data,
+    params: typeof params === 'function' ? params(variables) : params
+  };
+};

package/build/es/engine/helpers/resolveDynamicQuery.test.js

@@ -17,20 +17,29 @@ describe('resolveDynamicQuery', () => {
   it('Should replace variables in all dynamic properties', () => {
     const query = {
       resource: 'test',
-      id: ({
-        id
-      }) => id,
-      params: ({
-        page
-      }) => ({
-        page,
-        foo: 'bar'
-      }),
-      data: ({
-        bar
-      }) => ({
-        bar
-      })
+      id: (_ref) => {
+        let {
+          id
+        } = _ref;
+        return id;
+      },
+      params: (_ref2) => {
+        let {
+          page
+        } = _ref2;
+        return {
+          page,
+          foo: 'bar'
+        };
+      },
+      data: (_ref3) => {
+        let {
+          bar
+        } = _ref3;
+        return {
+          bar
+        };
+      }
     };
     const vars = {
       id: '42',

package/build/es/engine/helpers/validate.js

@@ -3,7 +3,7 @@ const validQueryKeys = ['resource', 'id', 'params', 'data'];
 const validTypes = ['read', 'create', 'update', 'replace', 'delete', 'json-patch'];
 export const getResourceQueryErrors = (type, query) => {
   if (!validTypes.includes(type)) {
-    return ["Unknown query or mutation type ".concat(type)];
+    return [`Unknown query or mutation type ${type}`];
   }
 
   if (typeof query !== 'object') {
@@ -38,18 +38,20 @@ export const getResourceQueryErrors = (type, query) => {
 
   const invalidKeys = Object.keys(query).filter(k => !validQueryKeys.includes(k));
   invalidKeys.forEach(k => {
-    errors.push("Property ".concat(k, " is not supported"));
+    errors.push(`Property ${k} is not supported`);
   });
   return errors;
 };
-export const validateResourceQueries = (queries, names = []) => {
+export const validateResourceQueries = function (queries) {
+  let names = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+
   if (names.length !== queries.length) {
     for (let i = names.length; i < queries.length; ++i) {
       names.push('query#' + i);
     }
   }
 
-  const errors = queries.reduce((errors, query, i) => errors.concat(getResourceQueryErrors('read', query).map(e => "[".concat(names[i], "] ").concat(e))), []);
+  const errors = queries.reduce((errors, query, i) => errors.concat(getResourceQueryErrors('read', query).map(e => `[${names[i]}] ${e}`)), []);
 
   if (errors.length) {
     throw new InvalidQueryError(errors);

package/build/es/engine/helpers/validate.test.js

@@ -19,25 +19,45 @@ describe('query validation', () => {
         resource: 'me'
       });
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Unknown query or mutation type rainbow\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Unknown query or mutation type rainbow",
+                ]
+            `);
     });
     it('should fail if query is not an object', () => {
       let errors = getResourceQueryErrors('read', 'query');
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"A query or mutation must be a javascript object\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "A query or mutation must be a javascript object",
+                ]
+            `);
       errors = getResourceQueryErrors('read', 42);
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"A query or mutation must be a javascript object\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "A query or mutation must be a javascript object",
+                ]
+            `);
     });
     it('should fail if query is missing resource property', () => {
       const errors = getResourceQueryErrors('read', {});
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Property resource must be a string\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Property resource must be a string",
+                ]
+            `);
     });
     it('should fail if query is missing resource property', () => {
       const errors = getResourceQueryErrors('read', {});
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Property resource must be a string\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Property resource must be a string",
+                ]
+            `);
     });
     it('should fail if query is create mutation with id prop', () => {
       const errors = getResourceQueryErrors('create', {
@@ -45,7 +65,11 @@ describe('query validation', () => {
         id: 'something'
       });
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Mutation type 'create' does not support property 'id'\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Mutation type 'create' does not support property 'id'",
+                ]
+            `);
     });
     it('should fail if id prop is not a string', () => {
       const errors = getResourceQueryErrors('update', {
@@ -53,7 +77,11 @@ describe('query validation', () => {
         id: 42
       });
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Property id must be a string\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Property id must be a string",
+                ]
+            `);
     });
     it('should fail if params prop is not an object', () => {
       const errors = getResourceQueryErrors('update', {
@@ -62,7 +90,11 @@ describe('query validation', () => {
         params: 'querystring=42'
       });
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Property params must be an object\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Property params must be an object",
+                ]
+            `);
     });
     it('should fail if query is delete mutation with data prop', () => {
       const errors = getResourceQueryErrors('delete', {
@@ -71,7 +103,11 @@ describe('query validation', () => {
         data: 'querystring=42'
       });
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Mutation type 'delete' does not support property 'data'\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Mutation type 'delete' does not support property 'data'",
+                ]
+            `);
     });
     it('should fail if query is json-patch mutation with non-array data prop', () => {
       const errors = getResourceQueryErrors('json-patch', {
@@ -79,7 +115,11 @@ describe('query validation', () => {
         data: {}
       });
       expect(errors).toHaveLength(1);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Mutation type 'json-patch' requires property 'data' to be of type Array\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Mutation type 'json-patch' requires property 'data' to be of type Array",
+                ]
+            `);
     });
     it('should fail if unrecognized keys are passed to query', () => {
       const errors = getResourceQueryErrors('update', {
@@ -89,7 +129,12 @@ describe('query validation', () => {
         foo: 'bar'
       });
       expect(errors).toHaveLength(2);
-      expect(errors).toMatchInlineSnapshot("\n                Array [\n                  \"Property query is not supported\",\n                  \"Property foo is not supported\",\n                ]\n            ");
+      expect(errors).toMatchInlineSnapshot(`
+                Array [
+                  "Property query is not supported",
+                  "Property foo is not supported",
+                ]
+            `);
     });
   });
   describe('validateResourceQuery', () => {
@@ -102,13 +147,19 @@ describe('query validation', () => {
       expect(() => validateResourceQuery('create', {
         resource: 'me',
         id: '42'
-      })).toThrowErrorMatchingInlineSnapshot("\n\"Invalid query\n - Mutation type 'create' does not support property 'id'\"\n");
+      })).toThrowErrorMatchingInlineSnapshot(`
+"Invalid query
+ - Mutation type 'create' does not support property 'id'"
+`);
     });
     it('should throw an error with an invalid query', () => {
       expect(() => validateResourceQuery('create', {
         resource: 'me',
         answer: 42
-      })).toThrowErrorMatchingInlineSnapshot("\n\"Invalid query\n - Property answer is not supported\"\n");
+      })).toThrowErrorMatchingInlineSnapshot(`
+"Invalid query
+ - Property answer is not supported"
+`);
     });
   });
   describe('validateResourceQueries', () => {
@@ -128,7 +179,11 @@ describe('query validation', () => {
       }, {
         resource: 'me',
         id: 42
-      }])).toThrowErrorMatchingInlineSnapshot("\n\"Invalid query\n - [query#1] Property params must be an object\n - [query#2] Property id must be a string\"\n");
+      }])).toThrowErrorMatchingInlineSnapshot(`
+"Invalid query
+ - [query#1] Property params must be an object
+ - [query#2] Property id must be a string"
+`);
     });
     it('should throw if any query is invalid, prefixing with relevant name', () => {
       expect(() => validateResourceQueries([{
@@ -139,7 +194,11 @@ describe('query validation', () => {
       }, {
         resource: 'me',
         id: 42
-      }], ['me', 'inds'])).toThrowErrorMatchingInlineSnapshot("\n\"Invalid query\n - [inds] Property params must be an object\n - [query#2] Property id must be a string\"\n");
+      }], ['me', 'inds'])).toThrowErrorMatchingInlineSnapshot(`
+"Invalid query
+ - [inds] Property params must be an object
+ - [query#2] Property id must be a string"
+`);
     });
   });
 });

package/build/es/engine/types/FetchError.js

@@ -1,11 +1,12 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 export class FetchError extends Error {
-  constructor({
-    message,
-    type,
-    details = {}
-  }) {
+  constructor(_ref) {
+    let {
+      message,
+      type,
+      details = {}
+    } = _ref;
     super(message);
 
     _defineProperty(this, "type", void 0);

package/build/es/engine/types/InvalidQueryError.js

@@ -2,7 +2,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 export class InvalidQueryError extends Error {
   constructor(errors) {
-    super("Invalid query\n".concat(errors.map(e => ' - ' + e).join('\n')));
+    super(`Invalid query\n${errors.map(e => ' - ' + e).join('\n')}`);
 
     _defineProperty(this, "type", 'invalid-query');
 

package/build/es/links/CustomDataLink.js

@@ -1,10 +1,12 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 export class CustomDataLink {
-  constructor(customData, {
-    failOnMiss = true,
-    loadForever = false
-  } = {}) {
+  constructor(customData) {
+    let {
+      failOnMiss = true,
+      loadForever = false
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
     _defineProperty(this, "failOnMiss", void 0);
 
     _defineProperty(this, "loadForever", void 0);
@@ -25,7 +27,7 @@ export class CustomDataLink {
 
     if (customResource === undefined) {
       if (this.failOnMiss) {
-        throw new Error("No data provided for resource type ".concat(query.resource, "!"));
+        throw new Error(`No data provided for resource type ${query.resource}!`);
       }
 
       return Promise.resolve(null);
@@ -43,7 +45,7 @@ export class CustomDataLink {
           const result = await customResource(type, query, options);
 
           if (typeof result === 'undefined' && this.failOnMiss) {
-            throw new Error("The custom function for resource ".concat(query.resource, " must always return a value but returned ").concat(result));
+            throw new Error(`The custom function for resource ${query.resource} must always return a value but returned ${result}`);
           }
 
           return result || null;

package/build/es/links/CustomDataLink.test.js

@@ -14,7 +14,7 @@ describe('CustomDataLink', () => {
     });
     expect(link.executeResourceQuery('read', {
       resource: 'something'
-    }, {})).rejects.toMatchInlineSnapshot("[Error: No data provided for resource type something!]");
+    }, {})).rejects.toMatchInlineSnapshot(`[Error: No data provided for resource type something!]`);
   });
   it('Should swallow miss error with failOnMiss=false', async () => {
     const link = new CustomDataLink({
@@ -40,7 +40,7 @@ describe('CustomDataLink', () => {
     });
     expect(link.executeResourceQuery('read', {
       resource: 'foo'
-    }, {})).rejects.toMatchInlineSnapshot("[Error: The custom function for resource foo must always return a value but returned undefined]");
+    }, {})).rejects.toMatchInlineSnapshot(`[Error: The custom function for resource foo must always return a value but returned undefined]`);
   });
   it('Should swallow functional miss if failOnMiss=false', async () => {
     const link = new CustomDataLink({