@3plus/redux-api 1.1.0 → 1.1.3

package/lib/urlTransform.js

@@ -1,30 +1,19 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = urlTransform;
-var _qs = _interopRequireDefault(require("qs"));
-var _omit = _interopRequireDefault(require("./utils/omit"));
-var _merge = _interopRequireDefault(require("./utils/merge"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var rxClean = /(\(:[^\)]+\)|:[^\/]+\/?)/g;
-function urlTransform(url, params, options) {
+import * as qs from "qs";
+import omit from "./utils/omit";
+import merge from "./utils/merge";
+const rxClean = /(\(:[^\)]+\)|:[^\/]+\/?)/g;
+export default function urlTransform(url, params, options) {
   if (!url) {
     return "";
   }
   params || (params = {});
-  var usedKeys = {};
-  var urlWithParams = Object.keys(params).reduce(function (url, key) {
-    var value = params[key];
-    var rx = new RegExp("(\\(:".concat(key, "\\)|:").concat(key, ")(/?)"), "g");
-    return url.replace(rx, function (_, _1, slash) {
+  const usedKeys = {};
+  const urlWithParams = Object.keys(params).reduce((url, key) => {
+    const value = params[key];
+    const rx = new RegExp(`(\\(:${key}\\)|:${key})(\/?)`, "g");
+    return url.replace(rx, (_, _1, slash) => {
       usedKeys[key] = value;
       return value ? value + slash : value;
     });
@@ -32,40 +21,44 @@ function urlTransform(url, params, options) {
   if (!urlWithParams) {
     return urlWithParams;
   }
-  var protocol, host, pathname;
+  let protocol, host, pathname;
   try {
-    var _URL = new URL(urlWithParams);
-    protocol = _URL.protocol;
-    host = _URL.host;
-    pathname = _URL.pathname;
+    ({
+      protocol,
+      host,
+      pathname
+    } = new URL(urlWithParams));
   } catch (error) {
-    var _pathname = {
+    ({
+      protocol,
+      host,
+      pathname
+    } = {
       pathname: urlWithParams
-    };
-    protocol = _pathname.protocol;
-    host = _pathname.host;
-    pathname = _pathname.pathname;
+    });
   }
-  var cleanURL = host ? "".concat(protocol, "//").concat(host).concat(pathname.replace(rxClean, "")) : pathname.replace(rxClean, "");
-  var usedKeysArray = Object.keys(usedKeys);
+  const cleanURL = host ? `${protocol}//${host}${pathname.replace(rxClean, "")}` : pathname.replace(rxClean, "");
+  const usedKeysArray = Object.keys(usedKeys);
   if (usedKeysArray.length !== Object.keys(params).length) {
-    var urlObject = cleanURL.split("?");
+    const urlObject = cleanURL.split("?");
     options || (options = {});
-    var _options = options,
-      arrayFormat = _options.arrayFormat,
-      delimiter = _options.delimiter;
-    var qsParseOptions = _objectSpread({
-      arrayFormat: arrayFormat,
-      delimiter: delimiter
-    }, options.qsParseOptions);
-    var mergeParams = (0, _merge["default"])(urlObject[1] && _qs["default"].parse(urlObject[1], qsParseOptions), (0, _omit["default"])(params, usedKeysArray));
-    var qsStringifyOptions = _objectSpread({
-      arrayFormat: arrayFormat,
-      delimiter: delimiter
-    }, options.qsStringifyOptions);
-    var urlStringParams = _qs["default"].stringify(mergeParams, qsStringifyOptions);
-    return "".concat(urlObject[0], "?").concat(urlStringParams);
+    const {
+      arrayFormat,
+      delimiter
+    } = options;
+    const qsParseOptions = {
+      arrayFormat,
+      delimiter,
+      ...options.qsParseOptions
+    };
+    const mergeParams = merge(urlObject[1] && qs.parse(urlObject[1], qsParseOptions), omit(params, usedKeysArray));
+    const qsStringifyOptions = {
+      arrayFormat,
+      delimiter,
+      ...options.qsStringifyOptions
+    };
+    const urlStringParams = qs.stringify(mergeParams, qsStringifyOptions);
+    return `${urlObject[0]}?${urlStringParams}`;
   }
   return cleanURL;
-}
-module.exports = exports.default;
+}

package/lib/utils/cache.js

@@ -1,26 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.MockNowDate = exports.Manager = void 0;
-exports["default"] = _default;
-exports.getCacheManager = getCacheManager;
-exports.setExpire = setExpire;
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var MockNowDate = exports.MockNowDate = {
+export const MockNowDate = {
   date: undefined,
-  push: function push(date) {
+  push(date) {
     this.date = date;
   },
-  pop: function pop() {
+  pop() {
     if (this.date) {
-      var d = this.date;
+      const d = this.date;
       this.date = undefined;
       return new Date(d);
     } else {
@@ -28,14 +13,16 @@ var MockNowDate = exports.MockNowDate = {
     }
   }
 };
-var Manager = exports.Manager = {
+export const Manager = {
   expire: false,
-  getData: function getData(cache) {
+  getData(cache) {
     if (!cache) {
       return;
     }
-    var expire = cache.expire,
-      data = cache.data;
+    const {
+      expire,
+      data
+    } = cache;
     if (expire === false || expire === undefined || expire === null) {
       return data;
     }
@@ -45,19 +32,17 @@ var Manager = exports.Manager = {
       }
     }
   },
-  id: function id(params) {
+  id(params) {
     if (!params) {
       return "";
     }
-    return Object.keys(params).reduce(function (memo, key) {
-      return memo + "".concat(key, "=").concat(params[key], ";");
-    }, "");
+    return Object.keys(params).reduce((memo, key) => memo + `${key}=${params[key]};`, "");
   }
 };
-function setExpire(value, oldDate) {
-  var expire = value;
+export function setExpire(value, oldDate) {
+  let expire = value;
   if (typeof expire === "number" || expire instanceof Number) {
-    var d = MockNowDate.pop();
+    const d = MockNowDate.pop();
     d.setSeconds(d.getSeconds() + expire);
     expire = d;
   }
@@ -68,26 +53,35 @@ function setExpire(value, oldDate) {
   }
   return expire;
 }
-function getCacheManager(expire, cache) {
+export function getCacheManager(expire, cache) {
   if (expire !== undefined) {
-    var ret = _objectSpread(_objectSpread({}, Manager), cache);
+    const ret = {
+      ...Manager,
+      ...cache
+    };
     if (ret.expire !== false) {
       ret.expire = setExpire(expire, ret.expire);
     }
     return ret;
   } else if (cache) {
-    return _objectSpread(_objectSpread({}, Manager), cache);
+    return {
+      ...Manager,
+      ...cache
+    };
   } else {
     return null;
   }
 }
-function _default(cache) {
+export default function (cache) {
   if (!cache) {
     return null;
   }
   if (cache === true) {
     return Manager;
   } else {
-    return _objectSpread(_objectSpread({}, Manager), cache);
+    return {
+      ...Manager,
+      ...cache
+    };
   }
 }

package/lib/utils/get.js

@@ -1,24 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function isEmpty(name) {
   return name === "" || name === null || name === void 0;
 }
-function get(obj) {
-  for (var _len = arguments.length, path = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    path[_key - 1] = arguments[_key];
-  }
-  return path.reduce(function (memo, name) {
-    return Array.isArray(name) ? get.apply(void 0, [memo].concat(_toConsumableArray(name))) : isEmpty(name) ? memo : memo && memo[name];
-  }, obj);
+function get(obj, ...path) {
+  return path.reduce((memo, name) => Array.isArray(name) ? get(memo, ...name) : isEmpty(name) ? memo : memo && memo[name], obj);
 }
-var _default = exports["default"] = get;
-module.exports = exports.default;
+export default get;

package/lib/utils/merge.js

@@ -1,22 +1,15 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = _default;
-exports.mergePair = mergePair;
-var toString = Object.prototype.toString;
-var OBJECT = "[object Object]";
-var ARRAY = "[object Array]";
-function mergePair(a, b) {
+const toString = Object.prototype.toString;
+const OBJECT = "[object Object]";
+const ARRAY = "[object Array]";
+export function mergePair(a, b) {
   if (a === void 0) {
     return b;
   }
   if (b === void 0) {
     return a;
   }
-  var aType = toString.call(a);
-  var bType = toString.call(b);
+  const aType = toString.call(a);
+  const bType = toString.call(b);
   if (aType === ARRAY) {
     return a.concat(b);
   }
@@ -26,14 +19,11 @@ function mergePair(a, b) {
   if (aType !== OBJECT || bType !== OBJECT) {
     return b;
   }
-  return Object.keys(b).reduce(function (memo, key) {
+  return Object.keys(b).reduce((memo, key) => {
     memo[key] = mergePair(a[key], b[key]);
     return memo;
   }, a);
 }
-function _default() {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
-  }
+export default function (...args) {
   return args.length ? args.reduce(mergePair) : null;
 }

package/lib/utils/omit.js

@@ -1,24 +1,13 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = _default;
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _default(object, props) {
+export default function (object, props) {
   if (!Array.isArray(props)) {
-    return _objectSpread({}, object);
+    return {
+      ...object
+    };
   }
-  return Object.keys(object || {}).reduce(function (memo, key) {
+  return Object.keys(object || {}).reduce((memo, key) => {
     if (props.indexOf(key) === -1) {
       memo[key] = object[key];
     }
     return memo;
   }, {});
-}
-module.exports = exports.default;
+}

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "@3plus/redux-api",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "author": {
     "name": "Efremov Alex",
     "email": "lexich121@gmail.com",
     "url": "https://github.com/lexich"
   },
   "main": "lib/index.js",
-  "module": "module/index.js",
+  "type": "module",
   "license": "MIT",
   "description": "Flux REST API for redux infrastructure",
   "repository": "http://github.com/3plus/redux-api",
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "scripts": {
     "test": "npm run eslint && npm run mocha",
     "mocha": "mocha --require @babel/register test/*_spec.js",
-    "build": "npm run build:node && npm run build:module",
-    "build:node": "babel src --out-dir lib --env-name node --no-comments --delete-dir-on-start --verbose",
-    "build:module": "babel src --out-dir module --env-name module --no-comments --delete-dir-on-start --verbose",
+    "build": "babel src --out-dir lib --no-comments --delete-dir-on-start --verbose",
     "lint": "eslint --quiet ./src",
     "lint:fix": "npm run lint -- --fix",
     "prettier:fix": "prettier --write './src/**/*.js'",
@@ -31,7 +32,6 @@
     "@babel/core": "^7.8.4",
     "@babel/eslint-parser": "^7.24.7",
     "@babel/preset-env": "^7.8.4",
-    "babel-plugin-add-module-exports": "^1.0.4",
     "chai": "4.2.0",
     "eslint": "^8.2.0",
     "eslint-config-airbnb": "19.0.4",
@@ -60,7 +60,6 @@
   "files": [
     "LICENSE.md",
     "README.md",
-    "module",
     "lib"
   ]
 }

package/module/PubSub.js

@@ -1,39 +0,0 @@
-"use strict";
-
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var PubSub = function () {
-  function PubSub() {
-    _classCallCheck(this, PubSub);
-    this.container = [];
-  }
-  return _createClass(PubSub, [{
-    key: "push",
-    value: function push(cb) {
-      cb instanceof Function && this.container.push(cb);
-    }
-  }, {
-    key: "resolve",
-    value: function resolve(data) {
-      var container = this.container;
-      this.container = [];
-      container.forEach(function (cb) {
-        return cb(null, data);
-      });
-    }
-  }, {
-    key: "reject",
-    value: function reject(err) {
-      var container = this.container;
-      this.container = [];
-      container.forEach(function (cb) {
-        return cb(err);
-      });
-    }
-  }]);
-}();
-export { PubSub as default };