@argon-router/paths 0.6.1 → 0.6.3

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function b(e){return r=>{const n=r.split("/").filter(Boolean);let t=null;function a(l,i){t||(t={}),t[l]=i}if(e.length===0)return n.length===0?{path:r,params:null}:null;for(let l=0;l<e.length;l++){let i=n[l];const c=e[l];switch(c.type){case"const":{if(i!==c.name)return null;continue}case"parameter":{const{arrayProps:f,genericProps:o,required:d}=c.payload;if(f){var u;const p=[];for(;i&&p.length<((s=f.max)!==null&&s!==void 0?s:1/0);){var s;switch(o==null?void 0:o.type){case"number":{if(isNaN(+i))return null;p.push(+i);break}case"union":{if(!o.items.includes(i))return null;p.push(i);break}default:{p.push(i);break}}i=n[l+p.length]}if(p.length<((u=f.min)!==null&&u!==void 0?u:0)||n[l+p.length]&&!e[l+1])return null;a(c.name,p);break}if(d&&!i)return null;if(!i){a(c.name,void 0);continue}switch(o==null?void 0:o.type){case"number":{if(isNaN(+i))return null;a(c.name,+i);break}case"union":{if(!o.items.includes(i))return null;a(c.name,i);break}default:{a(c.name,i);break}}}}}return{path:r,params:t}}}function g(e){if(!e)return null;const r=e[1];let n,t,a;for(const u of e.slice(2))if(u){if(u.includes("<")){n=u.replace("<","").replace(">","");continue}if(u.includes("{")&&(t=u.replace("{","").replace("}","").split(",").map(s=>parseInt(s))),["*","?","+"].includes(u)){a=u;continue}}return{name:r,genericProps:n,arrayProps:t,modificator:a}}function h(e){return r=>{const n=[];if(e.length===0)return"/";for(const t of e)switch(t.type){case"const":{n.push(t.name);break}case"parameter":{if(!r[t.name])continue;if(Array.isArray(r[t.name]))for(const a of r[t.name])n.push(a.toString());else n.push(r[t.name].toString());break}}return"/".concat(n.join("/"))}}function m(e,r){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var t=Object.getOwnPropertySymbols(e);r&&(t=t.filter(function(a){return Object.getOwnPropertyDescriptor(e,a).enumerable})),n.push.apply(n,t)}return n}function y(e){for(var r=1;r<arguments.length;r++){var n=arguments[r]!=null?arguments[r]:{};r%2?m(Object(n),!0).forEach(function(t){v(e,t,n[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):m(Object(n)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))})}return e}function v(e,r,n){return(r=P(r))in e?Object.defineProperty(e,r,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[r]=n,e}function P(e){var r=w(e,"string");return typeof r=="symbol"?r:r+""}function w(e,r){if(typeof e!="object"||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var t=n.call(e,r);if(typeof t!="object")return t;throw new TypeError("@@toPrimitive must return a primitive value.")}return(r==="string"?String:Number)(e)}function O(e){const r=[],n=/:(\w+)(<[\w|]+>)?({\d+\,\d+})?([+*?])?/,t=e.split("/").filter(Boolean);for(let a=0;a<t.length;a++){const u=t[a];if(!u)continue;const s=g(u.match(n));if(!s){r.push({type:"const",name:u,payload:void 0});continue}const{arrayProps:l,genericProps:i,modificator:c,name:f}=s;if(!f)throw new Error('Invalid path: "'.concat(e,'". Name for argument must be provided'));const o={type:"parameter",name:f,payload:{required:!0}};switch(i&&i==="number"&&(o.payload.genericProps={type:"number"}),i&&i.includes("|")&&(o.payload.genericProps={type:"union",items:i.split("|")}),c){case"*":{o.payload.arrayProps={};break}case"+":{o.payload.arrayProps={min:1};break}case"?":{o.payload.required=!1;break}}l&&(o.payload.arrayProps=y(y({},o.payload.arrayProps),{},{min:l[0],max:l[1]})),r.push(o)}return{parse:b(r),build:h(r)}}exports.compile=O;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function g(e){return r=>{const t=r.split("/").map(u=>u.trim()).filter(u=>u!=="");let n=null;function i(u,o){n||(n={}),n[u]=o}if(e.length===0)return t.length===0?{path:r,params:null}:null;for(let u=0;u<e.length;u++){const o=e[u];switch(o.type){case"const":{if(o.name!==t.shift())return null;continue}case"parameter":{const{arrayProps:y,genericProps:l,required:c}=o.payload;if(y){var a;const m=[];let f;for(;;){var s;if(f=t.shift(),!f)break;switch(l==null?void 0:l.type){case"number":{if(isNaN(+f))return null;m.push(+f);break}case"union":{if(!l.items.includes(f))return null;m.push(f);break}default:{m.push(f);break}}if(m.length>=((s=y.max)!==null&&s!==void 0?s:1/0))break}if(m.length<((a=y.min)!==null&&a!==void 0?a:0)||t.length>0&&!e[u+1])return null;i(o.name,m);break}const p=t.shift();if(c&&!p)return null;if(!p){i(o.name,void 0);continue}switch(l==null?void 0:l.type){case"number":{if(isNaN(+p))return null;i(o.name,+p);break}case"union":{if(!l.items.includes(p))return null;i(o.name,p);break}default:{i(o.name,p);break}}}}}return t.length>0?null:{path:r,params:n}}}function h(e){if(!e)return null;const r=e[1];let t,n,i;for(const a of e.slice(2))if(a){if(a.includes("<")){t=a.replace("<","").replace(">","");continue}if(a.includes("{")&&(n=a.replace("{","").replace("}","").split(",").map(s=>parseInt(s))),["*","?","+"].includes(a)){i=a;continue}}return{name:r,genericProps:t,arrayProps:n,modificator:i}}function v(e){return r=>{const t=[];if(e.length===0)return"/";for(const n of e)switch(n.type){case"const":{t.push(n.name);break}case"parameter":{if(!r[n.name])continue;if(Array.isArray(r[n.name]))for(const i of r[n.name])t.push(i.toString());else t.push(r[n.name].toString());break}}return"/".concat(t.join("/"))}}function d(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter(function(i){return Object.getOwnPropertyDescriptor(e,i).enumerable})),t.push.apply(t,n)}return t}function b(e){for(var r=1;r<arguments.length;r++){var t=arguments[r]!=null?arguments[r]:{};r%2?d(Object(t),!0).forEach(function(n){P(e,n,t[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):d(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))})}return e}function P(e,r,t){return(r=w(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function w(e){var r=k(e,"string");return typeof r=="symbol"?r:r+""}function k(e,r){if(typeof e!="object"||!e)return e;var t=e[Symbol.toPrimitive];if(t!==void 0){var n=t.call(e,r);if(typeof n!="object")return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return(r==="string"?String:Number)(e)}function O(e){const r=[],t=/:(\w+)(<[\w|]+>)?({\d+\,\d+})?([+*?])?/,n=e.split("/").filter(Boolean);for(let i=0;i<n.length;i++){const a=n[i];if(!a)continue;const s=h(a.match(t));if(!s){r.push({type:"const",name:a,payload:void 0});continue}const{arrayProps:u,genericProps:o,modificator:y,name:l}=s;if(!l)throw new Error('Invalid path: "'.concat(e,'". Name for argument must be provided'));const c={type:"parameter",name:l,payload:{required:!0}};switch(o&&o==="number"&&(c.payload.genericProps={type:"number"}),o&&o.includes("|")&&(c.payload.genericProps={type:"union",items:o.split("|")}),y){case"*":{c.payload.arrayProps={};break}case"+":{c.payload.arrayProps={min:1};break}case"?":{c.payload.required=!1;break}}u&&(c.payload.arrayProps=b(b({},c.payload.arrayProps),{},{min:u[0],max:u[1]})),r.push(c)}return{parse:g(r),build:v(r)}}exports.compile=O;

package/dist/index.js

@@ -1,88 +1,92 @@
-function b(e) {
+function h(e) {
   return (r) => {
-    const n = r.split("/").filter(Boolean);
+    const n = r.split("/").map((u) => u.trim()).filter((u) => u !== "");
     let t = null;
-    function a(l, i) {
-      t || (t = {}), t[l] = i;
+    function i(u, o) {
+      t || (t = {}), t[u] = o;
     }
     if (e.length === 0)
       return n.length === 0 ? {
         path: r,
         params: null
       } : null;
-    for (let l = 0; l < e.length; l++) {
-      let i = n[l];
-      const c = e[l];
-      switch (c.type) {
+    for (let u = 0; u < e.length; u++) {
+      const o = e[u];
+      switch (o.type) {
         case "const": {
-          if (i !== c.name)
+          if (o.name !== n.shift())
             return null;
           continue;
         }
         case "parameter": {
           const {
-            arrayProps: f,
-            genericProps: o,
-            required: d
-          } = c.payload;
-          if (f) {
-            var u;
-            const p = [];
-            for (; i && p.length < ((s = f.max) !== null && s !== void 0 ? s : 1 / 0); ) {
+            arrayProps: y,
+            genericProps: l,
+            required: c
+          } = o.payload;
+          if (y) {
+            var a;
+            const m = [];
+            let f;
+            for (; ; ) {
               var s;
-              switch (o == null ? void 0 : o.type) {
+              if (f = n.shift(), !f)
+                break;
+              switch (l == null ? void 0 : l.type) {
                 case "number": {
-                  if (isNaN(+i))
+                  if (isNaN(+f))
                     return null;
-                  p.push(+i);
+                  m.push(+f);
                   break;
                 }
                 case "union": {
-                  if (!o.items.includes(i))
+                  if (!l.items.includes(f))
                     return null;
-                  p.push(i);
+                  m.push(f);
                   break;
                 }
                 default: {
-                  p.push(i);
+                  m.push(f);
                   break;
                 }
               }
-              i = n[l + p.length];
+              if (m.length >= ((s = y.max) !== null && s !== void 0 ? s : 1 / 0))
+                break;
             }
-            if (p.length < ((u = f.min) !== null && u !== void 0 ? u : 0) || n[l + p.length] && !e[l + 1])
+            if (m.length < ((a = y.min) !== null && a !== void 0 ? a : 0) || n.length > 0 && !e[u + 1])
               return null;
-            a(c.name, p);
+            i(o.name, m);
             break;
           }
-          if (d && !i)
+          const p = n.shift();
+          if (c && !p)
             return null;
-          if (!i) {
-            a(c.name, void 0);
+          if (!p) {
+            i(o.name, void 0);
             continue;
           }
-          switch (o == null ? void 0 : o.type) {
+          switch (l == null ? void 0 : l.type) {
             case "number": {
-              if (isNaN(+i))
+              if (isNaN(+p))
                 return null;
-              a(c.name, +i);
+              i(o.name, +p);
               break;
             }
             case "union": {
-              if (!o.items.includes(i))
+              if (!l.items.includes(p))
                 return null;
-              a(c.name, i);
+              i(o.name, p);
               break;
             }
             default: {
-              a(c.name, i);
+              i(o.name, p);
               break;
             }
           }
         }
       }
     }
-    return {
+    return n.length > 0 ? null : {
       path: r,
       params: t
     };
@@ -92,15 +96,15 @@ function g(e) {
   if (!e)
     return null;
   const r = e[1];
-  let n, t, a;
-  for (const u of e.slice(2))
-    if (u) {
-      if (u.includes("<")) {
-        n = u.replace("<", "").replace(">", "");
+  let n, t, i;
+  for (const a of e.slice(2))
+    if (a) {
+      if (a.includes("<")) {
+        n = a.replace("<", "").replace(">", "");
         continue;
       }
-      if (u.includes("{") && (t = u.replace("{", "").replace("}", "").split(",").map((s) => parseInt(s))), ["*", "?", "+"].includes(u)) {
-        a = u;
+      if (a.includes("{") && (t = a.replace("{", "").replace("}", "").split(",").map((s) => parseInt(s))), ["*", "?", "+"].includes(a)) {
+        i = a;
         continue;
       }
     }
@@ -108,10 +112,10 @@ function g(e) {
     name: r,
     genericProps: n,
     arrayProps: t,
-    modificator: a
+    modificator: i
   };
 }
-function h(e) {
+function v(e) {
   return (r) => {
     const n = [];
     if (e.length === 0)
@@ -126,8 +130,8 @@ function h(e) {
           if (!r[t.name])
             continue;
           if (Array.isArray(r[t.name]))
-            for (const a of r[t.name])
-              n.push(a.toString());
+            for (const i of r[t.name])
+              n.push(i.toString());
           else
             n.push(r[t.name].toString());
           break;
@@ -136,35 +140,35 @@ function h(e) {
     return "/".concat(n.join("/"));
   };
 }
-function m(e, r) {
+function d(e, r) {
   var n = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var t = Object.getOwnPropertySymbols(e);
-    r && (t = t.filter(function(a) {
-      return Object.getOwnPropertyDescriptor(e, a).enumerable;
+    r && (t = t.filter(function(i) {
+      return Object.getOwnPropertyDescriptor(e, i).enumerable;
     })), n.push.apply(n, t);
   }
   return n;
 }
-function y(e) {
+function b(e) {
   for (var r = 1; r < arguments.length; r++) {
     var n = arguments[r] != null ? arguments[r] : {};
-    r % 2 ? m(Object(n), !0).forEach(function(t) {
-      v(e, t, n[t]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : m(Object(n)).forEach(function(t) {
+    r % 2 ? d(Object(n), !0).forEach(function(t) {
+      P(e, t, n[t]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : d(Object(n)).forEach(function(t) {
       Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(n, t));
     });
   }
   return e;
 }
-function v(e, r, n) {
-  return (r = P(r)) in e ? Object.defineProperty(e, r, { value: n, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = n, e;
+function P(e, r, n) {
+  return (r = w(r)) in e ? Object.defineProperty(e, r, { value: n, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = n, e;
 }
-function P(e) {
-  var r = w(e, "string");
+function w(e) {
+  var r = k(e, "string");
   return typeof r == "symbol" ? r : r + "";
 }
-function w(e, r) {
+function k(e, r) {
   if (typeof e != "object" || !e) return e;
   var n = e[Symbol.toPrimitive];
   if (n !== void 0) {
@@ -174,75 +178,75 @@ function w(e, r) {
   }
   return (r === "string" ? String : Number)(e);
 }
-function k(e) {
+function O(e) {
   const r = [], n = /:(\w+)(<[\w|]+>)?({\d+\,\d+})?([+*?])?/, t = e.split("/").filter(Boolean);
-  for (let a = 0; a < t.length; a++) {
-    const u = t[a];
-    if (!u)
+  for (let i = 0; i < t.length; i++) {
+    const a = t[i];
+    if (!a)
       continue;
-    const s = g(u.match(n));
+    const s = g(a.match(n));
     if (!s) {
       r.push({
         type: "const",
-        name: u,
+        name: a,
         payload: void 0
       });
       continue;
     }
     const {
-      arrayProps: l,
-      genericProps: i,
-      modificator: c,
-      name: f
+      arrayProps: u,
+      genericProps: o,
+      modificator: y,
+      name: l
     } = s;
-    if (!f)
+    if (!l)
       throw new Error('Invalid path: "'.concat(e, '". Name for argument must be provided'));
-    const o = {
+    const c = {
       type: "parameter",
-      name: f,
+      name: l,
       payload: {
         required: !0
       }
     };
-    switch (i && i === "number" && (o.payload.genericProps = {
+    switch (o && o === "number" && (c.payload.genericProps = {
       type: "number"
-    }), i && i.includes("|") && (o.payload.genericProps = {
+    }), o && o.includes("|") && (c.payload.genericProps = {
       type: "union",
-      items: i.split("|")
-    }), c) {
+      items: o.split("|")
+    }), y) {
       case "*": {
-        o.payload.arrayProps = {};
+        c.payload.arrayProps = {};
         break;
       }
       case "+": {
-        o.payload.arrayProps = {
+        c.payload.arrayProps = {
           min: 1
         };
         break;
       }
       case "?": {
-        o.payload.required = !1;
+        c.payload.required = !1;
         break;
       }
     }
-    l && (o.payload.arrayProps = y(y({}, o.payload.arrayProps), {}, {
-      min: l[0],
-      max: l[1]
-    })), r.push(o);
+    u && (c.payload.arrayProps = b(b({}, c.payload.arrayProps), {}, {
+      min: u[0],
+      max: u[1]
+    })), r.push(c);
   }
   return {
     /**
      * @param input Input path
      * @returns `{ path: string; params: Params }` | `null`
      */
-    parse: b(r),
+    parse: h(r),
     /**
      * @param params Route parameters
      * @returns string
      */
-    build: h(r)
+    build: v(r)
   };
 }
 export {
-  k as compile
+  O as compile
 };

package/package.json

@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "private": false,
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Paths with power of effector",
   "keywords": [
     "paths",
@@ -41,5 +41,5 @@
   "bugs": {
     "url": "https://github.com/movpushmov/argon-router/issues"
   },
-  "gitHead": "7f4fbed2048af77d3087cc608fb2fe30c9991d9b"
+  "gitHead": "5faa9c25438bb19acd19fd19b9d9eb92399a3696"
 }