@argon-router/core 0.1.0 → 0.1.2

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("effector"),H=require("patronum");function L(t){let n;const e=c.createEffect(()=>n==null?void 0:n(),{name:"waitForAsyncBundleFx",sid:"sy4dxt"}),r=c.createEffect(async v=>(await e(),t.parent&&await t.parent.internal.openFx(v),v),{name:"openFx",sid:"-vpkil5"}),s=c.createStore({},{name:"$params",sid:"c7nw5"}),a=c.createStore(!1,{name:"$isOpened",sid:"83ksdl"}),o=r.pending,i=c.createEvent({name:"open",sid:"v8jsib"}),l=c.createEvent({name:"close",sid:"-9nrj06"}),u=c.createEvent({name:"opened",sid:"-ddw25k"}),f=c.createEvent({name:"openedOnServer",sid:"rqvufw"}),d=c.createEvent({name:"openedOnClient",sid:"rofchv"}),h=c.createEvent({name:"closed",sid:"-qg25d5"});return c.sample({and:[{clock:i,target:r}],or:{sid:"sbzuux"}}),c.split({and:[{source:r.doneData,match:()=>typeof window>"u"?"server":"client",cases:{server:f,client:d}}],or:{sid:"sqaiab"}}),c.sample({and:[{clock:[d,f],target:u}],or:{sid:"t6sc35"}}),c.sample({and:[{clock:u,fn:()=>!0,target:a}],or:{sid:"t9jb1y"}}),c.sample({and:[{clock:h,fn:()=>!1,target:a}],or:{sid:"todr2p"}}),{$params:s,$isOpened:a,$isPending:o,open:i,closed:h,opened:u,openedOnClient:d,openedOnServer:f,internal:{index:!1,close:l,openFx:r,setAsyncImport:v=>n=v,...t},"@@unitShape":()=>({params:s,isPending:o,isOpened:a,onOpen:i})}}var E={};Object.defineProperty(E,"__esModule",{value:!0});E.TokenData=void 0;E.parse=O;var M=E.compile=W,B=E.match=G;E.pathToRegexp=U;E.stringify=Y;const F="/",N=t=>t,I=/^[$_\p{ID_Start}]$/u,P=/^[$\u200c\u200d\p{ID_Continue}]$/u,R="https://git.new/pathToRegexpError",q={"{":"{","}":"}","(":"(",")":")","[":"[","]":"]","+":"+","?":"?","!":"!"};function J(t){return t.replace(/[{}()\[\]+?!:*]/g,"\\$&")}function b(t){return t.replace(/[.+*?^${}()[\]|/\\]/g,"\\$&")}function*V(t){const n=[...t];let e=0;function r(){let s="";if(I.test(n[++e]))for(s+=n[e];P.test(n[++e]);)s+=n[e];else if(n[e]==='"'){let a=e;for(;e<n.length;){if(n[++e]==='"'){e++,a=0;break}n[e]==="\\"?s+=n[++e]:s+=n[e]}if(a)throw new TypeError(`Unterminated quote at ${a}: ${R}`)}if(!s)throw new TypeError(`Missing parameter name at ${e}: ${R}`);return s}for(;e<n.length;){const s=n[e],a=q[s];if(a)yield{type:a,index:e++,value:s};else if(s==="\\")yield{type:"ESCAPED",index:e++,value:n[e++]};else if(s===":"){const o=r();yield{type:"PARAM",index:e,value:o}}else if(s==="*"){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 Q{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:s}=this.peek();throw new TypeError(`Unexpected ${r} at ${s}, expected ${n}: ${R}`)}text(){let n="",e;for(;e=this.tryConsume("CHAR")||this.tryConsume("ESCAPED");)n+=e;return n}}class A{constructor(n){this.tokens=n}}E.TokenData=A;function O(t,n={}){const{encodePath:e=N}=n,r=new Q(V(t));function s(o){const i=[];for(;;){const l=r.text();l&&i.push({type:"text",value:e(l)});const u=r.tryConsume("PARAM");if(u){i.push({type:"param",name:u});continue}const f=r.tryConsume("WILDCARD");if(f){i.push({type:"wildcard",name:f});continue}if(r.tryConsume("{")){i.push({type:"group",tokens:s("}")});continue}return r.consume(o),i}}const a=s("END");return new A(a)}function W(t,n={}){const{encode:e=encodeURIComponent,delimiter:r=F}=n,s=t instanceof A?t:O(t,n),a=_(s.tokens,r,e);return function(i={}){const[l,...u]=a(i);if(u.length)throw new TypeError(`Missing parameters: ${u.join(", ")}`);return l}}function _(t,n,e){const r=t.map(s=>z(s,n,e));return s=>{const a=[""];for(const o of r){const[i,...l]=o(s);a[0]+=i,a.push(...l)}return a}}function z(t,n,e){if(t.type==="text")return()=>[t.value];if(t.type==="group"){const s=_(t.tokens,n,e);return a=>{const[o,...i]=s(a);return i.length?[""]:[o]}}const r=e||N;return t.type==="wildcard"&&e!==!1?s=>{const a=s[t.name];if(a==null)return["",t.name];if(!Array.isArray(a)||a.length===0)throw new TypeError(`Expected "${t.name}" to be a non-empty array`);return[a.map((o,i)=>{if(typeof o!="string")throw new TypeError(`Expected "${t.name}/${i}" to be a string`);return r(o)}).join(n)]}:s=>{const a=s[t.name];if(a==null)return["",t.name];if(typeof a!="string")throw new TypeError(`Expected "${t.name}" to be a string`);return[r(a)]}}function G(t,n={}){const{decode:e=decodeURIComponent,delimiter:r=F}=n,{regexp:s,keys:a}=U(t,n),o=a.map(i=>e===!1?N:i.type==="param"?e:l=>l.split(r).map(e));return function(l){const u=s.exec(l);if(!u)return!1;const f=u[0],d=Object.create(null);for(let h=1;h<u.length;h++){if(u[h]===void 0)continue;const v=a[h-1],k=o[h-1];d[v.name]=k(u[h])}return{path:f,params:d}}}function U(t,n={}){const{delimiter:e=F,end:r=!0,sensitive:s=!1,trailing:a=!0}=n,o=[],i=[],l=s?"":"i",f=(Array.isArray(t)?t:[t]).map(v=>v instanceof A?v:O(v,n));for(const{tokens:v}of f)for(const k of S(v,0,[])){const T=K(k,e,o);i.push(T)}let d=`^(?:${i.join("|")})`;return a&&(d+=`(?:${b(e)}$)?`),d+=r?"$":`(?=${b(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 s=e.slice();for(const a of S(r.tokens,0,s))yield*S(t,n+1,a)}else e.push(r);yield*S(t,n+1,e)}function K(t,n,e){let r="",s="",a=!0;for(let o=0;o<t.length;o++){const i=t[o];if(i.type==="text"){r+=b(i.value),s+=i.value,a||(a=i.value.includes(n));continue}if(i.type==="param"||i.type==="wildcard"){if(!a&&!s)throw new TypeError(`Missing text after "${i.name}": ${R}`);i.type==="param"?r+=`(${X(n,a?"":s)}+)`:r+="([\\s\\S]+)",e.push(i),s="",a=!1;continue}}return r}function X(t,n){return n.length<2?t.length<2?`[^${b(t+n)}]`:`(?:(?!${b(t)})[^${b(n)}])`:t.length<2?`(?:(?!${b(n)})[^${b(t)}])`:`(?:(?!${b(n)}|${b(t)})[\\s\\S])`}function Y(t){return t.tokens.map(function n(e,r,s){if(e.type==="text")return J(e.value);if(e.type==="group")return`{${e.tokens.map(n).join("")}}`;const o=Z(e.name)&&ee(s[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 Z(t){const[n,...e]=t;return I.test(n)?e.every(r=>P.test(r)):!1}function ee(t){return(t==null?void 0:t.type)!=="text"?!0:!P.test(t.value[0])}const te=Symbol("any"),ne=Symbol("number"),re=Symbol("string"),se=Symbol("array"),$={any:te,number:ne,string:re,array:se};function C(t,n){for(const e of t)if(!n.includes(e))return!1;return!0}function D(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 $.any:{if(!t[e])return!1;break}case $.string:{if(!t[e]||Array.isArray(t[e]))return!1;break}case $.array:{if(!t[e]||!Array.isArray(t[e]))return!1;break}case $.number:{if(!t[e]||Array.isArray(t[e])||isNaN(parseInt(t[e]))&&isNaN(parseFloat(t[e])))return!1;break}}}return!0}function ae(t,n){const e={};for(const r in n){const s=n[r],a=t[r];if(Array.isArray(s)){e[r]=a==="1"||a==="true";continue}switch(typeof s){case"number":{const o=t[r];e[r]=isNaN(parseInt(o))?parseFloat(o):parseInt(o);break}case"object":{e[r]=JSON.parse(a);break}case"string":e[r]=t[r];case"boolean":{const o=t[r];e[r]=o==="0"?parseFloat(o):parseInt(o);break}}switch(s){case $.any:case $.string:case $.array:{e[r]=t[r];break}case $.number:{const o=t[r];e[r]=isNaN(parseInt(o))?parseFloat(o):parseInt(o);break}}}return e}function oe(t,n){return e=>{const{parameters:r,forRoutes:s}=e,a=c.createEvent({name:"entered",sid:"-d3obu6"}),o=c.createEvent({name:"exited",sid:"-xofyk3"}),i=c.createEvent({name:"exit",sid:"-673d76"});return c.sample({and:[{source:{activeRoutes:t,query:n},filter:l=>{let{activeRoutes:u,query:f}=l;return(!s||C(s,u))&&D(f,r)},fn:l=>{let{query:u}=l;return ae(u,r)}}],or:{sid:"-so0f9q"}}),c.sample({and:[{source:{activeRoutes:t,query:n},filter:l=>{let{activeRoutes:u,query:f}=l;return!((!s||C(s,u))&&D(f,r))},target:o}],or:{sid:"-s82e29"}}),{entered:a,exited:o,exit:i,getPayload:l=>Object.entries(l).reduce((u,f)=>{let[d,h]=f;return typeof r[d]=="symbol"?u[d]=h:u[d]=r[d],u},{})}}}function ie(t){const{base:n="/",history:e,routes:r}=t,s=c.createStore({},{name:"$query",sid:"2wd7x1"}),a=c.createStore(e??null,{name:"$history",sid:"31majq"}),o=c.createStore("/",{name:"$path",sid:"ld3nhr"}),i=c.createStore([],{name:"$activeRoutes",sid:"mrug12"}),l=c.createEvent({name:"setHistory",sid:"sekwlw"}),u=c.createEvent({name:"back",sid:"-icnnoo"}),f=c.createEvent({name:"forward",sid:"-72o1my"}),d=c.createEvent({name:"locationUpdated",sid:"d8lu52"}),h=r.map(m=>{let g=m;const p=[];for(p.unshift(g.internal.path);g.internal.parent;)g=g.internal.parent,p.unshift(g.internal.path);const y=(n==="/"?p:[n,...p]).join("");return{route:m,path:y,toPath:M(y),fromPath:B(y)}}),v=c.attach({and:{source:{history:a},effect:async(m,g)=>{let{history:p}=m,{path:y,query:x,replace:w}=g;if(!p)throw new Error("history not found");const j={pathname:y,query:x};w?p.replace(j):p.push(j)}},or:{name:"updateHistoryFx",sid:"h74tsu"}});for(const{route:m,toPath:g}of h)c.sample({and:[{clock:m.opened,source:i,fn:p=>[...p,m],target:i}],or:{sid:"-px1r6l"}}),c.sample({and:[{clock:m.opened,fn:p=>{let{params:y,query:x,replace:w}=p;return{path:g(y),query:x??{},replace:w}},target:v}],or:{sid:"-phnikh"}}),c.sample({and:[{clock:m.closed,source:i,fn:p=>p.filter(y=>y!==m),target:i}],or:{sid:"e0gjjf"}});c.sample({and:[{clock:l,target:a}],or:{sid:"egekp6"}});const k=c.createEffect(m=>{const g=c.scopeBind(d);if(!m)throw new Error;m.listen(p=>{let{location:y}=p;g(y)})},{name:"subscribeHistoryFx",sid:"5cocq6"}),T=c.attach({and:{source:{query:s,path:o},effect:async m=>{let{query:g,path:p}=m;for(const{route:y,fromPath:x}of h){const w=x(p);if(w)await y.internal.openFx({query:g,params:w.params});else continue}}},or:{name:"openRoutesByPathFx",sid:"tmly43"}});return c.sample({and:[{clock:a,filter:Boolean,target:k}],or:{sid:"fwn12h"}}),c.sample({and:[{clock:d,fn:m=>{let{pathname:g,search:p}=m;const y=new URLSearchParams(p);return{path:g,query:[...y.keys()].reduce((x,w)=>(x[w]?x[w]=y.getAll(w):x[w]=y.get(w),x),{})}},target:c.withFactory({sid:"f47wtp",fn:()=>H.spread({targets:{path:o,query:s}}),name:"target",method:"spread"})}],or:{sid:"gbhh38"}}),c.sample({and:[{clock:o,target:T}],or:{sid:"hcvhfs"}}),{$query:s,$path:o,$activeRoutes:i,back:u,forward:f,routes:r,setHistory:l,mappedRoutes:h,trackQuery:oe(i,s),"@@unitShape":()=>({query:s,path:o,activeRoutes:i,onBack:u,onForward:f})}}exports.createRoute=L;exports.createRouter=ie;exports.parameters=$;
+"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;

package/dist/index.d.ts

@@ -17,8 +17,7 @@ declare const arraySymbol: unique symbol;
 declare interface Config<T> {
     path: T;
     parent?: Route<any>;
-    index?: boolean;
-    beforeOpen?: Effect<any, any, any>[];
+    beforeOpen?: Effect<void, any, any>[];
 }
 
 export declare function createRoute<T extends string, Params = ParseUrlParams<T>>(config: Config<T>): Route<Params>;
@@ -109,7 +108,6 @@ export declare interface Router {
 
 declare interface RouterConfig {
     base?: string;
-    history?: History_2;
     routes: Route<any>[];
 }
 

package/dist/index.js

@@ -1,118 +1,176 @@
-import { createEffect as P, createStore as S, createEvent as x, sample as w, split as J, attach as _, scopeBind as V, withFactory as q } from "effector";
-import { spread as Q } from "patronum";
-function me(t) {
+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 { spread as L } from "patronum";
+function B(t, n) {
+  var e = Object.keys(t);
+  if (Object.getOwnPropertySymbols) {
+    var r = Object.getOwnPropertySymbols(t);
+    n && (r = r.filter(function(s) {
+      return Object.getOwnPropertyDescriptor(t, s).enumerable;
+    })), e.push.apply(e, r);
+  }
+  return e;
+}
+function T(t) {
+  for (var n = 1; n < arguments.length; n++) {
+    var e = arguments[n] != null ? arguments[n] : {};
+    n % 2 ? B(Object(e), !0).forEach(function(r) {
+      W(t, r, e[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(t, Object.getOwnPropertyDescriptors(e)) : B(Object(e)).forEach(function(r) {
+      Object.defineProperty(t, r, Object.getOwnPropertyDescriptor(e, r));
+    });
+  }
+  return t;
+}
+function W(t, n, e) {
+  return (n = G(n)) in t ? Object.defineProperty(t, n, { value: e, enumerable: !0, configurable: !0, writable: !0 }) : t[n] = e, t;
+}
+function G(t) {
+  var n = X(t, "string");
+  return typeof n == "symbol" ? n : n + "";
+}
+function X(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 we(t) {
   let n;
-  const e = P(() => n == null ? void 0 : n(), {
+  const e = P(() => {
+    var y;
+    return (y = n) === null || y === void 0 ? void 0 : y();
+  }, {
     name: "waitForAsyncBundleFx",
-    sid: "sy4dxt"
-  }), r = P(async (g) => (await e(), t.parent && await t.parent.internal.openFx(g), g), {
+    sid: "hl1gh5"
+  }), r = P(async () => {
+    for (const l of (y = t.beforeOpen) !== null && y !== void 0 ? y : []) {
+      var y;
+      await l();
+    }
+  }, {
+    name: "beforeOpenFx",
+    sid: "jez0xa"
+  }), s = P(async (y) => (await e(), await r(), t.parent && await t.parent.internal.openFx(T(T({}, y), {}, {
+    historyIgnore: !0
+  })), y), {
     name: "openFx",
-    sid: "-vpkil5"
-  }), s = S({}, {
+    sid: "-uafnek"
+  }), o = O({}, {
     name: "$params",
-    sid: "c7nw5"
-  }), a = S(!1, {
+    sid: "dlh2xl"
+  }), a = O(!1, {
     name: "$isOpened",
-    sid: "83ksdl"
-  }), o = r.pending, i = x({
+    sid: "lcu7f1"
+  }), i = s.pending, u = w({
     name: "open",
-    sid: "v8jsib"
-  }), u = x({
+    sid: "-qjaufd"
+  }), c = w({
     name: "close",
-    sid: "-9nrj06"
-  }), c = x({
+    sid: "-6cg68t"
+  }), d = w({
     name: "opened",
-    sid: "-ddw25k"
-  }), p = x({
+    sid: "-a2kpe7"
+  }), p = w({
     name: "openedOnServer",
-    sid: "rqvufw"
-  }), f = x({
+    sid: "-u0yshs"
+  }), h = w({
     name: "openedOnClient",
-    sid: "rofchv"
-  }), m = x({
+    sid: "-u3faft"
+  }), v = w({
     name: "closed",
-    sid: "-qg25d5"
+    sid: "-d6sqbp"
   });
-  return w({
+  return g({
     and: [{
-      clock: i,
-      target: r
+      clock: u,
+      target: s
     }],
     or: {
-      sid: "sbzuux"
+      sid: "sre3h1"
     }
-  }), J({
+  }), V({
     and: [{
-      source: r.doneData,
+      source: s.doneData,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
         server: p,
-        client: f
+        client: h
       }
     }],
     or: {
-      sid: "sqaiab"
+      sid: "t5oqwf"
     }
-  }), w({
+  }), g({
     and: [{
-      clock: [f, p],
-      target: c
+      clock: [h, p],
+      target: d
     }],
     or: {
-      sid: "t6sc35"
+      sid: "tamw8o"
     }
-  }), w({
+  }), g({
     and: [{
-      clock: c,
+      clock: d,
       fn: () => !0,
       target: a
     }],
     or: {
-      sid: "t9jb1y"
+      sid: "toxjo2"
+    }
+  }), g({
+    and: [{
+      clock: c,
+      target: v
+    }],
+    or: {
+      sid: "u3rzot"
     }
-  }), w({
+  }), g({
     and: [{
-      clock: m,
+      clock: v,
       fn: () => !1,
       target: a
     }],
     or: {
-      sid: "todr2p"
+      sid: "u6iynm"
     }
   }), {
-    $params: s,
+    $params: o,
     $isOpened: a,
-    $isPending: o,
-    open: i,
-    closed: m,
-    opened: c,
-    openedOnClient: f,
+    $isPending: i,
+    open: u,
+    closed: v,
+    opened: d,
+    openedOnClient: h,
     openedOnServer: p,
-    internal: {
+    internal: T({
       index: !1,
-      close: u,
-      openFx: r,
-      setAsyncImport: (g) => n = g,
-      ...t
-    },
+      close: c,
+      openFx: s,
+      setAsyncImport: (y) => n = y
+    }, t),
     "@@unitShape": () => ({
-      params: s,
-      isPending: o,
+      params: o,
+      isPending: i,
       isOpened: a,
-      onOpen: i
+      onOpen: u
     })
   };
 }
-var E = {};
-Object.defineProperty(E, "__esModule", {
+var k = {};
+Object.defineProperty(k, "__esModule", {
   value: !0
 });
-E.TokenData = void 0;
-E.parse = O;
-var W = E.compile = Z, z = E.match = te;
-E.pathToRegexp = M;
-E.stringify = se;
-const C = "/", D = (t) => t, L = /^[$_\p{ID_Start}]$/u, I = /^[$\u200c\u200d\p{ID_Continue}]$/u, T = "https://git.new/pathToRegexpError", G = {
+k.TokenData = void 0;
+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 = {
   // Groups.
   "{": "{",
   "}": "}",
@@ -125,41 +183,41 @@ const C = "/", D = (t) => t, L = /^[$_\p{ID_Start}]$/u, I = /^[$\u200c\u200d\p{I
   "?": "?",
   "!": "!"
 };
-function K(t) {
+function te(t) {
   return t.replace(/[{}()\[\]+?!:*]/g, "\\$&");
 }
-function v(t) {
+function x(t) {
   return t.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
 }
-function* X(t) {
+function* ne(t) {
   const n = [...t];
   let e = 0;
   function r() {
     let s = "";
-    if (L.test(n[++e]))
-      for (s += n[e]; I.test(n[++e]); )
+    if (J.test(n[++e]))
+      for (s += n[e]; D.test(n[++e]); )
         s += n[e];
     else if (n[e] === '"') {
-      let a = e;
+      let o = e;
       for (; e < n.length; ) {
         if (n[++e] === '"') {
-          e++, a = 0;
+          e++, o = 0;
           break;
         }
         n[e] === "\\" ? s += n[++e] : s += n[e];
       }
-      if (a)
-        throw new TypeError(`Unterminated quote at ${a}: ${T}`);
+      if (o)
+        throw new TypeError(`Unterminated quote at ${o}: ${A}`);
     }
     if (!s)
-      throw new TypeError(`Missing parameter name at ${e}: ${T}`);
+      throw new TypeError(`Missing parameter name at ${e}: ${A}`);
     return s;
   }
   for (; e < n.length; ) {
-    const s = n[e], a = G[s];
-    if (a)
+    const s = n[e], o = ee[s];
+    if (o)
       yield {
-        type: a,
+        type: o,
         index: e++,
         value: s
       };
@@ -170,18 +228,18 @@ function* X(t) {
         value: n[e++]
       };
     else if (s === ":") {
-      const o = r();
+      const a = r();
       yield {
         type: "PARAM",
         index: e,
-        value: o
+        value: a
       };
     } else if (s === "*") {
-      const o = r();
+      const a = r();
       yield {
         type: "WILDCARD",
         index: e,
-        value: o
+        value: a
       };
     } else
       yield {
@@ -196,7 +254,7 @@ function* X(t) {
     value: ""
   };
 }
-class Y {
+class re {
   constructor(n) {
     this.tokens = n;
   }
@@ -219,7 +277,7 @@ class Y {
       type: r,
       index: s
     } = this.peek();
-    throw new TypeError(`Unexpected ${r} at ${s}, expected ${n}: ${T}`);
+    throw new TypeError(`Unexpected ${r} at ${s}, expected ${n}: ${A}`);
   }
   text() {
     let n = "", e;
@@ -228,17 +286,17 @@ class Y {
     return n;
   }
 }
-class F {
+class R {
   constructor(n) {
     this.tokens = n;
   }
 }
-E.TokenData = F;
-function O(t, n = {}) {
+k.TokenData = R;
+function N(t, n = {}) {
   const {
-    encodePath: e = D
-  } = n, r = new Y(X(t));
-  function s(o) {
+    encodePath: e = I
+  } = n, r = new re(ne(t));
+  function s(a) {
     const i = [];
     for (; ; ) {
       const u = r.text();
@@ -254,11 +312,11 @@ function O(t, n = {}) {
         });
         continue;
       }
-      const p = r.tryConsume("WILDCARD");
-      if (p) {
+      const d = r.tryConsume("WILDCARD");
+      if (d) {
         i.push({
           type: "wildcard",
-          name: p
+          name: d
         });
         continue;
       }
@@ -269,169 +327,169 @@ function O(t, n = {}) {
         });
         continue;
       }
-      return r.consume(o), i;
+      return r.consume(a), i;
     }
   }
-  const a = s("END");
-  return new F(a);
+  const o = s("END");
+  return new R(o);
 }
-function Z(t, n = {}) {
+function se(t, n = {}) {
   const {
     encode: e = encodeURIComponent,
-    delimiter: r = C
-  } = n, s = t instanceof F ? t : O(t, n), a = B(s.tokens, r, e);
+    delimiter: r = F
+  } = n, s = t instanceof R ? t : N(t, n), o = q(s.tokens, r, e);
   return function(i = {}) {
-    const [u, ...c] = a(i);
+    const [u, ...c] = o(i);
     if (c.length)
       throw new TypeError(`Missing parameters: ${c.join(", ")}`);
     return u;
   };
 }
-function B(t, n, e) {
-  const r = t.map((s) => ee(s, n, e));
+function q(t, n, e) {
+  const r = t.map((s) => oe(s, n, e));
   return (s) => {
-    const a = [""];
-    for (const o of r) {
-      const [i, ...u] = o(s);
-      a[0] += i, a.push(...u);
+    const o = [""];
+    for (const a of r) {
+      const [i, ...u] = a(s);
+      o[0] += i, o.push(...u);
     }
-    return a;
+    return o;
   };
 }
-function ee(t, n, e) {
+function oe(t, n, e) {
   if (t.type === "text") return () => [t.value];
   if (t.type === "group") {
-    const s = B(t.tokens, n, e);
-    return (a) => {
-      const [o, ...i] = s(a);
-      return i.length ? [""] : [o];
+    const s = q(t.tokens, n, e);
+    return (o) => {
+      const [a, ...i] = s(o);
+      return i.length ? [""] : [a];
     };
   }
-  const r = e || D;
+  const r = e || I;
   return t.type === "wildcard" && e !== !1 ? (s) => {
-    const a = s[t.name];
-    if (a == null) return ["", t.name];
-    if (!Array.isArray(a) || a.length === 0)
+    const o = s[t.name];
+    if (o == null) return ["", t.name];
+    if (!Array.isArray(o) || o.length === 0)
       throw new TypeError(`Expected "${t.name}" to be a non-empty array`);
-    return [a.map((o, i) => {
-      if (typeof o != "string")
+    return [o.map((a, i) => {
+      if (typeof a != "string")
         throw new TypeError(`Expected "${t.name}/${i}" to be a string`);
-      return r(o);
+      return r(a);
     }).join(n)];
   } : (s) => {
-    const a = s[t.name];
-    if (a == null) return ["", t.name];
-    if (typeof a != "string")
+    const o = s[t.name];
+    if (o == null) return ["", t.name];
+    if (typeof o != "string")
       throw new TypeError(`Expected "${t.name}" to be a string`);
-    return [r(a)];
+    return [r(o)];
   };
 }
-function te(t, n = {}) {
+function ae(t, n = {}) {
   const {
     decode: e = decodeURIComponent,
-    delimiter: r = C
+    delimiter: r = F
   } = n, {
     regexp: s,
-    keys: a
-  } = M(t, n), o = a.map((i) => e === !1 ? D : i.type === "param" ? e : (u) => u.split(r).map(e));
+    keys: o
+  } = K(t, n), a = o.map((i) => e === !1 ? I : i.type === "param" ? e : (u) => u.split(r).map(e));
   return function(u) {
     const c = s.exec(u);
     if (!c) return !1;
-    const p = c[0], f = /* @__PURE__ */ Object.create(null);
-    for (let m = 1; m < c.length; m++) {
-      if (c[m] === void 0) continue;
-      const g = a[m - 1], A = o[m - 1];
-      f[g.name] = A(c[m]);
+    const d = c[0], p = /* @__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]);
     }
     return {
-      path: p,
-      params: f
+      path: d,
+      params: p
     };
   };
 }
-function M(t, n = {}) {
+function K(t, n = {}) {
   const {
-    delimiter: e = C,
+    delimiter: e = F,
     end: r = !0,
     sensitive: s = !1,
-    trailing: a = !0
-  } = n, o = [], i = [], u = s ? "" : "i", p = (Array.isArray(t) ? t : [t]).map((g) => g instanceof F ? g : O(g, n));
+    trailing: o = !0
+  } = n, a = [], i = [], u = s ? "" : "i", d = (Array.isArray(t) ? t : [t]).map((v) => v instanceof R ? v : N(v, n));
   for (const {
-    tokens: g
-  } of p)
-    for (const A of R(g, 0, [])) {
-      const N = ne(A, e, o);
-      i.push(N);
+    tokens: v
+  } of d)
+    for (const y of j(v, 0, [])) {
+      const l = ie(y, e, a);
+      i.push(l);
     }
-  let f = `^(?:${i.join("|")})`;
-  return a && (f += `(?:${v(e)}$)?`), f += r ? "$" : `(?=${v(e)}|$)`, {
-    regexp: new RegExp(f, u),
-    keys: o
+  let p = `^(?:${i.join("|")})`;
+  return o && (p += `(?:${x(e)}$)?`), p += r ? "$" : `(?=${x(e)}|$)`, {
+    regexp: new RegExp(p, u),
+    keys: a
   };
 }
-function* R(t, n, e) {
+function* j(t, n, e) {
   if (n === t.length)
     return yield e;
   const r = t[n];
   if (r.type === "group") {
     const s = e.slice();
-    for (const a of R(r.tokens, 0, s))
-      yield* R(t, n + 1, a);
+    for (const o of j(r.tokens, 0, s))
+      yield* j(t, n + 1, o);
   } else
     e.push(r);
-  yield* R(t, n + 1, e);
+  yield* j(t, n + 1, e);
 }
-function ne(t, n, e) {
-  let r = "", s = "", a = !0;
-  for (let o = 0; o < t.length; o++) {
-    const i = t[o];
+function ie(t, n, e) {
+  let r = "", s = "", o = !0;
+  for (let a = 0; a < t.length; a++) {
+    const i = t[a];
     if (i.type === "text") {
-      r += v(i.value), s += i.value, a || (a = i.value.includes(n));
+      r += x(i.value), s += i.value, o || (o = i.value.includes(n));
       continue;
     }
     if (i.type === "param" || i.type === "wildcard") {
-      if (!a && !s)
-        throw new TypeError(`Missing text after "${i.name}": ${T}`);
-      i.type === "param" ? r += `(${re(n, a ? "" : s)}+)` : r += "([\\s\\S]+)", e.push(i), s = "", a = !1;
+      if (!o && !s)
+        throw new TypeError(`Missing text after "${i.name}": ${A}`);
+      i.type === "param" ? r += `(${ce(n, o ? "" : s)}+)` : r += "([\\s\\S]+)", e.push(i), s = "", o = !1;
       continue;
     }
   }
   return r;
 }
-function re(t, n) {
-  return n.length < 2 ? t.length < 2 ? `[^${v(t + n)}]` : `(?:(?!${v(t)})[^${v(n)}])` : t.length < 2 ? `(?:(?!${v(n)})[^${v(t)}])` : `(?:(?!${v(n)}|${v(t)})[\\s\\S])`;
+function ce(t, n) {
+  return n.length < 2 ? t.length < 2 ? `[^${x(t + n)}]` : `(?:(?!${x(t)})[^${x(n)}])` : t.length < 2 ? `(?:(?!${x(n)})[^${x(t)}])` : `(?:(?!${x(n)}|${x(t)})[\\s\\S])`;
 }
-function se(t) {
+function ue(t) {
   return t.tokens.map(function n(e, r, s) {
-    if (e.type === "text") return K(e.value);
+    if (e.type === "text") return te(e.value);
     if (e.type === "group")
       return `{${e.tokens.map(n).join("")}}`;
-    const o = ae(e.name) && oe(s[r + 1]) ? e.name : JSON.stringify(e.name);
-    if (e.type === "param") return `:${o}`;
-    if (e.type === "wildcard") return `*${o}`;
+    const a = le(e.name) && fe(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}`);
   }).join("");
 }
-function ae(t) {
+function le(t) {
   const [n, ...e] = t;
-  return L.test(n) ? e.every((r) => I.test(r)) : !1;
+  return J.test(n) ? e.every((r) => D.test(r)) : !1;
 }
-function oe(t) {
-  return (t == null ? void 0 : t.type) !== "text" ? !0 : !I.test(t.value[0]);
+function fe(t) {
+  return (t == null ? void 0 : t.type) !== "text" ? !0 : !D.test(t.value[0]);
 }
-const ie = Symbol("any"), ce = Symbol("number"), ue = Symbol("string"), le = Symbol("array"), k = {
-  any: ie,
-  number: ce,
-  string: ue,
-  array: le
+const pe = Symbol("any"), de = Symbol("number"), ye = Symbol("string"), me = Symbol("array"), $ = {
+  any: pe,
+  number: de,
+  string: ye,
+  array: me
 };
-function U(t, n) {
+function H(t, n) {
   for (const e of t)
     if (!n.includes(e))
       return !1;
   return !0;
 }
-function H(t, n) {
+function M(t, n) {
   for (const e in n) {
     const r = n[e];
     if (Array.isArray(r) && (!t[e] || JSON.stringify(r) !== t[e]))
@@ -459,22 +517,22 @@ function H(t, n) {
       }
     }
     switch (r) {
-      case k.any: {
+      case $.any: {
         if (!t[e])
           return !1;
         break;
       }
-      case k.string: {
+      case $.string: {
         if (!t[e] || Array.isArray(t[e]))
           return !1;
         break;
       }
-      case k.array: {
+      case $.array: {
         if (!t[e] || !Array.isArray(t[e]))
           return !1;
         break;
       }
-      case k.number: {
+      case $.number: {
         if (!t[e] || Array.isArray(t[e]) || isNaN(parseInt(t[e])) && isNaN(parseFloat(t[e])))
           return !1;
         break;
@@ -483,64 +541,64 @@ function H(t, n) {
   }
   return !0;
 }
-function pe(t, n) {
+function he(t, n) {
   const e = {};
   for (const r in n) {
-    const s = n[r], a = t[r];
+    const s = n[r], o = t[r];
     if (Array.isArray(s)) {
-      e[r] = a === "1" || a === "true";
+      e[r] = o === "1" || o === "true";
       continue;
     }
     switch (typeof s) {
       case "number": {
-        const o = t[r];
-        e[r] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
+        const a = t[r];
+        e[r] = isNaN(parseInt(a)) ? parseFloat(a) : parseInt(a);
         break;
       }
       case "object": {
-        e[r] = JSON.parse(a);
+        e[r] = JSON.parse(o);
         break;
       }
       case "string":
         e[r] = t[r];
       case "boolean": {
-        const o = t[r];
-        e[r] = o === "0" ? parseFloat(o) : parseInt(o);
+        const a = t[r];
+        e[r] = a === "0" ? parseFloat(a) : parseInt(a);
         break;
       }
     }
     switch (s) {
-      case k.any:
-      case k.string:
-      case k.array: {
+      case $.any:
+      case $.string:
+      case $.array: {
         e[r] = t[r];
         break;
       }
-      case k.number: {
-        const o = t[r];
-        e[r] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
+      case $.number: {
+        const a = t[r];
+        e[r] = isNaN(parseInt(a)) ? parseFloat(a) : parseInt(a);
         break;
       }
     }
   }
   return e;
 }
-function fe(t, n) {
+function ge(t, n) {
   return (e) => {
     const {
       parameters: r,
       forRoutes: s
-    } = e, a = x({
+    } = e, o = w({
       name: "entered",
       sid: "-d3obu6"
-    }), o = x({
+    }), a = w({
       name: "exited",
       sid: "-xofyk3"
-    }), i = x({
+    }), i = w({
       name: "exit",
       sid: "-673d76"
     });
-    return w({
+    return g({
       and: [{
         source: {
           activeRoutes: t,
@@ -549,21 +607,21 @@ function fe(t, n) {
         filter: (u) => {
           let {
             activeRoutes: c,
-            query: p
+            query: d
           } = u;
-          return (!s || U(s, c)) && H(p, r);
+          return (!s || H(s, c)) && M(d, r);
         },
         fn: (u) => {
           let {
             query: c
           } = u;
-          return pe(c, r);
+          return he(c, r);
         }
       }],
       or: {
         sid: "-so0f9q"
       }
-    }), w({
+    }), g({
       and: [{
         source: {
           activeRoutes: t,
@@ -572,221 +630,243 @@ function fe(t, n) {
         filter: (u) => {
           let {
             activeRoutes: c,
-            query: p
+            query: d
           } = u;
-          return !((!s || U(s, c)) && H(p, r));
+          return !((!s || H(s, c)) && M(d, r));
         },
-        target: o
+        target: a
       }],
       or: {
         sid: "-s82e29"
       }
     }), {
-      entered: a,
-      exited: o,
+      entered: o,
+      exited: a,
       exit: i,
-      getPayload: (u) => Object.entries(u).reduce((c, p) => {
-        let [f, m] = p;
-        return typeof r[f] == "symbol" ? c[f] = m : c[f] = r[f], c;
+      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;
       }, {})
     };
   };
 }
-function he(t) {
+function z(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 xe(t) {
   const {
     base: n = "/",
-    history: e,
-    routes: r
-  } = t, s = S({}, {
+    routes: e
+  } = t, r = O({}, {
     name: "$query",
-    sid: "2wd7x1"
-  }), a = S(e ?? null, {
+    sid: "uczasb"
+  }), s = O(null, {
     name: "$history",
-    sid: "31majq"
-  }), o = S("/", {
+    sid: "ui8df0"
+  }), o = O(null, {
     name: "$path",
-    sid: "ld3nhr"
-  }), i = S([], {
+    sid: "-m7ebm3"
+  }), a = O([], {
     name: "$activeRoutes",
-    sid: "mrug12"
-  }), u = x({
+    sid: "-ksnj2s"
+  }), i = w({
     name: "setHistory",
-    sid: "sekwlw"
-  }), c = x({
+    sid: "-p3v4s1"
+  }), u = w({
     name: "back",
-    sid: "-icnnoo"
-  }), p = x({
+    sid: "-tzn3h"
+  }), c = w({
     name: "forward",
-    sid: "-72o1my"
-  }), f = x({
+    sid: "afzyy9"
+  }), d = w({
     name: "locationUpdated",
-    sid: "d8lu52"
-  }), m = r.map((d) => {
-    let h = d;
-    const l = [];
-    for (l.unshift(h.internal.path); h.internal.parent; )
-      h = h.internal.parent, l.unshift(h.internal.path);
-    const y = (n === "/" ? l : [n, ...l]).join("");
+    sid: "-ubw4ys"
+  }), p = 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("");
     return {
-      route: d,
-      path: y,
-      toPath: W(y),
-      fromPath: z(y)
+      route: l,
+      path: m,
+      toPath: Y(m),
+      fromPath: Z(m)
     };
-  }), g = _({
+  }), h = C({
     and: {
       source: {
-        history: a
+        history: s
       },
-      effect: async (d, h) => {
+      effect: async (l, b) => {
         let {
-          history: l
-        } = d, {
-          path: y,
-          query: b,
-          replace: $
-        } = h;
-        if (!l)
+          history: f
+        } = l, {
+          path: m,
+          query: S,
+          replace: E
+        } = b;
+        if (!f)
           throw new Error("history not found");
-        const j = {
-          pathname: y,
-          query: b
+        const _ = {
+          pathname: m,
+          query: S
         };
-        $ ? l.replace(j) : l.push(j);
+        E ? f.replace(_) : f.push(_.pathname);
       }
     },
     or: {
       name: "updateHistoryFx",
-      sid: "h74tsu"
+      sid: "-oy8a4f"
     }
   });
   for (const {
-    route: d,
-    toPath: h
-  } of m)
-    w({
+    route: l,
+    toPath: b
+  } of p)
+    g({
       and: [{
-        clock: d.opened,
-        source: i,
-        fn: (l) => [...l, d],
-        target: i
+        clock: l.opened,
+        source: a,
+        filter: (f) => !f.includes(l),
+        fn: (f) => [...f, l],
+        target: a
       }],
       or: {
-        sid: "-px1r6l"
+        sid: "e1k4q5"
       }
-    }), w({
+    }), g({
       and: [{
-        clock: d.opened,
-        fn: (l) => {
+        clock: l.opened,
+        filter: (f) => !f.historyIgnore,
+        fn: function() {
           let {
-            params: y,
-            query: b,
-            replace: $
-          } = l;
+            params: f,
+            query: m,
+            replace: S
+          } = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
+            params: {}
+          };
           return {
-            path: h(y),
-            query: b ?? {},
-            replace: $
+            path: b(f),
+            query: m ?? {},
+            replace: S
           };
         },
-        target: g
+        target: h
       }],
       or: {
-        sid: "-phnikh"
+        sid: "ehi5xm"
       }
-    }), w({
+    }), g({
       and: [{
-        clock: d.closed,
-        source: i,
-        fn: (l) => l.filter((y) => y !== d),
-        target: i
+        clock: l.closed,
+        source: a,
+        fn: (f) => f.filter((m) => m !== l),
+        target: a
       }],
       or: {
-        sid: "e0gjjf"
+        sid: "ez3kx6"
       }
     });
-  w({
+  g({
     and: [{
-      clock: u,
-      target: a
+      clock: i,
+      target: s
     }],
     or: {
-      sid: "egekp6"
+      sid: "ff1m2x"
     }
   });
-  const A = P((d) => {
-    const h = V(f);
-    if (!d)
+  const v = P((l) => {
+    const b = Q(d);
+    if (!l)
       throw new Error();
-    d.listen((l) => {
+    l.listen((f) => {
       let {
-        location: y
-      } = l;
-      h(y);
+        location: m
+      } = f;
+      b(m);
     });
   }, {
     name: "subscribeHistoryFx",
-    sid: "5cocq6"
-  }), N = _({
+    sid: "z6ijkf"
+  }), y = C({
     and: {
       source: {
-        query: s,
+        query: r,
         path: o
       },
-      effect: async (d) => {
+      effect: async (l) => {
         let {
-          query: h,
-          path: l
-        } = d;
+          query: b,
+          path: f
+        } = l;
         for (const {
-          route: y,
-          fromPath: b
-        } of m) {
-          const $ = b(l);
-          if ($)
-            await y.internal.openFx({
-              query: h,
-              params: $.params
+          route: m,
+          fromPath: S
+        } of p) {
+          const E = S(f);
+          if (E)
+            await m.internal.openFx({
+              query: b,
+              params: E.params
             });
-          else
+          else {
+            m.internal.close();
             continue;
+          }
         }
       }
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "tmly43"
+      sid: "-1mpuqp"
     }
   });
-  return w({
+  return g({
     and: [{
-      clock: a,
+      clock: s,
       filter: Boolean,
-      target: A
+      target: v
     }],
     or: {
-      sid: "fwn12h"
+      sid: "gvtv1l"
     }
-  }), w({
+  }), g({
     and: [{
-      clock: f,
-      fn: (d) => {
-        let {
-          pathname: h,
-          search: l
-        } = d;
-        const y = new URLSearchParams(l);
-        return {
-          path: h,
-          query: [...y.keys()].reduce((b, $) => (b[$] ? b[$] = y.getAll($) : b[$] = y.get($), b), {})
-        };
-      },
-      target: q({
-        sid: "f47wtp",
-        fn: () => Q({
+      clock: s,
+      filter: Boolean,
+      fn: (l) => z(l.location),
+      target: U({
+        sid: "suiy9c",
+        fn: () => L({
+          targets: {
+            path: o,
+            query: r
+          }
+        }),
+        name: "target",
+        method: "spread"
+      })
+    }],
+    or: {
+      sid: "haob2c"
+    }
+  }), g({
+    and: [{
+      clock: [d],
+      fn: (l) => z(l),
+      target: U({
+        sid: "-r1573k",
+        fn: () => L({
           targets: {
             path: o,
-            query: s
+            query: r
           }
         }),
         name: "target",
@@ -794,37 +874,37 @@ function he(t) {
       })
     }],
     or: {
-      sid: "gbhh38"
+      sid: "hstin9"
     }
-  }), w({
+  }), g({
     and: [{
       clock: o,
-      target: N
+      target: y
     }],
     or: {
-      sid: "hcvhfs"
+      sid: "iaexmt"
     }
   }), {
-    $query: s,
+    $query: r,
     $path: o,
-    $activeRoutes: i,
-    back: c,
-    forward: p,
-    routes: r,
-    setHistory: u,
-    mappedRoutes: m,
-    trackQuery: fe(i, s),
+    $activeRoutes: a,
+    back: u,
+    forward: c,
+    routes: e,
+    setHistory: i,
+    mappedRoutes: p,
+    trackQuery: ge(a, r),
     "@@unitShape": () => ({
-      query: s,
+      query: r,
       path: o,
-      activeRoutes: i,
-      onBack: c,
-      onForward: p
+      activeRoutes: a,
+      onBack: u,
+      onForward: c
     })
   };
 }
 export {
-  me as createRoute,
-  he as createRouter,
-  k as parameters
+  we as createRoute,
+  xe as createRouter,
+  $ as parameters
 };

package/package.json

@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "private": false,
-  "version": "0.1.0",
+  "version": "0.1.2",
   "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": "59ab2eda9dffd095ffe5c4625b6a40cd71487410"
+  "gitHead": "c5ab346d7c4ed17a58dba0e133895193c93f76d5"
 }