@dhis2/app-service-data 3.16.0 → 3.17.0-beta.2

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

@@ -4,18 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useQueryExecutor = void 0;
+var _dataEngine = require("@dhis2/data-engine");
 var _react = require("react");
-var _engine = require("../../engine");
 var _useStaticInput = require("./useStaticInput");
-const useQueryExecutor = _ref => {
-  let {
-    execute,
-    variables: initialVariables,
-    singular,
-    immediate,
-    onComplete,
-    onError
-  } = _ref;
+const useQueryExecutor = ({
+  execute,
+  variables: initialVariables,
+  singular,
+  immediate,
+  onComplete,
+  onError
+}) => {
   const [theExecute] = (0, _useStaticInput.useStaticInput)(execute);
   const [state, setState] = (0, _react.useState)({
     called: !!immediate,
@@ -32,14 +31,13 @@ const useQueryExecutor = _ref => {
     setState(state => ({
       called: state.called,
       loading: false,
-      error: new _engine.FetchError({
+      error: new _dataEngine.FetchError({
         type: 'aborted',
         message: 'Aborted'
       })
     }));
   }, [abort]);
-  const refetch = (0, _react.useCallback)(function () {
-    let newVariables = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const refetch = (0, _react.useCallback)((newVariables = {}) => {
     setState(state => !state.called || !state.loading ? {
       called: true,
       loading: true

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

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

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

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useStaticInput = void 0;
 var _react = require("react");
-const useStaticInput = function (staticValue) {
-  let {
-    warn = false,
-    name = 'input'
-  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const useStaticInput = (staticValue, {
+  warn = false,
+  name = 'input'
+} = {}) => {
   const originalValue = (0, _react.useRef)(staticValue);
   const [value, setValue] = (0, _react.useState)(() => originalValue.current);
   (0, _react.useDebugValue)(value, debugValue => `${name}: ${JSON.stringify(debugValue)}`);

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

@@ -21,12 +21,9 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _react.renderHook)(_ref => {
-      let {
-        value
-      } = _ref;
-      return (0, _useStaticInput.useStaticInput)(value);
-    }, {
+    } = (0, _react.renderHook)(({
+      value
+    }) => (0, _useStaticInput.useStaticInput)(value), {
       initialProps: {
         value: 42
       }
@@ -42,14 +39,11 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _react.renderHook)(_ref2 => {
-      let {
-        value
-      } = _ref2;
-      return (0, _useStaticInput.useStaticInput)(value, {
-        warn: true
-      });
-    }, {
+    } = (0, _react.renderHook)(({
+      value
+    }) => (0, _useStaticInput.useStaticInput)(value, {
+      warn: true
+    }), {
       initialProps: {
         value: 42
       }
@@ -70,15 +64,12 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _react.renderHook)(_ref3 => {
-      let {
-        value
-      } = _ref3;
-      return (0, _useStaticInput.useStaticInput)(value, {
-        warn: true,
-        name: 'TESTING THING'
-      });
-    }, {
+    } = (0, _react.renderHook)(({
+      value
+    }) => (0, _useStaticInput.useStaticInput)(value, {
+      warn: true,
+      name: 'TESTING THING'
+    }), {
       initialProps: {
         value: 42
       }
@@ -95,14 +86,11 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _react.renderHook)(_ref4 => {
-      let {
-        value
-      } = _ref4;
-      return (0, _useStaticInput.useStaticInput)(value, {
-        warn: true
-      });
-    }, {
+    } = (0, _react.renderHook)(({
+      value
+    }) => (0, _useStaticInput.useStaticInput)(value, {
+      warn: true
+    }), {
       initialProps: {
         value: 42
       }
@@ -131,14 +119,11 @@ describe('useStaticInput', () => {
     const {
       result,
       rerender
-    } = (0, _react.renderHook)(_ref5 => {
-      let {
-        value
-      } = _ref5;
-      return (0, _useStaticInput.useStaticInput)(value, {
-        warn: true
-      });
-    }, {
+    } = (0, _react.renderHook)(({
+      value
+    }) => (0, _useStaticInput.useStaticInput)(value, {
+      warn: true
+    }), {
       initialProps: {
         value: fn
       }

package/build/cjs/react/index.js

@@ -3,80 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "CustomDataProvider", {
-  enumerable: true,
-  get: function () {
-    return _CustomDataProvider.CustomDataProvider;
-  }
-});
-Object.defineProperty(exports, "DataContext", {
-  enumerable: true,
-  get: function () {
-    return _DataContext.DataContext;
-  }
-});
-Object.defineProperty(exports, "DataMutation", {
-  enumerable: true,
-  get: function () {
-    return _DataMutation.DataMutation;
-  }
-});
-Object.defineProperty(exports, "DataProvider", {
-  enumerable: true,
-  get: function () {
-    return _DataProvider.DataProvider;
-  }
-});
-Object.defineProperty(exports, "DataQuery", {
-  enumerable: true,
-  get: function () {
-    return _DataQuery.DataQuery;
-  }
-});
-Object.defineProperty(exports, "defaultContext", {
-  enumerable: true,
-  get: function () {
-    return _defaultContext.defaultContext;
-  }
-});
-Object.defineProperty(exports, "useDataEngine", {
-  enumerable: true,
-  get: function () {
-    return _useDataEngine.useDataEngine;
-  }
-});
-Object.defineProperty(exports, "useDataMutation", {
-  enumerable: true,
-  get: function () {
-    return _useDataMutation.useDataMutation;
-  }
-});
-Object.defineProperty(exports, "useDataQuery", {
-  enumerable: true,
-  get: function () {
-    return _useDataQuery.useDataQuery;
-  }
-});
-Object.defineProperty(exports, "useQueryExecutor", {
-  enumerable: true,
-  get: function () {
-    return _useQueryExecutor.useQueryExecutor;
-  }
-});
-Object.defineProperty(exports, "useStaticInput", {
-  enumerable: true,
-  get: function () {
-    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");
+var _components = require("./components");
+Object.keys(_components).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _components[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _components[key];
+    }
+  });
+});
+var _hooks = require("./hooks");
+Object.keys(_hooks).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _hooks[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _hooks[key];
+    }
+  });
+});

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

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

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

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

package/build/es/index.js

@@ -1,3 +1,2 @@
-export { DataQuery, DataMutation, DataProvider, CustomDataProvider } from './react';
-export { useDataEngine, useDataQuery, useDataMutation } from './react';
-export { FetchError } from './engine';
+export * from './react';
+export { FetchError } from '@dhis2/data-engine';

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

@@ -1,16 +1,14 @@
+import { DataEngine, CustomDataLink } from '@dhis2/data-engine';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import React from 'react';
-import { DataEngine } from '../../engine';
-import { CustomDataLink } from '../../links';
 import { DataContext } from '../context/DataContext';
 import { queryClientOptions as queryClientDefaults } from './DataProvider';
-export const CustomDataProvider = _ref => {
-  let {
-    children,
-    data,
-    options,
-    queryClientOptions = queryClientDefaults
-  } = _ref;
+export const CustomDataProvider = ({
+  children,
+  data,
+  options,
+  queryClientOptions = queryClientDefaults
+}) => {
   const link = new CustomDataLink(data, options);
   const engine = new DataEngine(link);
   const queryClient = new QueryClient(queryClientOptions);

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

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

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

@@ -1,10 +1,9 @@
 /* eslint-disable react/no-unused-prop-types */
 
 import { useConfig } from '@dhis2/app-service-config';
+import { DataEngine, RestAPILink } from '@dhis2/data-engine';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import React from 'react';
-import { DataEngine } from '../../engine';
-import { RestAPILink } from '../../links';
 import { DataContext } from '../context/DataContext';
 export const queryClientOptions = {
   defaultOptions: {

package/build/es/react/components/DataProvider.test.js

@@ -1,7 +1,6 @@
+import { DataEngine, RestAPILink } from '@dhis2/data-engine';
 import { render } from '@testing-library/react';
 import React from 'react';
-import { DataEngine } from '../../engine';
-import { RestAPILink } from '../../links';
 import { DataContext } from '../context/DataContext';
 import { DataProvider } from './DataProvider';
 describe('DataProvider', () => {

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

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

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

@@ -0,0 +1,4 @@
+export { CustomDataProvider } from './CustomDataProvider';
+export { DataMutation } from './DataMutation';
+export { DataProvider } from './DataProvider';
+export { DataQuery } from './DataQuery';

package/build/es/react/context/DataContext.js

@@ -1,3 +1,3 @@
 import React from 'react';
-import { defaultContext } from './defaultContext';
-export const DataContext = /*#__PURE__*/React.createContext(defaultContext);
+import { defaultDataContext } from './defaultDataContext';
+export const DataContext = /*#__PURE__*/React.createContext(defaultDataContext);

package/build/es/react/context/{defaultContext.js → defaultDataContext.js}

@@ -1,8 +1,7 @@
-import { DataEngine } from '../../engine';
-import { ErrorLink } from '../../links';
+import { DataEngine, ErrorLink } from '@dhis2/data-engine';
 const errorMessage = 'DHIS2 data context must be initialized, please ensure that you include a <DataProvider> in your application';
 const link = new ErrorLink(errorMessage);
 const engine = new DataEngine(link);
-export const defaultContext = {
+export const defaultDataContext = {
   engine
 };

package/build/es/react/context/{defaultContext.test.js → defaultDataContext.test.js}

@@ -1,4 +1,4 @@
-import { defaultContext } from './defaultContext';
+import { defaultDataContext } from './defaultDataContext';
 describe('defaultContext', () => {
   const originalError = console.error;
   const mockError = jest.fn();
@@ -8,7 +8,7 @@ describe('defaultContext', () => {
   });
   afterEach(() => console.error = originalError);
   it('Should throw if query is called', () => {
-    const context = defaultContext;
+    const context = defaultDataContext;
     expect(context.engine.query({
       test: {
         resource: 'test'
@@ -22,7 +22,7 @@ describe('defaultContext', () => {
         `);
   });
   it('Should throw and log if mutate is called', () => {
-    const context = defaultContext;
+    const context = defaultDataContext;
     expect(context.engine.mutate({
       type: 'create',
       resource: 'test',

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

@@ -0,0 +1,3 @@
+export { useDataEngine } from './useDataEngine';
+export { useDataMutation } from './useDataMutation';
+export { useDataQuery } from './useDataQuery';

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

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