@micromag/data 0.3.480 → 0.3.482

package/es/index.js

@@ -1,14 +1,14 @@
-import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import React, { useContext, useMemo, useState, useCallback, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
+import React, { useContext, useMemo, useState, useCallback, useEffect, useRef } from 'react';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _callSuper from '@babel/runtime/helpers/callSuper';
 import _inherits from '@babel/runtime/helpers/inherits';
+import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
 import { stringify, parse } from 'query-string';
-import { generatePath } from 'react-router';
+import { generatePath } from '@folklore/routes';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import isString from 'lodash/isString';
@@ -76,6 +76,7 @@ var Base = /*#__PURE__*/function () {
   }]);
   return Base;
 }();
+var Base$1 = Base;
 
 var ContributionsApi = /*#__PURE__*/function (_Base) {
   _inherits(ContributionsApi, _Base);
@@ -115,7 +116,7 @@ var ContributionsApi = /*#__PURE__*/function (_Base) {
     }
   }]);
   return ContributionsApi;
-}(Base);
+}(Base$1);
 
 var MediasApi = /*#__PURE__*/function (_Base) {
   _inherits(MediasApi, _Base);
@@ -207,7 +208,7 @@ var MediasApi = /*#__PURE__*/function (_Base) {
     }
   }]);
   return MediasApi;
-}(Base);
+}(Base$1);
 
 var QuizApi = /*#__PURE__*/function (_Base) {
   _inherits(QuizApi, _Base);
@@ -237,7 +238,7 @@ var QuizApi = /*#__PURE__*/function (_Base) {
     }
   }]);
   return QuizApi;
-}(Base);
+}(Base$1);
 
 var Api = /*#__PURE__*/function (_Base) {
   _inherits(Api, _Base);
@@ -252,7 +253,8 @@ var Api = /*#__PURE__*/function (_Base) {
     return _this;
   }
   return _createClass(Api);
-}(Base);
+}(Base$1);
+var Api$1 = Api;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var ApiContext = /*#__PURE__*/React.createContext(null);
@@ -260,7 +262,7 @@ var useApi = function useApi() {
   return useContext(ApiContext);
 };
 var propTypes$1 = {
-  api: PropTypes.instanceOf(Api),
+  api: PropTypes.instanceOf(Api$1),
   baseUrl: PropTypes.string,
   children: PropTypes.node.isRequired
 };
@@ -274,7 +276,7 @@ var ApiProvider = function ApiProvider(_ref) {
     children = _ref.children;
   var previousApi = useApi();
   var api = useMemo(function () {
-    return initialApi || previousApi || new Api({
+    return initialApi || previousApi || new Api$1({
       baseUrl: baseUrl
       // baseUrl: 'https://micromag.studio.test/api',
     });
@@ -316,6 +318,7 @@ var useContributionCreate = function useContributionCreate() {
     creating: creating
   };
 };
+var useContributionCreate$1 = useContributionCreate;
 
 var useData = function useData(loadData) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -372,6 +375,7 @@ var useData = function useData(loadData) {
     error: error
   };
 };
+var useData$1 = useData;
 
 var _excluded$3 = ["data"];
 var useContributions = function useContributions() {
@@ -391,7 +395,7 @@ var useContributions = function useContributions() {
   var loader = useCallback(function () {
     return api !== null ? api.contributions.get(screenId) : null;
   }, [api, screenId]);
-  var _ref2 = api !== null ? useData(loader, opts) : {
+  var _ref2 = api !== null ? useData$1(loader, opts) : {
       data: null
     },
     data = _ref2.data,
@@ -400,6 +404,7 @@ var useContributions = function useContributions() {
     contributions: data || defaultContributions
   }, request);
 };
+var useContributions$1 = useContributions;
 
 var useItems$1 = function useItems(_ref) {
   var _ref$getPage = _ref.getPage,
@@ -612,6 +617,7 @@ var useItems$1 = function useItems(_ref) {
     loadPage: loadPage
   };
 };
+var useItems$2 = useItems$1;
 
 var _excluded$2 = ["data"];
 var useMedia = function useMedia(id, opts) {
@@ -619,13 +625,14 @@ var useMedia = function useMedia(id, opts) {
   var loader = useCallback(function () {
     return api.medias.find(id);
   }, [api, id]);
-  var _useData = useData(loader, opts),
+  var _useData = useData$1(loader, opts),
     data = _useData.data,
     request = _objectWithoutProperties(_useData, _excluded$2);
   return _objectSpread({
     story: data
   }, request);
 };
+var useMedia$1 = useMedia;
 
 // import { useCallback } from 'react';
 
@@ -645,6 +652,7 @@ var useMediaAuthors = function useMediaAuthors() {
     // ...request,
   };
 };
+var useMediaAuthors$1 = useMediaAuthors;
 
 var useMediaCreate = function useMediaCreate() {
   var _useState = useState(false),
@@ -664,6 +672,7 @@ var useMediaCreate = function useMediaCreate() {
     creating: creating
   };
 };
+var useMediaCreate$1 = useMediaCreate;
 
 var useItems = function useItems(_ref) {
   var _ref$getPage = _ref.getPage,
@@ -867,6 +876,7 @@ var useMedias = function useMedias() {
     count: count
   }, opts));
 };
+var useMedias$1 = useMedias;
 
 var useMediasRecent = function useMediasRecent(opts) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'media-gallery-recent-searches';
@@ -894,6 +904,7 @@ var useMediasRecent = function useMediasRecent(opts) {
     getSearches: getSearches
   };
 };
+var useMediasRecent$1 = useMediasRecent;
 
 var _excluded$1 = ["items", "pageItems"];
 var useMediaTags = function useMediaTags() {
@@ -904,7 +915,7 @@ var useMediaTags = function useMediaTags() {
   var getItems = useCallback(function () {
     return api.medias.getTags(query, count);
   }, [api, query, count]);
-  var _useItems = useItems$1(_objectSpread({
+  var _useItems = useItems$2(_objectSpread({
       getItems: getItems
     }, opts)),
     items = _useItems.items;
@@ -914,6 +925,7 @@ var useMediaTags = function useMediaTags() {
     tags: items
   }, request);
 };
+var useMediaTags$1 = useMediaTags;
 
 var useMediaUpdate = function useMediaUpdate() {
   var _useState = useState(false),
@@ -933,6 +945,7 @@ var useMediaUpdate = function useMediaUpdate() {
     updating: updating
   };
 };
+var useMediaUpdate$1 = useMediaUpdate;
 
 var useMediaRequestDelete = function useMediaRequestDelete() {
   var _useState = useState(false),
@@ -952,6 +965,7 @@ var useMediaRequestDelete = function useMediaRequestDelete() {
     requesting: requesting
   };
 };
+var useMediaRequestDelete$1 = useMediaRequestDelete;
 
 var useMediaDelete = function useMediaDelete() {
   var _useState = useState(false),
@@ -971,6 +985,7 @@ var useMediaDelete = function useMediaDelete() {
     deleting: deleting
   };
 };
+var useMediaDelete$1 = useMediaDelete;
 
 var _excluded = ["data"];
 var useQuiz = function useQuiz() {
@@ -982,7 +997,7 @@ var useQuiz = function useQuiz() {
   var loader = useCallback(function () {
     return api !== null ? api.quiz.results(screenId) : null;
   }, [api, screenId]);
-  var _ref2 = api !== null ? useData(loader, opts) : {
+  var _ref2 = api !== null ? useData$1(loader, opts) : {
       data: null
     },
     data = _ref2.data,
@@ -991,6 +1006,7 @@ var useQuiz = function useQuiz() {
     quiz: data || []
   }, request);
 };
+var useQuiz$1 = useQuiz;
 
 var useQuizCreate = function useQuizCreate() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -1032,10 +1048,11 @@ var useQuizCreate = function useQuizCreate() {
     creating: creating
   };
 };
+var useQuizCreate$1 = useQuizCreate;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var propTypes = {
-  api: PropTypes.instanceOf(Api),
+  api: PropTypes.instanceOf(Api$1),
   apiBaseUrl: PropTypes.string,
   children: PropTypes.node
 };
@@ -1055,5 +1072,6 @@ var DataProvider = function DataProvider(_ref) {
 };
 DataProvider.propTypes = propTypes;
 DataProvider.defaultProps = defaultProps;
+var DataProvider$1 = DataProvider;
 
-export { Api, ApiProvider, Base as BaseApi, DataProvider, useApi, useContributionCreate, useContributions, useData, useItems$1 as useItems, useMedia, useMediaAuthors, useMediaCreate, useMediaDelete, useMediaRequestDelete, useMediaTags, useMediaUpdate, useMedias, useMediasRecent as useMediasRecentSearches, useQuiz, useQuizCreate };
+export { Api$1 as Api, ApiProvider, Base$1 as BaseApi, DataProvider$1 as DataProvider, useApi, useContributionCreate$1 as useContributionCreate, useContributions$1 as useContributions, useData$1 as useData, useItems$2 as useItems, useMedia$1 as useMedia, useMediaAuthors$1 as useMediaAuthors, useMediaCreate$1 as useMediaCreate, useMediaDelete$1 as useMediaDelete, useMediaRequestDelete$1 as useMediaRequestDelete, useMediaTags$1 as useMediaTags, useMediaUpdate$1 as useMediaUpdate, useMedias$1 as useMedias, useMediasRecent$1 as useMediasRecentSearches, useQuiz$1 as useQuiz, useQuizCreate$1 as useQuizCreate };

package/lib/index.js

@@ -1,21 +1,36 @@
 'use strict';
 
-var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var React = require('react');
 var PropTypes = require('prop-types');
+var React = require('react');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _callSuper = require('@babel/runtime/helpers/callSuper');
 var _inherits = require('@babel/runtime/helpers/inherits');
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var fetch = require('@folklore/fetch');
 var queryString = require('query-string');
-var reactRouter = require('react-router');
+var pathToRegexp = require('path-to-regexp');
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var isString = require('lodash/isString');
 var contexts = require('@micromag/core/contexts');
 
+({
+  children: PropTypes.node.isRequired,
+  routes: PropTypes.objectOf(PropTypes.string).isRequired,
+  basePath: PropTypes.string
+});
+var compilers = {};
+function generatePath(path, data) {
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  if (typeof compilers[path] === 'undefined') {
+    compilers[path] = pathToRegexp.compile(path, opts);
+  }
+  var compiler = compilers[path];
+  return compiler(data);
+}
+
 var Base = /*#__PURE__*/function () {
   function Base() {
     var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -67,7 +82,7 @@ var Base = /*#__PURE__*/function () {
     key: "route",
     value: function route(_route, params) {
       var routes = this.options.routes;
-      return reactRouter.generatePath(routes[_route] || _route, params);
+      return generatePath(routes[_route] || _route, params);
     }
   }, {
     key: "getFullUrl",
@@ -78,6 +93,7 @@ var Base = /*#__PURE__*/function () {
   }]);
   return Base;
 }();
+var Base$1 = Base;
 
 var ContributionsApi = /*#__PURE__*/function (_Base) {
   _inherits(ContributionsApi, _Base);
@@ -117,7 +133,7 @@ var ContributionsApi = /*#__PURE__*/function (_Base) {
     }
   }]);
   return ContributionsApi;
-}(Base);
+}(Base$1);
 
 var MediasApi = /*#__PURE__*/function (_Base) {
   _inherits(MediasApi, _Base);
@@ -209,7 +225,7 @@ var MediasApi = /*#__PURE__*/function (_Base) {
     }
   }]);
   return MediasApi;
-}(Base);
+}(Base$1);
 
 var QuizApi = /*#__PURE__*/function (_Base) {
   _inherits(QuizApi, _Base);
@@ -239,7 +255,7 @@ var QuizApi = /*#__PURE__*/function (_Base) {
     }
   }]);
   return QuizApi;
-}(Base);
+}(Base$1);
 
 var Api = /*#__PURE__*/function (_Base) {
   _inherits(Api, _Base);
@@ -254,7 +270,8 @@ var Api = /*#__PURE__*/function (_Base) {
     return _this;
   }
   return _createClass(Api);
-}(Base);
+}(Base$1);
+var Api$1 = Api;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var ApiContext = /*#__PURE__*/React.createContext(null);
@@ -262,7 +279,7 @@ var useApi = function useApi() {
   return React.useContext(ApiContext);
 };
 var propTypes$1 = {
-  api: PropTypes.instanceOf(Api),
+  api: PropTypes.instanceOf(Api$1),
   baseUrl: PropTypes.string,
   children: PropTypes.node.isRequired
 };
@@ -276,7 +293,7 @@ var ApiProvider = function ApiProvider(_ref) {
     children = _ref.children;
   var previousApi = useApi();
   var api = React.useMemo(function () {
-    return initialApi || previousApi || new Api({
+    return initialApi || previousApi || new Api$1({
       baseUrl: baseUrl
       // baseUrl: 'https://micromag.studio.test/api',
     });
@@ -318,6 +335,7 @@ var useContributionCreate = function useContributionCreate() {
     creating: creating
   };
 };
+var useContributionCreate$1 = useContributionCreate;
 
 var useData = function useData(loadData) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -374,6 +392,7 @@ var useData = function useData(loadData) {
     error: error
   };
 };
+var useData$1 = useData;
 
 var _excluded$3 = ["data"];
 var useContributions = function useContributions() {
@@ -393,7 +412,7 @@ var useContributions = function useContributions() {
   var loader = React.useCallback(function () {
     return api !== null ? api.contributions.get(screenId) : null;
   }, [api, screenId]);
-  var _ref2 = api !== null ? useData(loader, opts) : {
+  var _ref2 = api !== null ? useData$1(loader, opts) : {
       data: null
     },
     data = _ref2.data,
@@ -402,6 +421,7 @@ var useContributions = function useContributions() {
     contributions: data || defaultContributions
   }, request);
 };
+var useContributions$1 = useContributions;
 
 var useItems$1 = function useItems(_ref) {
   var _ref$getPage = _ref.getPage,
@@ -614,6 +634,7 @@ var useItems$1 = function useItems(_ref) {
     loadPage: loadPage
   };
 };
+var useItems$2 = useItems$1;
 
 var _excluded$2 = ["data"];
 var useMedia = function useMedia(id, opts) {
@@ -621,13 +642,14 @@ var useMedia = function useMedia(id, opts) {
   var loader = React.useCallback(function () {
     return api.medias.find(id);
   }, [api, id]);
-  var _useData = useData(loader, opts),
+  var _useData = useData$1(loader, opts),
     data = _useData.data,
     request = _objectWithoutProperties(_useData, _excluded$2);
   return _objectSpread({
     story: data
   }, request);
 };
+var useMedia$1 = useMedia;
 
 // import { useCallback } from 'react';
 
@@ -647,6 +669,7 @@ var useMediaAuthors = function useMediaAuthors() {
     // ...request,
   };
 };
+var useMediaAuthors$1 = useMediaAuthors;
 
 var useMediaCreate = function useMediaCreate() {
   var _useState = React.useState(false),
@@ -666,6 +689,7 @@ var useMediaCreate = function useMediaCreate() {
     creating: creating
   };
 };
+var useMediaCreate$1 = useMediaCreate;
 
 var useItems = function useItems(_ref) {
   var _ref$getPage = _ref.getPage,
@@ -869,6 +893,7 @@ var useMedias = function useMedias() {
     count: count
   }, opts));
 };
+var useMedias$1 = useMedias;
 
 var useMediasRecent = function useMediasRecent(opts) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'media-gallery-recent-searches';
@@ -896,6 +921,7 @@ var useMediasRecent = function useMediasRecent(opts) {
     getSearches: getSearches
   };
 };
+var useMediasRecent$1 = useMediasRecent;
 
 var _excluded$1 = ["items", "pageItems"];
 var useMediaTags = function useMediaTags() {
@@ -906,7 +932,7 @@ var useMediaTags = function useMediaTags() {
   var getItems = React.useCallback(function () {
     return api.medias.getTags(query, count);
   }, [api, query, count]);
-  var _useItems = useItems$1(_objectSpread({
+  var _useItems = useItems$2(_objectSpread({
       getItems: getItems
     }, opts)),
     items = _useItems.items;
@@ -916,6 +942,7 @@ var useMediaTags = function useMediaTags() {
     tags: items
   }, request);
 };
+var useMediaTags$1 = useMediaTags;
 
 var useMediaUpdate = function useMediaUpdate() {
   var _useState = React.useState(false),
@@ -935,6 +962,7 @@ var useMediaUpdate = function useMediaUpdate() {
     updating: updating
   };
 };
+var useMediaUpdate$1 = useMediaUpdate;
 
 var useMediaRequestDelete = function useMediaRequestDelete() {
   var _useState = React.useState(false),
@@ -954,6 +982,7 @@ var useMediaRequestDelete = function useMediaRequestDelete() {
     requesting: requesting
   };
 };
+var useMediaRequestDelete$1 = useMediaRequestDelete;
 
 var useMediaDelete = function useMediaDelete() {
   var _useState = React.useState(false),
@@ -973,6 +1002,7 @@ var useMediaDelete = function useMediaDelete() {
     deleting: deleting
   };
 };
+var useMediaDelete$1 = useMediaDelete;
 
 var _excluded = ["data"];
 var useQuiz = function useQuiz() {
@@ -984,7 +1014,7 @@ var useQuiz = function useQuiz() {
   var loader = React.useCallback(function () {
     return api !== null ? api.quiz.results(screenId) : null;
   }, [api, screenId]);
-  var _ref2 = api !== null ? useData(loader, opts) : {
+  var _ref2 = api !== null ? useData$1(loader, opts) : {
       data: null
     },
     data = _ref2.data,
@@ -993,6 +1023,7 @@ var useQuiz = function useQuiz() {
     quiz: data || []
   }, request);
 };
+var useQuiz$1 = useQuiz;
 
 var useQuizCreate = function useQuizCreate() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -1034,10 +1065,11 @@ var useQuizCreate = function useQuizCreate() {
     creating: creating
   };
 };
+var useQuizCreate$1 = useQuizCreate;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var propTypes = {
-  api: PropTypes.instanceOf(Api),
+  api: PropTypes.instanceOf(Api$1),
   apiBaseUrl: PropTypes.string,
   children: PropTypes.node
 };
@@ -1057,24 +1089,25 @@ var DataProvider = function DataProvider(_ref) {
 };
 DataProvider.propTypes = propTypes;
 DataProvider.defaultProps = defaultProps;
+var DataProvider$1 = DataProvider;
 
-exports.Api = Api;
+exports.Api = Api$1;
 exports.ApiProvider = ApiProvider;
-exports.BaseApi = Base;
-exports.DataProvider = DataProvider;
+exports.BaseApi = Base$1;
+exports.DataProvider = DataProvider$1;
 exports.useApi = useApi;
-exports.useContributionCreate = useContributionCreate;
-exports.useContributions = useContributions;
-exports.useData = useData;
-exports.useItems = useItems$1;
-exports.useMedia = useMedia;
-exports.useMediaAuthors = useMediaAuthors;
-exports.useMediaCreate = useMediaCreate;
-exports.useMediaDelete = useMediaDelete;
-exports.useMediaRequestDelete = useMediaRequestDelete;
-exports.useMediaTags = useMediaTags;
-exports.useMediaUpdate = useMediaUpdate;
-exports.useMedias = useMedias;
-exports.useMediasRecentSearches = useMediasRecent;
-exports.useQuiz = useQuiz;
-exports.useQuizCreate = useQuizCreate;
+exports.useContributionCreate = useContributionCreate$1;
+exports.useContributions = useContributions$1;
+exports.useData = useData$1;
+exports.useItems = useItems$2;
+exports.useMedia = useMedia$1;
+exports.useMediaAuthors = useMediaAuthors$1;
+exports.useMediaCreate = useMediaCreate$1;
+exports.useMediaDelete = useMediaDelete$1;
+exports.useMediaRequestDelete = useMediaRequestDelete$1;
+exports.useMediaTags = useMediaTags$1;
+exports.useMediaUpdate = useMediaUpdate$1;
+exports.useMedias = useMedias$1;
+exports.useMediasRecentSearches = useMediasRecent$1;
+exports.useQuiz = useQuiz$1;
+exports.useQuizCreate = useQuizCreate$1;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/data",
-    "version": "0.3.480",
+    "version": "0.3.482",
     "private": false,
     "description": "",
     "keywords": [
@@ -44,6 +44,7 @@
         "assets"
     ],
     "scripts": {
+        "clean": "rm -rf es && rm -rf lib && rm -rf assets",
         "prepare": "../../scripts/prepare-package.sh"
     },
     "devDependencies": {
@@ -57,15 +58,15 @@
     "dependencies": {
         "@babel/runtime": "^7.13.10",
         "@folklore/fetch": "^0.1.17",
-        "@micromag/core": "^0.3.480",
+        "@folklore/routes": "^0.2.27",
+        "@micromag/core": "^0.3.482",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
-        "query-string": "^6.13.7",
-        "react-router": "^5.2.0"
+        "query-string": "^6.13.7"
     },
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "4a69863ce7f8aa2e254242a2fd368763611cf096"
+    "gitHead": "931f86bb7dd77a05d196cadda88c8a170e665c3d"
 }