@dhis2/app-service-data 3.11.2 → 3.12.0-alpha.1

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

@@ -4,14 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useQueryExecutor = void 0;
-
 var _react = require("react");
-
 var _engine = require("../../engine");
-
 var _useStaticInput = require("./useStaticInput");
-
-const useQueryExecutor = (_ref) => {
+const useQueryExecutor = _ref => {
   let {
     execute,
     variables: initialVariables,
@@ -48,14 +44,13 @@ const useQueryExecutor = (_ref) => {
       called: true,
       loading: true
     } : state);
-
     if (singular) {
       abort(); // Cleanup any in-progress fetches
     }
-
     const controller = new AbortController();
     abortControllersRef.current.push(controller);
-    variables.current = { ...variables.current,
+    variables.current = {
+      ...variables.current,
       ...newVariables
     };
     const options = {
@@ -73,7 +68,6 @@ const useQueryExecutor = (_ref) => {
         });
         return data;
       }
-
       return new Promise(() => undefined); // Wait forever
     }).catch(error => {
       if (!controller.signal.aborted) {
@@ -83,17 +77,16 @@ const useQueryExecutor = (_ref) => {
           error
         });
       }
-
       return new Promise(() => undefined); // Don't throw errors in refetch promises, wait forever
     });
-  }, [abort, onComplete, onError, singular, theExecute]); // Don't include immediate or refetch as deps, otherwise unintentional refetches
-  // may be triggered by changes to input, i.e. recreating the onComplete callback
+  }, [abort, onComplete, onError, singular, theExecute]);
 
+  // Don't include immediate or refetch as deps, otherwise unintentional refetches
+  // may be triggered by changes to input, i.e. recreating the onComplete callback
   (0, _react.useEffect)(() => {
     if (immediate) {
       refetch();
     }
-
     return abort;
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -103,5 +96,4 @@ const useQueryExecutor = (_ref) => {
     ...state
   };
 };
-
 exports.useQueryExecutor = useQueryExecutor;

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

@@ -1,12 +1,10 @@
 "use strict";
 
-var _reactHooks = require("@testing-library/react-hooks");
-
+var _react = require("@testing-library/react");
 var _useQueryExecutor = require("./useQueryExecutor");
-
 const testError = new Error('TEST ERROR');
 let theSignal;
-const execute = jest.fn(async (_ref) => {
+const execute = jest.fn(async _ref => {
   let {
     signal
   } = _ref;
@@ -24,7 +22,7 @@ describe('useQueryExecutor', () => {
   it('When not immediate, should start with called false and loading false', () => {
     const {
       result
-    } = (0, _reactHooks.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
+    } = (0, _react.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
       execute,
       immediate: false,
       singular: true,
@@ -37,9 +35,8 @@ describe('useQueryExecutor', () => {
   });
   it('When immediate, should start with called true and loading true', async () => {
     const {
-      result,
-      waitForNextUpdate
-    } = (0, _reactHooks.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
+      result
+    } = (0, _react.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
       execute,
       immediate: true,
       singular: true,
@@ -49,18 +46,18 @@ describe('useQueryExecutor', () => {
       called: true,
       loading: true
     });
-    await waitForNextUpdate();
-    expect(result.current).toMatchObject({
-      called: true,
-      loading: false,
-      data: 42
+    await (0, _react.waitFor)(() => {
+      expect(result.current).toMatchObject({
+        called: true,
+        loading: false,
+        data: 42
+      });
     });
   });
   it('Should start when refetch called (if not immediate)', async () => {
     const {
-      result,
-      waitForNextUpdate
-    } = (0, _reactHooks.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
+      result
+    } = (0, _react.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
       execute,
       immediate: false,
       singular: true,
@@ -70,25 +67,25 @@ describe('useQueryExecutor', () => {
       called: false,
       loading: false
     });
-    (0, _reactHooks.act)(() => {
+    (0, _react.act)(() => {
       result.current.refetch();
     });
     expect(result.current).toMatchObject({
       called: true,
       loading: true
     });
-    await waitForNextUpdate();
-    expect(result.current).toMatchObject({
-      called: true,
-      loading: false,
-      data: 42
+    await (0, _react.waitFor)(() => {
+      expect(result.current).toMatchObject({
+        called: true,
+        loading: false,
+        data: 42
+      });
     });
   });
   it('Should report an error when execute fails', async () => {
     const {
-      result,
-      waitForNextUpdate
-    } = (0, _reactHooks.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
+      result
+    } = (0, _react.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
       execute: failingExecute,
       immediate: false,
       singular: true,
@@ -98,26 +95,26 @@ describe('useQueryExecutor', () => {
       called: false,
       loading: false
     });
-    (0, _reactHooks.act)(() => {
+    (0, _react.act)(() => {
       result.current.refetch();
     });
     expect(result.current).toMatchObject({
       called: true,
       loading: true
     });
-    await waitForNextUpdate();
-    expect(result.current).toMatchObject({
-      called: true,
-      loading: false,
-      error: testError
+    await (0, _react.waitFor)(() => {
+      expect(result.current).toMatchObject({
+        called: true,
+        loading: false,
+        error: testError
+      });
     });
   });
   it("Shouldn't abort+refetch when inputs change on subsequent renders", async () => {
     const {
       result,
-      waitForNextUpdate,
       rerender
-    } = (0, _reactHooks.renderHook)((_ref2) => {
+    } = (0, _react.renderHook)(_ref2 => {
       let {
         onComplete
       } = _ref2;
@@ -140,20 +137,20 @@ describe('useQueryExecutor', () => {
     rerender({
       onComplete: () => null
     });
-    await waitForNextUpdate();
-    expect(result.current).toMatchObject({
-      called: true,
-      loading: false,
-      data: 42
+    await (0, _react.waitFor)(() => {
+      expect(result.current).toMatchObject({
+        called: true,
+        loading: false,
+        data: 42
+      });
+      expect(theSignal && theSignal.aborted).toBe(false);
+      expect(execute).toHaveBeenCalledTimes(1);
     });
-    expect(theSignal && theSignal.aborted).toBe(false);
-    expect(execute).toHaveBeenCalledTimes(1);
   });
   it('Should respect abort signal', async () => {
     const {
-      result,
-      waitForNextUpdate
-    } = (0, _reactHooks.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
+      result
+    } = (0, _react.renderHook)(() => (0, _useQueryExecutor.useQueryExecutor)({
       execute,
       immediate: false,
       singular: true,
@@ -163,14 +160,14 @@ describe('useQueryExecutor', () => {
       called: false,
       loading: false
     });
-    (0, _reactHooks.act)(() => {
+    (0, _react.act)(() => {
       result.current.refetch();
     });
     expect(result.current).toMatchObject({
       called: true,
       loading: true
     });
-    (0, _reactHooks.act)(() => {
+    (0, _react.act)(() => {
       result.current.abort();
     });
     expect(theSignal && theSignal.aborted).toBe(true);

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

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useStaticInput = void 0;
-
 var _react = require("react");
-
 const useStaticInput = function (staticValue) {
   let {
     warn = false,
@@ -22,5 +20,4 @@ const useStaticInput = function (staticValue) {
   }, [warn, staticValue, originalValue, name]);
   return [value, setValue];
 };
-
 exports.useStaticInput = useStaticInput;

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

@@ -1,9 +1,7 @@
 "use strict";
 
-var _reactHooks = require("@testing-library/react-hooks");
-
+var _react = require("@testing-library/react");
 var _useStaticInput = require("./useStaticInput");
-
 describe('useStaticInput', () => {
   const originalWarn = console.warn;
   const mockWarn = jest.fn();
@@ -15,7 +13,7 @@ describe('useStaticInput', () => {
   it('Should pass without warnings on first render', () => {
     const {
       result
-    } = (0, _reactHooks.renderHook)(() => (0, _useStaticInput.useStaticInput)(42));
+    } = (0, _react.renderHook)(() => (0, _useStaticInput.useStaticInput)(42));
     expect(result.current[0]).toBe(42);
     expect(mockWarn).not.toHaveBeenCalled();
   });
@@ -23,7 +21,7 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)((_ref) => {
+    } = (0, _react.renderHook)(_ref => {
       let {
         value
       } = _ref;
@@ -44,7 +42,7 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)((_ref2) => {
+    } = (0, _react.renderHook)(_ref2 => {
       let {
         value
       } = _ref2;
@@ -72,7 +70,7 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)((_ref3) => {
+    } = (0, _react.renderHook)(_ref3 => {
       let {
         value
       } = _ref3;
@@ -97,7 +95,7 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)((_ref4) => {
+    } = (0, _react.renderHook)(_ref4 => {
       let {
         value
       } = _ref4;
@@ -111,7 +109,7 @@ describe('useStaticInput', () => {
     });
     const [value, setValue] = result.current;
     expect(value).toBe(42);
-    (0, _reactHooks.act)(() => {
+    (0, _react.act)(() => {
       setValue(54);
     });
     expect(result.current[0]).toBe(54);
@@ -133,7 +131,7 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _reactHooks.renderHook)((_ref5) => {
+    } = (0, _react.renderHook)(_ref5 => {
       let {
         value
       } = _ref5;

package/build/cjs/react/index.js

@@ -69,25 +69,14 @@ Object.defineProperty(exports, "useStaticInput", {
     return _useStaticInput.useStaticInput;
   }
 });
-
 var _CustomDataProvider = require("./components/CustomDataProvider");
-
 var _DataMutation = require("./components/DataMutation");
-
 var _DataProvider = require("./components/DataProvider");
-
 var _DataQuery = require("./components/DataQuery");
-
 var _DataContext = require("./context/DataContext");
-
 var _defaultContext = require("./context/defaultContext");
-
 var _useDataEngine = require("./hooks/useDataEngine");
-
 var _useDataMutation = require("./hooks/useDataMutation");
-
 var _useDataQuery = require("./hooks/useDataQuery");
-
 var _useQueryExecutor = require("./hooks/useQueryExecutor");
-
 var _useStaticInput = require("./hooks/useStaticInput");

package/build/cjs/setupRTL.js

@@ -1,7 +1,6 @@
 "use strict";
 
-require("@testing-library/jest-dom/extend-expect");
-
+require("@testing-library/jest-dom");
 process.on('unhandledRejection', err => {
   throw err;
 });

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

@@ -6,8 +6,7 @@ describe('<DataQuery />', () => {
     const data = {
       answer: 42
     };
-
-    const wrapper = (_ref) => {
+    const wrapper = _ref => {
       let {
         children
       } = _ref;
@@ -15,9 +14,8 @@ describe('<DataQuery />', () => {
         data: data
       }, children);
     };
-
     const renderFunction = jest.fn(() => null);
-    render( /*#__PURE__*/React.createElement(DataQuery, {
+    render(/*#__PURE__*/React.createElement(DataQuery, {
       query: {
         answer: {
           resource: 'answer'
@@ -47,8 +45,7 @@ describe('<DataQuery />', () => {
         throw expectedError;
       }
     };
-
-    const wrapper = (_ref2) => {
+    const wrapper = _ref2 => {
       let {
         children
       } = _ref2;
@@ -56,9 +53,8 @@ describe('<DataQuery />', () => {
         data: data
       }, children);
     };
-
     const renderFunction = jest.fn(() => null);
-    render( /*#__PURE__*/React.createElement(DataQuery, {
+    render(/*#__PURE__*/React.createElement(DataQuery, {
       query: {
         test: {
           resource: 'test'

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

@@ -14,8 +14,7 @@ describe('<DataMutation />', () => {
     const data = {
       answer: endpointSpy
     };
-
-    const wrapper = (_ref) => {
+    const wrapper = _ref => {
       let {
         children
       } = _ref;
@@ -23,9 +22,8 @@ describe('<DataMutation />', () => {
         data: data
       }, children);
     };
-
     const renderSpy = jest.fn(() => null);
-    render( /*#__PURE__*/React.createElement(DataMutation, {
+    render(/*#__PURE__*/React.createElement(DataMutation, {
       mutation: mutation
     }, renderSpy), {
       wrapper

package/build/es/engine/DataEngine.js

@@ -1,21 +1,18 @@
-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; }
-
+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 { getMutationFetchType } from './helpers/getMutationFetchType';
 import { resolveDynamicQuery } from './helpers/resolveDynamicQuery';
 import { validateResourceQuery, validateResourceQueries } from './helpers/validate';
-
 const reduceResponses = (responses, names) => responses.reduce((out, response, idx) => {
   out[names[idx]] = response;
   return out;
 }, {});
-
 export class DataEngine {
   constructor(link) {
     _defineProperty(this, "link", void 0);
-
     this.link = link;
   }
-
   query(query) {
     let {
       variables = {},
@@ -39,7 +36,6 @@ export class DataEngine {
       throw error;
     });
   }
-
   mutate(mutation) {
     let {
       variables = {},
@@ -61,6 +57,5 @@ export class DataEngine {
       throw error;
     });
   }
-
 }
 export default DataEngine;

package/build/es/engine/DataEngine.test.js

@@ -14,7 +14,6 @@ const mockLink = {
     if (query.resource === 'ERROR') {
       throw new Error('MOCK ERROR');
     }
-
     return {
       type,
       resource: query.resource,

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

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

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

@@ -5,37 +5,28 @@ export const getResourceQueryErrors = (type, query) => {
   if (!validTypes.includes(type)) {
     return [`Unknown query or mutation type ${type}`];
   }
-
   if (typeof query !== 'object') {
     return ['A query or mutation must be a javascript object'];
   }
-
   const errors = [];
-
   if (!query.resource || typeof query.resource !== 'string') {
     errors.push('Property resource must be a string');
   }
-
   if (type === 'create' && query.id) {
     errors.push("Mutation type 'create' does not support property 'id'");
   }
-
   if (query.id && typeof query.id !== 'string') {
     errors.push('Property id must be a string');
   }
-
   if (query.params && typeof query.params !== 'object') {
     errors.push('Property params must be an object');
   }
-
   if (type === 'delete' && query.data) {
     errors.push("Mutation type 'delete' does not support property 'data'");
   }
-
   if (type === 'json-patch' && !Array.isArray(query.data)) {
     errors.push("Mutation type 'json-patch' requires property 'data' to be of type Array");
   }
-
   const invalidKeys = Object.keys(query).filter(k => !validQueryKeys.includes(k));
   invalidKeys.forEach(k => {
     errors.push(`Property ${k} is not supported`);
@@ -44,22 +35,18 @@ export const getResourceQueryErrors = (type, query) => {
 };
 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 => `[${names[i]}] ${e}`)), []);
-
   if (errors.length) {
     throw new InvalidQueryError(errors);
   }
 };
 export const validateResourceQuery = (type, query) => {
   const errors = getResourceQueryErrors(type, query);
-
   if (errors.length) {
     throw new InvalidQueryError(errors);
   }

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

@@ -1,5 +1,6 @@
-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; }
-
+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); }
 export class FetchError extends Error {
   constructor(_ref) {
     let {
@@ -8,13 +9,9 @@ export class FetchError extends Error {
       details = {}
     } = _ref;
     super(message);
-
     _defineProperty(this, "type", void 0);
-
     _defineProperty(this, "details", void 0);
-
     this.type = type;
     this.details = details;
   }
-
 }

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

@@ -1,14 +1,11 @@
-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; }
-
+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); }
 export class InvalidQueryError extends Error {
   constructor(errors) {
     super(`Invalid query\n${errors.map(e => ' - ' + e).join('\n')}`);
-
     _defineProperty(this, "type", 'invalid-query');
-
     _defineProperty(this, "details", void 0);
-
     this.details = errors;
   }
-
 }

package/build/es/links/CustomDataLink.js

@@ -1,56 +1,44 @@
-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; }
-
+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); }
 export class CustomDataLink {
   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);
-
     _defineProperty(this, "data", void 0);
-
     this.data = customData;
     this.failOnMiss = failOnMiss;
     this.loadForever = loadForever;
   }
-
   async executeResourceQuery(type, query, options) {
     if (this.loadForever) {
       return new Promise(() => undefined);
     }
-
     const customResource = this.data[query.resource];
-
     if (customResource === undefined) {
       if (this.failOnMiss) {
         throw new Error(`No data provided for resource type ${query.resource}!`);
       }
-
       return Promise.resolve(null);
     }
-
     switch (typeof customResource) {
       case 'string':
       case 'number':
       case 'boolean':
       case 'object':
         return customResource;
-
       case 'function':
         {
           const result = await customResource(type, query, options);
-
           if (typeof result === 'undefined' && this.failOnMiss) {
             throw new Error(`The custom function for resource ${query.resource} must always return a value but returned ${result}`);
           }
-
           return result || null;
         }
     }
   }
-
 }