switch-path - npm Package Compare versions

Comparing version 1.1.5 to 1.1.6

dist/switch-path.js

@@ -90,3 +90,3 @@ (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.switchPath = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 
-    var params = matchesWithParams(sourcePath, pattern);
+    var params = matchesWithParams(sourcePath, pattern).filter(Boolean);
 
@@ -93,0 +93,0 @@ if (params.length > 0 && betterMatch(sourcePath, matchedPath)) {

dist/switch-path.min.js

@@ -1,1 +0,1 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.switchPath=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:true});var _util=require("./util");function _toConsumableArray(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i]}return arr2}else{return Array.from(arr)}}function switchPathInputGuard(path,routes){if(!(0,_util.isPattern)(path)){throw new Error("First parameter to switchPath must be a route path.")}if(!(0,_util.isRouteDefinition)(routes)){throw new Error("Second parameter to switchPath must be an object "+"containing route patterns.")}}function betterMatch(candidate,reference){if(!(0,_util.isNotNull)(candidate)){return false}if(!(0,_util.isNotNull)(reference)){return true}return candidate.length>=reference.length}function matchesWithParams(sourcePath,pattern){var sourceParts=(0,_util.splitPath)(sourcePath);var patternParts=(0,_util.splitPath)(pattern);var params=patternParts.map(function(part,i){return(0,_util.isParam)(part)?sourceParts[i]:null}).filter(_util.isNotNull);var matched=patternParts.every(function(part,i){return(0,_util.isParam)(part)||part===sourceParts[i]});return matched?params:[]}function getParamFnValue(paramFn,params){var _paramFn=(0,_util.isRouteDefinition)(paramFn)?paramFn["/"]:paramFn;return typeof _paramFn==="function"?_paramFn.apply(undefined,_toConsumableArray(params)):_paramFn}function validatePath(sourcePath,matchedPath){var sourceParts=(0,_util.splitPath)(sourcePath);var matchedParts=(0,_util.splitPath)(matchedPath);for(var i=0;i<matchedParts.length;++i){if(matchedParts[i]!==sourceParts[i]){return null}}return"/"+(0,_util.extractPartial)(sourcePath,matchedPath)}function validate(_ref){var sourcePath=_ref.sourcePath;var matchedPath=_ref.matchedPath;var matchedValue=_ref.matchedValue;var routes=_ref.routes;var path=matchedPath?validatePath(sourcePath,matchedPath):null;var value=matchedValue;if(!path){path=routes["*"]?sourcePath:null;value=path?routes["*"]:null}return{path:path,value:value}}function switchPath(sourcePath,routes){switchPathInputGuard(sourcePath,routes);var matchedPath=null;var matchedValue=null;(0,_util.traverseRoutes)(routes,function matchPattern(pattern){if(sourcePath.search(pattern)===0&&betterMatch(pattern,matchedPath)){matchedPath=pattern;matchedValue=routes[pattern]}var params=matchesWithParams(sourcePath,pattern);if(params.length>0&&betterMatch(sourcePath,matchedPath)){matchedPath=(0,_util.extractPartial)(sourcePath,pattern);matchedValue=getParamFnValue(routes[pattern],params)}if((0,_util.isRouteDefinition)(routes[pattern])&&params.length===0){var child=switchPath((0,_util.unprefixed)(sourcePath,pattern)||"/",routes[pattern]);var nestedPath=pattern+child.path;if(!child.path!==null&&betterMatch(nestedPath,matchedPath)){matchedPath=nestedPath;matchedValue=child.value}}});return validate({sourcePath:sourcePath,matchedPath:matchedPath,matchedValue:matchedValue,routes:routes})}exports.default=switchPath},{"./util":2}],2:[function(require,module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.isPattern=isPattern;exports.isRouteDefinition=isRouteDefinition;exports.traverseRoutes=traverseRoutes;exports.isNotNull=isNotNull;exports.splitPath=splitPath;exports.isParam=isParam;exports.extractPartial=extractPartial;exports.unprefixed=unprefixed;function isPattern(candidate){return typeof candidate==="string"&&(candidate.charAt(0)==="/"||candidate==="*")}function isRouteDefinition(candidate){return!candidate||typeof candidate!=="object"?false:isPattern(Object.keys(candidate)[0])}function traverseRoutes(routes,callback){var keys=Object.keys(routes);for(var i=0;i<keys.length;++i){var pattern=keys[i];if(pattern==="*"){continue}callback(pattern)}}function isNotNull(candidate){return candidate!==null}function splitPath(path){return path.split("/").filter(function(s){return!!s})}function isParam(candidate){return candidate.match(/:\w+/)!==null}function extractPartial(sourcePath,pattern){var patternParts=splitPath(pattern);var sourceParts=splitPath(sourcePath);var matchedParts=[];for(var i=0;i<patternParts.length;++i){matchedParts.push(sourceParts[i])}return matchedParts.filter(isNotNull).join("/")}function unprefixed(fullString,prefix){return fullString.split(prefix)[1]}},{}]},{},[1])(1)});
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.switchPath=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:true});var _util=require("./util");function _toConsumableArray(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i]}return arr2}else{return Array.from(arr)}}function switchPathInputGuard(path,routes){if(!(0,_util.isPattern)(path)){throw new Error("First parameter to switchPath must be a route path.")}if(!(0,_util.isRouteDefinition)(routes)){throw new Error("Second parameter to switchPath must be an object "+"containing route patterns.")}}function betterMatch(candidate,reference){if(!(0,_util.isNotNull)(candidate)){return false}if(!(0,_util.isNotNull)(reference)){return true}return candidate.length>=reference.length}function matchesWithParams(sourcePath,pattern){var sourceParts=(0,_util.splitPath)(sourcePath);var patternParts=(0,_util.splitPath)(pattern);var params=patternParts.map(function(part,i){return(0,_util.isParam)(part)?sourceParts[i]:null}).filter(_util.isNotNull);var matched=patternParts.every(function(part,i){return(0,_util.isParam)(part)||part===sourceParts[i]});return matched?params:[]}function getParamFnValue(paramFn,params){var _paramFn=(0,_util.isRouteDefinition)(paramFn)?paramFn["/"]:paramFn;return typeof _paramFn==="function"?_paramFn.apply(undefined,_toConsumableArray(params)):_paramFn}function validatePath(sourcePath,matchedPath){var sourceParts=(0,_util.splitPath)(sourcePath);var matchedParts=(0,_util.splitPath)(matchedPath);for(var i=0;i<matchedParts.length;++i){if(matchedParts[i]!==sourceParts[i]){return null}}return"/"+(0,_util.extractPartial)(sourcePath,matchedPath)}function validate(_ref){var sourcePath=_ref.sourcePath;var matchedPath=_ref.matchedPath;var matchedValue=_ref.matchedValue;var routes=_ref.routes;var path=matchedPath?validatePath(sourcePath,matchedPath):null;var value=matchedValue;if(!path){path=routes["*"]?sourcePath:null;value=path?routes["*"]:null}return{path:path,value:value}}function switchPath(sourcePath,routes){switchPathInputGuard(sourcePath,routes);var matchedPath=null;var matchedValue=null;(0,_util.traverseRoutes)(routes,function matchPattern(pattern){if(sourcePath.search(pattern)===0&&betterMatch(pattern,matchedPath)){matchedPath=pattern;matchedValue=routes[pattern]}var params=matchesWithParams(sourcePath,pattern).filter(Boolean);if(params.length>0&&betterMatch(sourcePath,matchedPath)){matchedPath=(0,_util.extractPartial)(sourcePath,pattern);matchedValue=getParamFnValue(routes[pattern],params)}if((0,_util.isRouteDefinition)(routes[pattern])&&params.length===0){var child=switchPath((0,_util.unprefixed)(sourcePath,pattern)||"/",routes[pattern]);var nestedPath=pattern+child.path;if(!child.path!==null&&betterMatch(nestedPath,matchedPath)){matchedPath=nestedPath;matchedValue=child.value}}});return validate({sourcePath:sourcePath,matchedPath:matchedPath,matchedValue:matchedValue,routes:routes})}exports.default=switchPath},{"./util":2}],2:[function(require,module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.isPattern=isPattern;exports.isRouteDefinition=isRouteDefinition;exports.traverseRoutes=traverseRoutes;exports.isNotNull=isNotNull;exports.splitPath=splitPath;exports.isParam=isParam;exports.extractPartial=extractPartial;exports.unprefixed=unprefixed;function isPattern(candidate){return typeof candidate==="string"&&(candidate.charAt(0)==="/"||candidate==="*")}function isRouteDefinition(candidate){return!candidate||typeof candidate!=="object"?false:isPattern(Object.keys(candidate)[0])}function traverseRoutes(routes,callback){var keys=Object.keys(routes);for(var i=0;i<keys.length;++i){var pattern=keys[i];if(pattern==="*"){continue}callback(pattern)}}function isNotNull(candidate){return candidate!==null}function splitPath(path){return path.split("/").filter(function(s){return!!s})}function isParam(candidate){return candidate.match(/:\w+/)!==null}function extractPartial(sourcePath,pattern){var patternParts=splitPath(pattern);var sourceParts=splitPath(sourcePath);var matchedParts=[];for(var i=0;i<patternParts.length;++i){matchedParts.push(sourceParts[i])}return matchedParts.filter(isNotNull).join("/")}function unprefixed(fullString,prefix){return fullString.split(prefix)[1]}},{}]},{},[1])(1)});

lib/index.js

@@ -89,3 +89,3 @@ 'use strict';
 
-    var params = matchesWithParams(sourcePath, pattern);
+    var params = matchesWithParams(sourcePath, pattern).filter(Boolean);
 
@@ -92,0 +92,0 @@ if (params.length > 0 && betterMatch(sourcePath, matchedPath)) {

package.json

 {
   "name": "switch-path",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "switch case for URLs, a small tool for routing in JavaScript",
@@ -31,3 +31,3 @@ "main": "lib/index.js",
     "test": "npm run eslint && npm run mocha",
-    "test-ci": "npm run eslint",
+    "test-ci": "npm run eslint && npm run mocha",
     "browserify": "browserify src/index.js -t babelify --standalone switchPath --outfile dist/switch-path.js",
@@ -38,3 +38,2 @@ "uglify": "uglifyjs dist/switch-path.js -o dist/switch-path.min.js",
     "dist": "npm run browserify && npm run uglify",
-    "docs": "node ./scripts/make-api-docs.js",
     "prepublish": "npm run compile-lib",
@@ -41,0 +40,0 @@ "release": "npm run release-patch",

src/index.js

@@ -85,3 +85,3 @@ import {
 
-    const params = matchesWithParams(sourcePath, pattern)
+    const params = matchesWithParams(sourcePath, pattern).filter(Boolean)
 
@@ -88,0 +88,0 @@ if (params.length > 0 && betterMatch(sourcePath, matchedPath)) {

test/index.js

@@ -216,2 +216,12 @@ /* global describe, it */
   })
+
+  it('should not match a :key type route if no params are given', () => {
+    const {path, value} = switchPath('/', {
+      '/': 'root',
+      '/:id': (id) => `$id`
+    })
+
+    expect(path).to.be.equal('/')
+    expect(value).to.be.equal('root')
+  })
 });

No alert changes

Worsened metrics

Total package byte prevSize

32446

decreased by-19.93%

Number of package files

17

decreased by-15%

Lines of code

614

decreased by-24.2%

No dependency changes