compose-paths 1.0.6 → 1.1.1

package/CHANGELOG.md

@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.1] - 2021-12-02
+
+### Updated
+
+- Minor perf/mem improvement to zip()
+
+## [1.1.0] - 2021-08-11
+
+### Fixed
+
+- Fix ESM build (import { ... } from 'compose-paths' was not working right)
+
+## [1.0.8] - 2021-06-04
+
+### Updated
+
+- Small refactor for readability
+
+## [1.0.7] - 2021-05-06
+
+### Added
+
+- BundlePhobia shield
+
+### Updated
+
+- Clean-up/comment fillOutPaths()
+
 ## [1.0.6] - 2021-05-02
 
 ### Fixed

package/README.md

@@ -6,6 +6,11 @@
       alt="MIT license"
       src="https://img.shields.io/npm/l/compose-paths?style=plastic"
     /></a>
+  <a href="https://bundlephobia.com/result?p=compose-paths">
+    <img
+      alt="npm bundle size"
+      src="https://img.shields.io/bundlephobia/minzip/compose-paths?style=plastic"
+    /></a>
   <a href="https://www.npmjs.com/package/compose-paths">
     <img
       alt="Version"
@@ -46,8 +51,6 @@ paths.PUBLIC
 
 ### `Path` &rarr; `Route` (via aliases)
 
-You can also zip-up two of these:
-
 ```js
 const { composePaths, zip } = require('compose-paths')
 

package/dist/compose-paths.browser.js

@@ -1,7 +1,7 @@
 /*
  * compose-paths
- * v1.0.6
+ * v1.1.1
  * https://github.com/shuckster/compose-paths
  * License: MIT
  */
-var composePaths=(()=>{var f=(n,e)=>()=>(e||n((e={exports:{}}).exports,e),e.exports);var p=f((h,r)=>{(function(n,e,s){typeof r!="undefined"&&r.exports?r.exports=s():typeof define=="function"&&define.amd?define(s):e[n]=s()})("urljoin",h,function(){function n(e){var s=[];if(e.length===0)return"";if(typeof e[0]!="string")throw new TypeError("Url must be a string. Received "+e[0]);if(e[0].match(/^[^/:]+:\/*$/)&&e.length>1){var i=e.shift();e[0]=i+e[0]}e[0].match(/^file:\/\/\//)?e[0]=e[0].replace(/^([^/:]+):\/*/,"$1:///"):e[0]=e[0].replace(/^([^/:]+):\/*/,"$1://");for(var l=0;l<e.length;l++){var t=e[l];if(typeof t!="string")throw new TypeError("Url must be a string. Received "+t);t!==""&&(l>0&&(t=t.replace(/^[\/]+/,"")),l<e.length-1?t=t.replace(/[\/]+$/,""):t=t.replace(/[\/]+$/,"/"),s.push(t))}var o=s.join("/");o=o.replace(/\/(\?|&|#[^!])/g,"$1");var u=o.split("?");return o=u.shift()+(u.length>0?"?":"")+u.join("&"),o}return function(){var e;return typeof arguments[0]=="object"?e=arguments[0]:e=[].slice.call(arguments),n(e)}})});var C=f((z,d)=>{d.exports={composePaths:v,zip:j};var P=p(),m="aliases";function v(n){let s=b(n).map($),i=s.reduce((c,{indent:a})=>Math.min(c,a),Infinity),l=s.map(({indent:c,content:a})=>({indent:c-i,content:a})),t=S(l),o=I(t);t.forEach(({name:c,index:a})=>{if(!c)return o;let g=o[a];Object.defineProperty(o,c,{value:g,enumerable:!1})});let u=t.filter(c=>!!(c==null?void 0:c.name)).map(c=>c.name);return Object.defineProperty(o,m,{value:u,enumerable:!1})}function j(n,e,s){let{aliases:i=[],ignoreAliases:l=!1}=s||{};return(i.length&&!l?i:n[m]).reduce((o,u)=>l&&i.includes(u)?o:[...o,[n[u],e[u]]],[])}var E=/[\r\n]/,O=/(\s*\/\/[^\n\r]*)/,R=/^(\s*)([^$]*)/,w=/\s*=\s*([^$]+)/,x=/^\s*$/;function I(n){let e=[],s=[],i=-1,l=-1;return n.forEach(({indent:t,content:o})=>{if(t<=i){let u=1+(i-t)/l;for(;u--;)e.pop()}else l<=0&&(l=t);e.push(o),s.push(P(...e)),i=t}),s}function S(n){return n.map((e,s)=>{let{content:i,indent:l}=e,t=i.match(w);return t?{index:s,indent:l,content:i.slice(0,i.length-t[0].length),name:t[1]}:{index:s,indent:l,content:i}})}function $(n){var i;let e=[n,"",n],s=(i=n.match(R))!=null?i:e;return{indent:s[1].length,content:s[2]}}function b(n){return[n].flat().reduce((e,s)=>[...e,...s.split(E)],[]).filter(_).map(e=>e.replace(O,""))}function _(n){return!x.test(n)}});return C();})();
+var composePaths=(()=>{var a=(n,e)=>()=>(e||n((e={exports:{}}).exports,e),e.exports);var h=a((p,c)=>{(function(n,e,t){typeof c!="undefined"&&c.exports?c.exports=t():typeof define=="function"&&define.amd?define(t):e[n]=t()})("urljoin",p,function(){function n(e){var t=[];if(e.length===0)return"";if(typeof e[0]!="string")throw new TypeError("Url must be a string. Received "+e[0]);if(e[0].match(/^[^/:]+:\/*$/)&&e.length>1){var i=e.shift();e[0]=i+e[0]}e[0].match(/^file:\/\/\//)?e[0]=e[0].replace(/^([^/:]+):\/*/,"$1:///"):e[0]=e[0].replace(/^([^/:]+):\/*/,"$1://");for(var o=0;o<e.length;o++){var s=e[o];if(typeof s!="string")throw new TypeError("Url must be a string. Received "+s);s!==""&&(o>0&&(s=s.replace(/^[\/]+/,"")),o<e.length-1?s=s.replace(/[\/]+$/,""):s=s.replace(/[\/]+$/,"/"),t.push(s))}var l=t.join("/");l=l.replace(/\/(\?|&|#[^!])/g,"$1");var u=l.split("?");return l=u.shift()+(u.length>0?"?":"")+u.join("&"),l}return function(){var e;return typeof arguments[0]=="object"?e=arguments[0]:e=[].slice.call(arguments),n(e)}})});var B=a((N,m)=>{m.exports={composePaths:v,zip:I};var g=h(),d="aliases";function v(n){let t=O(n).map(L),i=t.reduce(E,1/0),o=t.map(R(i)),s=_(o),l=x(s),u=s.map(r=>r==null?void 0:r.name).filter(Boolean),f=l;return s.forEach(w(f)),Object.defineProperty(f,d,{value:u,enumerable:!1})}function I(n,e,t){let{aliases:i=[],ignoreAliases:o=!1}=t||{};return(i.length&&!o?i:n[d]).reduce((l,u)=>(o&&i.includes(u)||l.push([n[u],e[u]]),l),[])}var j=/[\r\n]/,P=/(\s*\/\/[^\n\r]*)/,S=/^(\s*)([^$]*)/,$=/\s*=\s*([^$]+)/,b=/^\s*$/;function E(n,{indent:e}){return Math.min(n,e)}function R(n){return({indent:e,content:t})=>({indent:e-n,content:t})}function w(n){return({name:e,index:t})=>{if(!e)return n;let i=n[t];Object.defineProperty(n,e,{value:i,enumerable:!1})}}function x(n){let e=[],t=[],i=-1,o=-1;return n.forEach(({indent:s,content:l})=>{if(o<=0)o=s;else if(s<=i){let u=1+(i-s)/o;for(;u--;)e.pop()}e.push(l),t.push(g(...e)),i=s}),t}function _(n){return n.map((e,t)=>{let{content:i,indent:o}=e,s=i.match($);return s?{index:t,indent:o,content:i.slice(0,i.length-s[0].length),name:s[1]}:{index:t,indent:o,content:i}})}function L(n){var i;let e=[n,"",n],t=(i=n.match(S))!=null?i:e;return{indent:t[1].length,content:t[2]}}function O(n){return[n].flat().reduce((e,t)=>[...e,...t.split(j)],[]).filter(z).map(e=>e.replace(P,""))}function z(n){return!b.test(n)}});return B();})();

package/dist/compose-paths.cjs.js

@@ -1,7 +1,7 @@
 /*
  * compose-paths
- * v1.0.6
+ * v1.1.1
  * https://github.com/shuckster/compose-paths
  * License: MIT
  */
-module.exports={composePaths:h,zip:p};var m=require("path").join,u="aliases";function h(e){let n=I(e).map(A),t=n.reduce((i,{indent:l})=>Math.min(i,l),Infinity),r=n.map(({indent:i,content:l})=>({indent:i-t,content:l})),o=P(r),c=d(o);o.forEach(({name:i,index:l})=>{if(!i)return c;let f=c[l];Object.defineProperty(c,i,{value:f,enumerable:!1})});let a=o.filter(i=>!!(i==null?void 0:i.name)).map(i=>i.name);return Object.defineProperty(c,u,{value:a,enumerable:!1})}function p(e,s,n){let{aliases:t=[],ignoreAliases:r=!1}=n||{};return(t.length&&!r?t:e[u]).reduce((c,a)=>r&&t.includes(a)?c:[...c,[e[a],s[a]]],[])}var S=/[\r\n]/,j=/(\s*\/\/[^\n\r]*)/,O=/^(\s*)([^$]*)/,g=/\s*=\s*([^$]+)/,_=/^\s*$/;function d(e){let s=[],n=[],t=-1,r=-1;return e.forEach(({indent:o,content:c})=>{if(o<=t){let a=1+(t-o)/r;for(;a--;)s.pop()}else r<=0&&(r=o);s.push(c),n.push(m(...s)),t=o}),n}function P(e){return e.map((s,n)=>{let{content:t,indent:r}=s,o=t.match(g);return o?{index:n,indent:r,content:t.slice(0,t.length-o[0].length),name:o[1]}:{index:n,indent:r,content:t}})}function A(e){var t;let s=[e,"",e],n=(t=e.match(O))!=null?t:s;return{indent:n[1].length,content:n[2]}}function I(e){return[e].flat().reduce((s,n)=>[...s,...n.split(S)],[]).filter(v).map(s=>s.replace(j,""))}function v(e){return!_.test(e)}
+module.exports={composePaths:f,zip:h};var p=require("path").join,a="aliases";function f(n){let e=x(n).map(v),s=e.reduce(S,1/0),i=e.map(g(s)),o=b(i),r=_(o),c=o.map(u=>u==null?void 0:u.name).filter(Boolean),l=r;return o.forEach(j(l)),Object.defineProperty(l,a,{value:c,enumerable:!1})}function h(n,t,e){let{aliases:s=[],ignoreAliases:i=!1}=e||{};return(s.length&&!i?s:n[a]).reduce((r,c)=>(i&&s.includes(c)||r.push([n[c],t[c]]),r),[])}var m=/[\r\n]/,d=/(\s*\/\/[^\n\r]*)/,I=/^(\s*)([^$]*)/,A=/\s*=\s*([^$]+)/,P=/^\s*$/;function S(n,{indent:t}){return Math.min(n,t)}function g(n){return({indent:t,content:e})=>({indent:t-n,content:e})}function j(n){return({name:t,index:e})=>{if(!t)return n;let s=n[e];Object.defineProperty(n,t,{value:s,enumerable:!1})}}function _(n){let t=[],e=[],s=-1,i=-1;return n.forEach(({indent:o,content:r})=>{if(i<=0)i=o;else if(o<=s){let c=1+(s-o)/i;for(;c--;)t.pop()}t.push(r),e.push(p(...t)),s=o}),e}function b(n){return n.map((t,e)=>{let{content:s,indent:i}=t,o=s.match(A);return o?{index:e,indent:i,content:s.slice(0,s.length-o[0].length),name:o[1]}:{index:e,indent:i,content:s}})}function v(n){var s;let t=[n,"",n],e=(s=n.match(I))!=null?s:t;return{indent:e[1].length,content:e[2]}}function x(n){return[n].flat().reduce((t,e)=>[...t,...e.split(m)],[]).filter(E).map(t=>t.replace(d,""))}function E(n){return!P.test(n)}

package/dist/compose-paths.esm.mjs

@@ -0,0 +1,7 @@
+/*
+ * compose-paths
+ * v1.1.1
+ * https://github.com/shuckster/compose-paths
+ * License: MIT
+ */
+var a=(n,e)=>()=>(e||n((e={exports:{}}).exports,e),e.exports);var h=a((p,c)=>{(function(n,e,t){typeof c!="undefined"&&c.exports?c.exports=t():typeof define=="function"&&define.amd?define(t):e[n]=t()})("urljoin",p,function(){function n(e){var t=[];if(e.length===0)return"";if(typeof e[0]!="string")throw new TypeError("Url must be a string. Received "+e[0]);if(e[0].match(/^[^/:]+:\/*$/)&&e.length>1){var i=e.shift();e[0]=i+e[0]}e[0].match(/^file:\/\/\//)?e[0]=e[0].replace(/^([^/:]+):\/*/,"$1:///"):e[0]=e[0].replace(/^([^/:]+):\/*/,"$1://");for(var o=0;o<e.length;o++){var s=e[o];if(typeof s!="string")throw new TypeError("Url must be a string. Received "+s);s!==""&&(o>0&&(s=s.replace(/^[\/]+/,"")),o<e.length-1?s=s.replace(/[\/]+$/,""):s=s.replace(/[\/]+$/,"/"),t.push(s))}var l=t.join("/");l=l.replace(/\/(\?|&|#[^!])/g,"$1");var u=l.split("?");return l=u.shift()+(u.length>0?"?":"")+u.join("&"),l}return function(){var e;return typeof arguments[0]=="object"?e=arguments[0]:e=[].slice.call(arguments),n(e)}})});var B=a((N,m)=>{m.exports={composePaths:v,zip:I};var g=h(),d="aliases";function v(n){let t=O(n).map(L),i=t.reduce(E,1/0),o=t.map(R(i)),s=_(o),l=x(s),u=s.map(r=>r==null?void 0:r.name).filter(Boolean),f=l;return s.forEach(w(f)),Object.defineProperty(f,d,{value:u,enumerable:!1})}function I(n,e,t){let{aliases:i=[],ignoreAliases:o=!1}=t||{};return(i.length&&!o?i:n[d]).reduce((l,u)=>(o&&i.includes(u)||l.push([n[u],e[u]]),l),[])}var j=/[\r\n]/,P=/(\s*\/\/[^\n\r]*)/,S=/^(\s*)([^$]*)/,$=/\s*=\s*([^$]+)/,b=/^\s*$/;function E(n,{indent:e}){return Math.min(n,e)}function R(n){return({indent:e,content:t})=>({indent:e-n,content:t})}function w(n){return({name:e,index:t})=>{if(!e)return n;let i=n[t];Object.defineProperty(n,e,{value:i,enumerable:!1})}}function x(n){let e=[],t=[],i=-1,o=-1;return n.forEach(({indent:s,content:l})=>{if(o<=0)o=s;else if(s<=i){let u=1+(i-s)/o;for(;u--;)e.pop()}e.push(l),t.push(g(...e)),i=s}),t}function _(n){return n.map((e,t)=>{let{content:i,indent:o}=e,s=i.match($);return s?{index:t,indent:o,content:i.slice(0,i.length-s[0].length),name:s[1]}:{index:t,indent:o,content:i}})}function L(n){var i;let e=[n,"",n],t=(i=n.match(S))!=null?i:e;return{indent:t[1].length,content:t[2]}}function O(n){return[n].flat().reduce((e,t)=>[...e,...t.split(j)],[]).filter(z).map(e=>e.replace(P,""))}function z(n){return!b.test(n)}});export default B();

package/index.mjs

@@ -0,0 +1,6 @@
+import lib from './dist/compose-paths.esm.mjs'
+
+const { composePaths, zip } = lib
+
+export { composePaths, zip }
+export default lib

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "compose-paths",
-  "version": "1.0.6",
+  "version": "1.1.1",
   "description": "Define paths + routes without the repetition.",
   "author": "Conan Theobald",
   "license": "MIT",
@@ -12,15 +12,16 @@
     "concatenation"
   ],
   "main": "./dist/compose-paths.cjs.js",
-  "module": "dist/compose-paths.esm.js",
+  "module": "index.mjs",
   "exports": {
+    "import": "./index.mjs",
     "default": "./dist/compose-paths.cjs.js",
-    "import": "./dist/compose-paths.esm.js",
-    "browser": "./dist/compose-paths.browser.js",
-    "require": "./dist/compose-paths.cjs.js"
+    "require": "./dist/compose-paths.cjs.js",
+    "browser": "./dist/compose-paths.browser.js"
   },
   "files": [
-    "dist/**/*.js",
+    "dist/*",
+    "index.mjs",
     "CHANGELOG.md",
     "README.md",
     "LICENSE"
@@ -37,33 +38,35 @@
     "url": "https://github.com/shuckster/compose-paths/issues",
     "email": "bugs+compose-paths@conans.co.uk"
   },
-  "scripts": {
-    "test": "jest",
-    "build": "cross-env NODE_ENV=production npm run build:esbuild",
-    "build:clean": "rimraf dist/; mkdir -p dist/",
-    "build:all": "pnpm run build:clean ; cross-env NODE_ENV=production pnpm run build",
-    "build:rollup": "concurrently \"pnpm run build:rollup:node\" \"pnpm run build:rollup:not-node\"",
-    "build:rollup:node": "rollup --config ./build-config/rollup.node.js",
-    "build:rollup:not-node": "rollup --config ./build-config/rollup.not-node.js",
-    "build:esbuild": "node ./build-config/esbuild.js"
-  },
   "devDependencies": {
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-replace": "^2.4.2",
-    "concurrently": "^6.0.2",
+    "@rollup/plugin-node-resolve": "^13.0.6",
+    "@rollup/plugin-replace": "^3.0.0",
+    "concurrently": "^6.4.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.11.17",
-    "eslint": "^7.25.0",
-    "eslint-plugin-jest": "^24.3.6",
-    "jest": "^26.6.3",
+    "esbuild": "^0.13.15",
+    "eslint": "^8.3.0",
+    "eslint-plugin-jest": "^25.3.0",
+    "jest": "^27.4.3",
+    "match-iz": "^1.10.3",
     "rimraf": "^3.0.2",
-    "rollup": "^2.46.0",
+    "rollup": "^2.60.2",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-terser": "7.0.2",
+    "typescript": "^4.5.2",
     "url-join": "^4.0.1"
+  },
+  "scripts": {
+    "test": "jest",
+    "build": "cross-env NODE_ENV=production pnpm run build:esbuild",
+    "build:clean": "rimraf dist/; mkdir -p dist/",
+    "build:all": "pnpm run build:clean ; cross-env NODE_ENV=production pnpm run build",
+    "build:rollup": "concurrently \"pnpm run build:rollup:node\" \"pnpm run build:rollup:not-node\"",
+    "build:rollup:node": "rollup --config ./build-config/rollup.node.js",
+    "build:rollup:not-node": "rollup --config ./build-config/rollup.not-node.js",
+    "build:esbuild": "node ./build-config/esbuild.js"
   }
-}
+}

package/dist/compose-paths.esm.js

@@ -1,7 +0,0 @@
-/*
- * compose-paths
- * v1.0.6
- * https://github.com/shuckster/compose-paths
- * License: MIT
- */
-var f=(n,e)=>()=>(e||n((e={exports:{}}).exports,e),e.exports);var p=f((h,r)=>{(function(n,e,s){typeof r!="undefined"&&r.exports?r.exports=s():typeof define=="function"&&define.amd?define(s):e[n]=s()})("urljoin",h,function(){function n(e){var s=[];if(e.length===0)return"";if(typeof e[0]!="string")throw new TypeError("Url must be a string. Received "+e[0]);if(e[0].match(/^[^/:]+:\/*$/)&&e.length>1){var i=e.shift();e[0]=i+e[0]}e[0].match(/^file:\/\/\//)?e[0]=e[0].replace(/^([^/:]+):\/*/,"$1:///"):e[0]=e[0].replace(/^([^/:]+):\/*/,"$1://");for(var l=0;l<e.length;l++){var t=e[l];if(typeof t!="string")throw new TypeError("Url must be a string. Received "+t);t!==""&&(l>0&&(t=t.replace(/^[\/]+/,"")),l<e.length-1?t=t.replace(/[\/]+$/,""):t=t.replace(/[\/]+$/,"/"),s.push(t))}var o=s.join("/");o=o.replace(/\/(\?|&|#[^!])/g,"$1");var u=o.split("?");return o=u.shift()+(u.length>0?"?":"")+u.join("&"),o}return function(){var e;return typeof arguments[0]=="object"?e=arguments[0]:e=[].slice.call(arguments),n(e)}})});var C=f((z,d)=>{d.exports={composePaths:v,zip:j};var P=p(),m="aliases";function v(n){let s=b(n).map($),i=s.reduce((c,{indent:a})=>Math.min(c,a),Infinity),l=s.map(({indent:c,content:a})=>({indent:c-i,content:a})),t=S(l),o=I(t);t.forEach(({name:c,index:a})=>{if(!c)return o;let g=o[a];Object.defineProperty(o,c,{value:g,enumerable:!1})});let u=t.filter(c=>!!(c==null?void 0:c.name)).map(c=>c.name);return Object.defineProperty(o,m,{value:u,enumerable:!1})}function j(n,e,s){let{aliases:i=[],ignoreAliases:l=!1}=s||{};return(i.length&&!l?i:n[m]).reduce((o,u)=>l&&i.includes(u)?o:[...o,[n[u],e[u]]],[])}var E=/[\r\n]/,O=/(\s*\/\/[^\n\r]*)/,R=/^(\s*)([^$]*)/,w=/\s*=\s*([^$]+)/,x=/^\s*$/;function I(n){let e=[],s=[],i=-1,l=-1;return n.forEach(({indent:t,content:o})=>{if(t<=i){let u=1+(i-t)/l;for(;u--;)e.pop()}else l<=0&&(l=t);e.push(o),s.push(P(...e)),i=t}),s}function S(n){return n.map((e,s)=>{let{content:i,indent:l}=e,t=i.match(w);return t?{index:s,indent:l,content:i.slice(0,i.length-t[0].length),name:t[1]}:{index:s,indent:l,content:i}})}function $(n){var i;let e=[n,"",n],s=(i=n.match(R))!=null?i:e;return{indent:s[1].length,content:s[2]}}function b(n){return[n].flat().reduce((e,s)=>[...e,...s.split(E)],[]).filter(_).map(e=>e.replace(O,""))}function _(n){return!x.test(n)}});export default C();