@argon-router/core 0.10.0 → 0.11.0

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("effector"),a=require("query-string"),r=require("patronum");const n={any:Symbol("any"),number:Symbol("number"),string:Symbol("string"),array:Symbol("array"),boolean:Symbol("boolean")};function t(e,a){for(const r of e)if(a.includes(r))return!0;return!1}function s(e,a){for(const r in a){const t=a[r];if(Array.isArray(t)&&(!e[r]||JSON.stringify(t)!==e[r]))return!1;switch(typeof t){case"number":if(!e[r]||t.toString()!==e[r])return!1;break;case"object":if(!e[r]||JSON.stringify(t)!==e[r])return!1;break;case"string":if(!e[r]||t!==e[r])return!1;break;case"boolean":if(!e[r]||!["0","1","false","true"].includes(e[r]))return!1}switch(t){case n.any:if(!e[r])return!1;break;case n.string:if(!e[r]||Array.isArray(e[r]))return!1;break;case n.array:if(!e[r]||!Array.isArray(e[r]))return!1;break;case n.number:if(!e[r]||Array.isArray(e[r])||isNaN(parseInt(e[r]))&&isNaN(parseFloat(e[r])))return!1;break;case n.boolean:if(!e[r]||Array.isArray(e[r])||!["0","1","false","true"].includes(e[r]))return!1}}return!0}function o(a){let{$query:r,navigate:n}=a;return i({$activeRoutes:e.createStore([],{name:"$activeRoutes",sid:"85ms46"}),$query:r,navigate:n})}function i(a){let{$activeRoutes:r,$query:o,navigate:i}=a;return a=>{const{parameters:c,forRoutes:p}=a,l=e.createStore(!1,{name:"$entered",sid:"-mo5ecc"}),d=e.createEvent({name:"entered",sid:"kuzfr"}),u=e.createEvent({name:"exited",sid:"-jzwna6"}),m=e.createEvent({name:"exit",sid:"7hfy2r"}),f=e.createEvent({name:"changeEntered",sid:"qh8w6v"});return e.sample({and:[{clock:f,target:l}],or:{sid:"-gf1fe4"}}),e.sample({and:[{source:{activeRoutes:r,query:o},filter:e=>{let{activeRoutes:a,query:r}=e;return(!p||t(p,a))&&s(r,c)},fn:e=>{let{query:a}=e;return function(e,a){const r={};for(const t in a){const s=a[t],o=e[t];if(Array.isArray(s)){const a=e[t];r[t]=a;continue}switch(typeof s){case"number":r[t]=isNaN(parseInt(o))?parseFloat(o):parseInt(o);break;case"object":r[t]=JSON.parse(o);break;case"string":r[t]=o;case"boolean":r[t]="1"===o||"true"===o}switch(s){case n.any:case n.string:case n.array:r[t]=e[t];break;case n.number:{const a=e[t];r[t]=isNaN(parseInt(a))?parseFloat(a):parseInt(a);break}case n.boolean:{const a=e[t];r[t]="1"===a||"true"===a;break}}}return r}(a,c)},target:[d,f.prepend(()=>!0)]}],or:{sid:"-gcagfb"}}),e.sample({and:[{source:{activeRoutes:r,query:o,entered:l},filter:e=>{let{activeRoutes:a,query:r,entered:n}=e;return n&&!((!p||t(p,a))&&s(r,c))},target:[u.prepend(()=>{}),f.prepend(()=>!1)]}],or:{sid:"-fvsmmh"}}),e.sample({and:[{clock:m,source:o,fn:(e,a)=>{if(a&&a.ignoreParams){const r={};for(const n of a.ignoreParams)e[n]&&(r[n]=e[n]);return{query:r}}return{query:{}}},target:i}],or:{sid:"-f105e9"}}),{entered:d,exited:u,exit:m}}}function c(e){return a=>{const r=a.split("/").map(e=>e.trim()).filter(e=>""!==e);let n=null;function t(e,a){n||(n={}),n[e]=a}if(0===e.length)return 0===r.length?{path:a,params:null}:null;for(let s=0;s<e.length;s++){const a=e[s];switch(a.type){case"const":if(a.name!==r.shift())return null;continue;case"parameter":{const{arrayProps:n,genericProps:o,required:i}=a.payload;if(n){const i=[];let c;for(;c=r.shift(),c;){switch(null==o?void 0:o.type){case"number":if(isNaN(+c))return null;i.push(+c);break;case"union":if(!o.items.includes(c))return null;i.push(c);break;default:i.push(c)}if(i.length>=(n.max??1/0))break}if(i.length<(n.min??0))return null;if(r.length>0&&!e[s+1])return null;t(a.name,i);break}const c=r.shift();if(i&&!c)return null;if(!c){t(a.name,void 0);continue}switch(null==o?void 0:o.type){case"number":if(isNaN(+c))return null;t(a.name,+c);break;case"union":if(!o.items.includes(c))return null;t(a.name,c);break;default:t(a.name,c)}}}}return r.length>0?null:{path:a,params:n}}}function p(e){if(!e)return null;const a=e[1];let r,n,t;for(const s of e.slice(2))s&&(s.includes("<")?r=s.replaceAll(/\s/g,"").replace("<","").replace(">",""):(s.includes("{")&&(n=s.replace("{","").replace("}","").split(",").map(e=>parseInt(e))),["*","?","+"].includes(s)&&(t=s)));return{name:a,genericProps:r,arrayProps:n,modificator:t}}function l(e){return a=>{const r=[];if(0===e.length)return"/";for(const n of e)switch(n.type){case"const":r.push(n.name);break;case"parameter":if(!a[n.name])continue;if(Array.isArray(a[n.name]))for(const e of a[n.name])r.push(e.toString());else r.push(a[n.name].toString())}return`/${r.join("/")}`}}function d(){const r=e.createStore(null,{and:{serialize:"ignore"},name:"$history",sid:"-ld7lzl"}),n=e.createStore({query:{},path:null},{name:"$locationState",sid:"-4u3w85"}),t=n.map(e=>e.query),s=n.map(e=>e.path),i=e.createEvent({name:"setHistory",sid:"-ormmkk"}),c=e.createEvent({name:"navigate",sid:"tawqep"}),p=e.createEvent({name:"back",sid:"bxy8rt"}),l=e.createEvent({name:"forward",sid:"-bpmzb1"}),d=e.createEvent({name:"locationUpdated",sid:"lkzldx"}),u=e.attach({and:{source:r,effect:(e,r)=>{let{path:n,query:t,replace:s}=r;if(!e)throw new Error("history not found");const o={pathname:n,search:`?${a.stringify(t)}`};s?e.replace(o):e.push(o)}},or:{name:"navigateFx",sid:"-ov1xn7"}}),m=e.createEffect(r=>{const n=e.scopeBind(d);if(n({pathname:r.location.pathname,query:{...a.parse(r.location.search)}}),!r)throw new Error;r.listen(e=>{let{location:r}=e;n({pathname:r.pathname,query:{...a.parse(r.search)}})})},{name:"subscribeHistoryFx",sid:"-m60vds"});return e.sample({and:[{clock:i,target:r}],or:{sid:"ii4q"}}),e.sample({and:[{clock:r,filter:Boolean,target:m}],or:{sid:"39h3j"}}),e.sample({and:[{clock:d,fn:e=>({path:e.pathname,query:e.query}),target:n}],or:{sid:"i3x4a"}}),e.sample({and:[{clock:c,source:s,fn:(e,a)=>({path:e,...a}),target:u}],or:{sid:"ylqx4"}}),{$history:r,$locationState:n,$query:t,$path:s,setHistory:i,navigate:c,back:p,forward:l,locationUpdated:d,trackQuery:o({$query:t,navigate:c})}}function u(){let a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:e.createStore(!1,{and:{name:"pending",sid:"r89aiv"},name:"pending",sid:"r89aiv"});const r=e.createStore(null,{name:"$params",sid:"-ftspin"}),n=e.createStore(!1,{name:"$isOpened",sid:"-v6936c"}),t=a,s=e.createEvent({name:"open",sid:"juc47v"}),o=e.createEvent({name:"opened",sid:"-quc8vc"}),i=e.createEvent({name:"openedOnServer",sid:"n25rh4"}),c=e.createEvent({name:"openedOnClient",sid:"-auqikx"}),p=e.createEvent({name:"close",sid:"4zlqo6"}),l=e.createEvent({name:"closed",sid:"wbpfrk"}),d=e.createEvent({name:"cancelled",sid:"-q3x5sf"});return e.sample({and:[{clock:s,target:o}],or:{sid:"-u8b34x"}}),e.split({and:[{source:o,match:()=>"undefined"==typeof window?"server":"client",cases:{server:i,client:c}}],or:{sid:"-u5k464"}}),e.sample({and:[{clock:p,target:l}],or:{sid:"-tp2ada"}}),e.sample({and:[{clock:[o.map(()=>!0),l.map(()=>!1)],target:n}],or:{sid:"-tarmxw"}}),{$params:r,$isOpened:n,$isPending:t,open:s,opened:o,openedOnClient:c,openedOnServer:i,close:p,closed:l,cancelled:d,path:null,"@@unitShape":()=>({params:r,isOpened:n,isPending:t,onOpen:s})}}exports.chainRoute=function(a){const{route:r,beforeOpen:n,openOn:t,cancelOn:s}=a;let o;const i=e.createEffect(()=>null==o?void 0:o(),{name:"waitForAsyncBundleFx",sid:"-tvp99n"}),c=e.createEffect(async e=>{await i();for(const a of[].concat(n))await a(e)},{name:"openFx",sid:"-9kc1je"}),p=u(c.pending);return e.sample({and:[{clock:r.opened,target:c}],or:{sid:"1162lk"}}),e.sample({and:[{clock:r.opened,fn:e=>e&&"params"in e?e.params:null,target:p.$params}],or:{sid:"13x1kd"}}),t&&e.sample({and:[{clock:t,source:{params:p.$params},fn:e=>{let{params:a}=e;return{params:a}},target:p.open}],or:{sid:"1kevex"}}),s&&(e.sample({and:[{clock:[r.closed].concat(s),target:p.close}],or:{sid:"20wp7r"}}),e.sample({and:[{clock:[].concat(s),target:p.cancelled}],or:{sid:"2f7cn5"}})),Object.assign(p,{internal:{setAsyncImport:e=>o=e}})},exports.createRoute=function(a){let r;const n=e.createEffect(()=>null==r?void 0:r(),{name:"waitForAsyncBundleFx",sid:"1y76ms"}),t=e.createEffect(async()=>{for(const e of a.beforeOpen??[])await e()},{name:"beforeOpenFx",sid:"-65tb76"}),s=e.createEffect(async e=>{await n(),await t();const r=a.parent;return r&&await r.internal.openFx({...e??{params:{}},navigate:!1}),e},{name:"openFx",sid:"p3u4q7"}),o=e.createStore({},{name:"$params",sid:"-a34rm3"}),i=e.createStore(!1,{name:"$isOpened",sid:"7m6f5g"}),c=s.pending,p=e.createEvent({name:"open",sid:"ur5fa6"}),l=e.createEvent({name:"close",sid:"-k33yie"}),d=e.createEvent({name:"opened",sid:"-nt8hns"}),u=e.createEvent({name:"openedOnServer",sid:"hbjexo"}),m=e.createEvent({name:"openedOnClient",sid:"h92wzn"}),f=e.createEvent({name:"navigated",sid:"-8amrhe"}),y=e.createEvent({name:"closed",sid:"-pql6th"});e.sample({and:[{clock:p,target:s}],or:{sid:"ymah4t"}});const h={};return e.sample({and:[{clock:f,fn:e=>e&&"params"in e?{...e.params}:h,target:o}],or:{sid:"z1opqx"}}),e.split({and:[{source:f,match:()=>"undefined"==typeof window?"server":"client",cases:{server:u,client:m}}],or:{sid:"-zha4na"}}),e.sample({and:[{clock:[m,u],target:d}],or:{sid:"-z08i93"}}),e.sample({and:[{clock:l,target:y}],or:{sid:"-yxhjaa"}}),e.sample({and:[{clock:[d.map(()=>!0),y.map(()=>!1)],target:i}],or:{sid:"-yj6vuw"}}),{$params:o,$isOpened:i,$isPending:c,open:p,closed:y,opened:d,openedOnClient:m,openedOnServer:u,...a,internal:{navigated:f,close:l,openFx:s,setAsyncImport:e=>r=e},"@@unitShape":()=>({params:o,isPending:c,isOpened:i,onOpen:p})}},exports.createRouter=function(a){const{base:r="/",routes:n}=a,{$path:t,$query:s,back:o,forward:u,navigate:m,setHistory:f,locationUpdated:y}=d(),h=n.map(e=>{let a=e;const n=[];for(n.unshift(a.path);a.parent;)a=a.parent,"/"!==a.path&&n.unshift(a.path);const t="/"===r?n.join(""):[r,...n].join(""),{build:s,parse:o}=function(e){const a=[],r=/:(\w+)(<[\s?\w|]+>)?({\d+\,\d+})?([+*?])?/,n=e.split("/").filter(Boolean);for(let t=0;t<n.length;t++){const s=n[t];if(!s)continue;const o=p(s.match(r));if(!o){a.push({type:"const",name:s,payload:void 0});continue}const{arrayProps:i,genericProps:c,modificator:l,name:d}=o;if(!d)throw new Error(`Invalid path: "${e}". Name for argument must be provided`);const u={type:"parameter",name:d,payload:{required:!0}};switch(c&&"number"===c&&(u.payload.genericProps={type:"number"}),c&&c.includes("|")&&(u.payload.genericProps={type:"union",items:c.split("|")}),l){case"*":u.payload.arrayProps={};break;case"+":u.payload.arrayProps={min:1};break;case"?":u.payload.required=!1}i&&(u.payload.arrayProps={...u.payload.arrayProps,min:i[0],max:i[1]}),a.push(u)}return{parse:c(a),build:l(a)}}(t);return{route:e,path:t,build:s,parse:o}}),g=t.map(e=>{const a=[];if(!e)return a;for(const{route:r,parse:n}of h)n(e)&&a.push(r);return a}),v=e.attach({and:{source:{query:s,path:t},effect:async a=>{let{query:r,path:n}=a;for(const{route:t,parse:s}of h){const a=s(n),[o,i]=[e.scopeBind(t.internal.close),e.scopeBind(t.internal.navigated)];a?i({query:r,params:a.params}):o()}}},or:{name:"openRoutesByPathFx",sid:"-3zl7vq"}});for(const{route:i,build:c}of h)e.sample({and:[{clock:i.internal.openFx.doneData,filter:e=>!1!==(null==e?void 0:e.navigate),fn:e=>({path:c(e&&"params"in e?e.params:void 0),query:(null==e?void 0:e.query)??{},replace:null==e?void 0:e.replace}),target:m}],or:{sid:"exzzqg"}});return e.sample({and:[{clock:y,fn:e=>({path:e.pathname,query:e.query}),target:v}],or:{sid:"ficdn3"}}),{$query:s,$path:t,$activeRoutes:g,back:o,forward:u,navigate:m,routes:n,setHistory:f,mappedRoutes:h,trackQuery:i({$activeRoutes:g,$query:s,navigate:m}),"@@unitShape":()=>({query:s,path:t,activeRoutes:g,onBack:o,onForward:u,onNavigate:m})}},exports.createRouterControls=d,exports.createVirtualRoute=u,exports.group=function(a){const n=u(e.withFactory({sid:"-uirglg",fn:()=>r.or(...a.map(e=>e.$isPending)),name:"$isPending",method:"or"}));return e.sample({and:[{clock:a.map(e=>e.$isOpened),filter:e.withFactory({sid:"6pispd",fn:()=>r.or(...a.map(e=>e.$isOpened)),name:"filter",method:"or"}),fn:()=>{},target:n.open}],or:{sid:"-xn8czd"}}),e.sample({and:[{clock:a.map(e=>e.$isOpened),filter:e.withFactory({sid:"a0u5gq",fn:()=>r.not(e.withFactory({sid:"xb4bx2",fn:()=>r.or(...a.map(e=>e.$isOpened)),name:"fn",method:"or"})),name:"filter",method:"not"}),fn:()=>{},target:n.close}],or:{sid:"-x7u4d9"}}),n},exports.parameters=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("effector"),a=require("query-string"),n=require("patronum");function t(e,a){for(const n of e)if(a.includes(n))return!0;return!1}function r(a){let{$query:n,navigate:t}=a;return o({$activeRoutes:e.createStore([],{name:"$activeRoutes",sid:"ni3bf8"}),$query:n,navigate:t})}function o(a){let{$activeRoutes:n,$query:r,navigate:o}=a;return a=>{const{parameters:s,forRoutes:i}=a,c=e.createStore(!1,{name:"$entered",sid:"-i5493b"}),d=e.createEvent({name:"entered",sid:"9i8bun"}),l=e.createEvent({name:"exited",sid:"-p2hcsy"}),p=e.createEvent({name:"enter",sid:"30cmky"}),u=e.createEvent({name:"exit",sid:"-2657ec"}),m=e.createEvent({name:"changeEntered",sid:"-5jm7r1"});return e.sample({and:[{clock:m,target:c}],or:{sid:"-j6nk9y"}}),e.sample({and:[{source:{activeRoutes:n,query:r},filter:e=>{let{activeRoutes:a,query:n}=e;return(!i||t(i,a))&&s.safeParse(n).success},fn:e=>{let{query:a}=e;return s.safeParse(a).data},target:[d,m.prepend(()=>!0)]}],or:{sid:"-iscwuk"}}),e.sample({and:[{source:{activeRoutes:n,query:r,entered:c},filter:e=>{let{activeRoutes:a,query:n,entered:r}=e;return r&&!((!i||t(i,a))&&s.safeParse(n).success)},target:[l.prepend(()=>{}),m.prepend(()=>!1)]}],or:{sid:"-ibv31q"}}),e.sample({and:[{clock:p,source:r,fn:(e,a)=>({query:{...e,...a}}),target:o}],or:{sid:"-hsmaa3"}}),e.sample({and:[{clock:u,source:r,fn:(e,a)=>{if(a&&a.ignoreParams){const n={};for(const t of a.ignoreParams)e[t]&&(n[t]=e[t]);return{query:n}}return{query:{}}},target:o}],or:{sid:"-whgzm0"}}),{enter:p,entered:d,exited:l,exit:u}}}function s(e){return a=>{const n=a.split("/").map(e=>e.trim()).filter(e=>""!==e);let t=null;function r(e,a){t||(t={}),t[e]=a}if(0===e.length)return 0===n.length?{path:a,params:null}:null;for(let o=0;o<e.length;o++){const a=e[o];switch(a.type){case"const":if(a.name!==n.shift())return null;continue;case"parameter":{const{arrayProps:t,genericProps:s,required:i}=a.payload;if(t){const i=[];let c;for(;c=n.shift(),c;){switch(null==s?void 0:s.type){case"number":if(isNaN(+c))return null;i.push(+c);break;case"union":if(!s.items.includes(c))return null;i.push(c);break;default:i.push(c)}if(i.length>=(t.max??1/0))break}if(i.length<(t.min??0))return null;if(n.length>0&&!e[o+1])return null;r(a.name,i);break}const c=n.shift();if(i&&!c)return null;if(!c){r(a.name,void 0);continue}switch(null==s?void 0:s.type){case"number":if(isNaN(+c))return null;r(a.name,+c);break;case"union":if(!s.items.includes(c))return null;r(a.name,c);break;default:r(a.name,c)}}}}return n.length>0?null:{path:a,params:t}}}function i(e){if(!e)return null;const a=e[1];let n,t,r;for(const o of e.slice(2))o&&(o.includes("<")?n=o.replaceAll(/\s/g,"").replace("<","").replace(">",""):(o.includes("{")&&(t=o.replace("{","").replace("}","").split(",").map(e=>parseInt(e))),["*","?","+"].includes(o)&&(r=o)));return{name:a,genericProps:n,arrayProps:t,modificator:r}}function c(e){return a=>{const n=[];if(0===e.length)return"/";for(const t of e)switch(t.type){case"const":n.push(t.name);break;case"parameter":if(!a[t.name])continue;if(Array.isArray(a[t.name]))for(const e of a[t.name])n.push(e.toString());else n.push(a[t.name].toString())}return`/${n.join("/")}`}}function d(){const n=e.createStore(null,{and:{serialize:"ignore"},name:"$history",sid:"-ld7lzl"}),t=e.createStore({query:{},path:null},{name:"$locationState",sid:"-4u3w85"}),o=t.map(e=>e.query),s=t.map(e=>e.path),i=e.createEvent({name:"setHistory",sid:"-ormmkk"}),c=e.createEvent({name:"navigate",sid:"tawqep"}),d=e.createEvent({name:"back",sid:"bxy8rt"}),l=e.createEvent({name:"forward",sid:"-bpmzb1"}),p=e.createEvent({name:"locationUpdated",sid:"lkzldx"}),u=e.attach({and:{source:n,effect:(e,n)=>{let{path:t,query:r,replace:o}=n;if(!e)throw new Error("history not found");const s={pathname:t,search:`?${a.stringify(r)}`};o?e.replace(s):e.push(s)}},or:{name:"navigateFx",sid:"-ov1xn7"}}),m=e.createEffect(n=>{const t=e.scopeBind(p);if(t({pathname:n.location.pathname,query:{...a.parse(n.location.search)}}),!n)throw new Error;n.listen(e=>{let{location:n}=e;t({pathname:n.pathname,query:{...a.parse(n.search)}})})},{name:"subscribeHistoryFx",sid:"-m60vds"});return e.sample({and:[{clock:i,target:n}],or:{sid:"ii4q"}}),e.sample({and:[{clock:n,filter:Boolean,target:m}],or:{sid:"39h3j"}}),e.sample({and:[{clock:p,fn:e=>({path:e.pathname,query:e.query}),target:t}],or:{sid:"i3x4a"}}),e.sample({and:[{clock:c,source:s,fn:(e,a)=>({path:e,...a}),target:u}],or:{sid:"ylqx4"}}),{$history:n,$locationState:t,$query:o,$path:s,setHistory:i,navigate:c,back:d,forward:l,locationUpdated:p,trackQuery:r({$query:o,navigate:c})}}function l(){let a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};const{beforeOpen:n,$isPending:t=e.createStore(!1,{name:"$isPending",sid:"-f18bwu"}),transformer:r=e=>e??null}=a,o=e.createStore(null,{name:"$params",sid:"v2ropa"}),s=e.createStore(!1,{name:"$isOpened",sid:"mzzqqr"}),i=e.createEvent({name:"open",sid:"f33vnd"}),c=e.createEvent({name:"opened",sid:"-efpvez"}),d=e.createEvent({name:"openedOnServer",sid:"o8st20"}),l=e.createEvent({name:"openedOnClient",sid:"xaagqn"}),p=e.createEvent({name:"close",sid:"-20upkw"}),u=e.createEvent({name:"closed",sid:"avevxu"}),m=e.createEvent({name:"cancelled",sid:"808tq5"});return e.sample({and:[{clock:i,target:[c]}],or:{sid:"p3r2ad"}}),e.sample({and:[{clock:i,fn:r,target:o}],or:{sid:"p6i196"}}),e.split({and:[{source:c,match:()=>"undefined"==typeof window?"server":"client",cases:{server:d,client:l}}],or:{sid:"plch9x"}}),e.sample({and:[{clock:p,target:u}],or:{sid:"q1ub2r"}}),e.sample({and:[{clock:[c.map(()=>!0),u.map(()=>!1)],target:s}],or:{sid:"q4la1k"}}),{$params:o,$isOpened:s,$isPending:t,open:i,opened:c,openedOnClient:l,openedOnServer:d,close:p,closed:u,cancelled:m,path:"",beforeOpen:n,"@@unitShape":()=>({params:o,isOpened:s,isPending:t,onOpen:i,onClose:p})}}exports.chainRoute=function(a){const{route:n,beforeOpen:t,openOn:r,cancelOn:o}=a;let s;const i=e.createEffect(()=>null==s?void 0:s(),{name:"waitForAsyncBundleFx",sid:"qdkcuo"}),c=e.createEffect(async e=>{await i();for(const a of[].concat(t))await a(e)},{name:"openFx",sid:"-fwntqy"}),d=e=>e&&"params"in e?e.params:null,p=l({transformer:d});return e.sample({and:[{clock:n.opened,target:c}],or:{sid:"-s9xf6p"}}),e.sample({and:[{clock:n.opened,fn:d,target:p.$params}],or:{sid:"-1u78yc"}}),r&&e.sample({and:[{clock:r,source:p.$params,fn:e=>e,target:p.open}],or:{sid:"-1qcor3"}}),o&&(e.sample({and:[{clock:[n.closed].concat(o),target:p.close}],or:{sid:"-19uuy9"}}),e.sample({and:[{clock:[].concat(o),target:p.cancelled}],or:{sid:"-vk7iv"}})),Object.assign(p,{internal:{setAsyncImport:e=>s=e}})},exports.createRoute=function(a){let n;const t=e.createEffect(async e=>{await f(),await y();const n=a.parent;return n&&await n.internal.openFx({...e??{params:{}},navigate:!1}),e},{name:"openFx",sid:"awhgwd"}),r=e.createStore({},{name:"$params",sid:"-oahffx"}),o=e.createStore(!1,{name:"$isOpened",sid:"-6l68oe"}),s=t.pending,i=e.createEvent({name:"open",sid:"gjsrgc"}),c=e.createEvent({name:"close",sid:"-yagmc8"}),d=e.createEvent({name:"opened",sid:"x0iwhi"}),l=e.createEvent({name:"openedOnServer",sid:"346r3u"}),p=e.createEvent({name:"openedOnClient",sid:"31q95t"}),u=e.createEvent({name:"navigated",sid:"-t30l0x"}),m=e.createEvent({name:"closed",sid:"uue4ce"}),f=e.createEffect(()=>null==n?void 0:n(),{name:"waitForAsyncBundleFx",sid:"-nml5ho"}),y=e.createEffect(async()=>{for(const e of a.beforeOpen??[])await e()},{name:"beforeOpenFx",sid:"-vqlnbm"}),h=e.attach({and:{effect:t},or:{name:"navigatedFx",sid:"a4yadj"}}),g={};return e.sample({and:[{clock:i,target:t}],or:{sid:"ynxuww"}}),e.sample({and:[{clock:u,fn:e=>({navigate:!1,...e}),target:h}],or:{sid:"z28ica"}}),e.sample({and:[{clock:h.doneData,fn:e=>e&&"params"in e?{...e.params}:g,target:r}],or:{sid:"z5j9wg"}}),e.sample({and:[{clock:h.failData,fn:()=>g,target:r}],or:{sid:"-z1vw16"}}),e.split({and:[{source:h.doneData,match:()=>"undefined"==typeof window?"server":"client",cases:{server:l,client:p}}],or:{sid:"-yyl4h0"}}),e.sample({and:[{clock:[p,l],target:d}],or:{sid:"-yhji2t"}}),e.sample({and:[{clock:c,target:m}],or:{sid:"-y38unf"}}),e.sample({and:[{clock:[d.map(()=>!0),m.map(()=>!1)],target:o}],or:{sid:"-y0hvom"}}),{$params:r,$isOpened:o,$isPending:s,open:i,closed:m,opened:d,openedOnClient:p,openedOnServer:l,...a,internal:{navigated:u,close:c,openFx:t,setAsyncImport:e=>n=e},"@@unitShape":()=>({params:r,isPending:s,isOpened:o,onOpen:i})}},exports.createRouter=function(a){const{base:n="/",routes:t}=a,{$path:r,$query:l,back:p,forward:u,navigate:m,setHistory:f,locationUpdated:y}=d(),h=t.map(e=>{let a=e;const t=[];for(t.unshift(a.path);a.parent;)a=a.parent,"/"!==a.path&&t.unshift(a.path);const r="/"===n?t.join(""):[n,...t].join(""),{build:o,parse:d}=function(e){const a=[],n=/:(\w+)(<[\s?\w|]+>)?({\d+\,\d+})?([+*?])?/,t=e.split("/").filter(Boolean);for(let r=0;r<t.length;r++){const o=t[r];if(!o)continue;const s=i(o.match(n));if(!s){a.push({type:"const",name:o,payload:void 0});continue}const{arrayProps:c,genericProps:d,modificator:l,name:p}=s;if(!p)throw new Error(`Invalid path: "${e}". Name for argument must be provided`);const u={type:"parameter",name:p,payload:{required:!0}};switch(d&&"number"===d&&(u.payload.genericProps={type:"number"}),d&&d.includes("|")&&(u.payload.genericProps={type:"union",items:d.split("|")}),l){case"*":u.payload.arrayProps={};break;case"+":u.payload.arrayProps={min:1};break;case"?":u.payload.required=!1}c&&(u.payload.arrayProps={...u.payload.arrayProps,min:c[0],max:c[1]}),a.push(u)}return{parse:s(a),build:c(a)}}(r);return{route:e,path:r,build:o,parse:d}}),g=r.map(e=>{const a=[];if(!e)return a;for(const{route:n,parse:t}of h)t(e)&&a.push(n);return a}),v=e.attach({and:{source:{query:l,path:r},effect:async a=>{let{query:n,path:t}=a;for(const{route:r,parse:o}of h){const a=o(t),[s,i]=[e.scopeBind(r.internal.close),e.scopeBind(r.internal.navigated)];a?i({query:n,params:a.params}):s()}}},or:{name:"openRoutesByPathFx",sid:"-3zl7vq"}});for(const{route:o,build:s}of h)e.sample({and:[{clock:o.internal.openFx.doneData,filter:e=>!1!==(null==e?void 0:e.navigate),fn:e=>({path:s(e&&"params"in e?e.params:void 0),query:(null==e?void 0:e.query)??{},replace:null==e?void 0:e.replace}),target:m}],or:{sid:"exzzqg"}});return e.sample({and:[{clock:y,fn:e=>({path:e.pathname,query:e.query}),target:v}],or:{sid:"ficdn3"}}),{$query:l,$path:r,$activeRoutes:g,back:p,forward:u,navigate:m,routes:t,setHistory:f,mappedRoutes:h,trackQuery:o({$activeRoutes:g,$query:l,navigate:m}),"@@unitShape":()=>({query:l,path:r,activeRoutes:g,onBack:p,onForward:u,onNavigate:m})}},exports.createRouterControls=d,exports.createVirtualRoute=l,exports.group=function(a){const t=l({$isPending:e.withFactory({sid:"-u1putn",fn:()=>n.or(...a.map(e=>e.$isPending)),name:"$isPending",method:"or"})});return e.sample({and:[{clock:a.map(e=>e.$isOpened),filter:e.withFactory({sid:"76kf3k",fn:()=>n.or(...a.map(e=>e.$isOpened)),name:"filter",method:"or"}),fn:()=>{},target:t.open}],or:{sid:"-xmoke0"}}),e.sample({and:[{clock:a.map(e=>e.$isOpened),filter:e.withFactory({sid:"ahvrux",fn:()=>n.not(e.withFactory({sid:"xs5yb9",fn:()=>n.or(...a.map(e=>e.$isOpened)),name:"fn",method:"or"})),name:"filter",method:"not"}),fn:()=>{},target:t.close}],or:{sid:"-x7abrw"}}),t};

package/dist/index.d.ts

@@ -9,23 +9,13 @@ import { Store } from 'effector';
 import { StoreWritable } from 'effector';
 import { Unit } from 'effector';
 import { ValidatePath } from '@argon-router/paths';
-
-declare type AnyParameter = typeof anySymbol;
-
-declare const anySymbol: unique symbol;
-
-declare type ArrayParameter = typeof arraySymbol;
-
-declare const arraySymbol: unique symbol;
+import { z } from 'zod';
+import { ZodType } from 'zod';
 
 declare type BeforeOpenUnit<T> = (T extends void ? EventCallable<void> | EventCallable<OpenPayloadBase> : EventCallable<{
     params: T;
 } & OpenPayloadBase>) | Effect<RouteOpenedPayload<T>, any>;
 
-declare type BooleanParameter = typeof booleanSymbol;
-
-declare const booleanSymbol: unique symbol;
-
 /**
  * @link https://movpushmov.dev/argon-router/core/chain-route.html
  * @param props Chain route props
@@ -67,7 +57,7 @@ declare const booleanSymbol: unique symbol;
  * const postLoadedRoute = chainRoute({ route: authorizedRoute, ... });
  * ```
  */
-export declare function chainRoute<T>(props: ChainRouteProps<T>): VirtualRoute<T>;
+export declare function chainRoute<T>(props: ChainRouteProps<T>): VirtualRoute<RouteOpenedPayload<T>, T>;
 
 declare interface ChainRouteProps<T> {
     route: Route<T>;
@@ -179,7 +169,7 @@ export declare function createRouter(config: RouterConfig): Router;
  */
 export declare function createRouterControls(): RouterControls;
 
-export declare function createVirtualRoute<T>(pending?: Store<boolean>): VirtualRoute<T>;
+export declare function createVirtualRoute<T = void, TransformerResult = void>(options?: VirtualRouteOptions<T, TransformerResult>): VirtualRoute<T, TransformerResult>;
 
 /**
  * @description Create virtual route which opens when some passed routes is opened. Closes if all passed routes are closed.
@@ -199,7 +189,7 @@ export declare function createVirtualRoute<T>(pending?: Store<boolean>): Virtual
  * signUpRoute.close(); // authorizationRoute.$isOpened —> false
  * ```
  */
-export declare function group(routes: Route<any>[]): VirtualRoute<void>;
+export declare function group(routes: Route<any>[]): VirtualRoute<void, void>;
 
 declare type LocationState = {
     path: string;
@@ -212,46 +202,27 @@ export declare type NavigatePayload = {
     replace?: boolean;
 };
 
-declare type NumberParameter = typeof numberSymbol;
-
-declare const numberSymbol: unique symbol;
-
 export declare type OpenPayloadBase = {
     query?: Query;
     replace?: boolean;
 };
 
-export declare const parameters: Parameters_2;
-
-declare type Parameters_2 = {
-    any: AnyParameter;
-    number: NumberParameter;
-    string: StringParameter;
-    array: ArrayParameter;
-    boolean: BooleanParameter;
-};
-
 export declare type Query = Record<string, string | null | Array<string | null>>;
 
-export declare interface QueryTracker<ParametersConfig extends RawConfig> {
-    entered: Event_2<ReadyConfig<ParametersConfig>>;
+export declare interface QueryTracker<ParametersConfig extends ZodType> {
+    entered: Event_2<z.infer<ParametersConfig>>;
     exited: Event_2<void>;
+    enter: EventCallable<z.infer<ParametersConfig>>;
     exit: EventCallable<{
         ignoreParams: string[];
     } | void>;
 }
 
-export declare type QueryTrackerConfig<ParametersConfig extends RawConfig> = {
+export declare type QueryTrackerConfig<ParametersConfig extends ZodType> = {
     forRoutes?: Route<any>[];
     parameters: ParametersConfig;
 };
 
-export declare type RawConfig = Record<string, AnyParameter | ArrayParameter | NumberParameter | StringParameter | BooleanParameter | SupportedPrimitive | SupportedPrimitive[]>;
-
-export declare type ReadyConfig<T extends RawConfig> = {
-    [K in keyof T]: T[K] extends StringParameter ? string : T[K] extends NumberParameter ? number : T[K] extends ArrayParameter ? string[] : T[K] extends AnyParameter ? string | string[] : never;
-};
-
 export declare interface Route<T = void> {
     $params: Store<T>;
     $isOpened: Store<boolean>;
@@ -310,7 +281,7 @@ export declare interface Router {
      * // /team?dialog=team&id=not_number
      * ```
      */
-    trackQuery: <ParametersConfig extends RawConfig>(config: QueryTrackerConfig<ParametersConfig>) => QueryTracker<ParametersConfig>;
+    trackQuery: <ParametersConfig extends ZodType>(config: QueryTrackerConfig<ParametersConfig>) => QueryTracker<ParametersConfig>;
     mappedRoutes: {
         route: Route<any>;
         path: string;
@@ -350,14 +321,16 @@ declare interface RouterControls {
      * @param config Query tacker config
      * @link https://movpushmov.dev/argon-router/core/track-query.html
      * @example ```ts
-     * import { parameters } from '@argon-router/core';
+     * import { z } from 'zod';
      * import { router } from '@shared/router';
      * import { createDialog } from '...';
      *
      * const dialog = createDialog();
      * const tracker = router.trackQuery({
-     *   dialog: 'team-member',
-     *   id: parameters.number,
+     *  parameters: {
+     *    dialog: z.literal('team-member'),
+     *    id: z.cource.number(),
+     *  },
      * });
      *
      * // triggered for:
@@ -370,19 +343,35 @@ declare interface RouterControls {
      * // /team?dialog=team&id=not_number
      * ```
      */
-    trackQuery: <T extends RawConfig>(config: Omit<QueryTrackerConfig<T>, 'forRoutes'>) => QueryTracker<T>;
+    trackQuery: <T extends ZodType>(config: Omit<QueryTrackerConfig<T>, 'forRoutes'>) => QueryTracker<T>;
 }
 
-declare type StringParameter = typeof stringSymbol;
-
-declare const stringSymbol: unique symbol;
-
-declare type SupportedPrimitive = string | number | Date | boolean;
-
-export declare interface VirtualRoute<T = any> extends Route<T> {
-    $params: StoreWritable<T>;
+export declare interface VirtualRoute<T, TransformerResult> {
+    $params: StoreWritable<TransformerResult>;
+    $isOpened: StoreWritable<boolean>;
+    $isPending: Store<boolean>;
+    open: EventCallable<T>;
+    opened: Event_2<T>;
+    openedOnServer: Event_2<T>;
+    openedOnClient: Event_2<T>;
     close: EventCallable<void>;
+    closed: Event_2<void>;
     cancelled: Event_2<void>;
+    path: string;
+    beforeOpen?: Effect<any, any, any>[];
+    '@@unitShape': () => {
+        params: Store<TransformerResult>;
+        isOpened: Store<boolean>;
+        isPending: Store<boolean>;
+        onOpen: EventCallable<T>;
+        onClose: EventCallable<void>;
+    };
+}
+
+declare interface VirtualRouteOptions<T, TransformerResult> {
+    beforeOpen?: Effect<void, any, any>[];
+    $isPending?: Store<boolean>;
+    transformer?: (payload: T) => TransformerResult;
 }
 
 export { }

package/dist/index.js

@@ -1,20 +1,8 @@
-import { createEffect, createStore, createEvent, sample, split, attach, scopeBind, withFactory } from "effector";
+import { createEffect, createStore, createEvent, attach, sample, split, scopeBind, withFactory } from "effector";
 import queryString from "query-string";
 import { or, not } from "patronum";
 function createRoute(config) {
   let asyncImport;
-  const waitForAsyncBundleFx = createEffect(() => asyncImport == null ? void 0 : asyncImport(), {
-    name: "waitForAsyncBundleFx",
-    sid: "1y76ms"
-  });
-  const beforeOpenFx = createEffect(async () => {
-    for (const fx of config.beforeOpen ?? []) {
-      await fx();
-    }
-  }, {
-    name: "beforeOpenFx",
-    sid: "-65tb76"
-  });
   const openFx = createEffect(async (payload) => {
     await waitForAsyncBundleFx();
     await beforeOpenFx();
@@ -30,58 +18,92 @@ function createRoute(config) {
     return payload;
   }, {
     name: "openFx",
-    sid: "p3u4q7"
+    sid: "awhgwd"
   });
   const $params = createStore({}, {
     name: "$params",
-    sid: "-a34rm3"
+    sid: "-oahffx"
   });
   const $isOpened = createStore(false, {
     name: "$isOpened",
-    sid: "7m6f5g"
+    sid: "-6l68oe"
   });
   const $isPending = openFx.pending;
   const open = createEvent({
     name: "open",
-    sid: "ur5fa6"
+    sid: "gjsrgc"
   });
   const close = createEvent({
     name: "close",
-    sid: "-k33yie"
+    sid: "-yagmc8"
   });
   const opened = createEvent({
     name: "opened",
-    sid: "-nt8hns"
+    sid: "x0iwhi"
   });
   const openedOnServer = createEvent({
     name: "openedOnServer",
-    sid: "hbjexo"
+    sid: "346r3u"
   });
   const openedOnClient = createEvent({
     name: "openedOnClient",
-    sid: "h92wzn"
+    sid: "31q95t"
   });
   const navigated = createEvent({
     name: "navigated",
-    sid: "-8amrhe"
+    sid: "-t30l0x"
   });
   const closed = createEvent({
     name: "closed",
-    sid: "-pql6th"
+    sid: "uue4ce"
+  });
+  const waitForAsyncBundleFx = createEffect(() => asyncImport == null ? void 0 : asyncImport(), {
+    name: "waitForAsyncBundleFx",
+    sid: "-nml5ho"
+  });
+  const beforeOpenFx = createEffect(async () => {
+    for (const fx of config.beforeOpen ?? []) {
+      await fx();
+    }
+  }, {
+    name: "beforeOpenFx",
+    sid: "-vqlnbm"
   });
+  const navigatedFx = attach({
+    and: {
+      effect: openFx
+    },
+    or: {
+      name: "navigatedFx",
+      sid: "a4yadj"
+    }
+  });
+  const defaultParams = {};
   sample({
     and: [{
       clock: open,
       target: openFx
     }],
     or: {
-      sid: "ymah4t"
+      sid: "ynxuww"
     }
   });
-  const defaultParams = {};
   sample({
     and: [{
       clock: navigated,
+      fn: (payload) => ({
+        navigate: false,
+        ...payload
+      }),
+      target: navigatedFx
+    }],
+    or: {
+      sid: "z28ica"
+    }
+  });
+  sample({
+    and: [{
+      clock: navigatedFx.doneData,
       fn: (payload) => {
         if (!payload) {
           return defaultParams;
@@ -93,12 +115,22 @@ function createRoute(config) {
       target: $params
     }],
     or: {
-      sid: "z1opqx"
+      sid: "z5j9wg"
+    }
+  });
+  sample({
+    and: [{
+      clock: navigatedFx.failData,
+      fn: () => defaultParams,
+      target: $params
+    }],
+    or: {
+      sid: "-z1vw16"
     }
   });
   split({
     and: [{
-      source: navigated,
+      source: navigatedFx.doneData,
       match: () => typeof window === "undefined" ? "server" : "client",
       cases: {
         server: openedOnServer,
@@ -106,7 +138,7 @@ function createRoute(config) {
       }
     }],
     or: {
-      sid: "-zha4na"
+      sid: "-yyl4h0"
     }
   });
   sample({
@@ -115,7 +147,7 @@ function createRoute(config) {
       target: opened
     }],
     or: {
-      sid: "-z08i93"
+      sid: "-yhji2t"
     }
   });
   sample({
@@ -124,7 +156,7 @@ function createRoute(config) {
       target: closed
     }],
     or: {
-      sid: "-yxhjaa"
+      sid: "-y38unf"
     }
   });
   sample({
@@ -133,7 +165,7 @@ function createRoute(config) {
       target: $isOpened
     }],
     or: {
-      sid: "-yj6vuw"
+      sid: "-y0hvom"
     }
   });
   return {
@@ -160,18 +192,6 @@ function createRoute(config) {
     })
   };
 }
-const anySymbol = Symbol("any");
-const numberSymbol = Symbol("number");
-const stringSymbol = Symbol("string");
-const arraySymbol = Symbol("array");
-const booleanSymbol = Symbol("boolean");
-const parameters = {
-  any: anySymbol,
-  number: numberSymbol,
-  string: stringSymbol,
-  array: arraySymbol,
-  boolean: booleanSymbol
-};
 function isForRouteActive(forRoutes, activeRoutes) {
   for (const route of forRoutes) {
     if (activeRoutes.includes(route)) {
@@ -180,121 +200,6 @@ function isForRouteActive(forRoutes, activeRoutes) {
   }
   return false;
 }
-function isHaveValidParams(query, neededParameters) {
-  for (const key in neededParameters) {
-    const parameterType = neededParameters[key];
-    if (Array.isArray(parameterType) && (!query[key] || JSON.stringify(parameterType) !== query[key])) {
-      return false;
-    }
-    switch (typeof parameterType) {
-      case "number": {
-        if (!query[key] || parameterType.toString() !== query[key]) {
-          return false;
-        }
-        break;
-      }
-      case "object": {
-        if (!query[key] || JSON.stringify(parameterType) !== query[key]) {
-          return false;
-        }
-        break;
-      }
-      case "string": {
-        if (!query[key] || parameterType !== query[key]) {
-          return false;
-        }
-        break;
-      }
-      case "boolean": {
-        if (!query[key] || !["0", "1", "false", "true"].includes(query[key])) {
-          return false;
-        }
-        break;
-      }
-    }
-    switch (parameterType) {
-      case parameters.any: {
-        if (!query[key]) {
-          return false;
-        }
-        break;
-      }
-      case parameters.string: {
-        if (!query[key] || Array.isArray(query[key])) {
-          return false;
-        }
-        break;
-      }
-      case parameters.array: {
-        if (!query[key] || !Array.isArray(query[key])) {
-          return false;
-        }
-        break;
-      }
-      case parameters.number: {
-        if (!query[key] || Array.isArray(query[key]) || isNaN(parseInt(query[key])) && isNaN(parseFloat(query[key]))) {
-          return false;
-        }
-        break;
-      }
-      case parameters.boolean: {
-        if (!query[key] || Array.isArray(query[key]) || !["0", "1", "false", "true"].includes(query[key])) {
-          return false;
-        }
-        break;
-      }
-    }
-  }
-  return true;
-}
-function transformParams(query, neededParameters) {
-  const result = {};
-  for (const key in neededParameters) {
-    const parameterType = neededParameters[key];
-    const data = query[key];
-    if (Array.isArray(parameterType)) {
-      const arrayData = query[key];
-      result[key] = arrayData;
-      continue;
-    }
-    switch (typeof parameterType) {
-      case "number": {
-        result[key] = isNaN(parseInt(data)) ? parseFloat(data) : parseInt(data);
-        break;
-      }
-      case "object": {
-        result[key] = JSON.parse(data);
-        break;
-      }
-      case "string": {
-        result[key] = data;
-      }
-      case "boolean": {
-        result[key] = data === "1" || data === "true";
-        break;
-      }
-    }
-    switch (parameterType) {
-      case parameters.any:
-      case parameters.string:
-      case parameters.array: {
-        result[key] = query[key];
-        break;
-      }
-      case parameters.number: {
-        const data2 = query[key];
-        result[key] = isNaN(parseInt(data2)) ? parseFloat(data2) : parseInt(data2);
-        break;
-      }
-      case parameters.boolean: {
-        const data2 = query[key];
-        result[key] = data2 === "1" || data2 === "true";
-        break;
-      }
-    }
-  }
-  return result;
-}
 function trackQueryControlsFactory(_ref) {
   let {
     $query,
@@ -303,7 +208,7 @@ function trackQueryControlsFactory(_ref) {
   return trackQueryFactory({
     $activeRoutes: createStore([], {
       name: "$activeRoutes",
-      sid: "85ms46"
+      sid: "ni3bf8"
     }),
     $query,
     navigate
@@ -317,28 +222,32 @@ function trackQueryFactory(_ref2) {
   } = _ref2;
   return (config) => {
     const {
-      parameters: parameters2,
+      parameters,
       forRoutes
     } = config;
     const $entered = createStore(false, {
       name: "$entered",
-      sid: "-mo5ecc"
+      sid: "-i5493b"
     });
     const entered = createEvent({
       name: "entered",
-      sid: "kuzfr"
+      sid: "9i8bun"
     });
     const exited = createEvent({
       name: "exited",
-      sid: "-jzwna6"
+      sid: "-p2hcsy"
+    });
+    const enter = createEvent({
+      name: "enter",
+      sid: "30cmky"
     });
     const exit = createEvent({
       name: "exit",
-      sid: "7hfy2r"
+      sid: "-2657ec"
     });
     const changeEntered = createEvent({
       name: "changeEntered",
-      sid: "qh8w6v"
+      sid: "-5jm7r1"
     });
     sample({
       and: [{
@@ -346,7 +255,7 @@ function trackQueryFactory(_ref2) {
         target: $entered
       }],
       or: {
-        sid: "-gf1fe4"
+        sid: "-j6nk9y"
       }
     });
     sample({
@@ -360,18 +269,18 @@ function trackQueryFactory(_ref2) {
             activeRoutes,
             query
           } = _ref3;
-          return (!forRoutes || isForRouteActive(forRoutes, activeRoutes)) && isHaveValidParams(query, parameters2);
+          return (!forRoutes || isForRouteActive(forRoutes, activeRoutes)) && parameters.safeParse(query).success;
         },
         fn: (_ref4) => {
           let {
             query
           } = _ref4;
-          return transformParams(query, parameters2);
+          return parameters.safeParse(query).data;
         },
         target: [entered, changeEntered.prepend(() => true)]
       }],
       or: {
-        sid: "-gcagfb"
+        sid: "-iscwuk"
       }
     });
     sample({
@@ -387,12 +296,30 @@ function trackQueryFactory(_ref2) {
             query,
             entered: entered2
           } = _ref5;
-          return entered2 && !((!forRoutes || isForRouteActive(forRoutes, activeRoutes)) && isHaveValidParams(query, parameters2));
+          return entered2 && !((!forRoutes || isForRouteActive(forRoutes, activeRoutes)) && parameters.safeParse(query).success);
         },
         target: [exited.prepend(() => void 0), changeEntered.prepend(() => false)]
       }],
       or: {
-        sid: "-fvsmmh"
+        sid: "-ibv31q"
+      }
+    });
+    sample({
+      and: [{
+        clock: enter,
+        source: $query,
+        fn: (query, payload) => {
+          return {
+            query: {
+              ...query,
+              ...payload
+            }
+          };
+        },
+        target: navigate
+      }],
+      or: {
+        sid: "-hsmaa3"
       }
     });
     sample({
@@ -418,10 +345,11 @@ function trackQueryFactory(_ref2) {
         target: navigate
       }],
       or: {
-        sid: "-f105e9"
+        sid: "-whgzm0"
       }
     });
     return {
+      enter,
       entered,
       exited,
       exit
@@ -610,8 +538,8 @@ function compile(path) {
     if (!parsedToken) {
       continue;
     }
-    const parameters2 = getTokenParameters(parsedToken.match(regexp));
-    if (!parameters2) {
+    const parameters = getTokenParameters(parsedToken.match(regexp));
+    if (!parameters) {
       tokens.push({
         type: "const",
         name: parsedToken,
@@ -624,7 +552,7 @@ function compile(path) {
       genericProps,
       modificator,
       name
-    } = parameters2;
+    } = parameters;
     if (!name) {
       throw new Error(`Invalid path: "${path}". Name for argument must be provided`);
     }
@@ -982,58 +910,68 @@ function createRouter(config) {
   };
 }
 function createVirtualRoute() {
-  let pending = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : createStore(false, {
-    and: {
-      name: "pending",
-      sid: "r89aiv"
-    },
-    name: "pending",
-    sid: "r89aiv"
-  });
+  let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+  const {
+    beforeOpen,
+    $isPending = createStore(false, {
+      name: "$isPending",
+      sid: "-f18bwu"
+    }),
+    transformer = (payload) => payload ?? null
+  } = options;
   const $params = createStore(null, {
     name: "$params",
-    sid: "-ftspin"
+    sid: "v2ropa"
   });
   const $isOpened = createStore(false, {
     name: "$isOpened",
-    sid: "-v6936c"
+    sid: "mzzqqr"
   });
-  const $isPending = pending;
   const open = createEvent({
     name: "open",
-    sid: "juc47v"
+    sid: "f33vnd"
   });
   const opened = createEvent({
     name: "opened",
-    sid: "-quc8vc"
+    sid: "-efpvez"
   });
   const openedOnServer = createEvent({
     name: "openedOnServer",
-    sid: "n25rh4"
+    sid: "o8st20"
   });
   const openedOnClient = createEvent({
     name: "openedOnClient",
-    sid: "-auqikx"
+    sid: "xaagqn"
   });
   const close = createEvent({
     name: "close",
-    sid: "4zlqo6"
+    sid: "-20upkw"
   });
   const closed = createEvent({
     name: "closed",
-    sid: "wbpfrk"
+    sid: "avevxu"
   });
   const cancelled = createEvent({
     name: "cancelled",
-    sid: "-q3x5sf"
+    sid: "808tq5"
   });
   sample({
     and: [{
       clock: open,
-      target: opened
+      target: [opened]
+    }],
+    or: {
+      sid: "p3r2ad"
+    }
+  });
+  sample({
+    and: [{
+      clock: open,
+      fn: transformer,
+      target: $params
     }],
     or: {
-      sid: "-u8b34x"
+      sid: "p6i196"
     }
   });
   split({
@@ -1046,7 +984,7 @@ function createVirtualRoute() {
       }
     }],
     or: {
-      sid: "-u5k464"
+      sid: "plch9x"
     }
   });
   sample({
@@ -1055,7 +993,7 @@ function createVirtualRoute() {
       target: closed
     }],
     or: {
-      sid: "-tp2ada"
+      sid: "q1ub2r"
     }
   });
   sample({
@@ -1064,7 +1002,7 @@ function createVirtualRoute() {
       target: $isOpened
     }],
     or: {
-      sid: "-tarmxw"
+      sid: "q4la1k"
     }
   });
   return {
@@ -1078,13 +1016,14 @@ function createVirtualRoute() {
     close,
     closed,
     cancelled,
-    // @ts-expect-error emulated path for virtual route
-    path: null,
+    path: "",
+    beforeOpen,
     "@@unitShape": () => ({
       params: $params,
       isOpened: $isOpened,
       isPending: $isPending,
-      onOpen: open
+      onOpen: open,
+      onClose: close
     })
   };
 }
@@ -1098,7 +1037,7 @@ function chainRoute(props) {
   let asyncImport;
   const waitForAsyncBundleFx = createEffect(() => asyncImport == null ? void 0 : asyncImport(), {
     name: "waitForAsyncBundleFx",
-    sid: "-tvp99n"
+    sid: "qdkcuo"
   });
   const openFx = createEffect(async (payload) => {
     await waitForAsyncBundleFx();
@@ -1107,47 +1046,46 @@ function chainRoute(props) {
     }
   }, {
     name: "openFx",
-    sid: "-9kc1je"
+    sid: "-fwntqy"
+  });
+  const transformer = (payload) => {
+    if (!payload) {
+      return null;
+    }
+    return "params" in payload ? payload.params : null;
+  };
+  const virtualRoute = createVirtualRoute({
+    transformer
   });
-  const virtualRoute = createVirtualRoute(openFx.pending);
   sample({
     and: [{
       clock: route.opened,
       target: openFx
     }],
     or: {
-      sid: "1162lk"
+      sid: "-s9xf6p"
     }
   });
   sample({
     and: [{
       clock: route.opened,
-      fn: (payload) => payload && "params" in payload ? payload.params : null,
+      fn: transformer,
       target: virtualRoute.$params
     }],
     or: {
-      sid: "13x1kd"
+      sid: "-1u78yc"
     }
   });
   if (openOn) {
     sample({
       and: [{
         clock: openOn,
-        source: {
-          params: virtualRoute.$params
-        },
-        fn: (_ref) => {
-          let {
-            params
-          } = _ref;
-          return {
-            params
-          };
-        },
+        source: virtualRoute.$params,
+        fn: (params) => params,
         target: virtualRoute.open
       }],
       or: {
-        sid: "1kevex"
+        sid: "-1qcor3"
       }
     });
   }
@@ -1158,7 +1096,7 @@ function chainRoute(props) {
         target: virtualRoute.close
       }],
       or: {
-        sid: "20wp7r"
+        sid: "-19uuy9"
       }
     });
     sample({
@@ -1167,7 +1105,7 @@ function chainRoute(props) {
         target: virtualRoute.cancelled
       }],
       or: {
-        sid: "2f7cn5"
+        sid: "-vk7iv"
       }
     });
   }
@@ -1178,18 +1116,19 @@ function chainRoute(props) {
   });
 }
 function group(routes) {
-  const $isPending = withFactory({
-    sid: "-uirglg",
-    fn: () => or(...routes.map((route) => route.$isPending)),
-    name: "$isPending",
-    method: "or"
+  const virtual = createVirtualRoute({
+    $isPending: withFactory({
+      sid: "-u1putn",
+      fn: () => or(...routes.map((route) => route.$isPending)),
+      name: "$isPending",
+      method: "or"
+    })
   });
-  const virtual = createVirtualRoute($isPending);
   sample({
     and: [{
       clock: routes.map((route) => route.$isOpened),
       filter: withFactory({
-        sid: "6pispd",
+        sid: "76kf3k",
         fn: () => or(...routes.map((route) => route.$isOpened)),
         name: "filter",
         method: "or"
@@ -1198,16 +1137,16 @@ function group(routes) {
       target: virtual.open
     }],
     or: {
-      sid: "-xn8czd"
+      sid: "-xmoke0"
     }
   });
   sample({
     and: [{
       clock: routes.map((route) => route.$isOpened),
       filter: withFactory({
-        sid: "a0u5gq",
+        sid: "ahvrux",
         fn: () => not(withFactory({
-          sid: "xb4bx2",
+          sid: "xs5yb9",
           fn: () => or(...routes.map((route) => route.$isOpened)),
           name: "fn",
           method: "or"
@@ -1219,7 +1158,7 @@ function group(routes) {
       target: virtual.close
     }],
     or: {
-      sid: "-x7u4d9"
+      sid: "-x7abrw"
     }
   });
   return virtual;
@@ -1230,6 +1169,5 @@ export {
   createRouter,
   createRouterControls,
   createVirtualRoute,
-  group,
-  parameters
+  group
 };

package/package.json

@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "private": false,
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Router with power of effector",
   "keywords": [
     "effector",
@@ -49,10 +49,11 @@
   },
   "devDependencies": {
     "@types/history": "^4.7.11",
-    "query-string": "^9.1.1"
+    "query-string": "^9.1.1",
+    "zod": "^3.25.71"
   },
   "dependencies": {
-    "@argon-router/paths": "^0.10.0"
+    "@argon-router/paths": "^0.11.0"
   },
-  "gitHead": "7f8d946c9b6d11a4a828bdf2bafcf012970aa4d7"
+  "gitHead": "0180f75dbbc73a123e706ff48961f8e57d57ce65"
 }