@cloudflare/util-routes 5.2.32 → 5.2.34

package/es/route.js

@@ -6,14 +6,8 @@ export class RoutePatternResult {
    * Interperolate arguments into the route pattern
    */
   constructor(pattern) {
-    _defineProperty(this, "pattern", void 0);
-
-    _defineProperty(this, "toUrl", void 0);
-
     _defineProperty(this, "keys", []);
 
-    _defineProperty(this, "expression", void 0);
-
     this.expression = pathToRegExp(pattern, this.keys);
     this.pattern = pattern;
     this.toUrl = pathToRegExp.compile(this.pattern);
@@ -24,10 +18,14 @@ export class RoutePatternResult {
  * Tag a template string with route data
  */
 
-export function route(strings, ...paramNames) {
-  const pattern = strings.reduce((accum, str, i) => {
-    let result = accum + str;
-    const paramName = paramNames[i];
+export function route(strings) {
+  for (var _len = arguments.length, paramNames = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    paramNames[_key - 1] = arguments[_key];
+  }
+
+  var pattern = strings.reduce((accum, str, i) => {
+    var result = accum + str;
+    var paramName = paramNames[i];
 
     if (paramName instanceof RoutePatternResult) {
       result += paramName.pattern;

package/es/useRoute.js

@@ -1,12 +1,12 @@
 export function useRoute(route, useParams) {
-  const result = {};
-  const params = useParams();
-
-  for (const _ref of route.keys) {
-    const name = _ref.name;
+  var result = {};
+  var params = useParams();
 
+  for (var {
+    name
+  } of route.keys) {
     if (typeof params[name] !== 'string') {
-      throw new Error(`useRoute did not find the required parameters for this route: ${route.pattern}. Missing parameter: ${name}`);
+      throw new Error("useRoute did not find the required parameters for this route: ".concat(route.pattern, ". Missing parameter: ").concat(name));
     }
 
     result[name] = params[name];

package/lib/index.js

@@ -8,6 +8,7 @@ var _route = require("./route");
 
 Object.keys(_route).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _route[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -20,6 +21,7 @@ var _useRoute = require("./useRoute");
 
 Object.keys(_useRoute).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useRoute[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/lib/route.js

@@ -3,36 +3,34 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.route = route;
 exports.RoutePatternResult = void 0;
+exports.route = route;
 
 var _pathToRegexp = _interopRequireDefault(require("path-to-regexp"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var RoutePatternResult =
+var RoutePatternResult = /*#__PURE__*/_createClass(
 /**
  * Interperolate arguments into the route pattern
  */
 function RoutePatternResult(pattern) {
   _classCallCheck(this, RoutePatternResult);
 
-  _defineProperty(this, "pattern", void 0);
-
-  _defineProperty(this, "toUrl", void 0);
-
   _defineProperty(this, "keys", []);
 
-  _defineProperty(this, "expression", void 0);
-
   this.expression = (0, _pathToRegexp.default)(pattern, this.keys);
   this.pattern = pattern;
   this.toUrl = _pathToRegexp.default.compile(this.pattern);
-};
+});
 /**
  * Tag a template string with route data
  */

package/lib/useRoute.js

@@ -5,17 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useRoute = useRoute;
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function useRoute(route, useParams) {
   var result = {};
   var params = useParams();
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
+
+  var _iterator = _createForOfIteratorHelper(route.keys),
+      _step;
 
   try {
-    for (var _iterator = route.keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var _ref2 = _step.value;
-      var name = _ref2.name;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var name = _step.value.name;
 
       if (typeof params[name] !== 'string') {
         throw new Error("useRoute did not find the required parameters for this route: ".concat(route.pattern, ". Missing parameter: ").concat(name));
@@ -24,18 +29,9 @@ function useRoute(route, useParams) {
       result[name] = params[name];
     }
   } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
+    _iterator.e(err);
   } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
+    _iterator.f();
   }
 
   return result;

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@cloudflare/util-routes",
   "description": "Wraps path-to-regexp with a convenient, type-safe tagged template function",
-  "version": "5.2.32",
-  "types": "./dist/index.d.ts",
+  "version": "5.2.34",
   "main": "lib/index.js",
   "module": "es/index.js",
   "author": "Frontend Team <frontend@cloudflare.com>",
@@ -12,8 +11,10 @@
   ],
   "license": "UNLICENSED",
   "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "restricted"
+    "access": "restricted",
+    "main": "lib/index.js",
+    "module": "es/index.js",
+    "types": "./dist/index.d.ts"
   },
   "stratus": {
     "srcDirectory": "./src",
@@ -21,8 +22,8 @@
     "autoGeneratedReadme": false
   },
   "dependencies": {
-    "@cloudflare/types": "^6.15.14",
+    "@cloudflare/types": "^6.21.15",
     "path-to-regexp": "^3.0.0"
   },
-  "gitHead": "216f13f248dedfe1b8ec6c4de0dae0244c7cfaa6"
-}
+  "types": "./dist/index.d.ts"
+}