@dhis2/app-service-data 3.7.0 → 3.9.0

package/build/es/links/RestAPILink/validateQuery.test.js

@@ -107,7 +107,7 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should not use wildcard or dynamic field groups\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should not use wildcard or dynamic field groups"`);
     process.env.NODE_ENV = 'test';
   });
   it('Should detect missing fields', () => {
@@ -117,7 +117,7 @@ describe('validateQuery', () => {
       resource: 'mapViews'
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should always specify fields to return\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should always specify fields to return"`);
     process.env.NODE_ENV = 'test';
   });
   it('Should detect paging false', () => {
@@ -131,7 +131,7 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries with paging=false are deprecated and should not be used!\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries with paging=false are deprecated and should not be used!"`);
     expect(validateResourceQuery({
       resource: 'optionSets',
       params: {
@@ -140,7 +140,7 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries with paging=false are deprecated and should not be used!\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries with paging=false are deprecated and should not be used!"`);
     process.env.NODE_ENV = 'test';
   });
   it('Should detect wildcard fields', () => {
@@ -153,7 +153,7 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should not use wildcard or dynamic field groups\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should not use wildcard or dynamic field groups"`);
     expect(validateResourceQuery({
       resource: 'organisationUnits',
       params: {
@@ -161,7 +161,7 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should not use wildcard or dynamic field groups\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should not use wildcard or dynamic field groups"`);
     expect(validateResourceQuery({
       resource: 'organisationUnitGroups',
       params: {
@@ -169,7 +169,7 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should not use wildcard or dynamic field groups\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should not use wildcard or dynamic field groups"`);
     expect(validateResourceQuery({
       resource: 'dashboards',
       params: {
@@ -177,7 +177,7 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(1);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should not use wildcard or dynamic field groups\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should not use wildcard or dynamic field groups"`);
     process.env.NODE_ENV = 'test';
   });
   it('Should warn for multiple errors in one query', () => {
@@ -191,8 +191,8 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(2);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries with paging=false are deprecated and should not be used!\"");
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should not use wildcard or dynamic field groups\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries with paging=false are deprecated and should not be used!"`);
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should not use wildcard or dynamic field groups"`);
     expect(validateResourceQuery({
       resource: 'dashboardItems',
       params: {
@@ -200,8 +200,8 @@ describe('validateQuery', () => {
       }
     }, 'read')).toBe(false);
     expect(warn).toHaveBeenCalledTimes(2);
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries with paging=false are deprecated and should not be used!\"");
-    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot("\"Data queries should always specify fields to return\"");
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries with paging=false are deprecated and should not be used!"`);
+    expect(warn.mock.calls.shift()[0]).toMatchInlineSnapshot(`"Data queries should always specify fields to return"`);
     process.env.NODE_ENV = 'test';
   });
 });

package/build/es/links/RestAPILink.js

@@ -21,9 +21,10 @@ export class RestAPILink {
     return fetchData(joinPath(this.config.baseUrl, path), options);
   }
 
-  executeResourceQuery(type, query, {
-    signal
-  }) {
+  executeResourceQuery(type, query, _ref) {
+    let {
+      signal
+    } = _ref;
     return this.fetch(queryToResourcePath(this, query, type), queryToRequestOptions(type, query, signal));
   }
 

package/build/es/react/components/CustomDataProvider.js

@@ -4,12 +4,13 @@ import { DataEngine } from '../../engine';
 import { CustomDataLink } from '../../links';
 import { DataContext } from '../context/DataContext';
 import { queryClientOptions as queryClientDefaults } from './DataProvider';
-export const CustomDataProvider = ({
-  children,
-  data,
-  options,
-  queryClientOptions = queryClientDefaults
-}) => {
+export const CustomDataProvider = (_ref) => {
+  let {
+    children,
+    data,
+    options,
+    queryClientOptions = queryClientDefaults
+  } = _ref;
   const link = new CustomDataLink(data, options);
   const engine = new DataEngine(link);
   const queryClient = new QueryClient(queryClientOptions);

package/build/es/react/components/DataMutation.js

@@ -1,11 +1,12 @@
 import { useDataMutation } from '../hooks/useDataMutation';
-export const DataMutation = ({
-  mutation,
-  onComplete,
-  onError,
-  variables,
-  children
-}) => {
+export const DataMutation = (_ref) => {
+  let {
+    mutation,
+    onComplete,
+    onError,
+    variables,
+    children
+  } = _ref;
   const mutationState = useDataMutation(mutation, {
     onComplete,
     onError,

package/build/es/react/components/DataQuery.js

@@ -1,12 +1,13 @@
 import { useDataQuery } from '../hooks/useDataQuery';
-export const DataQuery = ({
-  query,
-  onComplete,
-  onError,
-  variables,
-  lazy,
-  children
-}) => {
+export const DataQuery = (_ref) => {
+  let {
+    query,
+    onComplete,
+    onError,
+    variables,
+    lazy,
+    children
+  } = _ref;
   const queryState = useDataQuery(query, {
     onComplete,
     onError,

package/build/es/react/context/defaultContext.test.js

@@ -15,7 +15,11 @@ describe('defaultContext', () => {
       }
     })).rejects.toBeTruthy();
     expect(mockError).toHaveBeenCalledTimes(1);
-    expect(mockError.mock.calls.pop()).toMatchInlineSnapshot("\n            Array [\n              \"DHIS2 data context must be initialized, please ensure that you include a <DataProvider> in your application\",\n            ]\n        ");
+    expect(mockError.mock.calls.pop()).toMatchInlineSnapshot(`
+            Array [
+              "DHIS2 data context must be initialized, please ensure that you include a <DataProvider> in your application",
+            ]
+        `);
   });
   it('Should throw and log if mutate is called', () => {
     const context = defaultContext;
@@ -25,6 +29,10 @@ describe('defaultContext', () => {
       data: {}
     })).rejects.toBeTruthy();
     expect(mockError).toHaveBeenCalled();
-    expect(mockError.mock.calls.pop()).toMatchInlineSnapshot("\n            Array [\n              \"DHIS2 data context must be initialized, please ensure that you include a <DataProvider> in your application\",\n            ]\n        ");
+    expect(mockError.mock.calls.pop()).toMatchInlineSnapshot(`
+            Array [
+              "DHIS2 data context must be initialized, please ensure that you include a <DataProvider> in your application",
+            ]
+        `);
   });
 });

package/build/es/react/hooks/stableVariablesHash.js

@@ -1,6 +1,6 @@
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === '[object Object]';
-} // eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/explicit-module-boundary-types
+} // eslint-disable-next-line @typescript-eslint/ban-types
 
 
 export function isPlainObject(o) {
@@ -33,7 +33,6 @@ export function isPlainObject(o) {
 /**
  * Hashes the value into a stable hash.
  */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 
 export function stableVariablesHash(value) {
   let hash;

package/build/es/react/hooks/stableVariablesHash.test.js

@@ -27,17 +27,17 @@ describe('stableVariablesHash', () => {
     const three = 3;
     const four = null;
     const five = true;
-    expect(stableVariablesHash(one)).toMatchInlineSnapshot("undefined");
-    expect(stableVariablesHash(two)).toMatchInlineSnapshot("\"\\\"string\\\"\"");
-    expect(stableVariablesHash(three)).toMatchInlineSnapshot("\"3\"");
-    expect(stableVariablesHash(four)).toMatchInlineSnapshot("\"null\"");
-    expect(stableVariablesHash(five)).toMatchInlineSnapshot("\"true\"");
+    expect(stableVariablesHash(one)).toMatchInlineSnapshot(`undefined`);
+    expect(stableVariablesHash(two)).toMatchInlineSnapshot(`"\\"string\\""`);
+    expect(stableVariablesHash(three)).toMatchInlineSnapshot(`"3"`);
+    expect(stableVariablesHash(four)).toMatchInlineSnapshot(`"null"`);
+    expect(stableVariablesHash(five)).toMatchInlineSnapshot(`"true"`);
   });
   it('throws a clear error when the variables contain a circular reference', () => {
     const unserializable = {
       value: 'value'
     };
     unserializable.circular = unserializable;
-    expect(() => stableVariablesHash(unserializable)).toThrowErrorMatchingInlineSnapshot("\"Could not serialize variables. Make sure that the variables do not contain circular references and can be processed by JSON.stringify.\"");
+    expect(() => stableVariablesHash(unserializable)).toThrowErrorMatchingInlineSnapshot(`"Could not serialize variables. Make sure that the variables do not contain circular references and can be processed by JSON.stringify."`);
   });
 });

package/build/es/react/hooks/useDataMutation.js

@@ -3,12 +3,13 @@ import { useDataEngine } from './useDataEngine';
 import { useQueryExecutor } from './useQueryExecutor';
 import { useStaticInput } from './useStaticInput';
 const empty = {};
-export const useDataMutation = (mutation, {
-  onComplete,
-  onError,
-  variables = empty,
-  lazy = true
-} = {}) => {
+export const useDataMutation = function (mutation) {
+  let {
+    onComplete,
+    onError,
+    variables = empty,
+    lazy = true
+  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const engine = useDataEngine();
   const [theMutation] = useStaticInput(mutation, {
     warn: true,

package/build/es/react/hooks/useDataMutation.test.js

@@ -16,11 +16,14 @@ describe('useDataMutation', () => {
       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 {
       result,
@@ -64,11 +67,14 @@ describe('useDataMutation', () => {
       answer: 42
     };
 
-    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 {
       result,
@@ -105,11 +111,14 @@ describe('useDataMutation', () => {
       answer: 42
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref3) => {
+      let {
+        children
+      } = _ref3;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const {
       result,
@@ -151,11 +160,14 @@ describe('useDataMutation', () => {
       }
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref4) => {
+      let {
+        children
+      } = _ref4;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const {
       result,
@@ -185,9 +197,12 @@ describe('useDataMutation', () => {
     const mutation = {
       type: 'update',
       resource: 'answer',
-      id: ({
-        id
-      }) => id,
+      id: (_ref5) => {
+        let {
+          id
+        } = _ref5;
+        return id;
+      },
       data: {
         answer: '?'
       }
@@ -197,11 +212,14 @@ describe('useDataMutation', () => {
       answer: answerSpy
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref6) => {
+      let {
+        children
+      } = _ref6;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const {
       result,
@@ -240,11 +258,14 @@ describe('useDataMutation', () => {
       }
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: {}
-    }, children);
+    const wrapper = (_ref7) => {
+      let {
+        children
+      } = _ref7;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: {}
+      }, children);
+    };
 
     const engineHook = renderHook(() => useDataEngine(), {
       wrapper
@@ -271,11 +292,14 @@ describe('useDataMutation', () => {
       answer: 42
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref8) => {
+      let {
+        children
+      } = _ref8;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const {
       result
@@ -307,11 +331,14 @@ describe('useDataMutation', () => {
       answer: 42
     };
 
-    const wrapper = ({
-      children
-    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: data
-    }, children);
+    const wrapper = (_ref9) => {
+      let {
+        children
+      } = _ref9;
+      return /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+    };
 
     const {
       result,

package/build/es/react/hooks/useDataQuery.js

@@ -17,12 +17,13 @@ setLogger({
   warn: noop,
   error: noop
 });
-export const useDataQuery = (query, {
-  onComplete: userOnSuccess,
-  onError: userOnError,
-  variables: initialVariables = {},
-  lazy: initialLazy = false
-} = {}) => {
+export const useDataQuery = function (query) {
+  let {
+    onComplete: userOnSuccess,
+    onError: userOnError,
+    variables: initialVariables = {},
+    lazy: initialLazy = false
+  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const [staticQuery] = useStaticInput(query, {
     warn: true,
     name: 'query'
@@ -114,9 +115,12 @@ export const useDataQuery = (query, {
       return queryRefetch({
         cancelRefetch: true,
         throwOnError: false
-      }).then(({
-        data
-      }) => data);
+      }).then((_ref) => {
+        let {
+          data
+        } = _ref;
+        return data;
+      });
     }
 
     queryState.current.variables = mergedVariables;