@argon-router/core 0.1.2 → 0.1.3

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("effector"),D=require("patronum");function N(t,n){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);n&&(r=r.filter(function(a){return Object.getOwnPropertyDescriptor(t,a).enumerable})),e.push.apply(e,r)}return e}function j(t){for(var n=1;n<arguments.length;n++){var e=arguments[n]!=null?arguments[n]:{};n%2?N(Object(e),!0).forEach(function(r){M(t,r,e[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(e)):N(Object(e)).forEach(function(r){Object.defineProperty(t,r,Object.getOwnPropertyDescriptor(e,r))})}return t}function M(t,n,e){return(n=z(n))in t?Object.defineProperty(t,n,{value:e,enumerable:!0,configurable:!0,writable:!0}):t[n]=e,t}function z(t){var n=q(t,"string");return typeof n=="symbol"?n:n+""}function q(t,n){if(typeof t!="object"||!t)return t;var e=t[Symbol.toPrimitive];if(e!==void 0){var r=e.call(t,n||"default");if(typeof r!="object")return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return(n==="string"?String:Number)(t)}function J(t){let n;const e=i.createEffect(()=>{var y;return(y=n)===null||y===void 0?void 0:y()},{name:"waitForAsyncBundleFx",sid:"hl1gh5"}),r=i.createEffect(async()=>{for(const p of(y=t.beforeOpen)!==null&&y!==void 0?y:[]){var y;await p()}},{name:"beforeOpenFx",sid:"jez0xa"}),a=i.createEffect(async y=>(await e(),await r(),t.parent&&await t.parent.internal.openFx(j(j({},y),{},{historyIgnore:!0})),y),{name:"openFx",sid:"-uafnek"}),s=i.createStore({},{name:"$params",sid:"dlh2xl"}),o=i.createStore(!1,{name:"$isOpened",sid:"lcu7f1"}),c=a.pending,l=i.createEvent({name:"open",sid:"-qjaufd"}),u=i.createEvent({name:"close",sid:"-6cg68t"}),m=i.createEvent({name:"opened",sid:"-a2kpe7"}),d=i.createEvent({name:"openedOnServer",sid:"-u0yshs"}),g=i.createEvent({name:"openedOnClient",sid:"-u3faft"}),b=i.createEvent({name:"closed",sid:"-d6sqbp"});return i.sample({and:[{clock:l,target:a}],or:{sid:"sre3h1"}}),i.split({and:[{source:a.doneData,match:()=>typeof window>"u"?"server":"client",cases:{server:d,client:g}}],or:{sid:"t5oqwf"}}),i.sample({and:[{clock:[g,d],target:m}],or:{sid:"tamw8o"}}),i.sample({and:[{clock:m,fn:()=>!0,target:o}],or:{sid:"toxjo2"}}),i.sample({and:[{clock:u,target:b}],or:{sid:"u3rzot"}}),i.sample({and:[{clock:b,fn:()=>!1,target:o}],or:{sid:"u6iynm"}}),{$params:s,$isOpened:o,$isPending:c,open:l,closed:b,opened:m,openedOnClient:g,openedOnServer:d,internal:j({index:!1,close:u,openFx:a,setAsyncImport:y=>n=y},t),"@@unitShape":()=>({params:s,isPending:c,isOpened:o,onOpen:l})}}var E={};Object.defineProperty(E,"__esModule",{value:!0});E.TokenData=void 0;E.parse=F;var K=E.compile=Y,V=E.match=ee;E.pathToRegexp=H;E.stringify=re;const R="/",A=t=>t,L=/^[$_\p{ID_Start}]$/u,T=/^[$\u200c\u200d\p{ID_Continue}]$/u,O="https://git.new/pathToRegexpError",Q={"{":"{","}":"}","(":"(",")":")","[":"[","]":"]","+":"+","?":"?","!":"!"};function W(t){return t.replace(/[{}()\[\]+?!:*]/g,"\\$&")}function w(t){return t.replace(/[.+*?^${}()[\]|/\\]/g,"\\$&")}function*G(t){const n=[...t];let e=0;function r(){let a="";if(L.test(n[++e]))for(a+=n[e];T.test(n[++e]);)a+=n[e];else if(n[e]==='"'){let s=e;for(;e<n.length;){if(n[++e]==='"'){e++,s=0;break}n[e]==="\\"?a+=n[++e]:a+=n[e]}if(s)throw new TypeError(`Unterminated quote at ${s}: ${O}`)}if(!a)throw new TypeError(`Missing parameter name at ${e}: ${O}`);return a}for(;e<n.length;){const a=n[e],s=Q[a];if(s)yield{type:s,index:e++,value:a};else if(a==="\\")yield{type:"ESCAPED",index:e++,value:n[e++]};else if(a===":"){const o=r();yield{type:"PARAM",index:e,value:o}}else if(a==="*"){const o=r();yield{type:"WILDCARD",index:e,value:o}}else yield{type:"CHAR",index:e,value:n[e++]}}return{type:"END",index:e,value:""}}class X{constructor(n){this.tokens=n}peek(){if(!this._peek){const n=this.tokens.next();this._peek=n.value}return this._peek}tryConsume(n){const e=this.peek();if(e.type===n)return this._peek=void 0,e.value}consume(n){const e=this.tryConsume(n);if(e!==void 0)return e;const{type:r,index:a}=this.peek();throw new TypeError(`Unexpected ${r} at ${a}, expected ${n}: ${O}`)}text(){let n="",e;for(;e=this.tryConsume("CHAR")||this.tryConsume("ESCAPED");)n+=e;return n}}class P{constructor(n){this.tokens=n}}E.TokenData=P;function F(t,n={}){const{encodePath:e=A}=n,r=new X(G(t));function a(o){const c=[];for(;;){const l=r.text();l&&c.push({type:"text",value:e(l)});const u=r.tryConsume("PARAM");if(u){c.push({type:"param",name:u});continue}const m=r.tryConsume("WILDCARD");if(m){c.push({type:"wildcard",name:m});continue}if(r.tryConsume("{")){c.push({type:"group",tokens:a("}")});continue}return r.consume(o),c}}const s=a("END");return new P(s)}function Y(t,n={}){const{encode:e=encodeURIComponent,delimiter:r=R}=n,a=t instanceof P?t:F(t,n),s=B(a.tokens,r,e);return function(c={}){const[l,...u]=s(c);if(u.length)throw new TypeError(`Missing parameters: ${u.join(", ")}`);return l}}function B(t,n,e){const r=t.map(a=>Z(a,n,e));return a=>{const s=[""];for(const o of r){const[c,...l]=o(a);s[0]+=c,s.push(...l)}return s}}function Z(t,n,e){if(t.type==="text")return()=>[t.value];if(t.type==="group"){const a=B(t.tokens,n,e);return s=>{const[o,...c]=a(s);return c.length?[""]:[o]}}const r=e||A;return t.type==="wildcard"&&e!==!1?a=>{const s=a[t.name];if(s==null)return["",t.name];if(!Array.isArray(s)||s.length===0)throw new TypeError(`Expected "${t.name}" to be a non-empty array`);return[s.map((o,c)=>{if(typeof o!="string")throw new TypeError(`Expected "${t.name}/${c}" to be a string`);return r(o)}).join(n)]}:a=>{const s=a[t.name];if(s==null)return["",t.name];if(typeof s!="string")throw new TypeError(`Expected "${t.name}" to be a string`);return[r(s)]}}function ee(t,n={}){const{decode:e=decodeURIComponent,delimiter:r=R}=n,{regexp:a,keys:s}=H(t,n),o=s.map(c=>e===!1?A:c.type==="param"?e:l=>l.split(r).map(e));return function(l){const u=a.exec(l);if(!u)return!1;const m=u[0],d=Object.create(null);for(let g=1;g<u.length;g++){if(u[g]===void 0)continue;const b=s[g-1],y=o[g-1];d[b.name]=y(u[g])}return{path:m,params:d}}}function H(t,n={}){const{delimiter:e=R,end:r=!0,sensitive:a=!1,trailing:s=!0}=n,o=[],c=[],l=a?"":"i",m=(Array.isArray(t)?t:[t]).map(b=>b instanceof P?b:F(b,n));for(const{tokens:b}of m)for(const y of S(b,0,[])){const p=te(y,e,o);c.push(p)}let d=`^(?:${c.join("|")})`;return s&&(d+=`(?:${w(e)}$)?`),d+=r?"$":`(?=${w(e)}|$)`,{regexp:new RegExp(d,l),keys:o}}function*S(t,n,e){if(n===t.length)return yield e;const r=t[n];if(r.type==="group"){const a=e.slice();for(const s of S(r.tokens,0,a))yield*S(t,n+1,s)}else e.push(r);yield*S(t,n+1,e)}function te(t,n,e){let r="",a="",s=!0;for(let o=0;o<t.length;o++){const c=t[o];if(c.type==="text"){r+=w(c.value),a+=c.value,s||(s=c.value.includes(n));continue}if(c.type==="param"||c.type==="wildcard"){if(!s&&!a)throw new TypeError(`Missing text after "${c.name}": ${O}`);c.type==="param"?r+=`(${ne(n,s?"":a)}+)`:r+="([\\s\\S]+)",e.push(c),a="",s=!1;continue}}return r}function ne(t,n){return n.length<2?t.length<2?`[^${w(t+n)}]`:`(?:(?!${w(t)})[^${w(n)}])`:t.length<2?`(?:(?!${w(n)})[^${w(t)}])`:`(?:(?!${w(n)}|${w(t)})[\\s\\S])`}function re(t){return t.tokens.map(function n(e,r,a){if(e.type==="text")return W(e.value);if(e.type==="group")return`{${e.tokens.map(n).join("")}}`;const o=ae(e.name)&&se(a[r+1])?e.name:JSON.stringify(e.name);if(e.type==="param")return`:${o}`;if(e.type==="wildcard")return`*${o}`;throw new TypeError(`Unexpected token: ${e}`)}).join("")}function ae(t){const[n,...e]=t;return L.test(n)?e.every(r=>T.test(r)):!1}function se(t){return(t==null?void 0:t.type)!=="text"?!0:!T.test(t.value[0])}const oe=Symbol("any"),ie=Symbol("number"),ce=Symbol("string"),ue=Symbol("array"),x={any:oe,number:ie,string:ce,array:ue};function _(t,n){for(const e of t)if(!n.includes(e))return!1;return!0}function C(t,n){for(const e in n){const r=n[e];if(Array.isArray(r)&&(!t[e]||JSON.stringify(r)!==t[e]))return!1;switch(typeof r){case"number":{if(!t[e]||r.toString()!==t[e])return!1;break}case"object":{if(!t[e]||JSON.stringify(r)!==t[e])return!1;break}case"string":{if(!t[e]||r!==t[e])return!1;break}case"boolean":{if(!t[e]||!["0","1","false","true"].includes(t[e]))return!1;break}}switch(r){case x.any:{if(!t[e])return!1;break}case x.string:{if(!t[e]||Array.isArray(t[e]))return!1;break}case x.array:{if(!t[e]||!Array.isArray(t[e]))return!1;break}case x.number:{if(!t[e]||Array.isArray(t[e])||isNaN(parseInt(t[e]))&&isNaN(parseFloat(t[e])))return!1;break}}}return!0}function le(t,n){const e={};for(const r in n){const a=n[r],s=t[r];if(Array.isArray(a)){e[r]=s==="1"||s==="true";continue}switch(typeof a){case"number":{const o=t[r];e[r]=isNaN(parseInt(o))?parseFloat(o):parseInt(o);break}case"object":{e[r]=JSON.parse(s);break}case"string":e[r]=t[r];case"boolean":{const o=t[r];e[r]=o==="0"?parseFloat(o):parseInt(o);break}}switch(a){case x.any:case x.string:case x.array:{e[r]=t[r];break}case x.number:{const o=t[r];e[r]=isNaN(parseInt(o))?parseFloat(o):parseInt(o);break}}}return e}function pe(t,n){return e=>{const{parameters:r,forRoutes:a}=e,s=i.createEvent({name:"entered",sid:"-d3obu6"}),o=i.createEvent({name:"exited",sid:"-xofyk3"}),c=i.createEvent({name:"exit",sid:"-673d76"});return i.sample({and:[{source:{activeRoutes:t,query:n},filter:l=>{let{activeRoutes:u,query:m}=l;return(!a||_(a,u))&&C(m,r)},fn:l=>{let{query:u}=l;return le(u,r)}}],or:{sid:"-so0f9q"}}),i.sample({and:[{source:{activeRoutes:t,query:n},filter:l=>{let{activeRoutes:u,query:m}=l;return!((!a||_(a,u))&&C(m,r))},target:o}],or:{sid:"-s82e29"}}),{entered:s,exited:o,exit:c,getPayload:l=>Object.entries(l).reduce((u,m)=>{let[d,g]=m;return typeof r[d]=="symbol"?u[d]=g:u[d]=r[d],u},{})}}}function U(t){const n=new URLSearchParams(t.search);return{path:t.pathname,query:[...n.keys()].reduce((e,r)=>(e[r]?e[r]=n.getAll(r):e[r]=n.get(r),e),{})}}function fe(t){const{base:n="/",routes:e}=t,r=i.createStore({},{name:"$query",sid:"uczasb"}),a=i.createStore(null,{name:"$history",sid:"ui8df0"}),s=i.createStore(null,{name:"$path",sid:"-m7ebm3"}),o=i.createStore([],{name:"$activeRoutes",sid:"-ksnj2s"}),c=i.createEvent({name:"setHistory",sid:"-p3v4s1"}),l=i.createEvent({name:"back",sid:"-tzn3h"}),u=i.createEvent({name:"forward",sid:"afzyy9"}),m=i.createEvent({name:"locationUpdated",sid:"-ubw4ys"}),d=e.map(p=>{let v=p;const f=[];for(f.unshift(v.internal.path);v.internal.parent;)v=v.internal.parent,v.internal.path!=="/"&&f.unshift(v.internal.path);const h=n==="/"?f.join(""):[n,...f].join("");return{route:p,path:h,toPath:K(h),fromPath:V(h)}}),g=i.attach({and:{source:{history:a},effect:async(p,v)=>{let{history:f}=p,{path:h,query:$,replace:k}=v;if(!f)throw new Error("history not found");const I={pathname:h,query:$};k?f.replace(I):f.push(I.pathname)}},or:{name:"updateHistoryFx",sid:"-oy8a4f"}});for(const{route:p,toPath:v}of d)i.sample({and:[{clock:p.opened,source:o,filter:f=>!f.includes(p),fn:f=>[...f,p],target:o}],or:{sid:"e1k4q5"}}),i.sample({and:[{clock:p.opened,filter:f=>!f.historyIgnore,fn:function(){let{params:f,query:h,replace:$}=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{params:{}};return{path:v(f),query:h??{},replace:$}},target:g}],or:{sid:"ehi5xm"}}),i.sample({and:[{clock:p.closed,source:o,fn:f=>f.filter(h=>h!==p),target:o}],or:{sid:"ez3kx6"}});i.sample({and:[{clock:c,target:a}],or:{sid:"ff1m2x"}});const b=i.createEffect(p=>{const v=i.scopeBind(m);if(!p)throw new Error;p.listen(f=>{let{location:h}=f;v(h)})},{name:"subscribeHistoryFx",sid:"z6ijkf"}),y=i.attach({and:{source:{query:r,path:s},effect:async p=>{let{query:v,path:f}=p;for(const{route:h,fromPath:$}of d){const k=$(f);if(k)await h.internal.openFx({query:v,params:k.params});else{h.internal.close();continue}}}},or:{name:"openRoutesByPathFx",sid:"-1mpuqp"}});return i.sample({and:[{clock:a,filter:Boolean,target:b}],or:{sid:"gvtv1l"}}),i.sample({and:[{clock:a,filter:Boolean,fn:p=>U(p.location),target:i.withFactory({sid:"suiy9c",fn:()=>D.spread({targets:{path:s,query:r}}),name:"target",method:"spread"})}],or:{sid:"haob2c"}}),i.sample({and:[{clock:[m],fn:p=>U(p),target:i.withFactory({sid:"-r1573k",fn:()=>D.spread({targets:{path:s,query:r}}),name:"target",method:"spread"})}],or:{sid:"hstin9"}}),i.sample({and:[{clock:s,target:y}],or:{sid:"iaexmt"}}),{$query:r,$path:s,$activeRoutes:o,back:l,forward:u,routes:e,setHistory:c,mappedRoutes:d,trackQuery:pe(o,r),"@@unitShape":()=>({query:r,path:s,activeRoutes:o,onBack:l,onForward:u})}}exports.createRoute=J;exports.createRouter=fe;exports.parameters=x;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("effector"),D=require("patronum");function N(t,n){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);n&&(r=r.filter(function(a){return Object.getOwnPropertyDescriptor(t,a).enumerable})),e.push.apply(e,r)}return e}function P(t){for(var n=1;n<arguments.length;n++){var e=arguments[n]!=null?arguments[n]:{};n%2?N(Object(e),!0).forEach(function(r){M(t,r,e[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(e)):N(Object(e)).forEach(function(r){Object.defineProperty(t,r,Object.getOwnPropertyDescriptor(e,r))})}return t}function M(t,n,e){return(n=q(n))in t?Object.defineProperty(t,n,{value:e,enumerable:!0,configurable:!0,writable:!0}):t[n]=e,t}function q(t){var n=z(t,"string");return typeof n=="symbol"?n:n+""}function z(t,n){if(typeof t!="object"||!t)return t;var e=t[Symbol.toPrimitive];if(e!==void 0){var r=e.call(t,n||"default");if(typeof r!="object")return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return(n==="string"?String:Number)(t)}function J(t){let n;const e=i.createEffect(()=>{var y;return(y=n)===null||y===void 0?void 0:y()},{name:"waitForAsyncBundleFx",sid:"hl1gh5"}),r=i.createEffect(async()=>{for(const p of(y=t.beforeOpen)!==null&&y!==void 0?y:[]){var y;await p()}},{name:"beforeOpenFx",sid:"jez0xa"}),a=i.createEffect(async y=>(await e(),await r(),t.parent&&await t.parent.internal.openFx(P(P({},y),{},{historyIgnore:!0})),y),{name:"openFx",sid:"-uafnek"}),s=i.createStore({},{name:"$params",sid:"dlh2xl"}),o=i.createStore(!1,{name:"$isOpened",sid:"lcu7f1"}),c=a.pending,l=i.createEvent({name:"open",sid:"-qjaufd"}),u=i.createEvent({name:"close",sid:"-6cg68t"}),m=i.createEvent({name:"opened",sid:"-a2kpe7"}),d=i.createEvent({name:"openedOnServer",sid:"-u0yshs"}),g=i.createEvent({name:"openedOnClient",sid:"-u3faft"}),b=i.createEvent({name:"closed",sid:"-d6sqbp"});return i.sample({and:[{clock:l,target:a}],or:{sid:"sre3h1"}}),i.split({and:[{source:a.doneData,match:()=>typeof window>"u"?"server":"client",cases:{server:d,client:g}}],or:{sid:"t5oqwf"}}),i.sample({and:[{clock:[g,d],target:m}],or:{sid:"tamw8o"}}),i.sample({and:[{clock:m,fn:()=>!0,target:o}],or:{sid:"toxjo2"}}),i.sample({and:[{clock:u,target:b}],or:{sid:"u3rzot"}}),i.sample({and:[{clock:b,fn:()=>!1,target:o}],or:{sid:"u6iynm"}}),{$params:s,$isOpened:o,$isPending:c,open:l,closed:b,opened:m,openedOnClient:g,openedOnServer:d,internal:P({index:!1,close:u,openFx:a,setAsyncImport:y=>n=y},t),"@@unitShape":()=>({params:s,isPending:c,isOpened:o,onOpen:l})}}var E={};Object.defineProperty(E,"__esModule",{value:!0});E.TokenData=void 0;E.parse=F;var K=E.compile=Y,V=E.match=ee;E.pathToRegexp=H;E.stringify=re;const R="/",A=t=>t,L=/^[$_\p{ID_Start}]$/u,T=/^[$\u200c\u200d\p{ID_Continue}]$/u,O="https://git.new/pathToRegexpError",Q={"{":"{","}":"}","(":"(",")":")","[":"[","]":"]","+":"+","?":"?","!":"!"};function W(t){return t.replace(/[{}()\[\]+?!:*]/g,"\\$&")}function w(t){return t.replace(/[.+*?^${}()[\]|/\\]/g,"\\$&")}function*G(t){const n=[...t];let e=0;function r(){let a="";if(L.test(n[++e]))for(a+=n[e];T.test(n[++e]);)a+=n[e];else if(n[e]==='"'){let s=e;for(;e<n.length;){if(n[++e]==='"'){e++,s=0;break}n[e]==="\\"?a+=n[++e]:a+=n[e]}if(s)throw new TypeError(`Unterminated quote at ${s}: ${O}`)}if(!a)throw new TypeError(`Missing parameter name at ${e}: ${O}`);return a}for(;e<n.length;){const a=n[e],s=Q[a];if(s)yield{type:s,index:e++,value:a};else if(a==="\\")yield{type:"ESCAPED",index:e++,value:n[e++]};else if(a===":"){const o=r();yield{type:"PARAM",index:e,value:o}}else if(a==="*"){const o=r();yield{type:"WILDCARD",index:e,value:o}}else yield{type:"CHAR",index:e,value:n[e++]}}return{type:"END",index:e,value:""}}class X{constructor(n){this.tokens=n}peek(){if(!this._peek){const n=this.tokens.next();this._peek=n.value}return this._peek}tryConsume(n){const e=this.peek();if(e.type===n)return this._peek=void 0,e.value}consume(n){const e=this.tryConsume(n);if(e!==void 0)return e;const{type:r,index:a}=this.peek();throw new TypeError(`Unexpected ${r} at ${a}, expected ${n}: ${O}`)}text(){let n="",e;for(;e=this.tryConsume("CHAR")||this.tryConsume("ESCAPED");)n+=e;return n}}class j{constructor(n){this.tokens=n}}E.TokenData=j;function F(t,n={}){const{encodePath:e=A}=n,r=new X(G(t));function a(o){const c=[];for(;;){const l=r.text();l&&c.push({type:"text",value:e(l)});const u=r.tryConsume("PARAM");if(u){c.push({type:"param",name:u});continue}const m=r.tryConsume("WILDCARD");if(m){c.push({type:"wildcard",name:m});continue}if(r.tryConsume("{")){c.push({type:"group",tokens:a("}")});continue}return r.consume(o),c}}const s=a("END");return new j(s)}function Y(t,n={}){const{encode:e=encodeURIComponent,delimiter:r=R}=n,a=t instanceof j?t:F(t,n),s=B(a.tokens,r,e);return function(c={}){const[l,...u]=s(c);if(u.length)throw new TypeError(`Missing parameters: ${u.join(", ")}`);return l}}function B(t,n,e){const r=t.map(a=>Z(a,n,e));return a=>{const s=[""];for(const o of r){const[c,...l]=o(a);s[0]+=c,s.push(...l)}return s}}function Z(t,n,e){if(t.type==="text")return()=>[t.value];if(t.type==="group"){const a=B(t.tokens,n,e);return s=>{const[o,...c]=a(s);return c.length?[""]:[o]}}const r=e||A;return t.type==="wildcard"&&e!==!1?a=>{const s=a[t.name];if(s==null)return["",t.name];if(!Array.isArray(s)||s.length===0)throw new TypeError(`Expected "${t.name}" to be a non-empty array`);return[s.map((o,c)=>{if(typeof o!="string")throw new TypeError(`Expected "${t.name}/${c}" to be a string`);return r(o)}).join(n)]}:a=>{const s=a[t.name];if(s==null)return["",t.name];if(typeof s!="string")throw new TypeError(`Expected "${t.name}" to be a string`);return[r(s)]}}function ee(t,n={}){const{decode:e=decodeURIComponent,delimiter:r=R}=n,{regexp:a,keys:s}=H(t,n),o=s.map(c=>e===!1?A:c.type==="param"?e:l=>l.split(r).map(e));return function(l){const u=a.exec(l);if(!u)return!1;const m=u[0],d=Object.create(null);for(let g=1;g<u.length;g++){if(u[g]===void 0)continue;const b=s[g-1],y=o[g-1];d[b.name]=y(u[g])}return{path:m,params:d}}}function H(t,n={}){const{delimiter:e=R,end:r=!0,sensitive:a=!1,trailing:s=!0}=n,o=[],c=[],l=a?"":"i",m=(Array.isArray(t)?t:[t]).map(b=>b instanceof j?b:F(b,n));for(const{tokens:b}of m)for(const y of S(b,0,[])){const p=te(y,e,o);c.push(p)}let d=`^(?:${c.join("|")})`;return s&&(d+=`(?:${w(e)}$)?`),d+=r?"$":`(?=${w(e)}|$)`,{regexp:new RegExp(d,l),keys:o}}function*S(t,n,e){if(n===t.length)return yield e;const r=t[n];if(r.type==="group"){const a=e.slice();for(const s of S(r.tokens,0,a))yield*S(t,n+1,s)}else e.push(r);yield*S(t,n+1,e)}function te(t,n,e){let r="",a="",s=!0;for(let o=0;o<t.length;o++){const c=t[o];if(c.type==="text"){r+=w(c.value),a+=c.value,s||(s=c.value.includes(n));continue}if(c.type==="param"||c.type==="wildcard"){if(!s&&!a)throw new TypeError(`Missing text after "${c.name}": ${O}`);c.type==="param"?r+=`(${ne(n,s?"":a)}+)`:r+="([\\s\\S]+)",e.push(c),a="",s=!1;continue}}return r}function ne(t,n){return n.length<2?t.length<2?`[^${w(t+n)}]`:`(?:(?!${w(t)})[^${w(n)}])`:t.length<2?`(?:(?!${w(n)})[^${w(t)}])`:`(?:(?!${w(n)}|${w(t)})[\\s\\S])`}function re(t){return t.tokens.map(function n(e,r,a){if(e.type==="text")return W(e.value);if(e.type==="group")return`{${e.tokens.map(n).join("")}}`;const o=ae(e.name)&&se(a[r+1])?e.name:JSON.stringify(e.name);if(e.type==="param")return`:${o}`;if(e.type==="wildcard")return`*${o}`;throw new TypeError(`Unexpected token: ${e}`)}).join("")}function ae(t){const[n,...e]=t;return L.test(n)?e.every(r=>T.test(r)):!1}function se(t){return(t==null?void 0:t.type)!=="text"?!0:!T.test(t.value[0])}const oe=Symbol("any"),ie=Symbol("number"),ce=Symbol("string"),ue=Symbol("array"),x={any:oe,number:ie,string:ce,array:ue};function _(t,n){for(const e of t)if(!n.includes(e))return!1;return!0}function C(t,n){for(const e in n){const r=n[e];if(Array.isArray(r)&&(!t[e]||JSON.stringify(r)!==t[e]))return!1;switch(typeof r){case"number":{if(!t[e]||r.toString()!==t[e])return!1;break}case"object":{if(!t[e]||JSON.stringify(r)!==t[e])return!1;break}case"string":{if(!t[e]||r!==t[e])return!1;break}case"boolean":{if(!t[e]||!["0","1","false","true"].includes(t[e]))return!1;break}}switch(r){case x.any:{if(!t[e])return!1;break}case x.string:{if(!t[e]||Array.isArray(t[e]))return!1;break}case x.array:{if(!t[e]||!Array.isArray(t[e]))return!1;break}case x.number:{if(!t[e]||Array.isArray(t[e])||isNaN(parseInt(t[e]))&&isNaN(parseFloat(t[e])))return!1;break}}}return!0}function le(t,n){const e={};for(const r in n){const a=n[r],s=t[r];if(Array.isArray(a)){e[r]=s==="1"||s==="true";continue}switch(typeof a){case"number":{const o=t[r];e[r]=isNaN(parseInt(o))?parseFloat(o):parseInt(o);break}case"object":{e[r]=JSON.parse(s);break}case"string":e[r]=t[r];case"boolean":{const o=t[r];e[r]=o==="0"?parseFloat(o):parseInt(o);break}}switch(a){case x.any:case x.string:case x.array:{e[r]=t[r];break}case x.number:{const o=t[r];e[r]=isNaN(parseInt(o))?parseFloat(o):parseInt(o);break}}}return e}function pe(t,n){return e=>{const{parameters:r,forRoutes:a}=e,s=i.createEvent({name:"entered",sid:"-d3obu6"}),o=i.createEvent({name:"exited",sid:"-xofyk3"}),c=i.createEvent({name:"exit",sid:"-673d76"});return i.sample({and:[{source:{activeRoutes:t,query:n},filter:l=>{let{activeRoutes:u,query:m}=l;return(!a||_(a,u))&&C(m,r)},fn:l=>{let{query:u}=l;return le(u,r)}}],or:{sid:"-so0f9q"}}),i.sample({and:[{source:{activeRoutes:t,query:n},filter:l=>{let{activeRoutes:u,query:m}=l;return!((!a||_(a,u))&&C(m,r))},target:o}],or:{sid:"-s82e29"}}),{entered:s,exited:o,exit:c,getPayload:l=>Object.entries(l).reduce((u,m)=>{let[d,g]=m;return typeof r[d]=="symbol"?u[d]=g:u[d]=r[d],u},{})}}}function U(t){const n=new URLSearchParams(t.search);return{path:t.pathname,query:[...n.keys()].reduce((e,r)=>(e[r]?e[r]=n.getAll(r):e[r]=n.get(r),e),{})}}function fe(t){const{base:n="/",routes:e}=t,r=i.createStore(null,{and:{serialize:"ignore"},name:"$history",sid:"u16r0t"}),a=i.createStore([],{and:{serialize:"ignore"},name:"$activeRoutes",sid:"-lqqrv6"}),s=i.createStore({},{name:"$query",sid:"vs45yw"}),o=i.createStore(null,{name:"$path",sid:"-l9b2tp"}),c=i.createEvent({name:"setHistory",sid:"-omtidu"}),l=i.createEvent({name:"back",sid:"-cy0pa"}),u=i.createEvent({name:"forward",sid:"kuznmj"}),m=i.createEvent({name:"locationUpdated",sid:"-tuuikl"}),d=e.map(p=>{let v=p;const f=[];for(f.unshift(v.internal.path);v.internal.parent;)v=v.internal.parent,v.internal.path!=="/"&&f.unshift(v.internal.path);const h=n==="/"?f.join(""):[n,...f].join("");return{route:p,path:h,toPath:K(h),fromPath:V(h)}}),g=i.attach({and:{source:{history:r},effect:async(p,v)=>{let{history:f}=p,{path:h,query:$,replace:k}=v;if(!f)throw new Error("history not found");const I={pathname:h,query:$};k?f.replace(I):f.push(I.pathname)}},or:{name:"updateHistoryFx",sid:"-oh6nq8"}});for(const{route:p,toPath:v}of d)i.sample({and:[{clock:p.opened,source:a,filter:f=>!f.includes(p),fn:f=>[...f,p],target:a}],or:{sid:"e23xbi"}}),i.sample({and:[{clock:p.opened,filter:f=>!f.historyIgnore,fn:function(){let{params:f,query:h,replace:$}=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{params:{}};return{path:v(f),query:h??{},replace:$}},target:g}],or:{sid:"ei1yiz"}}),i.sample({and:[{clock:p.closed,source:a,fn:f=>f.filter(h=>h!==p),target:a}],or:{sid:"ezndij"}});i.sample({and:[{clock:c,target:r}],or:{sid:"ffleoa"}});const b=i.createEffect(p=>{const v=i.scopeBind(m);if(!p)throw new Error;p.listen(f=>{let{location:h}=f;v(h)})},{name:"subscribeHistoryFx",sid:"-zdjw0i"}),y=i.attach({and:{source:{query:s,path:o},effect:async p=>{let{query:v,path:f}=p;for(const{route:h,fromPath:$}of d){const k=$(f);if(k)await h.internal.openFx({query:v,params:k.params});else{h.internal.close();continue}}}},or:{name:"openRoutesByPathFx",sid:"-15o8ci"}});return i.sample({and:[{clock:r,filter:Boolean,target:b}],or:{sid:"gwdnmy"}}),i.sample({and:[{clock:r,filter:Boolean,fn:p=>U(p.location),target:i.withFactory({sid:"tbkknj",fn:()=>D.spread({targets:{path:o,query:s}}),name:"target",method:"spread"})}],or:{sid:"hb83np"}}),i.sample({and:[{clock:[m],fn:p=>U(p),target:i.withFactory({sid:"-qk3kpd",fn:()=>D.spread({targets:{path:o,query:s}}),name:"target",method:"spread"})}],or:{sid:"htdb8m"}}),i.sample({and:[{clock:o,target:y}],or:{sid:"iayq86"}}),{$query:s,$path:o,$activeRoutes:a,back:l,forward:u,routes:e,setHistory:c,mappedRoutes:d,trackQuery:pe(a,s),"@@unitShape":()=>({query:s,path:o,activeRoutes:a,onBack:l,onForward:u})}}exports.createRoute=J;exports.createRouter=fe;exports.parameters=x;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createEffect as P, createStore as O, createEvent as w, sample as g, split as V, attach as C, scopeBind as Q, withFactory as U } from "effector";
+import { createEffect as j, createStore as O, createEvent as v, sample as g, split as V, attach as C, scopeBind as Q, withFactory as U } from "effector";
 import { spread as L } from "patronum";
 function B(t, n) {
   var e = Object.keys(t);
@@ -38,15 +38,15 @@ function X(t, n) {
   }
   return (n === "string" ? String : Number)(t);
 }
-function we(t) {
+function ve(t) {
   let n;
-  const e = P(() => {
+  const e = j(() => {
     var y;
     return (y = n) === null || y === void 0 ? void 0 : y();
   }, {
     name: "waitForAsyncBundleFx",
     sid: "hl1gh5"
-  }), r = P(async () => {
+  }), r = j(async () => {
     for (const l of (y = t.beforeOpen) !== null && y !== void 0 ? y : []) {
       var y;
       await l();
@@ -54,7 +54,7 @@ function we(t) {
   }, {
     name: "beforeOpenFx",
     sid: "jez0xa"
-  }), s = P(async (y) => (await e(), await r(), t.parent && await t.parent.internal.openFx(T(T({}, y), {}, {
+  }), s = j(async (y) => (await e(), await r(), t.parent && await t.parent.internal.openFx(T(T({}, y), {}, {
     historyIgnore: !0
   })), y), {
     name: "openFx",
@@ -65,22 +65,22 @@ function we(t) {
   }), a = O(!1, {
     name: "$isOpened",
     sid: "lcu7f1"
-  }), i = s.pending, u = w({
+  }), i = s.pending, u = v({
     name: "open",
     sid: "-qjaufd"
-  }), c = w({
+  }), c = v({
     name: "close",
     sid: "-6cg68t"
-  }), d = w({
+  }), d = v({
     name: "opened",
     sid: "-a2kpe7"
-  }), p = w({
+  }), f = v({
     name: "openedOnServer",
     sid: "-u0yshs"
-  }), h = w({
+  }), h = v({
     name: "openedOnClient",
     sid: "-u3faft"
-  }), v = w({
+  }), w = v({
     name: "closed",
     sid: "-d6sqbp"
   });
@@ -97,7 +97,7 @@ function we(t) {
       source: s.doneData,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
-        server: p,
+        server: f,
         client: h
       }
     }],
@@ -106,7 +106,7 @@ function we(t) {
     }
   }), g({
     and: [{
-      clock: [h, p],
+      clock: [h, f],
       target: d
     }],
     or: {
@@ -124,14 +124,14 @@ function we(t) {
   }), g({
     and: [{
       clock: c,
-      target: v
+      target: w
     }],
     or: {
       sid: "u3rzot"
     }
   }), g({
     and: [{
-      clock: v,
+      clock: w,
       fn: () => !1,
       target: a
     }],
@@ -143,10 +143,10 @@ function we(t) {
     $isOpened: a,
     $isPending: i,
     open: u,
-    closed: v,
+    closed: w,
     opened: d,
     openedOnClient: h,
-    openedOnServer: p,
+    openedOnServer: f,
     internal: T({
       index: !1,
       close: c,
@@ -170,7 +170,7 @@ k.parse = N;
 var Y = k.compile = se, Z = k.match = ae;
 k.pathToRegexp = K;
 k.stringify = ue;
-const F = "/", I = (t) => t, J = /^[$_\p{ID_Start}]$/u, D = /^[$\u200c\u200d\p{ID_Continue}]$/u, A = "https://git.new/pathToRegexpError", ee = {
+const F = "/", I = (t) => t, q = /^[$_\p{ID_Start}]$/u, D = /^[$\u200c\u200d\p{ID_Continue}]$/u, A = "https://git.new/pathToRegexpError", ee = {
   // Groups.
   "{": "{",
   "}": "}",
@@ -194,7 +194,7 @@ function* ne(t) {
   let e = 0;
   function r() {
     let s = "";
-    if (J.test(n[++e]))
+    if (q.test(n[++e]))
       for (s += n[e]; D.test(n[++e]); )
         s += n[e];
     else if (n[e] === '"') {
@@ -337,7 +337,7 @@ function se(t, n = {}) {
   const {
     encode: e = encodeURIComponent,
     delimiter: r = F
-  } = n, s = t instanceof R ? t : N(t, n), o = q(s.tokens, r, e);
+  } = n, s = t instanceof R ? t : N(t, n), o = J(s.tokens, r, e);
   return function(i = {}) {
     const [u, ...c] = o(i);
     if (c.length)
@@ -345,7 +345,7 @@ function se(t, n = {}) {
     return u;
   };
 }
-function q(t, n, e) {
+function J(t, n, e) {
   const r = t.map((s) => oe(s, n, e));
   return (s) => {
     const o = [""];
@@ -359,7 +359,7 @@ function q(t, n, e) {
 function oe(t, n, e) {
   if (t.type === "text") return () => [t.value];
   if (t.type === "group") {
-    const s = q(t.tokens, n, e);
+    const s = J(t.tokens, n, e);
     return (o) => {
       const [a, ...i] = s(o);
       return i.length ? [""] : [a];
@@ -395,15 +395,15 @@ function ae(t, n = {}) {
   return function(u) {
     const c = s.exec(u);
     if (!c) return !1;
-    const d = c[0], p = /* @__PURE__ */ Object.create(null);
+    const d = c[0], f = /* @__PURE__ */ Object.create(null);
     for (let h = 1; h < c.length; h++) {
       if (c[h] === void 0) continue;
-      const v = o[h - 1], y = a[h - 1];
-      p[v.name] = y(c[h]);
+      const w = o[h - 1], y = a[h - 1];
+      f[w.name] = y(c[h]);
     }
     return {
       path: d,
-      params: p
+      params: f
     };
   };
 }
@@ -413,31 +413,31 @@ function K(t, n = {}) {
     end: r = !0,
     sensitive: s = !1,
     trailing: o = !0
-  } = n, a = [], i = [], u = s ? "" : "i", d = (Array.isArray(t) ? t : [t]).map((v) => v instanceof R ? v : N(v, n));
+  } = n, a = [], i = [], u = s ? "" : "i", d = (Array.isArray(t) ? t : [t]).map((w) => w instanceof R ? w : N(w, n));
   for (const {
-    tokens: v
+    tokens: w
   } of d)
-    for (const y of j(v, 0, [])) {
+    for (const y of P(w, 0, [])) {
       const l = ie(y, e, a);
       i.push(l);
     }
-  let p = `^(?:${i.join("|")})`;
-  return o && (p += `(?:${x(e)}$)?`), p += r ? "$" : `(?=${x(e)}|$)`, {
-    regexp: new RegExp(p, u),
+  let f = `^(?:${i.join("|")})`;
+  return o && (f += `(?:${x(e)}$)?`), f += r ? "$" : `(?=${x(e)}|$)`, {
+    regexp: new RegExp(f, u),
     keys: a
   };
 }
-function* j(t, n, e) {
+function* P(t, n, e) {
   if (n === t.length)
     return yield e;
   const r = t[n];
   if (r.type === "group") {
     const s = e.slice();
-    for (const o of j(r.tokens, 0, s))
-      yield* j(t, n + 1, o);
+    for (const o of P(r.tokens, 0, s))
+      yield* P(t, n + 1, o);
   } else
     e.push(r);
-  yield* j(t, n + 1, e);
+  yield* P(t, n + 1, e);
 }
 function ie(t, n, e) {
   let r = "", s = "", o = !0;
@@ -464,7 +464,7 @@ function ue(t) {
     if (e.type === "text") return te(e.value);
     if (e.type === "group")
       return `{${e.tokens.map(n).join("")}}`;
-    const a = le(e.name) && fe(s[r + 1]) ? e.name : JSON.stringify(e.name);
+    const a = le(e.name) && pe(s[r + 1]) ? e.name : JSON.stringify(e.name);
     if (e.type === "param") return `:${a}`;
     if (e.type === "wildcard") return `*${a}`;
     throw new TypeError(`Unexpected token: ${e}`);
@@ -472,13 +472,13 @@ function ue(t) {
 }
 function le(t) {
   const [n, ...e] = t;
-  return J.test(n) ? e.every((r) => D.test(r)) : !1;
+  return q.test(n) ? e.every((r) => D.test(r)) : !1;
 }
-function fe(t) {
+function pe(t) {
   return (t == null ? void 0 : t.type) !== "text" ? !0 : !D.test(t.value[0]);
 }
-const pe = Symbol("any"), de = Symbol("number"), ye = Symbol("string"), me = Symbol("array"), $ = {
-  any: pe,
+const fe = Symbol("any"), de = Symbol("number"), ye = Symbol("string"), me = Symbol("array"), $ = {
+  any: fe,
   number: de,
   string: ye,
   array: me
@@ -489,7 +489,7 @@ function H(t, n) {
       return !1;
   return !0;
 }
-function M(t, n) {
+function z(t, n) {
   for (const e in n) {
     const r = n[e];
     if (Array.isArray(r) && (!t[e] || JSON.stringify(r) !== t[e]))
@@ -588,13 +588,13 @@ function ge(t, n) {
     const {
       parameters: r,
       forRoutes: s
-    } = e, o = w({
+    } = e, o = v({
       name: "entered",
       sid: "-d3obu6"
-    }), a = w({
+    }), a = v({
       name: "exited",
       sid: "-xofyk3"
-    }), i = w({
+    }), i = v({
       name: "exit",
       sid: "-673d76"
     });
@@ -609,7 +609,7 @@ function ge(t, n) {
             activeRoutes: c,
             query: d
           } = u;
-          return (!s || H(s, c)) && M(d, r);
+          return (!s || H(s, c)) && z(d, r);
         },
         fn: (u) => {
           let {
@@ -632,7 +632,7 @@ function ge(t, n) {
             activeRoutes: c,
             query: d
           } = u;
-          return !((!s || H(s, c)) && M(d, r));
+          return !((!s || H(s, c)) && z(d, r));
         },
         target: a
       }],
@@ -644,13 +644,13 @@ function ge(t, n) {
       exited: a,
       exit: i,
       getPayload: (u) => Object.entries(u).reduce((c, d) => {
-        let [p, h] = d;
-        return typeof r[p] == "symbol" ? c[p] = h : c[p] = r[p], c;
+        let [f, h] = d;
+        return typeof r[f] == "symbol" ? c[f] = h : c[f] = r[f], c;
       }, {})
     };
   };
 }
-function z(t) {
+function M(t) {
   const n = new URLSearchParams(t.search);
   return {
     path: t.pathname,
@@ -661,36 +661,42 @@ function xe(t) {
   const {
     base: n = "/",
     routes: e
-  } = t, r = O({}, {
-    name: "$query",
-    sid: "uczasb"
-  }), s = O(null, {
+  } = t, r = O(null, {
+    and: {
+      serialize: "ignore"
+    },
     name: "$history",
-    sid: "ui8df0"
-  }), o = O(null, {
-    name: "$path",
-    sid: "-m7ebm3"
-  }), a = O([], {
+    sid: "u16r0t"
+  }), s = O([], {
+    and: {
+      serialize: "ignore"
+    },
     name: "$activeRoutes",
-    sid: "-ksnj2s"
-  }), i = w({
+    sid: "-lqqrv6"
+  }), o = O({}, {
+    name: "$query",
+    sid: "vs45yw"
+  }), a = O(null, {
+    name: "$path",
+    sid: "-l9b2tp"
+  }), i = v({
     name: "setHistory",
-    sid: "-p3v4s1"
-  }), u = w({
+    sid: "-omtidu"
+  }), u = v({
     name: "back",
-    sid: "-tzn3h"
-  }), c = w({
+    sid: "-cy0pa"
+  }), c = v({
     name: "forward",
-    sid: "afzyy9"
-  }), d = w({
+    sid: "kuznmj"
+  }), d = v({
     name: "locationUpdated",
-    sid: "-ubw4ys"
-  }), p = e.map((l) => {
+    sid: "-tuuikl"
+  }), f = e.map((l) => {
     let b = l;
-    const f = [];
-    for (f.unshift(b.internal.path); b.internal.parent; )
-      b = b.internal.parent, b.internal.path !== "/" && f.unshift(b.internal.path);
-    const m = n === "/" ? f.join("") : [n, ...f].join("");
+    const p = [];
+    for (p.unshift(b.internal.path); b.internal.parent; )
+      b = b.internal.parent, b.internal.path !== "/" && p.unshift(b.internal.path);
+    const m = n === "/" ? p.join("") : [n, ...p].join("");
     return {
       route: l,
       path: m,
@@ -700,59 +706,59 @@ function xe(t) {
   }), h = C({
     and: {
       source: {
-        history: s
+        history: r
       },
       effect: async (l, b) => {
         let {
-          history: f
+          history: p
         } = l, {
           path: m,
           query: S,
           replace: E
         } = b;
-        if (!f)
+        if (!p)
           throw new Error("history not found");
         const _ = {
           pathname: m,
           query: S
         };
-        E ? f.replace(_) : f.push(_.pathname);
+        E ? p.replace(_) : p.push(_.pathname);
       }
     },
     or: {
       name: "updateHistoryFx",
-      sid: "-oy8a4f"
+      sid: "-oh6nq8"
     }
   });
   for (const {
     route: l,
     toPath: b
-  } of p)
+  } of f)
     g({
       and: [{
         clock: l.opened,
-        source: a,
-        filter: (f) => !f.includes(l),
-        fn: (f) => [...f, l],
-        target: a
+        source: s,
+        filter: (p) => !p.includes(l),
+        fn: (p) => [...p, l],
+        target: s
       }],
       or: {
-        sid: "e1k4q5"
+        sid: "e23xbi"
       }
     }), g({
       and: [{
         clock: l.opened,
-        filter: (f) => !f.historyIgnore,
+        filter: (p) => !p.historyIgnore,
         fn: function() {
           let {
-            params: f,
+            params: p,
             query: m,
             replace: S
           } = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
             params: {}
           };
           return {
-            path: b(f),
+            path: b(p),
             query: m ?? {},
             replace: S
           };
@@ -760,57 +766,57 @@ function xe(t) {
         target: h
       }],
       or: {
-        sid: "ehi5xm"
+        sid: "ei1yiz"
       }
     }), g({
       and: [{
         clock: l.closed,
-        source: a,
-        fn: (f) => f.filter((m) => m !== l),
-        target: a
+        source: s,
+        fn: (p) => p.filter((m) => m !== l),
+        target: s
       }],
       or: {
-        sid: "ez3kx6"
+        sid: "ezndij"
       }
     });
   g({
     and: [{
       clock: i,
-      target: s
+      target: r
     }],
     or: {
-      sid: "ff1m2x"
+      sid: "ffleoa"
     }
   });
-  const v = P((l) => {
+  const w = j((l) => {
     const b = Q(d);
     if (!l)
       throw new Error();
-    l.listen((f) => {
+    l.listen((p) => {
       let {
         location: m
-      } = f;
+      } = p;
       b(m);
     });
   }, {
     name: "subscribeHistoryFx",
-    sid: "z6ijkf"
+    sid: "-zdjw0i"
   }), y = C({
     and: {
       source: {
-        query: r,
-        path: o
+        query: o,
+        path: a
       },
       effect: async (l) => {
         let {
           query: b,
-          path: f
+          path: p
         } = l;
         for (const {
           route: m,
           fromPath: S
-        } of p) {
-          const E = S(f);
+        } of f) {
+          const E = S(p);
           if (E)
             await m.internal.openFx({
               query: b,
@@ -825,29 +831,29 @@ function xe(t) {
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "-1mpuqp"
+      sid: "-15o8ci"
     }
   });
   return g({
     and: [{
-      clock: s,
+      clock: r,
       filter: Boolean,
-      target: v
+      target: w
     }],
     or: {
-      sid: "gvtv1l"
+      sid: "gwdnmy"
     }
   }), g({
     and: [{
-      clock: s,
+      clock: r,
       filter: Boolean,
-      fn: (l) => z(l.location),
+      fn: (l) => M(l.location),
       target: U({
-        sid: "suiy9c",
+        sid: "tbkknj",
         fn: () => L({
           targets: {
-            path: o,
-            query: r
+            path: a,
+            query: o
           }
         }),
         name: "target",
@@ -855,18 +861,18 @@ function xe(t) {
       })
     }],
     or: {
-      sid: "haob2c"
+      sid: "hb83np"
     }
   }), g({
     and: [{
       clock: [d],
-      fn: (l) => z(l),
+      fn: (l) => M(l),
       target: U({
-        sid: "-r1573k",
+        sid: "-qk3kpd",
         fn: () => L({
           targets: {
-            path: o,
-            query: r
+            path: a,
+            query: o
           }
         }),
         name: "target",
@@ -874,37 +880,37 @@ function xe(t) {
       })
     }],
     or: {
-      sid: "hstin9"
+      sid: "htdb8m"
     }
   }), g({
     and: [{
-      clock: o,
+      clock: a,
       target: y
     }],
     or: {
-      sid: "iaexmt"
+      sid: "iayq86"
     }
   }), {
-    $query: r,
-    $path: o,
-    $activeRoutes: a,
+    $query: o,
+    $path: a,
+    $activeRoutes: s,
     back: u,
     forward: c,
     routes: e,
     setHistory: i,
-    mappedRoutes: p,
-    trackQuery: ge(a, r),
+    mappedRoutes: f,
+    trackQuery: ge(s, o),
     "@@unitShape": () => ({
-      query: r,
-      path: o,
-      activeRoutes: a,
+      query: o,
+      path: a,
+      activeRoutes: s,
       onBack: u,
       onForward: c
     })
   };
 }
 export {
-  we as createRoute,
+  ve as createRoute,
   xe as createRouter,
   $ as parameters
 };

package/package.json

@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "private": false,
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Router with power of effector",
   "keywords": [
     "effector",
@@ -55,5 +55,5 @@
     "path-to-regexp": "^8.2.0",
     "typed-url-params": "^1.0.1"
   },
-  "gitHead": "c5ab346d7c4ed17a58dba0e133895193c93f76d5"
+  "gitHead": "1b46e0c9601dbefe0ba9c29b062237403e5502c3"
 }