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

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

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

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

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

package/build/cjs/index.js

@@ -3,53 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "CustomDataProvider", {
-  enumerable: true,
-  get: function () {
-    return _react.CustomDataProvider;
-  }
-});
-Object.defineProperty(exports, "DataMutation", {
-  enumerable: true,
-  get: function () {
-    return _react.DataMutation;
-  }
-});
-Object.defineProperty(exports, "DataProvider", {
-  enumerable: true,
-  get: function () {
-    return _react.DataProvider;
-  }
-});
-Object.defineProperty(exports, "DataQuery", {
-  enumerable: true,
-  get: function () {
-    return _react.DataQuery;
-  }
-});
+var _exportNames = {
+  FetchError: true
+};
 Object.defineProperty(exports, "FetchError", {
   enumerable: true,
   get: function () {
-    return _engine.FetchError;
-  }
-});
-Object.defineProperty(exports, "useDataEngine", {
-  enumerable: true,
-  get: function () {
-    return _react.useDataEngine;
-  }
-});
-Object.defineProperty(exports, "useDataMutation", {
-  enumerable: true,
-  get: function () {
-    return _react.useDataMutation;
-  }
-});
-Object.defineProperty(exports, "useDataQuery", {
-  enumerable: true,
-  get: function () {
-    return _react.useDataQuery;
+    return _dataEngine.FetchError;
   }
 });
 var _react = require("./react");
-var _engine = require("./engine");
+Object.keys(_react).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _react[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _react[key];
+    }
+  });
+});
+var _dataEngine = require("@dhis2/data-engine");

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

@@ -4,22 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CustomDataProvider = void 0;
+var _dataEngine = require("@dhis2/data-engine");
 var _reactQuery = require("@tanstack/react-query");
 var _react = _interopRequireDefault(require("react"));
-var _engine = require("../../engine");
-var _links = require("../../links");
 var _DataContext = require("../context/DataContext");
 var _DataProvider = require("./DataProvider");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const CustomDataProvider = _ref => {
-  let {
-    children,
-    data,
-    options,
-    queryClientOptions = _DataProvider.queryClientOptions
-  } = _ref;
-  const link = new _links.CustomDataLink(data, options);
-  const engine = new _engine.DataEngine(link);
+const CustomDataProvider = ({
+  children,
+  data,
+  options,
+  queryClientOptions = _DataProvider.queryClientOptions
+}) => {
+  const link = new _dataEngine.CustomDataLink(data, options);
+  const engine = new _dataEngine.DataEngine(link);
   const queryClient = new _reactQuery.QueryClient(queryClientOptions);
   const context = {
     engine

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

@@ -5,14 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DataMutation = void 0;
 var _useDataMutation = require("../hooks/useDataMutation");
-const DataMutation = _ref => {
-  let {
-    mutation,
-    onComplete,
-    onError,
-    variables,
-    children
-  } = _ref;
+const DataMutation = ({
+  mutation,
+  onComplete,
+  onError,
+  variables,
+  children
+}) => {
   const mutationState = (0, _useDataMutation.useDataMutation)(mutation, {
     onComplete,
     onError,

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

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.queryClientOptions = exports.DataProvider = void 0;
 var _appServiceConfig = require("@dhis2/app-service-config");
+var _dataEngine = require("@dhis2/data-engine");
 var _reactQuery = require("@tanstack/react-query");
 var _react = _interopRequireDefault(require("react"));
-var _engine = require("../../engine");
-var _links = require("../../links");
 var _DataContext = require("../context/DataContext");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* eslint-disable react/no-unused-prop-types */
@@ -39,8 +38,8 @@ const DataProvider = props => {
     ...(0, _appServiceConfig.useConfig)(),
     ...props
   };
-  const link = new _links.RestAPILink(config);
-  const engine = new _engine.DataEngine(link);
+  const link = new _dataEngine.RestAPILink(config);
+  const engine = new _dataEngine.DataEngine(link);
   const context = {
     engine
   };

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

@@ -1,9 +1,8 @@
 "use strict";
 
+var _dataEngine = require("@dhis2/data-engine");
 var _react = require("@testing-library/react");
 var _react2 = _interopRequireDefault(require("react"));
-var _engine = require("../../engine");
-var _links = require("../../links");
 var _DataContext = require("../context/DataContext");
 var _DataProvider = require("./DataProvider");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -17,7 +16,7 @@ describe('DataProvider', () => {
     expect(renderFunction).toHaveBeenCalled();
     const context = renderFunction.mock.calls.pop()[0];
     expect(context).not.toBeUndefined();
-    expect(context.engine).toBeInstanceOf(_engine.DataEngine);
-    expect(context.engine.link).toBeInstanceOf(_links.RestAPILink);
+    expect(context.engine).toBeInstanceOf(_dataEngine.DataEngine);
+    expect(context.engine.link).toBeInstanceOf(_dataEngine.RestAPILink);
   });
 });

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

@@ -5,15 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DataQuery = void 0;
 var _useDataQuery = require("../hooks/useDataQuery");
-const DataQuery = _ref => {
-  let {
-    query,
-    onComplete,
-    onError,
-    variables,
-    lazy,
-    children
-  } = _ref;
+const DataQuery = ({
+  query,
+  onComplete,
+  onError,
+  variables,
+  lazy,
+  children
+}) => {
   const queryState = (0, _useDataQuery.useDataQuery)(query, {
     onComplete,
     onError,

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

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "CustomDataProvider", {
+  enumerable: true,
+  get: function () {
+    return _CustomDataProvider.CustomDataProvider;
+  }
+});
+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;
+  }
+});
+var _CustomDataProvider = require("./CustomDataProvider");
+var _DataMutation = require("./DataMutation");
+var _DataProvider = require("./DataProvider");
+var _DataQuery = require("./DataQuery");

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

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DataContext = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _defaultContext = require("./defaultContext");
+var _defaultDataContext = require("./defaultDataContext");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const DataContext = exports.DataContext = /*#__PURE__*/_react.default.createContext(_defaultContext.defaultContext);
+const DataContext = exports.DataContext = /*#__PURE__*/_react.default.createContext(_defaultDataContext.defaultDataContext);

package/build/cjs/react/context/defaultDataContext.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.defaultDataContext = void 0;
+var _dataEngine = require("@dhis2/data-engine");
+const errorMessage = 'DHIS2 data context must be initialized, please ensure that you include a <DataProvider> in your application';
+const link = new _dataEngine.ErrorLink(errorMessage);
+const engine = new _dataEngine.DataEngine(link);
+const defaultDataContext = exports.defaultDataContext = {
+  engine
+};

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

@@ -1,6 +1,6 @@
 "use strict";
 
-var _defaultContext = require("./defaultContext");
+var _defaultDataContext = require("./defaultDataContext");
 describe('defaultContext', () => {
   const originalError = console.error;
   const mockError = jest.fn();
@@ -10,7 +10,7 @@ describe('defaultContext', () => {
   });
   afterEach(() => console.error = originalError);
   it('Should throw if query is called', () => {
-    const context = _defaultContext.defaultContext;
+    const context = _defaultDataContext.defaultDataContext;
     expect(context.engine.query({
       test: {
         resource: 'test'
@@ -24,7 +24,7 @@ describe('defaultContext', () => {
         `);
   });
   it('Should throw and log if mutate is called', () => {
-    const context = _defaultContext.defaultContext;
+    const context = _defaultDataContext.defaultDataContext;
     expect(context.engine.mutate({
       type: 'create',
       resource: 'test',

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

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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;
+  }
+});
+var _useDataEngine = require("./useDataEngine");
+var _useDataMutation = require("./useDataMutation");
+var _useDataQuery = require("./useDataQuery");

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

@@ -9,13 +9,12 @@ var _useDataEngine = require("./useDataEngine");
 var _useQueryExecutor = require("./useQueryExecutor");
 var _useStaticInput = require("./useStaticInput");
 const empty = {};
-const useDataMutation = function (mutation) {
-  let {
-    onComplete,
-    onError,
-    variables = empty,
-    lazy = true
-  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const useDataMutation = (mutation, {
+  onComplete,
+  onError,
+  variables = empty,
+  lazy = true
+} = {}) => {
   const engine = (0, _useDataEngine.useDataEngine)();
   const [theMutation] = (0, _useStaticInput.useStaticInput)(mutation, {
     warn: true,

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

@@ -18,14 +18,11 @@ describe('useDataMutation', () => {
     const data = {
       answer: 42
     };
-    const wrapper = _ref => {
-      let {
-        children
-      } = _ref;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: data
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: data
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useDataMutation.useDataMutation)(mutation), {
@@ -66,14 +63,11 @@ describe('useDataMutation', () => {
     const data = {
       answer: 42
     };
-    const wrapper = _ref2 => {
-      let {
-        children
-      } = _ref2;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: data
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: data
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useDataMutation.useDataMutation)(mutation, {
@@ -107,14 +101,11 @@ describe('useDataMutation', () => {
     const data = {
       answer: 42
     };
-    const wrapper = _ref3 => {
-      let {
-        children
-      } = _ref3;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: data
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: data
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useDataMutation.useDataMutation)(mutation, {
@@ -153,14 +144,11 @@ describe('useDataMutation', () => {
         throw error;
       }
     };
-    const wrapper = _ref4 => {
-      let {
-        children
-      } = _ref4;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: data
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: data
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useDataMutation.useDataMutation)(mutation, {
@@ -188,28 +176,22 @@ describe('useDataMutation', () => {
     const mutation = {
       type: 'update',
       resource: 'answer',
-      id: _ref5 => {
-        let {
-          id
-        } = _ref5;
-        return id;
-      },
+      id: ({
+        id
+      }) => id,
       data: {
         answer: '?'
       }
     };
-    const answerSpy = jest.fn(() => 42);
+    const answerSpy = jest.fn(() => Promise.resolve(42));
     const data = {
       answer: answerSpy
     };
-    const wrapper = _ref6 => {
-      let {
-        children
-      } = _ref6;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: data
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: data
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useDataMutation.useDataMutation)(mutation, {
@@ -245,14 +227,11 @@ describe('useDataMutation', () => {
         answer: '?'
       }
     };
-    const wrapper = _ref7 => {
-      let {
-        children
-      } = _ref7;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: {}
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: {}
+    }, children);
     const engineHook = (0, _react.renderHook)(() => (0, _useDataEngine.useDataEngine)(), {
       wrapper
     });
@@ -277,14 +256,11 @@ describe('useDataMutation', () => {
     const data = {
       answer: 42
     };
-    const wrapper = _ref8 => {
-      let {
-        children
-      } = _ref8;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: data
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: data
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useDataMutation.useDataMutation)(mutation), {
@@ -314,14 +290,11 @@ describe('useDataMutation', () => {
     const data = {
       answer: 42
     };
-    const wrapper = _ref9 => {
-      let {
-        children
-      } = _ref9;
-      return /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
-        data: data
-      }, children);
-    };
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+      data: data
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useDataMutation.useDataMutation)(mutation), {

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

@@ -9,13 +9,12 @@ var _react = require("react");
 var _mergeAndCompareVariables = require("./mergeAndCompareVariables");
 var _useDataEngine = require("./useDataEngine");
 var _useStaticInput = require("./useStaticInput");
-const useDataQuery = function (query) {
-  let {
-    onComplete: userOnSuccess,
-    onError: userOnError,
-    variables: initialVariables = {},
-    lazy: initialLazy = false
-  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const useDataQuery = (query, {
+  onComplete: userOnSuccess,
+  onError: userOnError,
+  variables: initialVariables = {},
+  lazy: initialLazy = false
+} = {}) => {
   const [staticQuery] = (0, _useStaticInput.useStaticInput)(query, {
     warn: true,
     name: 'query'
@@ -44,7 +43,7 @@ const useDataQuery = function (query) {
 
   const onSuccess = data => {
     var _queryState$current$r, _queryState$current;
-    (_queryState$current$r = (_queryState$current = queryState.current).refetchCallback) === null || _queryState$current$r === void 0 ? void 0 : _queryState$current$r.call(_queryState$current, data);
+    (_queryState$current$r = (_queryState$current = queryState.current).refetchCallback) === null || _queryState$current$r === void 0 || _queryState$current$r.call(_queryState$current, data);
     queryState.current.refetchCallback = undefined;
     if (userOnSuccess) {
       userOnSuccess(data);
@@ -104,12 +103,9 @@ const useDataQuery = function (query) {
     if (queryState.current.enabled && identical) {
       return queryRefetch({
         throwOnError: false
-      }).then(_ref => {
-        let {
-          data
-        } = _ref;
-        return data;
-      });
+      }).then(({
+        data
+      }) => data);
     }
     queryState.current.variables = mergedVariables;
     queryState.current.variablesHash = mergedVariablesHash;