@dhis2/app-runtime - npm Package Compare versions

Comparing version 1.2.0 to 1.3.0

build/cjs/index.js

@@ -23,16 +23,29 @@ 'use strict';
 
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    keys.push.apply(keys, Object.getOwnPropertySymbols(object));
+  }
+
+  if (enumerableOnly) keys = keys.filter(function (sym) {
+    return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+  });
+  return keys;
+}
+
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-
-    if (typeof Object.getOwnPropertySymbols === 'function') {
-      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-      }));
+    if (i % 2) {
+      var source = arguments[i] != null ? arguments[i] : {};
+      ownKeys(source, true).forEach(function (key) {
+        _defineProperty(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(arguments[i]));
+    } else {
+      ownKeys(source).forEach(function (key) {
+        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(arguments[i], key));
+      });
     }
-
-    ownKeys.forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    });
   }
@@ -127,16 +140,29 @@
 
+function ownKeys$1(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    keys.push.apply(keys, Object.getOwnPropertySymbols(object));
+  }
+
+  if (enumerableOnly) keys = keys.filter(function (sym) {
+    return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+  });
+  return keys;
+}
+
 function _objectSpread$1(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-
-    if (typeof Object.getOwnPropertySymbols === 'function') {
-      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-      }));
+    if (i % 2) {
+      var source = arguments[i] != null ? arguments[i] : {};
+      ownKeys$1(source, true).forEach(function (key) {
+        _defineProperty$2(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(arguments[i]));
+    } else {
+      ownKeys$1(source).forEach(function (key) {
+        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(arguments[i], key));
+      });
     }
-
-    ownKeys.forEach(function (key) {
-      _defineProperty$2(target, key, source[key]);
-    });
   }
@@ -257,3 +283,12 @@
 
-const queryToResourcePath = _ref => {
+const actionPrefix = 'action::';
+
+const isAction = resource => resource.startsWith(actionPrefix);
+
+const makeActionURL = (baseUrl, resource) => joinPath(baseUrl, 'dhis-web-commons', `${resource.substr(actionPrefix.length)}.action`);
+
+const queryToResourceUrl = (_ref, {
+  baseUrl,
+  apiUrl
+}) => {
   let {
@@ -264,7 +299,9 @@ resource
 
+  const base = isAction(resource) ? makeActionURL(baseUrl, resource) : joinPath(apiUrl, resource);
+
   if (Object.keys(params).length) {
-    return `${resource}?${queryParametersToQueryString(params)}`;
+    return `${base}?${queryParametersToQueryString(params)}`;
   }
 
-  return resource;
+  return base;
 };
@@ -277,8 +314,9 @@
   const apiUrl = joinPath(baseUrl, 'api', String(apiVersion));
-  return {
+  const context = {
     baseUrl,
     apiVersion,
     apiUrl,
-    fetch: (query, options) => fetchData(joinPath(apiUrl, queryToResourcePath(query)), options)
+    fetch: (query, options) => fetchData(joinPath(queryToResourceUrl(query, context)), options)
   };
+  return context;
 };
@@ -285,0 +323,0 @@

build/es/index.js

@@ -16,16 +16,29 @@ import React, { useContext, useState, useEffect } from 'react';
 
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    keys.push.apply(keys, Object.getOwnPropertySymbols(object));
+  }
+
+  if (enumerableOnly) keys = keys.filter(function (sym) {
+    return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+  });
+  return keys;
+}
+
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-
-    if (typeof Object.getOwnPropertySymbols === 'function') {
-      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-      }));
+    if (i % 2) {
+      var source = arguments[i] != null ? arguments[i] : {};
+      ownKeys(source, true).forEach(function (key) {
+        _defineProperty(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(arguments[i]));
+    } else {
+      ownKeys(source).forEach(function (key) {
+        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(arguments[i], key));
+      });
     }
-
-    ownKeys.forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    });
   }
@@ -120,16 +133,29 @@
 
+function ownKeys$1(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    keys.push.apply(keys, Object.getOwnPropertySymbols(object));
+  }
+
+  if (enumerableOnly) keys = keys.filter(function (sym) {
+    return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+  });
+  return keys;
+}
+
 function _objectSpread$1(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-
-    if (typeof Object.getOwnPropertySymbols === 'function') {
-      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-      }));
+    if (i % 2) {
+      var source = arguments[i] != null ? arguments[i] : {};
+      ownKeys$1(source, true).forEach(function (key) {
+        _defineProperty$2(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(arguments[i]));
+    } else {
+      ownKeys$1(source).forEach(function (key) {
+        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(arguments[i], key));
+      });
     }
-
-    ownKeys.forEach(function (key) {
-      _defineProperty$2(target, key, source[key]);
-    });
   }
@@ -250,3 +276,12 @@
 
-const queryToResourcePath = _ref => {
+const actionPrefix = 'action::';
+
+const isAction = resource => resource.startsWith(actionPrefix);
+
+const makeActionURL = (baseUrl, resource) => joinPath(baseUrl, 'dhis-web-commons', `${resource.substr(actionPrefix.length)}.action`);
+
+const queryToResourceUrl = (_ref, {
+  baseUrl,
+  apiUrl
+}) => {
   let {
@@ -257,7 +292,9 @@ resource
 
+  const base = isAction(resource) ? makeActionURL(baseUrl, resource) : joinPath(apiUrl, resource);
+
   if (Object.keys(params).length) {
-    return `${resource}?${queryParametersToQueryString(params)}`;
+    return `${base}?${queryParametersToQueryString(params)}`;
   }
 
-  return resource;
+  return base;
 };
@@ -270,8 +307,9 @@
   const apiUrl = joinPath(baseUrl, 'api', String(apiVersion));
-  return {
+  const context = {
     baseUrl,
     apiVersion,
     apiUrl,
-    fetch: (query, options) => fetchData(joinPath(apiUrl, queryToResourcePath(query)), options)
+    fetch: (query, options) => fetchData(joinPath(queryToResourceUrl(query, context)), options)
   };
+  return context;
 };
@@ -278,0 +316,0 @@

package.json

 {
     "name": "@dhis2/app-runtime",
     "description": "A singular runtime dependency for applications on the DHIS2 platform",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "main": "build/cjs/index.js",
@@ -18,9 +18,9 @@ "module": "build/es/index.js",
     "devDependencies": {
-        "@babel/core": "^7.4.3",
-        "@babel/preset-env": "^7.4.3",
-        "@dhis2/app-service-data": "1.2.0",
+        "@babel/core": "^7.5.0",
+        "@babel/preset-env": "^7.5.2",
+        "@dhis2/app-service-data": "1.3.0",
         "loop": "^3.1.3",
         "rollup": "^1.9.0",
         "rollup-plugin-babel": "^4.3.2",
-        "rollup-plugin-node-resolve": "^4.2.1"
+        "rollup-plugin-node-resolve": "^5.0.0"
     },
@@ -27,0 +27,0 @@ "peerDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

21136

increased by12.65%

Lines of code

655

increased by10.83%

No dependency changes