@dhis2/app-service-data 3.8.0 → 3.10.0-alpha.1

package/build/cjs/links/RestAPILink/queryToRequestOptions/requestContentType.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requestBodyForContentType = exports.requestHeadersForContentType = exports.requestContentType = void 0;
+exports.requestHeadersForContentType = exports.requestContentType = exports.requestBodyForContentType = void 0;
 
 var multipartFormDataMatchers = _interopRequireWildcard(require("./multipartFormDataMatchers"));
 
@@ -25,10 +25,11 @@ const convertData = (data, initialValue) => {
   const dataEntries = Object.entries(data);
 
   if (dataEntries.length === 0) {
-    throw new Error("Could not convert data to ".concat(initialValue.constructor.name, ": object does not have own enumerable string-keyed properties"));
+    throw new Error(`Could not convert data to ${initialValue.constructor.name}: object does not have own enumerable string-keyed properties`);
   }
 
-  return dataEntries.reduce((convertedData, [key, value]) => {
+  return dataEntries.reduce((convertedData, _ref) => {
+    let [key, value] = _ref;
     convertedData.append(key, value);
     return convertedData;
   }, initialValue);
@@ -79,9 +80,11 @@ const requestHeadersForContentType = contentType => {
 
 exports.requestHeadersForContentType = requestHeadersForContentType;
 
-const requestBodyForContentType = (contentType, {
-  data
-}) => {
+const requestBodyForContentType = (contentType, _ref2) => {
+  let {
+    data
+  } = _ref2;
+
   if (typeof data === 'undefined') {
     return undefined;
   }

package/build/cjs/links/RestAPILink/queryToRequestOptions/requestContentType.test.js

@@ -88,7 +88,7 @@ describe('requestBodyForContentType', () => {
           type: 'text/plain'
         })
       });
-    }).toThrowErrorMatchingInlineSnapshot("\"Could not convert data to FormData: object does not have own enumerable string-keyed properties\"");
+    }).toThrowErrorMatchingInlineSnapshot(`"Could not convert data to FormData: object does not have own enumerable string-keyed properties"`);
   });
   it('converts to URLSearchParams if contentType is "application/x-www-form-urlencoded"', () => {
     const data = {
@@ -109,7 +109,7 @@ describe('requestBodyForContentType', () => {
           type: 'text/plain'
         })
       });
-    }).toThrowErrorMatchingInlineSnapshot("\"Could not convert data to URLSearchParams: object does not have own enumerable string-keyed properties\"");
+    }).toThrowErrorMatchingInlineSnapshot(`"Could not convert data to URLSearchParams: object does not have own enumerable string-keyed properties"`);
   });
   it('returns the data as received if contentType is "text/plain"', () => {
     const data = 'Something';

package/build/cjs/links/RestAPILink/queryToRequestOptions/textPlainMatchers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isExpressionDescriptionValidation = exports.isMetadataPackageInstallation = exports.addOrUpdateConfigurationProperty = exports.isAddOrUpdateSystemOrUserSetting = exports.isInterpretationCommentUpdate = exports.isCommentOnInterpretation = exports.isUpdateInterpretation = exports.isCreateInterpretation = exports.isCreateFeedbackMessage = exports.isReplyToMessageConversation = void 0;
+exports.isUpdateInterpretation = exports.isReplyToMessageConversation = exports.isMetadataPackageInstallation = exports.isInterpretationCommentUpdate = exports.isExpressionDescriptionValidation = exports.isCreateInterpretation = exports.isCreateFeedbackMessage = exports.isCommentOnInterpretation = exports.isAddOrUpdateSystemOrUserSetting = exports.addOrUpdateConfigurationProperty = void 0;
 
 /*
  * Requests that expect a "text/plain" Content-Type have been collected by scanning
@@ -16,9 +16,10 @@ exports.isExpressionDescriptionValidation = exports.isMetadataPackageInstallatio
  * "create" mutation-objects, we will have to include additional checks below.
  */
 // POST to `messageConversations/${id}` (reply to a messagConversation)
-const isReplyToMessageConversation = (type, {
-  resource
-}) => {
+const isReplyToMessageConversation = (type, _ref) => {
+  let {
+    resource
+  } = _ref;
   const pattern = /^messageConversations\/[a-zA-Z0-9]{11}$/;
   return type === 'create' && pattern.test(resource);
 }; // POST to 'messageConversations/feedback' (create a feedback message)
@@ -26,16 +27,20 @@ const isReplyToMessageConversation = (type, {
 
 exports.isReplyToMessageConversation = isReplyToMessageConversation;
 
-const isCreateFeedbackMessage = (type, {
-  resource
-}) => type === 'create' && resource === 'messageConversations/feedback'; // POST `interpretations/${objectType}/${id}` (add an interpretation to a visualization)
+const isCreateFeedbackMessage = (type, _ref2) => {
+  let {
+    resource
+  } = _ref2;
+  return type === 'create' && resource === 'messageConversations/feedback';
+}; // POST `interpretations/${objectType}/${id}` (add an interpretation to a visualization)
 
 
 exports.isCreateFeedbackMessage = isCreateFeedbackMessage;
 
-const isCreateInterpretation = (type, {
-  resource
-}) => {
+const isCreateInterpretation = (type, _ref3) => {
+  let {
+    resource
+  } = _ref3;
   const pattern = /^interpretations\/(?:reportTable|chart|visualization|map|eventVisualization|eventReport|eventChart|dataSetReport)\/[a-zA-Z0-9]{11}$/;
   return type === 'create' && pattern.test(resource);
 }; // PUT to `interpretations/${id}` (update an interpretation)
@@ -43,10 +48,12 @@ const isCreateInterpretation = (type, {
 
 exports.isCreateInterpretation = isCreateInterpretation;
 
-const isUpdateInterpretation = (type, {
-  resource,
-  id
-}) => {
+const isUpdateInterpretation = (type, _ref4) => {
+  let {
+    resource,
+    id
+  } = _ref4;
+
   if (type !== 'replace') {
     return false;
   }
@@ -66,9 +73,10 @@ const isUpdateInterpretation = (type, {
 
 exports.isUpdateInterpretation = isUpdateInterpretation;
 
-const isCommentOnInterpretation = (type, {
-  resource
-}) => {
+const isCommentOnInterpretation = (type, _ref5) => {
+  let {
+    resource
+  } = _ref5;
   const pattern = /^interpretations\/[a-zA-Z0-9]{11}\/comments$/;
   return type === 'create' && pattern.test(resource);
 }; // PUT to `interpretations/${interpretationId}/comments/${commentId}`
@@ -77,10 +85,12 @@ const isCommentOnInterpretation = (type, {
 
 exports.isCommentOnInterpretation = isCommentOnInterpretation;
 
-const isInterpretationCommentUpdate = (type, {
-  resource,
-  id
-}) => {
+const isInterpretationCommentUpdate = (type, _ref6) => {
+  let {
+    resource,
+    id
+  } = _ref6;
+
   if (type !== 'replace') {
     return false;
   }
@@ -100,9 +110,10 @@ const isInterpretationCommentUpdate = (type, {
 
 exports.isInterpretationCommentUpdate = isInterpretationCommentUpdate;
 
-const isAddOrUpdateSystemOrUserSetting = (type, {
-  resource
-}) => {
+const isAddOrUpdateSystemOrUserSetting = (type, _ref7) => {
+  let {
+    resource
+  } = _ref7;
   // At least 4 chars because the all start with 'key' (i.e. keyStyle)
   const pattern = /^(?:systemSettings|userSettings)\/[a-zA-Z]{4,}$/;
   return type === 'create' && pattern.test(resource);
@@ -112,9 +123,10 @@ const isAddOrUpdateSystemOrUserSetting = (type, {
 
 exports.isAddOrUpdateSystemOrUserSetting = isAddOrUpdateSystemOrUserSetting;
 
-const addOrUpdateConfigurationProperty = (type, {
-  resource
-}) => {
+const addOrUpdateConfigurationProperty = (type, _ref8) => {
+  let {
+    resource
+  } = _ref8;
   // NOTE: The corsWhitelist property does expect "application/json"
   const pattern = /^(configuration)\/([a-zA-Z]{1,50})$/;
   const match = resource.match(pattern);
@@ -124,15 +136,21 @@ const addOrUpdateConfigurationProperty = (type, {
 
 exports.addOrUpdateConfigurationProperty = addOrUpdateConfigurationProperty;
 
-const isMetadataPackageInstallation = (type, {
-  resource
-}) => type === 'create' && resource === 'synchronization/metadataPull'; // POST to 'indicaators/expression/description' (validate an expression)
+const isMetadataPackageInstallation = (type, _ref9) => {
+  let {
+    resource
+  } = _ref9;
+  return type === 'create' && resource === 'synchronization/metadataPull';
+}; // POST to 'indicaators/expression/description' (validate an expression)
 
 
 exports.isMetadataPackageInstallation = isMetadataPackageInstallation;
 
-const isExpressionDescriptionValidation = (type, {
-  resource
-}) => type === 'create' && resource === 'indicators/expression/description';
+const isExpressionDescriptionValidation = (type, _ref10) => {
+  let {
+    resource
+  } = _ref10;
+  return type === 'create' && resource === 'indicators/expression/description';
+};
 
 exports.isExpressionDescriptionValidation = isExpressionDescriptionValidation;

package/build/cjs/links/RestAPILink/queryToRequestOptions/xWwwFormUrlencodedMatchers.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.isSvgConversion = void 0;
 
 // POST to convert an SVG file
-const isSvgConversion = (type, {
-  resource
-}) => type === 'create' && (resource === 'svg.png' || resource === 'svg.pdf');
+const isSvgConversion = (type, _ref) => {
+  let {
+    resource
+  } = _ref;
+  return type === 'create' && (resource === 'svg.png' || resource === 'svg.pdf');
+};
 
 exports.isSvgConversion = isSvgConversion;

package/build/cjs/links/RestAPILink/queryToRequestOptions.js

@@ -26,7 +26,7 @@ const getMethod = type => {
       return 'DELETE';
 
     default:
-      throw new Error("Unknown type ".concat(type));
+      throw new Error(`Unknown type ${type}`);
   }
 };
 

package/build/cjs/links/RestAPILink/queryToRequestOptions.test.js

@@ -7,7 +7,14 @@ describe('queryToRequestOptions', () => {
     const options = (0, _queryToRequestOptions.queryToRequestOptions)('read', {
       resource: 'test'
     });
-    expect(options).toMatchInlineSnapshot("\n            Object {\n              \"body\": undefined,\n              \"headers\": undefined,\n              \"method\": \"GET\",\n              \"signal\": undefined,\n            }\n        ");
+    expect(options).toMatchInlineSnapshot(`
+            Object {
+              "body": undefined,
+              "headers": undefined,
+              "method": "GET",
+              "signal": undefined,
+            }
+        `);
   });
   it('should return a valid Fetch option object for create request', () => {
     const options = (0, _queryToRequestOptions.queryToRequestOptions)('create', {
@@ -17,7 +24,16 @@ describe('queryToRequestOptions', () => {
         foo: 'bar'
       }
     });
-    expect(options).toMatchInlineSnapshot("\n            Object {\n              \"body\": \"{\\\"answer\\\":42,\\\"foo\\\":\\\"bar\\\"}\",\n              \"headers\": Object {\n                \"Content-Type\": \"application/json\",\n              },\n              \"method\": \"POST\",\n              \"signal\": undefined,\n            }\n        ");
+    expect(options).toMatchInlineSnapshot(`
+            Object {
+              "body": "{\\"answer\\":42,\\"foo\\":\\"bar\\"}",
+              "headers": Object {
+                "Content-Type": "application/json",
+              },
+              "method": "POST",
+              "signal": undefined,
+            }
+        `);
   });
   it('should return a valid Fetch option object for update request', () => {
     const options = (0, _queryToRequestOptions.queryToRequestOptions)('update', {
@@ -27,7 +43,16 @@ describe('queryToRequestOptions', () => {
         foo: 'bar'
       }
     });
-    expect(options).toMatchInlineSnapshot("\n            Object {\n              \"body\": \"{\\\"answer\\\":42,\\\"foo\\\":\\\"bar\\\"}\",\n              \"headers\": Object {\n                \"Content-Type\": \"application/json\",\n              },\n              \"method\": \"PATCH\",\n              \"signal\": undefined,\n            }\n        ");
+    expect(options).toMatchInlineSnapshot(`
+            Object {
+              "body": "{\\"answer\\":42,\\"foo\\":\\"bar\\"}",
+              "headers": Object {
+                "Content-Type": "application/json",
+              },
+              "method": "PATCH",
+              "signal": undefined,
+            }
+        `);
   });
   it('should return a valid Fetch option object for json-patch request', () => {
     const options = (0, _queryToRequestOptions.queryToRequestOptions)('json-patch', {
@@ -37,7 +62,16 @@ describe('queryToRequestOptions', () => {
         foo: 'bar'
       }
     });
-    expect(options).toMatchInlineSnapshot("\n            Object {\n              \"body\": \"{\\\"answer\\\":42,\\\"foo\\\":\\\"bar\\\"}\",\n              \"headers\": Object {\n                \"Content-Type\": \"application/json-patch+json\",\n              },\n              \"method\": \"PATCH\",\n              \"signal\": undefined,\n            }\n        ");
+    expect(options).toMatchInlineSnapshot(`
+            Object {
+              "body": "{\\"answer\\":42,\\"foo\\":\\"bar\\"}",
+              "headers": Object {
+                "Content-Type": "application/json-patch+json",
+              },
+              "method": "PATCH",
+              "signal": undefined,
+            }
+        `);
   });
   it('should return a valid Fetch option object for replace request', () => {
     const options = (0, _queryToRequestOptions.queryToRequestOptions)('replace', {
@@ -47,12 +81,28 @@ describe('queryToRequestOptions', () => {
         foo: 'bar'
       }
     });
-    expect(options).toMatchInlineSnapshot("\n            Object {\n              \"body\": \"{\\\"answer\\\":42,\\\"foo\\\":\\\"bar\\\"}\",\n              \"headers\": Object {\n                \"Content-Type\": \"application/json\",\n              },\n              \"method\": \"PUT\",\n              \"signal\": undefined,\n            }\n        ");
+    expect(options).toMatchInlineSnapshot(`
+            Object {
+              "body": "{\\"answer\\":42,\\"foo\\":\\"bar\\"}",
+              "headers": Object {
+                "Content-Type": "application/json",
+              },
+              "method": "PUT",
+              "signal": undefined,
+            }
+        `);
   });
   it('should return a valid Fetch option object for delete request', () => {
     const options = (0, _queryToRequestOptions.queryToRequestOptions)('delete', {
       resource: 'test'
     });
-    expect(options).toMatchInlineSnapshot("\n            Object {\n              \"body\": undefined,\n              \"headers\": undefined,\n              \"method\": \"DELETE\",\n              \"signal\": undefined,\n            }\n        ");
+    expect(options).toMatchInlineSnapshot(`
+            Object {
+              "body": undefined,
+              "headers": undefined,
+              "method": "DELETE",
+              "signal": undefined,
+            }
+        `);
   });
 });

package/build/cjs/links/RestAPILink/queryToResourcePath.js

@@ -51,17 +51,20 @@ const queryParametersMapToArray = params => Object.keys(params).reduce((out, key
 
 const queryParametersToQueryString = params => {
   const expandedParams = queryParametersMapToArray(params);
-  return expandedParams.map(({
-    key,
-    value
-  }) => "".concat(encodeURIComponent(key), "=").concat(encodeQueryParameter(value))).join('&');
+  return expandedParams.map((_ref) => {
+    let {
+      key,
+      value
+    } = _ref;
+    return `${encodeURIComponent(key)}=${encodeQueryParameter(value)}`;
+  }).join('&');
 };
 
 const actionPrefix = 'action::';
 
 const isAction = resource => resource.startsWith(actionPrefix);
 
-const makeActionPath = resource => (0, _path.joinPath)('dhis-web-commons', "".concat(resource.substr(actionPrefix.length), ".action"));
+const makeActionPath = resource => (0, _path.joinPath)('dhis-web-commons', `${resource.substr(actionPrefix.length)}.action`);
 
 const skipApiVersion = (resource, config) => {
   if (resource === 'tracker' || resource.startsWith('tracker/')) {
@@ -70,6 +73,11 @@ const skipApiVersion = (resource, config) => {
     if (!((_config$serverVersion = config.serverVersion) !== null && _config$serverVersion !== void 0 && _config$serverVersion.minor) || ((_config$serverVersion2 = config.serverVersion) === null || _config$serverVersion2 === void 0 ? void 0 : _config$serverVersion2.minor) < 38) {
       return true;
     }
+  } // The `/api/ping` endpoint is unversioned
+
+
+  if (resource === 'ping') {
+    return true;
   }
 
   return false;
@@ -86,7 +94,7 @@ const queryToResourcePath = (link, query, type) => {
   (0, _validateQuery.validateResourceQuery)(query, type);
 
   if (Object.keys(params).length) {
-    return "".concat(base, "?").concat(queryParametersToQueryString(params));
+    return `${base}?${queryParametersToQueryString(params)}`;
   }
 
   return base;

package/build/cjs/links/RestAPILink/queryToResourcePath.test.js

@@ -17,7 +17,7 @@ const defaultConfig = {
 };
 const link = createLink(defaultConfig);
 const apiPath = link.versionedApiPath;
-const actionPrefix = "dhis-web-commons/";
+const actionPrefix = `dhis-web-commons/`;
 const actionPostfix = '.action';
 describe('queryToResourcePath', () => {
   describe('action', () => {
@@ -25,7 +25,7 @@ describe('queryToResourcePath', () => {
       const query = {
         resource: 'action::test'
       };
-      expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(actionPrefix, "test").concat(actionPostfix));
+      expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${actionPrefix}test${actionPostfix}`);
     });
     it('should return action URL with a simple querystring if query parameters are passed', () => {
       const query = {
@@ -34,7 +34,7 @@ describe('queryToResourcePath', () => {
           key: 'value'
         }
       };
-      expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(actionPrefix, "test").concat(actionPostfix, "?key=value"));
+      expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${actionPrefix}test${actionPostfix}?key=value`);
     });
   });
   describe('resource with dot', () => {
@@ -42,14 +42,14 @@ describe('queryToResourcePath', () => {
       const query = {
         resource: 'svg.pdf'
       };
-      expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/svg.pdf"));
+      expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/svg.pdf`);
     });
   });
   it('should return resource url with no querystring if not query parameters are passed', () => {
     const query = {
       resource: 'test'
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test`);
   });
   it('should return resource url and singular parameter separated by ?', () => {
     const query = {
@@ -58,7 +58,7 @@ describe('queryToResourcePath', () => {
         key: 'value'
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?key=value"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?key=value`);
   });
   it('should return resource url and multiple parameters separated by ? and &', () => {
     const query = {
@@ -68,7 +68,7 @@ describe('queryToResourcePath', () => {
         param: 'value2'
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?key=value&param=value2"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?key=value&param=value2`);
   });
   it('should url encode special characters in query keys', () => {
     const query = {
@@ -77,7 +77,7 @@ describe('queryToResourcePath', () => {
         'key=42&val': 'value'
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?key%3D42%26val=value"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?key%3D42%26val=value`);
   });
   it('should url encode special characters in string parameters', () => {
     const query = {
@@ -87,7 +87,7 @@ describe('queryToResourcePath', () => {
         param: 'value2&& 53'
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?key=value%3F%3D42&param=value2%26%26%2053"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?key=value%3F%3D42&param=value2%26%26%2053`);
   });
   it('should support numeric (integer and float) parameters', () => {
     const query = {
@@ -97,7 +97,7 @@ describe('queryToResourcePath', () => {
         param: 193.75
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?key=42&param=193.75"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?key=42&param=193.75`);
   });
   it('should support boolean parameters', () => {
     const query = {
@@ -107,7 +107,7 @@ describe('queryToResourcePath', () => {
         someflag: true
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?key=42&someflag=true"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?key=42&someflag=true`);
   });
   it('should join array parameters with commas', () => {
     const query = {
@@ -116,7 +116,7 @@ describe('queryToResourcePath', () => {
         key: ['asdf', 123]
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?key=asdf,123"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?key=asdf,123`);
   });
   it('should include multiple filter parameters when array of filters provided', () => {
     const query = {
@@ -125,7 +125,7 @@ describe('queryToResourcePath', () => {
         filter: ['asdf', 123]
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(apiPath, "/test?filter=asdf&filter=123"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${apiPath}/test?filter=asdf&filter=123`);
   });
   it('should NOT YET support name-aliased parameters', () => {
     const query = {
@@ -151,13 +151,13 @@ describe('queryToResourcePath', () => {
     const query = {
       resource: 'tracker'
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(link.unversionedApiPath, "/tracker"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${link.unversionedApiPath}/tracker`);
   });
   it('should return an unversioned endpoint sub-resources of the new tracker importer (in version 2.37)', () => {
     const query = {
       resource: 'tracker/test'
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe("".concat(link.unversionedApiPath, "/tracker/test"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(link, query, 'read')).toBe(`${link.unversionedApiPath}/tracker/test`);
   });
   it('should return a VERSIONED endpoint for the new tracker importer (in version 2.38)', () => {
     const query = {
@@ -170,6 +170,6 @@ describe('queryToResourcePath', () => {
         patch: 0
       }
     };
-    expect((0, _queryToResourcePath.queryToResourcePath)(createLink(v38config), query, 'read')).toBe("".concat(link.versionedApiPath, "/tracker"));
+    expect((0, _queryToResourcePath.queryToResourcePath)(createLink(v38config), query, 'read')).toBe(`${link.versionedApiPath}/tracker`);
   });
 });

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

@@ -110,7 +110,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', () => {
@@ -120,7 +120,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', () => {
@@ -134,7 +134,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((0, _validateQuery.validateResourceQuery)({
       resource: 'optionSets',
       params: {
@@ -143,7 +143,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', () => {
@@ -156,7 +156,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((0, _validateQuery.validateResourceQuery)({
       resource: 'organisationUnits',
       params: {
@@ -164,7 +164,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((0, _validateQuery.validateResourceQuery)({
       resource: 'organisationUnitGroups',
       params: {
@@ -172,7 +172,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((0, _validateQuery.validateResourceQuery)({
       resource: 'dashboards',
       params: {
@@ -180,7 +180,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', () => {
@@ -194,8 +194,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((0, _validateQuery.validateResourceQuery)({
       resource: 'dashboardItems',
       params: {
@@ -203,8 +203,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/cjs/links/RestAPILink.js

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

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

@@ -19,12 +19,13 @@ var _DataProvider = require("./DataProvider");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const CustomDataProvider = ({
-  children,
-  data,
-  options,
-  queryClientOptions = _DataProvider.queryClientOptions
-}) => {
+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 queryClient = new _reactQuery.QueryClient(queryClientOptions);