@ossy/router-react 0.13.4 → 0.14.1

package/build/index.js

@@ -1 +1 @@
-import e,{createContext as n,useCallback as r,useContext as a}from"react";import{Router as t}from"@ossy/router";var o=function(){return o=Object.assign||function(e){for(var n,r=1,a=arguments.length;r<a;r++)for(var t in n=arguments[r])Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);return e},o.apply(this,arguments)};"function"==typeof SuppressedError&&SuppressedError;var i=n({pages:[],defaultLanguage:void 0,supportedLanguages:[]}),u=function(){return a(i)},d=function(e){return void 0===e&&(e=""),function(e){return"/"===e[e.length-1]?e:"".concat(e,"/")}(function(e){return"/"===e[0]?e:"/".concat(e)}(e))},l=function(n){var a,u,l,c,s,f=n.url,g=n.pages,p=void 0===g?[]:g,v=n.defaultLanguage,w=void 0===v?void 0:v,h=n.supportedLanguages,m=void 0===h?[]:h;if(f){var y=f.match(/([^?#]*)(\?[^#]*)?(#.*)?/);u=f,l=(null==y?void 0:y[1])||"",c=(null==y?void 0:y[3])||"",s=(null==y?void 0:y[2])||""}else{if("undefined"==typeof window)return e.createElement(e.Fragment,null);u=window.location.href,l=window.location.pathname,s=(null==(c=window.location.hash)?void 0:c.includes("?"))?c.split("?")[1]:window.location.search}var L=m.length>1&&!!w,P=l.split("/")[1]||"",S=m.includes(P)?P:w,b=t.of({pages:p,defaultLanguage:w,supportedLanguages:m}),E=b.getParamsFromUrl(u),R=new URLSearchParams(s),k=b.getPageByUrl(u);if(k||(L&&"/"===l&&"undefined"!=typeof window&&(window.location.href="/"+w),k=L?p.find(function(e){return"*"===d(e.path[S])}):p.find(function(e){return"*"===d(e.path)})),!k)return console.warn("[RouterReact] No active page found for",l),e.createElement(e.Fragment,null);r(function(e,n){if("undefined"!=typeof window){window.history.pushState({},"","".concat(l,"?").concat(R.toString()));var r=new URLSearchParams(R);r.set(e,n),history.pushState({},"","?".concat(r.toString()))}},[R]);var U=r(function(e){var n,r,a,t,o,i={};if("string"==typeof e?(n=e,i=E,r=S):(o=e).id||void 0===o.language?(n=(null==e?void 0:e.id)||k.id,i=(null==e?void 0:e.params)||E,r=(null==e?void 0:e.language)||S):(n=k.id,i=E,r=e.language),n.includes("#")){var u=n.split("#");if(n=u[0],(a=u[1]).includes("?")){var d=n.split("?");a=d[0],t=d[1]}}else if(n.includes("?")){var l=n.split("?");n=l[0],t=l[1]}var c=b.getPathname({id:n.replace("@",""),params:i,language:r});return a&&(c=c+"#"+a),t&&(c=c+"?"+t),c},[b,S]),F=r(function(e){if("undefined"!=typeof window&&e)if("@back"!==e){var n=U(e);n&&(window.location.href=n)}else window.history.back()},[U]),O=r(function(){"undefined"!=typeof window&&window.history.back()},[]),j={href:u,pages:p,language:S,defaultLanguage:w,supportedLanguages:m,params:E,searchParams:o({},Array.from(R.entries()).reduce(function(e,n){var r,a=n[0],t=n[1];return o(o({},e),((r={})[a]=t,r))},{})),navigate:F,getHref:U,back:O};(null==k?void 0:k.redirect)&&F({id:k.redirect});var x=(null==k?void 0:k.element)||(null===(a=null==k?void 0:k.render)||void 0===a?void 0:a.call(k));return e.createElement(i.Provider,{value:j},x)};export{l as Router,i as RouterContext,u as useRouter};
+import e,{createContext as n,useCallback as a,useContext as r}from"react";import{Router as o,isCatchAllRoutePath as t}from"@ossy/router";var i=function(){return i=Object.assign||function(e){for(var n,a=1,r=arguments.length;a<r;a++)for(var o in n=arguments[a])Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o]);return e},i.apply(this,arguments)};"function"==typeof SuppressedError&&SuppressedError;var u=n({pages:[],defaultLanguage:void 0,supportedLanguages:[]}),l=function(){return r(u)},d=function(n){var r,l,d,s,c,f=n.url,p=n.pages,g=void 0===p?[]:p,v=n.defaultLanguage,w=void 0===v?void 0:v,h=n.supportedLanguages,m=void 0===h?[]:h;if(f){var y=f.match(/([^?#]*)(\?[^#]*)?(#.*)?/);l=f,d=(null==y?void 0:y[1])||"",s=(null==y?void 0:y[3])||"",c=(null==y?void 0:y[2])||""}else{if("undefined"==typeof window)return e.createElement(e.Fragment,null);l=window.location.href,d=window.location.pathname,c=(null==(s=window.location.hash)?void 0:s.includes("?"))?s.split("?")[1]:window.location.search}var L=m.length>1&&!!w,P=d.split("/")[1]||"",S=m.includes(P)?P:w,b=o.of({pages:g,defaultLanguage:w,supportedLanguages:m}),E=b.getParamsFromUrl(l),R=new URLSearchParams(c),k=b.getPageByUrl(l);if(k||(L&&"/"===d&&"undefined"!=typeof window&&(window.location.href="/"+w),k=L?g.find(function(e){var n,a=e.path,r=null!==(n=null==a?void 0:a[S])&&void 0!==n?n:null==a?void 0:a[w];return t(r)}):g.find(function(e){return t(e.path)})),!k)return console.warn("[RouterReact] No active page found for",d),e.createElement(e.Fragment,null);a(function(e,n){if("undefined"!=typeof window){window.history.pushState({},"","".concat(d,"?").concat(R.toString()));var a=new URLSearchParams(R);a.set(e,n),history.pushState({},"","?".concat(a.toString()))}},[R]);var U=a(function(e){var n,a,r,o,t,i={};if("string"==typeof e?(n=e,i=E,a=S):(t=e).id||void 0===t.language?(n=(null==e?void 0:e.id)||k.id,i=(null==e?void 0:e.params)||E,a=(null==e?void 0:e.language)||S):(n=k.id,i=E,a=e.language),n.includes("#")){var u=n.split("#");if(n=u[0],(r=u[1]).includes("?")){var l=n.split("?");r=l[0],o=l[1]}}else if(n.includes("?")){var d=n.split("?");n=d[0],o=d[1]}var s=b.getPathname({id:n.replace("@",""),params:i,language:a});return r&&(s=s+"#"+r),o&&(s=s+"?"+o),s},[b,S]),F=a(function(e){if("undefined"!=typeof window&&e)if("@back"!==e){var n=U(e);n&&(window.location.href=n)}else window.history.back()},[U]),O=a(function(){"undefined"!=typeof window&&window.history.back()},[]),j={href:l,pages:g,language:S,defaultLanguage:w,supportedLanguages:m,params:E,searchParams:i({},Array.from(R.entries()).reduce(function(e,n){var a,r=n[0],o=n[1];return i(i({},e),((a={})[r]=o,a))},{})),navigate:F,getHref:U,back:O};(null==k?void 0:k.redirect)&&F({id:k.redirect});var x=(null==k?void 0:k.element)||(null===(r=null==k?void 0:k.render)||void 0===r?void 0:r.call(k));return e.createElement(u.Provider,{value:j},x)};export{d as Router,u as RouterContext,l as useRouter};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/router-react",
-  "version": "0.13.4",
+  "version": "0.14.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ossy-se/packages.git"
@@ -61,5 +61,5 @@
     "/build",
     "README.md"
   ],
-  "gitHead": "1ef8329ef65dd0ea790717064d367dec255ba7f9"
+  "gitHead": "b64b14021bc1f3aa6d8668a64754e0ba8b4ab63d"
 }