@argon-router/core 0.12.0 → 1.0.0-rc.0

package/LICENSE.MD

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Edward Gigolaev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -2,9 +2,6 @@
 
 Router without a headache
 
-> [!WARNING]
-> argon-router is not production ready yet and still may have bugs and unstable API. If you found bug — please report it on GitHub.
-
 ## Documentation
 
 For additional information, guides and api reference visit [documentation site](https://movpushmov.dev/argon-router/)

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("effector"),t=require("effector-action"),a=require("@argon-router/paths"),n=require("query-string"),r=require("patronum");function o(e,t){for(const a of e)if(t.includes(a))return!0;return!1}function s(t){let{$query:a,navigate:n}=t;return c({$activeRoutes:e.createStore([],{name:"$activeRoutes",sid:"og6k7m"}),$query:a,navigate:n})}function c(t){let{$activeRoutes:a,$query:n,navigate:r}=t;return t=>{const{parameters:s,forRoutes:c}=t,i=e.createStore(!1,{name:"$entered",sid:"-792y0u"}),p=e.createEvent({name:"entered",sid:"agbkn1"}),d=e.createEvent({name:"exited",sid:"-o4e40k"}),u=e.createEvent({name:"enter",sid:"3yfvdc"}),l=e.createEvent({name:"exit",sid:"-181yly"}),m=e.createEvent({name:"changeEntered",sid:"-4liyyn"});return e.sample({and:[{clock:m,target:i}],or:{sid:"-iu0amn"}}),e.sample({and:[{source:{activeRoutes:a,query:n},filter:e=>{let{activeRoutes:t,query:a}=e;return(!c||o(c,t))&&s.safeParse(a).success},fn:e=>{let{query:t}=e;return s.safeParse(t).data},target:[p,m.prepend(()=>!0)]}],or:{sid:"-ir9bnu"}}),e.sample({and:[{source:{activeRoutes:a,query:n,entered:i},filter:e=>{let{activeRoutes:t,query:a,entered:n}=e;return n&&!((!c||o(c,t))&&s.safeParse(a).success)},target:[d.prepend(()=>{}),m.prepend(()=>!1)]}],or:{sid:"-iarhv0"}}),e.sample({and:[{clock:u,source:n,fn:(e,t)=>({query:{...e,...t}}),target:r}],or:{sid:"-hqywi0"}}),e.sample({and:[{clock:l,source:n,fn:(e,t)=>{if(t&&t.ignoreParams){const a={};for(const n of t.ignoreParams)e[n]&&(a[n]=e[n]);return{query:a}}return{query:{}}},target:r}],or:{sid:"-wf9t8k"}}),{enter:u,entered:p,exited:d,exit:l}}}function i(){const a=e.createStore(null,{and:{serialize:"ignore"},name:"$history",sid:"-kw5zle"}),r=e.createStore({query:{},path:null},{name:"$locationState",sid:"-2xxend"}),o=e.createStore(null,{name:"$subscription",sid:"27a2zr"}),c=r.map(e=>e.query),i=r.map(e=>e.path),p=e.createEvent({name:"setHistory",sid:"-lxcw7e"}),d=e.createEvent({name:"navigate",sid:"w56grv"}),u=e.createEvent({name:"back",sid:"es7z4z"}),l=e.createEvent({name:"forward",sid:"12ktc8"}),m=e.createEvent({name:"locationUpdated",sid:"yd7e16"}),f=e.attach({and:{source:a,effect:(e,t)=>{let{path:a,query:r,replace:o}=t;if(!e)throw new Error("history not found");const s={pathname:a,search:`?${n.stringify(r)}`};o?e.replace(s):e.push(s)}},or:{name:"navigateFx",sid:"-m0s7a1"}}),h=t.createAsyncAction({target:{locationUpdated:m,$subscription:o},source:{$subscription:o},fn:async(e,t,a)=>{if(!a)throw Error("Cannot initialize router controls with empty history adapter. Please provide some provider or check your code for passing of nullable value");const r=await t();r.subscription&&r.subscription.unsubscribe(),e.locationUpdated({pathname:a.location.pathname,query:{...n.parse(a.location.search)}}),e.$subscription(a.listen(t=>{e.locationUpdated({pathname:t.pathname,query:{...n.parse(t.search)}})}))}}),g=e.attach({and:{source:a,effect:e=>{if(!e)throw new Error("history not found");e.goBack()}},or:{name:"goBackFx",sid:"k3gxue"}}),y=e.attach({and:{source:a,effect:e=>{if(!e)throw new Error("history not found");e.goForward()}},or:{name:"goForwardFx",sid:"1m1c40"}});return e.sample({and:[{clock:p,target:a}],or:{sid:"1ycdhl"}}),e.sample({and:[{clock:a,filter:Boolean,target:h}],or:{sid:"213cge"}}),e.sample({and:[{clock:m,fn:e=>({path:e.pathname,query:e.query}),target:r}],or:{sid:"2fxsh5"}}),e.sample({and:[{clock:d,source:i,fn:(e,t)=>({path:e,...t}),target:f}],or:{sid:"2wfm9z"}}),e.sample({and:[{clock:u,target:g}],or:{sid:"3btuw3"}}),e.sample({and:[{clock:l,target:y}],or:{sid:"3ektuw"}}),{$history:a,$locationState:r,$query:c,$path:i,setHistory:p,navigate:d,back:u,forward:l,locationUpdated:m,trackQuery:s({$query:c,navigate:d})}}const p={route:e=>p.pathRoute(e)||p.pathlessRoute(e),pathRoute:e=>"object"==typeof e&&null!==e&&"@@type"in e&&"path-route"===e["@@type"],pathlessRoute:e=>"object"==typeof e&&null!==e&&"@@type"in e&&"pathless-route"===e["@@type"],router:e=>"object"==typeof e&&null!==e&&"@@type"in e&&"router"===e["@@type"]},d={pathlessRoute:e=>"route"in e,pathRoute(e){return!this.pathlessRoute(e)&&!this.router(e)},router:e=>p.router(e)};function u(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};const{beforeOpen:a,$isPending:n=e.createStore(!1,{name:"$isPending",sid:"-f18bwu"}),transformer:r=e=>e??null}=t,o=e.createStore(null,{name:"$params",sid:"v2ropa"}),s=e.createStore(!1,{name:"$isOpened",sid:"mzzqqr"}),c=e.createEvent({name:"open",sid:"f33vnd"}),i=e.createEvent({name:"opened",sid:"-efpvez"}),p=e.createEvent({name:"openedOnServer",sid:"o8st20"}),d=e.createEvent({name:"openedOnClient",sid:"xaagqn"}),u=e.createEvent({name:"close",sid:"-20upkw"}),l=e.createEvent({name:"closed",sid:"avevxu"}),m=e.createEvent({name:"cancelled",sid:"808tq5"});return e.sample({and:[{clock:c,target:[i]}],or:{sid:"p3r2ad"}}),e.sample({and:[{clock:c,fn:r,target:o}],or:{sid:"p6i196"}}),e.split({and:[{source:i,match:()=>"undefined"==typeof window?"server":"client",cases:{server:p,client:d}}],or:{sid:"plch9x"}}),e.sample({and:[{clock:u,target:l}],or:{sid:"q1ub2r"}}),e.sample({and:[{clock:[i.map(()=>!0),l.map(()=>!1)],target:s}],or:{sid:"q4la1k"}}),{"@@type":"pathless-route",$params:o,$isOpened:s,$isPending:n,open:c,opened:i,openedOnClient:d,openedOnServer:p,close:u,closed:l,cancelled:m,path:"",beforeOpen:a,"@@unitShape":()=>({params:o,isOpened:s,isPending:n,onOpen:c,onClose:u})}}function l(e){const t=new URL(decodeURIComponent(e.search));return{pathname:t.pathname,search:t.search,hash:t.hash}}exports.chainRoute=function(t){const{route:a,beforeOpen:n,openOn:r,cancelOn:o}=t;let s;const c=e.createEffect(()=>null==s?void 0:s(),{name:"waitForAsyncBundleFx",sid:"t7u37u"}),i=e.createEffect(async e=>{await c();for(const t of[].concat(n))await t(e)},{name:"openFx",sid:"-34g13p"}),p=e=>e&&"params"in e?e.params:{},d=u({transformer:p});return e.sample({and:[{clock:a.opened,target:i}],or:{sid:"-1tngcz"}}),e.sample({and:[{clock:a.opened,fn:p,target:d.$params}],or:{sid:"-1qwhe6"}}),r&&e.sample({and:[{clock:r,source:d.$params,fn:e=>({params:e}),target:d.open}],or:{sid:"-1bi8qc"}}),o&&(e.sample({and:[{clock:[a.closed].concat(o),target:d.close}],or:{sid:"-v0exi"}}),e.sample({and:[{clock:[].concat(o),target:d.cancelled}],or:{sid:"-s9fyp"}})),Object.assign(d,{internal:{setAsyncImport:e=>s=e}})},exports.createRoute=function(){let a,n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};const r=n.beforeOpen??[],o=e.createEffect(async e=>{await v(),await k();const t=n.parent;return t&&await t.internal.openFx({...e??{params:{}},navigate:!1}),e},{name:"openFx",sid:"sf5hhk"}),s=e.createEffect(async e=>{const t=n.parent;return t&&await t.internal.forceOpenParentFx({...e??{params:{}},navigate:!1}),e},{name:"forceOpenParentFx",sid:"acd7wj"}),c=e.attach({and:{effect:o},or:{name:"navigatedFx",sid:"ci6eci"}}),i=e.createStore({},{name:"$params",sid:"p3bnh9"}),p=e.createStore(!1,{name:"$isOpened",sid:"o5kkev"}),d=o.pending,u=e.createEvent({name:"open",sid:"-bhgc3p"}),l=e.createEvent({name:"close",sid:"vypd6z"}),m=e.createEvent({name:"opened",sid:"-uyucke"}),f=e.createEvent({name:"openedOnServer",sid:"mewjoi"}),h=e.createEvent({name:"openedOnClient",sid:"63cfjt"}),g=e.createEvent({name:"navigated",sid:"mycajg"}),y=e.createEvent({name:"closed",sid:"5idv7d"}),v=e.createEffect(()=>null==a?void 0:a(),{name:"waitForAsyncBundleFx",sid:"-6s0q41"}),k=e.createEffect(async()=>{for(const e of r)await e()},{name:"beforeOpenFx",sid:"7f9gfq"}),w={};return e.sample({and:[{clock:u,target:o}],or:{sid:"-yxhjaa"}}),e.sample({and:[{clock:g,fn:e=>({navigate:!1,...e}),target:c}],or:{sid:"-yj6vuw"}}),e.sample({and:[{clock:c.done,fn:e=>{let{params:t}=e;return t},target:s}],or:{sid:"-yfw4aq"}}),t.createAction({clock:[c.doneData,s.doneData],target:{$params:i},fn:(e,t)=>t?e.$params("params"in t?{...t.params}:w):e.$params(w)}),e.sample({and:[{clock:c.failData,fn:()=>w,target:i}],or:{sid:"-xhsvic"}}),t.createAction({clock:[c.doneData,s.doneData],target:{openedOnServer:f,openedOnClient:h},fn:(e,t)=>"undefined"==typeof window?e.openedOnServer(t):e.openedOnClient(t)}),e.sample({and:[{clock:[h,f],target:m}],or:{sid:"-w72d2n"}}),e.sample({and:[{clock:l,target:y}],or:{sid:"-w4be3u"}}),e.sample({and:[{clock:[m.map(()=>!0),y.map(()=>!1)],target:p}],or:{sid:"-ls2oed"}}),{$params:i,$isOpened:p,$isPending:d,open:u,closed:y,opened:m,openedOnClient:h,openedOnServer:f,...n,internal:{navigated:g,close:l,openFx:o,forceOpenParentFx:s,setAsyncImport:e=>a=e},"@@unitShape":()=>({params:i,isPending:d,isOpened:p,onOpen:u})}},exports.createRouter=function(n){const{base:r="/",routes:o}=n,{$path:s,$query:u,$history:l,back:m,forward:f,navigate:h,setHistory:g,locationUpdated:y}=n.controls??i();function v(e){return"/"===r?e:"/"===e?r:`${r}${e}`}const k=e.createEvent({name:"connectToParentRouter",sid:"t0jaae"});let w=null;const $=[];function b(t){if(d.pathlessRoute(t)){const{build:e,parse:n}=a.compile(v(t.path));return{route:t.route,path:t.path,build:e,parse:n}}if(d.router(t))return e.sample({and:[{clock:g,target:t.setHistory}],or:{sid:"ez3kyw"}}),null;let n=t;const r=[];for(r.unshift(n.path);n.parent&&!p.pathlessRoute(n.parent);)n=n.parent,"/"!==n.path&&r.unshift(n.path);const o=v(r.join("")),{build:s,parse:c}=a.compile(o);return{route:t,path:o,build:s,parse:c}}const q=o.reduce((e,t)=>{const a=b(t);return a&&($.push(a),e.push(a)),d.router(t)&&$.push(...t.knownRoutes),e},[]),x=s.map(e=>{const t=[];if(!e)return t;for(const{route:a,parse:n}of q)n(e)&&t.push(a);return t}),R=e.attach({and:{source:{query:u,path:s},effect:async t=>{let{query:a,path:n}=t;for(const{route:r,parse:o}of q){const t=o(n),[s,c]=[e.scopeBind(r.internal.close),e.scopeBind(r.internal.navigated)];t?c({query:a,params:t.params}):s()}}},or:{name:"openRoutesByPathFx",sid:"-bl0nuq"}});function O(e){let{route:a,build:n}=e;t.createAction({clock:a.internal.openFx.doneData,target:{navigate:h},fn:(e,t)=>{if(!1===(null==t?void 0:t.navigate))return;const a={path:n(t&&"params"in t?t.params:void 0),query:(null==t?void 0:t.query)??{},replace:null==t?void 0:t.replace};return e.navigate(a)}})}for(const e of q)O(e);return e.sample({and:[{clock:y,fn:e=>({path:e.pathname,query:e.query}),target:R}],or:{sid:"ukhip5"}}),{"@@type":"router",$query:u,$path:s,$history:l,$activeRoutes:x,back:m,forward:f,navigate:h,setHistory:g,ownRoutes:q,knownRoutes:$,internal:{connectToParentRouter:k,get parent(){return w},set parent(e){w=e},base:r},trackQuery:c({$activeRoutes:x,$query:u,navigate:h}),registerRoute:e=>{const t=b(e);t&&($.push(t),q.push(t),O(t)),d.router(e)&&$.push(...e.knownRoutes)},"@@unitShape":()=>({query:u,path:s,activeRoutes:x,onBack:m,onForward:f,onNavigate:h})}},exports.createRouterControls=i,exports.createVirtualRoute=u,exports.group=function(t){const a=u({$isPending:e.withFactory({sid:"-u1putn",fn:()=>r.or(...t.map(e=>e.$isPending)),name:"$isPending",method:"or"})});return e.sample({and:[{clock:t.map(e=>e.$isOpened),filter:e.withFactory({sid:"76kf3k",fn:()=>r.or(...t.map(e=>e.$isOpened)),name:"filter",method:"or"}),fn:()=>{},target:a.open}],or:{sid:"-xmoke0"}}),e.sample({and:[{clock:t.map(e=>e.$isOpened),filter:e.withFactory({sid:"ahvrux",fn:()=>r.not(e.withFactory({sid:"xs5yb9",fn:()=>r.or(...t.map(e=>e.$isOpened)),name:"fn",method:"or"})),name:"filter",method:"not"}),fn:()=>{},target:a.close}],or:{sid:"-x7abrw"}}),a},exports.historyAdapter=function(e){return{location:e.location,push:e.push.bind(e),replace:e.replace.bind(e),goBack:e.back.bind(e),goForward:e.forward.bind(e),listen:t=>{const a=e.listen(e=>{let{location:a}=e;return t(a)});return Object.assign(a,{unsubscribe:a})}}},exports.is=p,exports.queryAdapter=function(e){return{location:l(e.location),push:t=>{if("string"==typeof t){const a=new URL(e.location.pathname);a.search=t,e.push(a.toString())}else{const a=new URL(e.location.pathname);a.search=`${t.pathname??""}${t.search??""}${t.hash??""}`,e.push(a.toString())}},replace:t=>{if("string"==typeof t){const a=new URL(e.location.pathname);a.search=t,e.replace(a.toString())}else{const a=new URL(e.location.pathname);a.search=`${t.pathname??""}${t.search??""}${t.hash??""}`,e.replace(a.toString())}},goBack:()=>{e.back()},goForward:()=>{e.forward()},listen:t=>{const a=e.listen(e=>{let{location:a}=e;return t(l(a))});return Object.assign(a,{unsubscribe:a})}}};
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("effector"),D=require("effector-action"),K=require("@argon-router/paths"),C=require("query-string"),A=require("patronum");function L(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable})),n.push.apply(n,o)}return n}function R(e){for(var t=1;t<arguments.length;t++){var n=arguments[t]!=null?arguments[t]:{};t%2?L(Object(n),!0).forEach(function(o){G(e,o,n[o])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):L(Object(n)).forEach(function(o){Object.defineProperty(e,o,Object.getOwnPropertyDescriptor(n,o))})}return e}function G(e,t,n){return(t=J(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function J(e){var t=X(e,"string");return typeof t=="symbol"?t:t+""}function X(e,t){if(typeof e!="object"||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var o=n.call(e,t);if(typeof o!="object")return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return(t==="string"?String:Number)(e)}function Y(){var e;let t=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},n;const o=(e=t.beforeOpen)!==null&&e!==void 0?e:[],c=r.createEffect(async l=>{await b(),await x();const O=t.parent;return O&&await O.internal.openFx(R(R({},l??{params:{}}),{},{navigate:!1})),l},{name:"openFx",sid:"sf5hhk"}),s=r.createEffect(async l=>{const O=t.parent;return O&&await O.internal.forceOpenParentFx(R(R({},l??{params:{}}),{},{navigate:!1})),l},{name:"forceOpenParentFx",sid:"acd7wj"}),m=r.attach({and:{effect:c},or:{name:"navigatedFx",sid:"ci6eci"}}),g=r.createStore({},{name:"$params",sid:"p3bnh9"}),y=r.createStore(!1,{name:"$isOpened",sid:"o5kkev"}),d=c.pending,p=r.createEvent({name:"open",sid:"-bhgc3p"}),k=r.createEvent({name:"close",sid:"vypd6z"}),w=r.createEvent({name:"opened",sid:"-uyucke"}),j=r.createEvent({name:"openedOnServer",sid:"mewjoi"}),a=r.createEvent({name:"openedOnClient",sid:"63cfjt"}),u=r.createEvent({name:"navigated",sid:"mycajg"}),v=r.createEvent({name:"closed",sid:"5idv7d"}),b=r.createEffect(()=>{var l;return(l=n)===null||l===void 0?void 0:l()},{name:"waitForAsyncBundleFx",sid:"-6s0q41"}),x=r.createEffect(async()=>{for(const l of o)await l()},{name:"beforeOpenFx",sid:"7f9gfq"}),F={};return r.sample({and:[{clock:p,target:c}],or:{sid:"-yxhjaa"}}),r.sample({and:[{clock:u,fn:l=>R({navigate:!1},l),target:m}],or:{sid:"-yj6vuw"}}),r.sample({and:[{clock:m.done,fn:l=>{let{params:O}=l;return O},target:s}],or:{sid:"-yfw4aq"}}),r.withFactory({sid:"-y11o9z",fn:()=>D.createAction({clock:s.doneData,target:{$params:g},fn:(l,O)=>O?l.$params("params"in O?R({},O.params):F):l.$params(F)}),name:"none",method:"createAction"}),r.sample({and:[{clock:m.failData,fn:()=>F,target:g}],or:{sid:"-xhsvic"}}),r.withFactory({sid:"-x2yfhl",fn:()=>D.createAction({clock:s.doneData,target:{openedOnServer:j,openedOnClient:a},fn:(l,O)=>typeof window>"u"?l.openedOnServer(O):l.openedOnClient(O)}),name:"none",method:"createAction"}),r.sample({and:[{clock:[a,j],target:w}],or:{sid:"-w72d2n"}}),r.sample({and:[{clock:k,target:v}],or:{sid:"-w4be3u"}}),r.sample({and:[{clock:[w.map(()=>!0),v.map(()=>!1)],target:y}],or:{sid:"-ls2oed"}}),R(R({$params:g,$isOpened:y,$isPending:d,open:p,closed:v,opened:w,openedOnClient:a,openedOnServer:j},t),{},{internal:{navigated:u,close:k,openFx:c,forceOpenParentFx:s,setAsyncImport:l=>n=l},"@@unitShape":()=>({params:g,isPending:d,isOpened:y,onOpen:p})})}function T(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable})),n.push.apply(n,o)}return n}function N(e){for(var t=1;t<arguments.length;t++){var n=arguments[t]!=null?arguments[t]:{};t%2?T(Object(n),!0).forEach(function(o){Z(e,o,n[o])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):T(Object(n)).forEach(function(o){Object.defineProperty(e,o,Object.getOwnPropertyDescriptor(n,o))})}return e}function Z(e,t,n){return(t=ee(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function ee(e){var t=te(e,"string");return typeof t=="symbol"?t:t+""}function te(e,t){if(typeof e!="object"||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var o=n.call(e,t);if(typeof o!="object")return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return(t==="string"?String:Number)(e)}function U(e,t){for(const n of e)if(t.includes(n))return!0;return!1}function ne(e){let{$query:t,navigate:n}=e;return V({$activeRoutes:r.createStore([],{name:"$activeRoutes",sid:"og6k7m"}),$query:t,navigate:n})}function V(e){let{$activeRoutes:t,$query:n,navigate:o}=e;return c=>{const{check:s,parameters:m,forRoutes:g}=c,y=r.createStore(!1,{name:"$entered",sid:"-792y0u"}),d=r.createEvent({name:"entered",sid:"agbkn1"}),p=r.createEvent({name:"exited",sid:"-o4e40k"}),k=r.createEvent({name:"enter",sid:"3yfvdc"}),w=r.createEvent({name:"exit",sid:"-181yly"}),j=r.createEvent({name:"changeEntered",sid:"-4liyyn"});return r.sample({and:[{clock:j,target:y}],or:{sid:"-iu0amn"}}),s?r.sample({and:[{clock:s,source:{activeRoutes:t,query:n},filter:a=>{let{activeRoutes:u,query:v}=a;return(!g||U(g,u))&&m.safeParse(v).success},fn:a=>{let{query:u}=a;return m.safeParse(u).data},target:[d,j.prepend(()=>!0)]}],or:{sid:"-iqpj0r"}}):r.sample({and:[{source:{activeRoutes:t,query:n},filter:a=>{let{activeRoutes:u,query:v}=a;return(!g||U(g,u))&&m.safeParse(v).success},fn:a=>{let{query:u}=a;return m.safeParse(u).data},target:[d,j.prepend(()=>!0)]}],or:{sid:"-i9nwmk"}}),r.sample({and:[{source:{activeRoutes:t,query:n,entered:y},filter:a=>{let{activeRoutes:u,query:v,entered:b}=a;return b&&!((!g||U(g,u))&&m.safeParse(v).success)},target:[p.prepend(()=>{}),j.prepend(()=>!1)]}],or:{sid:"-hsmaa3"}}),r.sample({and:[{clock:k,source:n,fn:(a,u)=>({query:N(N({},a),u)}),target:o}],or:{sid:"-w2mjl9"}}),r.sample({and:[{clock:w,source:n,fn:(a,u)=>{if(u&&u.ignoreParams){const v={};for(const b of u.ignoreParams)a[b]&&(v[b]=a[b]);return{query:v}}return{query:{}}},target:o}],or:{sid:"-vlkx72"}}),{enter:k,entered:d,exited:p,exit:w}}}function _(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable})),n.push.apply(n,o)}return n}function I(e){for(var t=1;t<arguments.length;t++){var n=arguments[t]!=null?arguments[t]:{};t%2?_(Object(n),!0).forEach(function(o){re(e,o,n[o])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):_(Object(n)).forEach(function(o){Object.defineProperty(e,o,Object.getOwnPropertyDescriptor(n,o))})}return e}function re(e,t,n){return(t=oe(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function oe(e){var t=ae(e,"string");return typeof t=="symbol"?t:t+""}function ae(e,t){if(typeof e!="object"||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var o=n.call(e,t);if(typeof o!="object")return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return(t==="string"?String:Number)(e)}function M(){const e=r.createStore(null,{and:{serialize:"ignore"},name:"$history",sid:"-kw5zle"}),t=r.createStore({query:{},path:null},{name:"$locationState",sid:"-2xxend"}),n=r.createStore(null,{name:"$subscription",sid:"27a2zr"}),o=t.map(a=>a.query),c=t.map(a=>a.path),s=r.createEvent({name:"setHistory",sid:"-lxcw7e"}),m=r.createEvent({name:"navigate",sid:"w56grv"}),g=r.createEvent({name:"back",sid:"es7z4z"}),y=r.createEvent({name:"forward",sid:"12ktc8"}),d=r.createEvent({name:"locationUpdated",sid:"yd7e16"}),p=r.attach({and:{source:e,effect:(a,u)=>{let{path:v,query:b,replace:x}=u;if(!a)throw new Error("history not found");const F={pathname:v,search:"?".concat(C.stringify(b))};x?a.replace(F):a.push(F)}},or:{name:"navigateFx",sid:"-m0s7a1"}}),k=r.withFactory({sid:"-jbr50m",fn:()=>D.createAsyncAction({target:{locationUpdated:d,$subscription:n},source:{$subscription:n},fn:async(a,u,v)=>{if(!v)throw Error("Cannot initialize router controls with empty history adapter. Please provide some provider or check your code for passing of nullable value");const b=await u();b.subscription&&b.subscription.unsubscribe(),a.locationUpdated({pathname:v.location.pathname,query:I({},C.parse(v.location.search))}),a.$subscription(v.listen(x=>{a.locationUpdated({pathname:x.pathname,query:I({},C.parse(x.search))})}))}}),name:"subscribeHistoryFx",method:"createAsyncAction"}),w=r.attach({and:{source:e,effect:a=>{if(!a)throw new Error("history not found");a.goBack()}},or:{name:"goBackFx",sid:"k3gxue"}}),j=r.attach({and:{source:e,effect:a=>{if(!a)throw new Error("history not found");a.goForward()}},or:{name:"goForwardFx",sid:"1m1c40"}});return r.sample({and:[{clock:s,target:e}],or:{sid:"1ycdhl"}}),r.sample({and:[{clock:e,filter:Boolean,target:k}],or:{sid:"213cge"}}),r.sample({and:[{clock:d,fn:a=>({path:a.pathname,query:a.query}),target:t}],or:{sid:"2fxsh5"}}),r.sample({and:[{clock:m,source:c,fn:(a,u)=>I({path:a},u),target:p}],or:{sid:"2wfm9z"}}),r.sample({and:[{clock:g,target:w}],or:{sid:"3btuw3"}}),r.sample({and:[{clock:y,target:j}],or:{sid:"3ektuw"}}),{$history:e,$locationState:t,$query:o,$path:c,setHistory:s,navigate:m,back:g,forward:y,locationUpdated:d,trackQuery:ne({$query:o,navigate:m})}}const $={route(e){return $.pathRoute(e)||$.pathlessRoute(e)},pathRoute(e){return typeof e=="object"&&e!==null&&"@@type"in e&&e["@@type"]==="path-route"},pathlessRoute(e){return typeof e=="object"&&e!==null&&"@@type"in e&&e["@@type"]==="pathless-route"},router(e){return typeof e=="object"&&e!==null&&"@@type"in e&&e["@@type"]==="router"}},B={pathlessRoute(e){return"route"in e},pathRoute(e){return!this.pathlessRoute(e)&&!this.router(e)},router(e){return $.router(e)}};function ce(e){var t;const{base:n="/",routes:o}=e,{$path:c,$query:s,$history:m,back:g,forward:y,navigate:d,setHistory:p,locationUpdated:k}=(t=e.controls)!==null&&t!==void 0?t:M();function w(i){return n==="/"?i:i==="/"?n:"".concat(n).concat(i)}const j=r.createEvent({name:"connectToParentRouter",sid:"t0jaae"});let a=null;const u=[];function v(i){if(B.pathlessRoute(i)){const{build:z,parse:W}=K.compile(w(i.path));return{route:i.route,path:i.path,build:z,parse:W}}if(B.router(i))return r.sample({and:[{clock:p,target:i.setHistory}],or:{sid:"ez3kyw"}}),null;let f=i;const P=[];for(P.unshift(f.path);f.parent&&!$.pathlessRoute(f.parent);)f=f.parent,f.path!=="/"&&P.unshift(f.path);const q=w(P.join("")),{build:h,parse:E}=K.compile(q);return{route:i,path:q,build:h,parse:E}}const b=o.reduce((i,f)=>{const P=v(f);return P&&(u.push(P),i.push(P)),B.router(f)&&u.push(...f.knownRoutes),i},[]),x=c.map(i=>{const f=[];if(!i)return f;for(const{route:P,parse:q}of b)q(i)&&f.push(P);return f}),F=r.attach({and:{source:{query:s,path:c},effect:i=>{let{query:f,path:P}=i;for(const{route:q,parse:h}of b){const E=h(P),[S,z]=[r.scopeBind(q.internal.close),r.scopeBind(q.internal.navigated)];E?z({query:f,params:E.params}):S()}}},or:{name:"openRoutesByPathFx",sid:"-bl0nuq"}});function l(i){let{route:f,build:P}=i;r.withFactory({sid:"t83mj3",fn:()=>D.createAction({clock:f.internal.openFx.doneData,target:{navigate:d},fn:(q,h)=>{var E;if(h?.navigate===!1)return;const S={path:P(h&&"params"in h?h.params:void 0),query:(E=h?.query)!==null&&E!==void 0?E:{},replace:h?.replace};return q.navigate(S)}}),name:"none",method:"createAction"})}for(const i of b)l(i);return r.sample({and:[{clock:k,fn:i=>({path:i.pathname,query:i.query}),target:F}],or:{sid:"ukhip5"}}),{"@@type":"router",$query:s,$path:c,$history:m,$activeRoutes:x,back:g,forward:y,navigate:d,setHistory:p,ownRoutes:b,knownRoutes:u,internal:{connectToParentRouter:j,get parent(){return a},set parent(i){a=i},base:n},trackQuery:V({$activeRoutes:x,$query:s,navigate:d}),registerRoute:i=>{const f=v(i);f&&(u.push(f),b.push(f),l(f)),B.router(i)&&u.push(...i.knownRoutes)},"@@unitShape":()=>({query:s,path:c,activeRoutes:x,onBack:g,onForward:y,onNavigate:d})}}function H(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};const{$isPending:t=r.createStore(!1,{name:"$isPending",sid:"-t8kzqo"}),transformer:n=w=>w??null}=e,o=r.createStore(null,{name:"$params",sid:"gvf0vg"}),c=r.createStore(!1,{name:"$isOpened",sid:"8sn2wx"}),s=r.createEvent({name:"open",sid:"vr7tj"}),m=r.createEvent({name:"opened",sid:"-sn2j8t"}),g=r.createEvent({name:"openedOnServer",sid:"a1g586"}),y=r.createEvent({name:"openedOnClient",sid:"j2xswt"}),d=r.createEvent({name:"close",sid:"-g87deq"}),p=r.createEvent({name:"closed",sid:"-3bxrw0"}),k=r.createEvent({name:"cancelled",sid:"3qu86e"});return r.sample({and:[{clock:s,target:[m]}],or:{sid:"on98hj"}}),r.sample({and:[{clock:s,fn:n,target:o}],or:{sid:"oq07gc"}}),r.split({and:[{source:m,match:()=>typeof window>"u"?"server":"client",cases:{server:g,client:y}}],or:{sid:"p4unh3"}}),r.sample({and:[{clock:d,target:p}],or:{sid:"plch9x"}}),r.sample({and:[{clock:[m.map(()=>!0),p.map(()=>!1)],target:c}],or:{sid:"po3g8q"}}),{"@@type":"pathless-route",$params:o,$isOpened:c,$isPending:t,open:s,opened:m,openedOnClient:y,openedOnServer:g,close:d,closed:p,cancelled:k,path:"","@@unitShape":()=>({params:o,isOpened:c,isPending:t,onOpen:s,onClose:d})}}function se(e){const{route:t,beforeOpen:n,openOn:o,cancelOn:c}=e;let s;const m=r.createEffect(()=>{var p;return(p=s)===null||p===void 0?void 0:p()},{name:"waitForAsyncBundleFx",sid:"t7u37u"}),g=r.createEffect(async p=>{await m();for(const k of[].concat(n))await k(p)},{name:"openFx",sid:"-34g13p"}),y=p=>p?"params"in p?p.params:{}:{},d=H({transformer:y});return r.sample({and:[{clock:t.opened,target:g}],or:{sid:"-1tngcz"}}),r.sample({and:[{clock:t.opened,fn:y,target:d.$params}],or:{sid:"-1qwhe6"}}),o&&r.sample({and:[{clock:o,source:d.$params,fn:p=>({params:p}),target:d.open}],or:{sid:"-1bi8qc"}}),c&&(r.sample({and:[{clock:[t.closed].concat(c),target:d.close}],or:{sid:"-v0exi"}}),r.sample({and:[{clock:[].concat(c),target:d.cancelled}],or:{sid:"-s9fyp"}})),Object.assign(d,{internal:{setAsyncImport:p=>s=p}})}function ie(e){const t=H({$isPending:r.withFactory({sid:"-u1putn",fn:()=>A.or(...e.map(n=>n.$isPending)),name:"$isPending",method:"or"})});return r.sample({and:[{clock:e.map(n=>n.$isOpened),filter:r.withFactory({sid:"76kf3k",fn:()=>A.or(...e.map(n=>n.$isOpened)),name:"filter",method:"or"}),fn:()=>{},target:t.open}],or:{sid:"-xmoke0"}}),r.sample({and:[{clock:e.map(n=>n.$isOpened),filter:r.withFactory({sid:"ahvrux",fn:()=>A.not(r.withFactory({sid:"xs5yb9",fn:()=>A.or(...e.map(n=>n.$isOpened)),name:"fn",method:"or"})),name:"filter",method:"not"}),fn:()=>{},target:t.close}],or:{sid:"-x7abrw"}}),t}function ue(e){return{location:e.location,push:e.push.bind(e),replace:e.replace.bind(e),goBack:e.back.bind(e),goForward:e.forward.bind(e),listen:t=>{const n=e.listen(o=>{let{location:c}=o;return t(c)});return Object.assign(n,{unsubscribe:n})}}}function Q(e){const t=new URL(decodeURIComponent(e.search));return{pathname:t.pathname,search:t.search,hash:t.hash}}function le(e){return{location:Q(e.location),push:t=>{if(typeof t=="string"){const s=new URL(e.location.pathname);s.search=t,e.push(s.toString())}else{var n,o,c;const s=new URL(e.location.pathname);s.search="".concat((n=t.pathname)!==null&&n!==void 0?n:"").concat((o=t.search)!==null&&o!==void 0?o:"").concat((c=t.hash)!==null&&c!==void 0?c:""),e.push(s.toString())}},replace:t=>{if(typeof t=="string"){const s=new URL(e.location.pathname);s.search=t,e.replace(s.toString())}else{var n,o,c;const s=new URL(e.location.pathname);s.search="".concat((n=t.pathname)!==null&&n!==void 0?n:"").concat((o=t.search)!==null&&o!==void 0?o:"").concat((c=t.hash)!==null&&c!==void 0?c:""),e.replace(s.toString())}},goBack:()=>{e.back()},goForward:()=>{e.forward()},listen:t=>{const n=e.listen(o=>{let{location:c}=o;return t(Q(c))});return Object.assign(n,{unsubscribe:n})}}}exports.chainRoute=se;exports.createRoute=Y;exports.createRouter=ce;exports.createRouterControls=M;exports.createVirtualRoute=H;exports.group=ie;exports.historyAdapter=ue;exports.is=$;exports.queryAdapter=le;

package/dist/index.d.ts

@@ -65,7 +65,7 @@ declare type BeforeOpenUnit<T extends object | void = void> = (T extends void ?
 export declare function chainRoute<T extends object | void = void>(props: ChainRouteProps<T>): VirtualRoute<RouteOpenedPayload<T>, T>;
 
 declare interface ChainRouteProps<T extends object | void = void> {
-    route: Route<T>;
+    route: Route<T> | VirtualRoute<RouteOpenedPayload<T>, T>;
     beforeOpen: BeforeOpenUnit<T> | BeforeOpenUnit<T>[];
     openOn?: Unit<any> | Unit<any>[];
     cancelOn?: Unit<any> | Unit<any>[];
@@ -194,7 +194,7 @@ export declare function createVirtualRoute<T = void, TransformerResult = void>(o
  * signUpRoute.close(); // authorizationRoute.$isOpened —> false
  * ```
  */
-export declare function group(routes: Route<any>[]): VirtualRoute<void, void>;
+export declare function group(routes: (Route<any> | VirtualRoute<any, any>)[]): VirtualRoute<void, void>;
 
 export declare function historyAdapter(history: History_2): RouterAdapter;
 
@@ -215,7 +215,7 @@ declare interface InternalPathRoute<T extends object | void = any> extends PathR
     internal: InternalRouteParams<T>;
 }
 
-declare type InternalRoute<T extends object | void = any> = InternalPathRoute<T> | InternalPathlessRoute<T>;
+export declare type InternalRoute<T extends object | void = any> = InternalPathRoute<T> | InternalPathlessRoute<T>;
 
 declare interface InternalRouteParams<T> {
     close: EventCallable<void>;
@@ -449,7 +449,6 @@ export declare interface VirtualRoute<T, TransformerResult> {
 }
 
 declare interface VirtualRouteOptions<T, TransformerResult> {
-    beforeOpen?: Effect<void, any, any>[];
     $isPending?: Store<boolean>;
     transformer?: (payload: T) => TransformerResult;
 }