chizu 0.2.6 → 0.2.7

package/dist/chizu.js

@@ -4,14 +4,14 @@ var k = (t) => {
 };
 var B = (t, e, n) => e in t ? N(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
 var y = (t, e, n) => B(t, typeof e != "symbol" ? e + "" : e, n), j = (t, e, n) => e.has(t) || k("Cannot " + n);
-var w = (t, e, n) => (j(t, e, "read from private field"), n ? n.call(t) : e.get(t)), b = (t, e, n) => e.has(t) ? k("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, n), E = (t, e, n, r) => (j(t, e, "write to private field"), r ? r.call(t, n) : e.set(t, n), n);
+var w = (t, e, n) => (j(t, e, "read from private field"), n ? n.call(t) : e.get(t)), E = (t, e, n) => e.has(t) ? k("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, n), b = (t, e, n, r) => (j(t, e, "write to private field"), r ? r.call(t, n) : e.set(t, n), n);
 import { jsx as h, Fragment as q } from "react/jsx-runtime";
 import x from "eventemitter3";
 import * as i from "react";
 import { Immer as z } from "immer";
 import p from "lodash/get";
 import M from "traverse";
-import * as f from "react-router-dom";
+import * as d from "react-router-dom";
 const A = i.createContext({
   appEmitter: new x()
 });
@@ -84,7 +84,7 @@ function C(t, e = []) {
               o.flatMap((c) => c.operations)
             );
             return !!(Array.from(u).reduce(
-              (c, d) => c | (d ?? 0),
+              (c, f) => c | (f ?? 0),
               0
             ) & s);
           };
@@ -126,14 +126,14 @@ function $(t, e, n) {
         const u = typeof this.node.value == "object", a = [
           ...u ? this.path : this.path.slice(0, -1),
           l.annotations
-        ], c = p(t.stateful, a) ?? [], d = this.node.attach(e);
+        ], c = p(t.stateful, a) ?? [], f = this.node.attach(e);
         u ? this.update(
           {
             ...this.node.value,
-            [l.annotations]: [d, ...c]
+            [l.annotations]: [f, ...c]
           },
           !0
-        ) : (this.parent && (this.parent.node[l.annotations] = [d, ...c]), this.update(this.node.value, !0));
+        ) : (this.parent && (this.parent.node[l.annotations] = [f, ...c]), this.update(this.node.value, !0));
       }
     });
   }
@@ -174,8 +174,7 @@ function Q(t) {
           return t.router.current;
         },
         queue: [],
-        handlers: t.options.props,
-        attributes: t.options.props,
+        props: t.options.props,
         actions: {
           annotate(e, n) {
             return T(e, n);
@@ -197,8 +196,7 @@ function Q(t) {
         get validate() {
           return t.model.current.validatable;
         },
-        handlers: t.options.props,
-        attributes: t.options.props,
+        props: t.options.props,
         actions: {
           dispatch([e, ...n]) {
             if (e == null) return Promise.reject();
@@ -233,8 +231,8 @@ function G(t) {
         t.model.current = D(I, o), t.update.rerender();
         break;
       }
-      const d = a;
-      t.model.current = d(t.model.current, o), t.update.rerender();
+      const f = a;
+      t.model.current = f(t.model.current, o), t.update.rerender();
     }
     r.resolve();
   };
@@ -246,9 +244,9 @@ var v, g;
 class H extends Error {
   constructor(n, r = null) {
     super(String(r));
-    b(this, v);
-    b(this, g);
-    E(this, v, n), E(this, g, r);
+    E(this, v);
+    E(this, g);
+    b(this, v, n), b(this, g, r);
   }
   get type() {
     return w(this, v);
@@ -282,10 +280,7 @@ function V(t) {
   var n, r, s, o;
   const e = i.useRef(!1);
   i.useLayoutEffect(() => {
-    t.dispatchers.dispatch(m.Derive, [
-      t.options.props,
-      t.router.current
-    ]);
+    t.dispatchers.dispatch(m.Derive, []);
   }, [
     t.options.props,
     (n = t.router.current) == null ? void 0 : n.location,
@@ -309,14 +304,14 @@ function Z() {
   return i.useRef(null);
 }
 function tt({ using: t, children: e }) {
-  return f.useInRouterContext() ? /* @__PURE__ */ h(et, { using: t, children: e }) : e();
+  return d.useInRouterContext() ? /* @__PURE__ */ h(et, { using: t, children: e }) : e();
 }
 function et({ using: t, children: e }) {
   return t.current = {
-    navigate: f.useNavigate(),
-    location: f.useLocation(),
-    params: f.useParams(),
-    search: f.useSearchParams()
+    navigate: d.useNavigate(),
+    location: d.useLocation(),
+    params: d.useParams(),
+    search: d.useSearchParams()
   }, /* @__PURE__ */ h(q, { children: e() });
 }
 function nt() {

package/dist/chizu.umd.cjs

@@ -1 +1 @@
-(function(o,u){typeof exports=="object"&&typeof module<"u"?u(exports,require("react/jsx-runtime"),require("eventemitter3"),require("react"),require("immer"),require("lodash/get"),require("traverse"),require("react-router-dom")):typeof define=="function"&&define.amd?define(["exports","react/jsx-runtime","eventemitter3","react","immer","lodash/get","traverse","react-router-dom"],u):(o=typeof globalThis<"u"?globalThis:o||self,u(o.Chizu={},o.jsxRuntime,o.EventEmitter3,o.React,o.Immer,o.get,o.Traverse,o.ReactRouterDOM))})(this,function(o,u,l,w,B,v,E,F){"use strict";var de=Object.defineProperty;var U=o=>{throw TypeError(o)};var fe=(o,u,l)=>u in o?de(o,u,{enumerable:!0,configurable:!0,writable:!0,value:l}):o[u]=l;var j=(o,u,l)=>fe(o,typeof u!="symbol"?u+"":u,l),z=(o,u,l)=>u.has(o)||U("Cannot "+l);var O=(o,u,l)=>(z(o,u,"read from private field"),l?l.call(o):u.get(o)),P=(o,u,l)=>u.has(o)?U("Cannot add the same private member more than once"):u instanceof WeakSet?u.add(o):u.set(o,l),D=(o,u,l,w)=>(z(o,u,"write to private field"),w?w.call(o,l):u.set(o,l),l);var g,b;function k(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const n in e)if(n!=="default"){const r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:()=>e[n]})}}return t.default=e,Object.freeze(t)}const a=k(w),y=k(F),_=a.createContext({appEmitter:new l});function x(){return a.useContext(_)}function J(e){return()=>{const t=a.useMemo(()=>({appEmitter:new l}),[]);return u.jsx(_.Provider,{value:t,children:u.jsx(e,{})})}}class q{constructor(t){this.value=t}}class T{static Draft(t){return new q(t)}}j(T,"Op",{Add:1,Remove:2,Update:4,Move:8,Replace:16});var m=(e=>(e.Mount="lifecycle/mount",e.Node="lifecycle/node",e.Derive="lifecycle/derive",e.Error="distributed/lifecycle/error",e.Unmount="lifecycle/unmount",e))(m||{});const h={immer:new B.Immer,annotations:Symbol("annotations")};h.immer.setAutoFreeze(!1);class M{constructor(t,n,r=null){j(this,"process");this.value=t,this.operations=n,this.field=r,this.process=null}attach(t){return this.process=t,this}}function $(e,t=[]){return new M(e,t)}class S{constructor(t,n=t){this.stateless=t,this.stateful=n}get validatable(){return A(this.stateful)}}function A(e,t=[]){return new Proxy(e,{get(n,r){switch(r){case"is":return i=>{const s=R(e,t);if(!s)return!1;const c=new Set(s.flatMap(f=>f.operations));return!!(Array.from(c).reduce((f,p)=>f|(p??0),0)&i)};case"pending":return()=>!!R(e,t);case"draft":return()=>{const i=R(e,t);if(!i)return v(e,t);const s=i.flatMap(c=>c.operations).find(c=>c instanceof q);return s?s.value:v(e,t)}}return A(e,[...t,String(r)])}})}function R(e,t){const r=typeof v(e,t)=="object"?t:t.slice(0,-1),i=r.length===0?e:v(e,r),s=(i==null?void 0:i[h.annotations])??[];return s.length>0?s:null}function L(e,t,n){function r(s){return E(s).forEach(function(){if(this.key===h.annotations){this.block();return}this.node instanceof M&&this.update(this.node.value)})}function i(s){return E(s).forEach(function(){if(this.key===h.annotations){this.block();return}if(this.node instanceof M){const c=typeof this.node.value=="object",d=[...c?this.path:this.path.slice(0,-1),h.annotations],f=v(e.stateful,d)??[],p=this.node.attach(t);c?this.update({...this.node.value,[h.annotations]:[p,...f]},!0):(this.parent&&(this.parent.node[h.annotations]=[p,...f]),this.update(this.node.value,!0))}})}return new S(r(h.immer.produce(e.stateless,n)),i(h.immer.produce(e.stateful,n)))}function C(e,t){const n=E(e.stateful).forEach(function(){if(this.key===h.annotations){this.block();return}if(this.node&&this.node[h.annotations]){const r=this.node[h.annotations];this.update({...this.node,[h.annotations]:r.filter(i=>i.process!==t)},!0)}});return new S(e.stateless,n)}function Q(e){return a.useMemo(()=>({controller:{get model(){return e.model.current.stateful},get router(){return e.router.current},queue:[],handlers:e.options.props,attributes:e.options.props,actions:{annotate(t,n){return $(t,n)},produce(t){return(n,r)=>L(n,r,t)},dispatch([t,...n]){if(t==null)return Promise.reject();const r=Promise.withResolvers();return e.dispatchers.dispatch(t,n,r),r.promise}}},view:{get model(){return e.model.current.stateless},get validate(){return e.model.current.validatable},handlers:e.options.props,attributes:e.options.props,actions:{dispatch([t,...n]){if(t==null)return Promise.reject();const r=Promise.withResolvers();return e.dispatchers.dispatch(t,n,r),r.promise}}}}),[])}function W(e){return a.useMemo(()=>{var r,i;const t=(i=(r=e.options).controller)==null?void 0:i.call(r,e.actions.controller);return t?(Object.entries(t).forEach(([s,c])=>e.dispatchers.attach(s,c)),t):void 0},[])}function G(e){return(t,n)=>async(r=Promise.withResolvers(),i)=>{if(typeof n!="function")return;const s=Symbol("process"),c=n(...i);if(typeof c=="function"){const d=c(e.model.current,s);return e.model.current=C(d,s),e.update.rerender(),void r.resolve()}for(;;){const{value:d,done:f}=await c.next();if(f){const le=d(e.model.current,s);e.model.current=C(le,s),e.update.rerender();break}const p=d;e.model.current=p(e.model.current,s),e.update.rerender()}r.resolve()}}function I(e){return e.startsWith("distributed")}class N extends Error{constructor(n,r=null){super(String(r));P(this,g);P(this,b);D(this,g,n),D(this,b,r)}get type(){return O(this,g)}get message(){return O(this,b)||""}}g=new WeakMap,b=new WeakMap;function H(e){const t=x(),n=G(e);return a.useMemo(()=>{const r=new l,i=t.appEmitter;return{attach(s,c){const d=String(s);I(d)?i.on(d,n(s,c)):r.on(d,n(s,c))},dispatch(s,c,d){const f=String(s);I(f)?i.emit(f,d,c):r.emit(f,d,c)}}},[])}function K(){const e=a.useRef(null);return a.useMemo(()=>({customElement:e}),[])}function V(e){var n,r,i,s;const t=a.useRef(!1);a.useLayoutEffect(()=>{e.dispatchers.dispatch(m.Derive,[e.options.props,e.router.current])},[e.options.props,(n=e.router.current)==null?void 0:n.location,(r=e.router.current)==null?void 0:r.params,(s=(i=e.router.current)==null?void 0:i.search)==null?void 0:s[0]]),a.useLayoutEffect(()=>{if(!t.current)return t.current=!0,e.dispatchers.dispatch(m.Mount,[]),e.dispatchers.dispatch(m.Node,[e.elements.customElement.current]),()=>e.dispatchers.dispatch(m.Unmount,[])},[])}function X(e){const t=a.useMemo(()=>e.options.model??{},[]);return a.useRef(new S(t,t))}function Y(){return a.useRef(new Set)}function Z(){return a.useRef(null)}function ee({using:e,children:t}){return y.useInRouterContext()?u.jsx(te,{using:e,children:t}):t()}function te({using:e,children:t}){return e.current={navigate:y.useNavigate(),location:y.useLocation(),params:y.useParams(),search:y.useSearchParams()},u.jsx(u.Fragment,{children:t()})}function ne(){const[e,t]=a.useReducer(n=>n+1,0);return a.useMemo(()=>({hash:e,rerender:t}),[e])}function re({options:e}){const t=x(),n=ne(),r=Y(),i=K(),s=Z(),c=X({options:e}),d=H({app:t,options:e,update:n,model:c,queue:r}),f=Q({app:t,options:e,model:c,dispatchers:d,router:s});return W({options:e,dispatchers:d,actions:f}),V({options:e,dispatchers:d,elements:i,router:s}),a.useMemo(()=>a.createElement(e.name,{ref:i.customElement,style:{display:"contents"},children:u.jsx(ee,{using:s,children:()=>e.view(f.view)})}),[n.hash])}function oe(e){return t=>a.memo(n=>re({options:{...t,name:e.join(""),props:n}}),(n,r)=>JSON.stringify(n)===JSON.stringify(r))}function se(e){return new Promise(t=>setTimeout(t,e))}function ue(e){return e?!!(e&&typeof e!="symbol"):Symbol(`pk.${Date.now()}.${crypto.randomUUID()}`)}function ie(e){return e instanceof N}const ce=Object.freeze(Object.defineProperty({__proto__:null,isEventError:ie,pk:ue,sleep:se},Symbol.toStringTag,{value:"Module"})),ae={app:J,module:oe};o.EventError=N,o.Lifecycle=m,o.State=T,o.create=ae,o.utils=ce,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});
+(function(o,u){typeof exports=="object"&&typeof module<"u"?u(exports,require("react/jsx-runtime"),require("eventemitter3"),require("react"),require("immer"),require("lodash/get"),require("traverse"),require("react-router-dom")):typeof define=="function"&&define.amd?define(["exports","react/jsx-runtime","eventemitter3","react","immer","lodash/get","traverse","react-router-dom"],u):(o=typeof globalThis<"u"?globalThis:o||self,u(o.Chizu={},o.jsxRuntime,o.EventEmitter3,o.React,o.Immer,o.get,o.Traverse,o.ReactRouterDOM))})(this,function(o,u,l,b,B,v,E,F){"use strict";var de=Object.defineProperty;var U=o=>{throw TypeError(o)};var fe=(o,u,l)=>u in o?de(o,u,{enumerable:!0,configurable:!0,writable:!0,value:l}):o[u]=l;var j=(o,u,l)=>fe(o,typeof u!="symbol"?u+"":u,l),z=(o,u,l)=>u.has(o)||U("Cannot "+l);var O=(o,u,l)=>(z(o,u,"read from private field"),l?l.call(o):u.get(o)),P=(o,u,l)=>u.has(o)?U("Cannot add the same private member more than once"):u instanceof WeakSet?u.add(o):u.set(o,l),D=(o,u,l,b)=>(z(o,u,"write to private field"),b?b.call(o,l):u.set(o,l),l);var g,w;function k(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const n in e)if(n!=="default"){const r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:()=>e[n]})}}return t.default=e,Object.freeze(t)}const a=k(b),y=k(F),_=a.createContext({appEmitter:new l});function x(){return a.useContext(_)}function J(e){return()=>{const t=a.useMemo(()=>({appEmitter:new l}),[]);return u.jsx(_.Provider,{value:t,children:u.jsx(e,{})})}}class q{constructor(t){this.value=t}}class T{static Draft(t){return new q(t)}}j(T,"Op",{Add:1,Remove:2,Update:4,Move:8,Replace:16});var h=(e=>(e.Mount="lifecycle/mount",e.Node="lifecycle/node",e.Derive="lifecycle/derive",e.Error="distributed/lifecycle/error",e.Unmount="lifecycle/unmount",e))(h||{});const m={immer:new B.Immer,annotations:Symbol("annotations")};m.immer.setAutoFreeze(!1);class M{constructor(t,n,r=null){j(this,"process");this.value=t,this.operations=n,this.field=r,this.process=null}attach(t){return this.process=t,this}}function $(e,t=[]){return new M(e,t)}class S{constructor(t,n=t){this.stateless=t,this.stateful=n}get validatable(){return A(this.stateful)}}function A(e,t=[]){return new Proxy(e,{get(n,r){switch(r){case"is":return c=>{const s=R(e,t);if(!s)return!1;const i=new Set(s.flatMap(f=>f.operations));return!!(Array.from(i).reduce((f,p)=>f|(p??0),0)&c)};case"pending":return()=>!!R(e,t);case"draft":return()=>{const c=R(e,t);if(!c)return v(e,t);const s=c.flatMap(i=>i.operations).find(i=>i instanceof q);return s?s.value:v(e,t)}}return A(e,[...t,String(r)])}})}function R(e,t){const r=typeof v(e,t)=="object"?t:t.slice(0,-1),c=r.length===0?e:v(e,r),s=(c==null?void 0:c[m.annotations])??[];return s.length>0?s:null}function L(e,t,n){function r(s){return E(s).forEach(function(){if(this.key===m.annotations){this.block();return}this.node instanceof M&&this.update(this.node.value)})}function c(s){return E(s).forEach(function(){if(this.key===m.annotations){this.block();return}if(this.node instanceof M){const i=typeof this.node.value=="object",d=[...i?this.path:this.path.slice(0,-1),m.annotations],f=v(e.stateful,d)??[],p=this.node.attach(t);i?this.update({...this.node.value,[m.annotations]:[p,...f]},!0):(this.parent&&(this.parent.node[m.annotations]=[p,...f]),this.update(this.node.value,!0))}})}return new S(r(m.immer.produce(e.stateless,n)),c(m.immer.produce(e.stateful,n)))}function C(e,t){const n=E(e.stateful).forEach(function(){if(this.key===m.annotations){this.block();return}if(this.node&&this.node[m.annotations]){const r=this.node[m.annotations];this.update({...this.node,[m.annotations]:r.filter(c=>c.process!==t)},!0)}});return new S(e.stateless,n)}function Q(e){return a.useMemo(()=>({controller:{get model(){return e.model.current.stateful},get router(){return e.router.current},queue:[],props:e.options.props,actions:{annotate(t,n){return $(t,n)},produce(t){return(n,r)=>L(n,r,t)},dispatch([t,...n]){if(t==null)return Promise.reject();const r=Promise.withResolvers();return e.dispatchers.dispatch(t,n,r),r.promise}}},view:{get model(){return e.model.current.stateless},get validate(){return e.model.current.validatable},props:e.options.props,actions:{dispatch([t,...n]){if(t==null)return Promise.reject();const r=Promise.withResolvers();return e.dispatchers.dispatch(t,n,r),r.promise}}}}),[])}function W(e){return a.useMemo(()=>{var r,c;const t=(c=(r=e.options).controller)==null?void 0:c.call(r,e.actions.controller);return t?(Object.entries(t).forEach(([s,i])=>e.dispatchers.attach(s,i)),t):void 0},[])}function G(e){return(t,n)=>async(r=Promise.withResolvers(),c)=>{if(typeof n!="function")return;const s=Symbol("process"),i=n(...c);if(typeof i=="function"){const d=i(e.model.current,s);return e.model.current=C(d,s),e.update.rerender(),void r.resolve()}for(;;){const{value:d,done:f}=await i.next();if(f){const le=d(e.model.current,s);e.model.current=C(le,s),e.update.rerender();break}const p=d;e.model.current=p(e.model.current,s),e.update.rerender()}r.resolve()}}function I(e){return e.startsWith("distributed")}class N extends Error{constructor(n,r=null){super(String(r));P(this,g);P(this,w);D(this,g,n),D(this,w,r)}get type(){return O(this,g)}get message(){return O(this,w)||""}}g=new WeakMap,w=new WeakMap;function H(e){const t=x(),n=G(e);return a.useMemo(()=>{const r=new l,c=t.appEmitter;return{attach(s,i){const d=String(s);I(d)?c.on(d,n(s,i)):r.on(d,n(s,i))},dispatch(s,i,d){const f=String(s);I(f)?c.emit(f,d,i):r.emit(f,d,i)}}},[])}function K(){const e=a.useRef(null);return a.useMemo(()=>({customElement:e}),[])}function V(e){var n,r,c,s;const t=a.useRef(!1);a.useLayoutEffect(()=>{e.dispatchers.dispatch(h.Derive,[])},[e.options.props,(n=e.router.current)==null?void 0:n.location,(r=e.router.current)==null?void 0:r.params,(s=(c=e.router.current)==null?void 0:c.search)==null?void 0:s[0]]),a.useLayoutEffect(()=>{if(!t.current)return t.current=!0,e.dispatchers.dispatch(h.Mount,[]),e.dispatchers.dispatch(h.Node,[e.elements.customElement.current]),()=>e.dispatchers.dispatch(h.Unmount,[])},[])}function X(e){const t=a.useMemo(()=>e.options.model??{},[]);return a.useRef(new S(t,t))}function Y(){return a.useRef(new Set)}function Z(){return a.useRef(null)}function ee({using:e,children:t}){return y.useInRouterContext()?u.jsx(te,{using:e,children:t}):t()}function te({using:e,children:t}){return e.current={navigate:y.useNavigate(),location:y.useLocation(),params:y.useParams(),search:y.useSearchParams()},u.jsx(u.Fragment,{children:t()})}function ne(){const[e,t]=a.useReducer(n=>n+1,0);return a.useMemo(()=>({hash:e,rerender:t}),[e])}function re({options:e}){const t=x(),n=ne(),r=Y(),c=K(),s=Z(),i=X({options:e}),d=H({app:t,options:e,update:n,model:i,queue:r}),f=Q({app:t,options:e,model:i,dispatchers:d,router:s});return W({options:e,dispatchers:d,actions:f}),V({options:e,dispatchers:d,elements:c,router:s}),a.useMemo(()=>a.createElement(e.name,{ref:c.customElement,style:{display:"contents"},children:u.jsx(ee,{using:s,children:()=>e.view(f.view)})}),[n.hash])}function oe(e){return t=>a.memo(n=>re({options:{...t,name:e.join(""),props:n}}),(n,r)=>JSON.stringify(n)===JSON.stringify(r))}function se(e){return new Promise(t=>setTimeout(t,e))}function ue(e){return e?!!(e&&typeof e!="symbol"):Symbol(`pk.${Date.now()}.${crypto.randomUUID()}`)}function ce(e){return e instanceof N}const ie=Object.freeze(Object.defineProperty({__proto__:null,isEventError:ce,pk:ue,sleep:se},Symbol.toStringTag,{value:"Module"})),ae={app:J,module:oe};o.EventError=N,o.Lifecycle=h,o.State=T,o.create=ae,o.utils=ie,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});

package/dist/controller/types.d.ts

@@ -1,7 +1,7 @@
 import { EventError } from '../module/renderer/dispatchers/utils.ts';
 import { Models } from '../module/renderer/model/utils.ts';
 import { Head } from '../module/renderer/types.ts';
-import { Actions, Attributes, Draft, Handlers, Lifecycle, ModuleDefinition, Op, Query, Queue } from '../types/index.ts';
+import { Actions, Draft, Lifecycle, ModuleDefinition, Op, Query, Queue } from '../types/index.ts';
 import * as Router from "../module/renderer/router/types.ts";
 export type ControllerActions<M extends ModuleDefinition> = {
     annotate<T>(value: T, operations?: (Op | Draft<T>)[]): T;
@@ -13,8 +13,7 @@ export type ControllerArgs<M extends ModuleDefinition> = Readonly<{
     queue: Readonly<Queue<M["Actions"]>>;
     router: M["Query"] extends NonNullable<Query> ? Readonly<Router.Context<M["Query"]>> : null;
     actions: Readonly<ControllerActions<M>>;
-    handlers: Readonly<Handlers<M["Props"]>>;
-    attributes: Readonly<Attributes<M["Props"]>>;
+    props: Readonly<M["Props"]>;
 }>;
 export type ActionEvent<M extends ModuleDefinition> = (...args: M["Actions"][number]) => ActionGenerator<M>;
 type ActionEvents<M extends ModuleDefinition> = {
@@ -24,7 +23,7 @@ export type ActionGenerator<M extends ModuleDefinition> = ((models: Models<M["Mo
 export type ControllerDefinition<M extends ModuleDefinition> = (controller: ControllerArgs<M>) => ControllerInstance<M>;
 export type ControllerInstance<M extends ModuleDefinition> = {
     [Lifecycle.Mount]?(): ActionGenerator<M>;
-    [Lifecycle.Derive]?(attributes: Attributes<M["Props"]>, routes: null | Router.Context<M["Query"]>): ActionGenerator<M>;
+    [Lifecycle.Derive]?(): ActionGenerator<M>;
     [Lifecycle.Node]?(tree: HTMLElement): ActionGenerator<M>;
     [Lifecycle.Error]?(error: Error | EventError): ActionGenerator<M>;
     [Lifecycle.Unmount]?(): ActionGenerator<M>;

package/dist/types/index.d.ts

@@ -48,18 +48,6 @@ export type ModuleDefinition = {
     Props: Props;
     Query: Query;
 };
-type Fns<P extends Props> = {
-    [K in keyof P]: P[K] extends (...args: any[]) => any ? P[K] : never;
-};
-type NonFns<P extends Props> = {
-    [K in keyof P]: P[K] extends (...args: any[]) => any ? never : P[K];
-};
-export type Handlers<P extends Props> = {
-    [K in keyof Fns<P> as Fns<P>[K] extends never ? never : K]: Fns<P>[K];
-};
-export type Attributes<P extends Props> = {
-    [K in keyof NonFns<P> as NonFns<P>[K] extends never ? never : K]: NonFns<P>[K];
-};
 export type Pk<T> = undefined | Symbol | T;
 export type Queue<A extends ModuleDefinition["Actions"]> = {
     name: Head<A>;

package/dist/view/types.d.ts

@@ -1,5 +1,5 @@
 import { Validatable } from '../module/renderer/model/types.ts';
-import { Attributes, Handlers, ModuleDefinition } from '../types/index.ts';
+import { ModuleDefinition } from '../types/index.ts';
 import * as React from "react";
 export type ViewActions<M extends ModuleDefinition> = {
     dispatch(action: M["Actions"]): Promise<void>;
@@ -8,7 +8,6 @@ export type ViewArgs<M extends ModuleDefinition> = Readonly<{
     model: Readonly<M["Model"]>;
     validate: Readonly<Validatable<M["Model"]>>;
     actions: Readonly<ViewActions<M>>;
-    handlers: Readonly<Handlers<M["Props"]>>;
-    attributes: Readonly<Attributes<M["Props"]>>;
+    props: Readonly<M["Props"]>;
 }>;
 export type ViewDefinition<M extends ModuleDefinition> = (actions: ViewArgs<M>) => React.ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chizu",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "main": "./dist/chizu.js",
   "types": "./dist/index.d.ts",