@unsetsoft/ryunixjs 1.1.6-canary.3 → 1.1.6-canary.4

package/dist/Ryunix.js

@@ -170,36 +170,40 @@
    * `setState` function that can be used to update the state.
    */
   const useStore = (initial) => {
-    const oldHook = vars.wipFiber.alternate?.hooks?.[vars.hookIndex];
+    const oldHook =
+      vars.wipFiber.alternate &&
+      vars.wipFiber.alternate.hooks &&
+      vars.wipFiber.alternate.hooks[vars.hookIndex];
     const hook = {
       state: oldHook ? oldHook.state : initial,
       queue: oldHook ? [...oldHook.queue] : [],
     };
 
     hook.queue.forEach((action) => {
-      const newState =
+      hook.state =
         typeof action === STRINGS.function ? action(hook.state) : action;
-      if (newState !== hook.state) {
-        hook.state = newState;
-      }
     });
 
+    hook.queue = [];
+
     const setState = (action) => {
       hook.queue.push(action);
 
-      if (!vars.wipRoot) {
-        vars.wipRoot = {
-          dom: vars.currentRoot.dom,
-          props: vars.currentRoot.props || {},
-          alternate: vars.currentRoot,
-        };
-        vars.nextUnitOfWork = vars.wipRoot;
-        vars.deletions = [];
-      }
+      vars.wipRoot = {
+        dom: vars.currentRoot.dom,
+        props: {
+          ...vars.currentRoot.props,
+        },
+        alternate: vars.currentRoot,
+      };
+      vars.nextUnitOfWork = vars.wipRoot;
+      vars.deletions = [];
     };
 
-    vars.wipFiber.hooks.push(hook);
-    vars.hookIndex++;
+    if (vars.wipFiber && vars.wipFiber.hooks) {
+      vars.wipFiber.hooks.push(hook);
+      vars.hookIndex++;
+    }
 
     return [hook.state, setState]
   };
@@ -341,51 +345,51 @@
   const useRouter = (routes) => {
     const [location, setLocation] = useStore(window.location.pathname);
 
-    const routeCache = new Map();
-
     const findRoute = (routes, path) => {
-      if (routeCache.has(path)) return routeCache.get(path)
-
       const pathname = path.split('?')[0];
-      const notFoundRoute = routes.find((route) => route.path === '*');
+
+      const notFoundRoute = routes.find((route) => route.NotFound);
       const notFound = notFoundRoute
         ? { route: { component: notFoundRoute.NotFound }, params: {} }
         : { route: { component: null }, params: {} };
 
       for (const route of routes) {
         if (route.subRoutes) {
-          const subRoute = findRoute(route.subRoutes, path);
-          if (subRoute && subRoute.route.component) {
-            routeCache.set(path, subRoute);
-            return subRoute
-          }
+          const childRoute = findRoute(route.subRoutes, path);
+          if (childRoute) return childRoute
+        }
+
+        if (route.path === '*') {
+          return notFound
         }
 
         if (!route.path || typeof route.path !== 'string') {
           console.warn('Invalid route detected:', route);
+          console.info(
+            "if you are using { NotFound: NotFound } please add { path: '*', NotFound: NotFound }",
+          );
           continue
         }
 
         const keys = [];
-        const pattern = `^${route.path.replace(/:\w+/g, (match) => {
-        keys.push(match.substring(1));
-        return '([^/]+)'
-      })}$`;
+        const pattern = new RegExp(
+          `^${route.path.replace(/:\w+/g, (match) => {
+          keys.push(match.substring(1));
+          return '([^/]+)'
+        })}$`,
+        );
 
-        const match = pathname.match(new RegExp(pattern));
+        const match = pathname.match(pattern);
         if (match) {
           const params = keys.reduce((acc, key, index) => {
             acc[key] = match[index + 1];
             return acc
           }, {});
 
-          const routeData = { route, params };
-          routeCache.set(path, routeData);
-          return routeData
+          return { route, params }
         }
       }
 
-      routeCache.set(path, notFound);
       return notFound
     };
 

package/dist/Ryunix.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).Ryunix={})}(this,(function(e){"use strict";let t={containerRoot:{},nextUnitOfWork:{},currentRoot:{},wipRoot:{},deletions:[],wipFiber:{},hookIndex:0};const o=/[A-Z]/g,n=Object.freeze({TEXT_ELEMENT:Symbol("text.element"),Ryunix_ELEMENT:Symbol("ryunix.element"),RYUNIX_EFFECT:Symbol("ryunix.effect"),RYUNIX_MEMO:Symbol("ryunix.memo"),RYUNIX_URL_QUERY:Symbol("ryunix.urlQuery"),RYUNIX_REF:Symbol("ryunix.ref"),RYUNIX_STORE:Symbol("ryunix.store"),RYUNIX_REDUCE:Symbol("ryunix.reduce")}),r=Object.freeze({object:"object",function:"function",style:"ryunix-style",className:"ryunix-class",children:"children",boolean:"boolean",string:"string"}),i=Object.freeze({PLACEMENT:Symbol("ryunix.reconciler.status.placement").toString(),UPDATE:Symbol("ryunix.reconciler.status.update").toString(),DELETION:Symbol("ryunix.reconciler.status.deletion").toString()}),s=(e,t)=>{if(!e||!t||e.length!==t.length)return!1;for(let o=0;o<e.length;o++)if(e[o]!==t[o])return!1;return!0},c=(e,t=[])=>(null==e||(Array.isArray(e)?e.forEach((e=>c(e,t))):t.push(e)),t),l=(e,t,...o)=>{const i=(e=>{const t={};for(const o in e)t[o]=typeof e[o]===r.function?e[o]():e[o];return t})({...t});i.children=c(o,[]);const s=i.key||`${n.Ryunix_ELEMENT.toString()}-${Math.random().toString(36).substring(2,9)}`;return{type:e,props:{...i,key:s,children:i.children.map((e=>typeof e===r.object?e:p(e)))}}},p=e=>({type:n.TEXT_ELEMENT,props:{nodeValue:e,children:[]}}),a=(e,o)=>{t.wipRoot={dom:o,props:{children:[e]},alternate:t.currentRoot},t.deletions=[],t.nextUnitOfWork=t.wipRoot},u=e=>{const o=t.wipFiber.alternate?.hooks?.[t.hookIndex],n={state:o?o.state:e,queue:o?[...o.queue]:[]};n.queue.forEach((e=>{const t=typeof e===r.function?e(n.state):e;t!==n.state&&(n.state=t)}));return t.wipFiber.hooks.push(n),t.hookIndex++,[n.state,e=>{n.queue.push(e),t.wipRoot||(t.wipRoot={dom:t.currentRoot.dom,props:t.currentRoot.props||{},alternate:t.currentRoot},t.nextUnitOfWork=t.wipRoot,t.deletions=[])}]},f=(e,o)=>{const r=t.wipFiber.alternate?.hooks?.[t.hookIndex],i={type:n.RYUNIX_EFFECT,deps:o,cleanup:r?.cleanup},c=!r||!s(r.deps,o);c&&i.cleanup&&i.cleanup(),c&&(i.cleanup=e()),t.wipFiber.hooks.push(i),t.hookIndex++},d=(e,o)=>{const r=t.wipFiber.alternate?.hooks?.[t.hookIndex],i={type:n.RYUNIX_MEMO,value:r?r.value:e(),deps:o};return r&&s(r.deps,o)||(i.value=e()),t.wipFiber.hooks.push(i),t.hookIndex++,i.value},h=()=>{const e=new URLSearchParams(window.location.search),t={};for(let[o,n]of e.entries())t[o]=n;return t},m=e=>e.startsWith("on"),y=e=>e!==r.children&&!m(e),E=(e,t)=>o=>e[o]!==t[o],b=e=>t=>!(t in e),R=e=>{e.hooks&&e.hooks.filter((e=>e.type===n.RYUNIX_EFFECT&&e.cancel)).forEach((e=>{e.cancel()}))},k=e=>{e.hooks&&e.hooks.filter((e=>e.type===n.RYUNIX_EFFECT&&e.effect)).forEach((e=>{e.cancel=e.effect()}))},w=e=>{const t=e.type===n.TEXT_ELEMENT?document.createTextNode(e.props.nodeValue):document.createElement(e.type);return x(t,{},e.props),t},x=(e,t,o)=>{Object.keys(t).filter(m).filter((e=>b(o)(e)||E(t,o)(e))).forEach((o=>{const n=o.toLowerCase().substring(2);e.removeEventListener(n,t[o])})),Object.keys(o).filter(m).filter(E(t,o)).forEach((t=>{const n=t.toLowerCase().substring(2);e.addEventListener(n,o[t])})),Object.keys(t).filter(y).filter(b(o)).forEach((t=>{e[t]=""})),Object.keys(o).filter(y).filter(E(t,o)).forEach((n=>{n===r.style?_(e,o[n]):n===r.className?o[n]!==t[n]&&(e.className=o[n]):e[n]=o[n]}))},_=(e,t)=>{for(const n in t){const r=n.replace(o,(e=>"-"+e.toLowerCase()));e.style[r]!==t[n]&&(e.style[r]=t[n])}};var g=Object.freeze({__proto__:null,DomStyle:_,createDom:w,updateDom:x});const T=()=>{t.deletions.forEach(I),t.wipRoot&&t.wipRoot.child&&(I(t.wipRoot.child),t.currentRoot=t.wipRoot),t.wipRoot=null},I=e=>{if(!e)return;let t=e.parent;for(;t&&!t.dom;)t=t.parent;const o=t?.dom;if(e.effectTag===i.PLACEMENT&&e.dom)o.appendChild(e.dom),k(e);else if(e.effectTag===i.UPDATE&&e.dom)R(e),x(e.dom,e.alternate.props,e.props),k(e);else if(e.effectTag===i.DELETION)return N(e,o),void R(e);I(e.child),I(e.sibling)},N=(e,t)=>{e.dom?t.removeChild(e.dom):e.child&&N(e.child,t),e.sibling&&N(e.sibling,t)};var O=Object.freeze({__proto__:null,commitDeletion:N,commitRoot:T,commitWork:I});const U=(e,o)=>{let n=0,r=null;const c=new Map;let l=e.alternate?.child;for(;l;){const e=l.props.key||l.type;c.set(e,l),l=l.sibling}for(;n<o.length;){const t=o[n],l=t.props.key||t.type,p=c.get(l);let a;const u=p&&t&&t.type===p.type;u&&s(p.props,t.props)?a=p:u?(a={...p,props:t.props,effectTag:i.UPDATE},c.delete(l)):t&&(a={type:t.type,props:t.props,effectTag:i.PLACEMENT,parent:e}),0===n?e.child=a:r&&(r.sibling=a),r=a,n++}c.forEach((e=>{e.effectTag=i.DELETION,t.deletions.push(e)}))};var v=Object.freeze({__proto__:null,reconcileChildren:U});const F=e=>{t.wipFiber=e,t.hookIndex=0,t.wipFiber.hooks=[];const o=e.type(e.props);U(e,Array.isArray(o)?o:[o])},C=e=>{e.dom||(e.dom=w(e)),U(e,e.props.children)};var L=Object.freeze({__proto__:null,updateFunctionComponent:F,updateHostComponent:C});const S=e=>{let o=!1;for(;t.nextUnitOfWork&&!o;)t.nextUnitOfWork=j(t.nextUnitOfWork),o=e.timeRemaining()<1;!t.nextUnitOfWork&&t.wipRoot&&T(),(t.nextUnitOfWork||t.wipRoot)&&requestIdleCallback(S)};requestIdleCallback(S);const j=e=>{if(e.type instanceof Function?F(e):C(e),e.child)return e.child;let t=e;for(;t;){if(t.sibling)return t.sibling;t=t.parent}};var M={createElement:l,render:a,init:(e,o="__ryunix")=>{t.containerRoot=document.getElementById(o),a(e,t.containerRoot)},Fragment:e=>e.children,Dom:g,Workers:Object.freeze({__proto__:null,performUnitOfWork:j,workLoop:S}),Reconciler:v,Components:L,Commits:O};window.Ryunix=M,e.default=M,e.useCallback=(e,t)=>d((()=>e),t),e.useEffect=f,e.useMemo=d,e.useQuery=h,e.useRef=e=>{const o=t.wipFiber.alternate?.hooks?.[t.hookIndex],r={type:n.RYUNIX_REF,value:o?o.value:{current:e}};return t.wipFiber.hooks.push(r),t.hookIndex++,r.value},e.useRouter=e=>{const[t,o]=u(window.location.pathname),n=new Map,i=(e,t)=>{if(n.has(t))return n.get(t);const o=t.split("?")[0],r=e.find((e=>"*"===e.path)),s=r?{route:{component:r.NotFound},params:{}}:{route:{component:null},params:{}};for(const r of e){if(r.subRoutes){const e=i(r.subRoutes,t);if(e&&e.route.component)return n.set(t,e),e}if(!r.path||"string"!=typeof r.path){console.warn("Invalid route detected:",r);continue}const e=[],s=`^${r.path.replace(/:\w+/g,(t=>(e.push(t.substring(1)),"([^/]+)")))}$`,c=o.match(new RegExp(s));if(c){const o={route:r,params:e.reduce(((e,t,o)=>(e[t]=c[o+1],e)),{})};return n.set(t,o),o}}return n.set(t,s),s},s=e=>{window.history.pushState({},"",e),c(e)},c=e=>{const t=e.split("?")[0];o(t)};f((()=>{const e=()=>c(window.location.pathname);return window.addEventListener("popstate",e),()=>window.removeEventListener("popstate",e)}),[]);const p=i(e,t)||{};return{Children:()=>{const e=h(),{route:t}=p;return t&&t.component&&typeof t.component===r.function?t.component({params:p.params||{},query:e}):(console.error("Component not found for current path or the component is not a valid function:",p),null)},NavLink:({to:e,...t})=>l("a",{href:e,onClick:t=>{t.preventDefault(),s(e)},...t},t.children),navigate:s}},e.useStore=u,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).Ryunix={})}(this,(function(e){"use strict";let t={containerRoot:{},nextUnitOfWork:{},currentRoot:{},wipRoot:{},deletions:[],wipFiber:{},hookIndex:0};const o=/[A-Z]/g,n=Object.freeze({TEXT_ELEMENT:Symbol("text.element"),Ryunix_ELEMENT:Symbol("ryunix.element"),RYUNIX_EFFECT:Symbol("ryunix.effect"),RYUNIX_MEMO:Symbol("ryunix.memo"),RYUNIX_URL_QUERY:Symbol("ryunix.urlQuery"),RYUNIX_REF:Symbol("ryunix.ref"),RYUNIX_STORE:Symbol("ryunix.store"),RYUNIX_REDUCE:Symbol("ryunix.reduce")}),r=Object.freeze({object:"object",function:"function",style:"ryunix-style",className:"ryunix-class",children:"children",boolean:"boolean",string:"string"}),i=Object.freeze({PLACEMENT:Symbol("ryunix.reconciler.status.placement").toString(),UPDATE:Symbol("ryunix.reconciler.status.update").toString(),DELETION:Symbol("ryunix.reconciler.status.deletion").toString()}),s=(e,t)=>{if(!e||!t||e.length!==t.length)return!1;for(let o=0;o<e.length;o++)if(e[o]!==t[o])return!1;return!0},l=(e,t=[])=>(null==e||(Array.isArray(e)?e.forEach((e=>l(e,t))):t.push(e)),t),c=(e,t,...o)=>{const i=(e=>{const t={};for(const o in e)t[o]=typeof e[o]===r.function?e[o]():e[o];return t})({...t});i.children=l(o,[]);const s=i.key||`${n.Ryunix_ELEMENT.toString()}-${Math.random().toString(36).substring(2,9)}`;return{type:e,props:{...i,key:s,children:i.children.map((e=>typeof e===r.object?e:p(e)))}}},p=e=>({type:n.TEXT_ELEMENT,props:{nodeValue:e,children:[]}}),a=(e,o)=>{t.wipRoot={dom:o,props:{children:[e]},alternate:t.currentRoot},t.deletions=[],t.nextUnitOfWork=t.wipRoot},u=e=>{const o=t.wipFiber.alternate&&t.wipFiber.alternate.hooks&&t.wipFiber.alternate.hooks[t.hookIndex],n={state:o?o.state:e,queue:o?[...o.queue]:[]};n.queue.forEach((e=>{n.state=typeof e===r.function?e(n.state):e})),n.queue=[];return t.wipFiber&&t.wipFiber.hooks&&(t.wipFiber.hooks.push(n),t.hookIndex++),[n.state,e=>{n.queue.push(e),t.wipRoot={dom:t.currentRoot.dom,props:{...t.currentRoot.props},alternate:t.currentRoot},t.nextUnitOfWork=t.wipRoot,t.deletions=[]}]},f=(e,o)=>{const r=t.wipFiber.alternate?.hooks?.[t.hookIndex],i={type:n.RYUNIX_EFFECT,deps:o,cleanup:r?.cleanup},l=!r||!s(r.deps,o);l&&i.cleanup&&i.cleanup(),l&&(i.cleanup=e()),t.wipFiber.hooks.push(i),t.hookIndex++},d=(e,o)=>{const r=t.wipFiber.alternate?.hooks?.[t.hookIndex],i={type:n.RYUNIX_MEMO,value:r?r.value:e(),deps:o};return r&&s(r.deps,o)||(i.value=e()),t.wipFiber.hooks.push(i),t.hookIndex++,i.value},h=()=>{const e=new URLSearchParams(window.location.search),t={};for(let[o,n]of e.entries())t[o]=n;return t},m=e=>e.startsWith("on"),y=e=>e!==r.children&&!m(e),E=(e,t)=>o=>e[o]!==t[o],b=e=>t=>!(t in e),R=e=>{e.hooks&&e.hooks.filter((e=>e.type===n.RYUNIX_EFFECT&&e.cancel)).forEach((e=>{e.cancel()}))},k=e=>{e.hooks&&e.hooks.filter((e=>e.type===n.RYUNIX_EFFECT&&e.effect)).forEach((e=>{e.cancel=e.effect()}))},w=e=>{const t=e.type===n.TEXT_ELEMENT?document.createTextNode(e.props.nodeValue):document.createElement(e.type);return x(t,{},e.props),t},x=(e,t,o)=>{Object.keys(t).filter(m).filter((e=>b(o)(e)||E(t,o)(e))).forEach((o=>{const n=o.toLowerCase().substring(2);e.removeEventListener(n,t[o])})),Object.keys(o).filter(m).filter(E(t,o)).forEach((t=>{const n=t.toLowerCase().substring(2);e.addEventListener(n,o[t])})),Object.keys(t).filter(y).filter(b(o)).forEach((t=>{e[t]=""})),Object.keys(o).filter(y).filter(E(t,o)).forEach((n=>{n===r.style?_(e,o[n]):n===r.className?o[n]!==t[n]&&(e.className=o[n]):e[n]=o[n]}))},_=(e,t)=>{for(const n in t){const r=n.replace(o,(e=>"-"+e.toLowerCase()));e.style[r]!==t[n]&&(e.style[r]=t[n])}};var g=Object.freeze({__proto__:null,DomStyle:_,createDom:w,updateDom:x});const F=()=>{t.deletions.forEach(T),t.wipRoot&&t.wipRoot.child&&(T(t.wipRoot.child),t.currentRoot=t.wipRoot),t.wipRoot=null},T=e=>{if(!e)return;let t=e.parent;for(;t&&!t.dom;)t=t.parent;const o=t?.dom;if(e.effectTag===i.PLACEMENT&&e.dom)o.appendChild(e.dom),k(e);else if(e.effectTag===i.UPDATE&&e.dom)R(e),x(e.dom,e.alternate.props,e.props),k(e);else if(e.effectTag===i.DELETION)return N(e,o),void R(e);T(e.child),T(e.sibling)},N=(e,t)=>{e.dom?t.removeChild(e.dom):e.child&&N(e.child,t),e.sibling&&N(e.sibling,t)};var I=Object.freeze({__proto__:null,commitDeletion:N,commitRoot:F,commitWork:T});const O=(e,o)=>{let n=0,r=null;const l=new Map;let c=e.alternate?.child;for(;c;){const e=c.props.key||c.type;l.set(e,c),c=c.sibling}for(;n<o.length;){const t=o[n],c=t.props.key||t.type,p=l.get(c);let a;const u=p&&t&&t.type===p.type;u&&s(p.props,t.props)?a=p:u?(a={...p,props:t.props,effectTag:i.UPDATE},l.delete(c)):t&&(a={type:t.type,props:t.props,effectTag:i.PLACEMENT,parent:e}),0===n?e.child=a:r&&(r.sibling=a),r=a,n++}l.forEach((e=>{e.effectTag=i.DELETION,t.deletions.push(e)}))};var U=Object.freeze({__proto__:null,reconcileChildren:O});const v=e=>{t.wipFiber=e,t.hookIndex=0,t.wipFiber.hooks=[];const o=e.type(e.props);O(e,Array.isArray(o)?o:[o])},C=e=>{e.dom||(e.dom=w(e)),O(e,e.props.children)};var L=Object.freeze({__proto__:null,updateFunctionComponent:v,updateHostComponent:C});const S=e=>{let o=!1;for(;t.nextUnitOfWork&&!o;)t.nextUnitOfWork=j(t.nextUnitOfWork),o=e.timeRemaining()<1;!t.nextUnitOfWork&&t.wipRoot&&F(),(t.nextUnitOfWork||t.wipRoot)&&requestIdleCallback(S)};requestIdleCallback(S);const j=e=>{if(e.type instanceof Function?v(e):C(e),e.child)return e.child;let t=e;for(;t;){if(t.sibling)return t.sibling;t=t.parent}};var M={createElement:c,render:a,init:(e,o="__ryunix")=>{t.containerRoot=document.getElementById(o),a(e,t.containerRoot)},Fragment:e=>e.children,Dom:g,Workers:Object.freeze({__proto__:null,performUnitOfWork:j,workLoop:S}),Reconciler:U,Components:L,Commits:I};window.Ryunix=M,e.default=M,e.useCallback=(e,t)=>d((()=>e),t),e.useEffect=f,e.useMemo=d,e.useQuery=h,e.useRef=e=>{const o=t.wipFiber.alternate?.hooks?.[t.hookIndex],r={type:n.RYUNIX_REF,value:o?o.value:{current:e}};return t.wipFiber.hooks.push(r),t.hookIndex++,r.value},e.useRouter=e=>{const[t,o]=u(window.location.pathname),n=(e,t)=>{const o=t.split("?")[0],r=e.find((e=>e.NotFound)),i=r?{route:{component:r.NotFound},params:{}}:{route:{component:null},params:{}};for(const r of e){if(r.subRoutes){const e=n(r.subRoutes,t);if(e)return e}if("*"===r.path)return i;if(!r.path||"string"!=typeof r.path){console.warn("Invalid route detected:",r),console.info("if you are using { NotFound: NotFound } please add { path: '*', NotFound: NotFound }");continue}const e=[],s=new RegExp(`^${r.path.replace(/:\w+/g,(t=>(e.push(t.substring(1)),"([^/]+)")))}$`),l=o.match(s);if(l){return{route:r,params:e.reduce(((e,t,o)=>(e[t]=l[o+1],e)),{})}}}return i},i=e=>{window.history.pushState({},"",e),s(e)},s=e=>{const t=e.split("?")[0];o(t)};f((()=>{const e=()=>s(window.location.pathname);return window.addEventListener("popstate",e),()=>window.removeEventListener("popstate",e)}),[]);const l=n(e,t)||{};return{Children:()=>{const e=h(),{route:t}=l;return t&&t.component&&typeof t.component===r.function?t.component({params:l.params||{},query:e}):(console.error("Component not found for current path or the component is not a valid function:",l),null)},NavLink:({to:e,...t})=>c("a",{href:e,onClick:t=>{t.preventDefault(),i(e)},...t},t.children),navigate:i}},e.useStore=u,Object.defineProperty(e,"__esModule",{value:!0})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unsetsoft/ryunixjs",
-  "version": "1.1.6-canary.3",
+  "version": "1.1.6-canary.4",
   "license": "MIT",
   "main": "./dist/Ryunix.min.js",
   "types": "./dist/Ryunix.d.ts",