@snupo/jmc 1.4.0 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/base.d.ts CHANGED
@@ -10,5 +10,7 @@ export declare class Thunk<T> {
10
10
  constructor(f: () => T);
11
11
  }
12
12
  export declare function live<T>(f: () => T): Thunk<T>;
13
+ export type Live<T> = T | Thunk<T>;
14
+ export declare function evallive<T>(v: Live<T>): T;
13
15
  export declare function mount(o: Record<string, any>): void;
14
16
  //# sourceMappingURL=base.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,MAA2B,GAAG,CAAC,CAKlF;AAED,wFAAwF;AACxF,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,MAS3H,CAAA;AAEF,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,CAAC,KAAG,CAAyJ,CAAA;AAErP,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,KAAG,CAAuC,CAAA;AAE3G,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,OAAO,GAAG,IAAI,GAAG,IAAI,CAAsE;AAExJ,4CAA4C;AAC5C,qBAAa,KAAK,CAAC,CAAC;IACG,CAAC,EAAE,MAAM,CAAC;gBAAV,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,YAAyB;AAE3D,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAAkC"}
1
+ {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,MAA2B,GAAG,CAAC,CAKlF;AAED,wFAAwF;AACxF,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,MAS3H,CAAA;AAEF,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,CAAC,KAAG,CAAyJ,CAAA;AAErP,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,KAAG,CAAuC,CAAA;AAE3G,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,OAAO,GAAG,IAAI,GAAG,IAAI,CAAsE;AAExJ,4CAA4C;AAC5C,qBAAa,KAAK,CAAC,CAAC;IACG,CAAC,EAAE,MAAM,CAAC;gBAAV,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,YAAyB;AAE3D,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;AAElC,wBAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAA0C;AAEpF,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAAkC"}
package/dist/base.js CHANGED
@@ -27,5 +27,6 @@ export class Thunk {
27
27
  }
28
28
  }
29
29
  export function live(f) { return new Thunk(f); }
30
+ export function evallive(v) { return v instanceof Thunk ? v.f() : v; }
30
31
  export function mount(o) { Object.assign(globalThis, o); }
31
32
  //# sourceMappingURL=base.js.map
package/dist/base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,MAAM,CAAmB,CAAI,EAAE,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;SAClD,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,aAAa,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC;SAC3E,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAE,CAAS,CAAC,IAAI,CAAC,GAAI,CAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACrE,OAAO,CAAC,CAAA;AACZ,CAAC;AAED,wFAAwF;AACxF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAgC,CAAI,EAAE,MAAwD,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE;IAC3I,GAAG,CAAC,MAAM,EAAE,IAAY,EAAE,QAAQ;QAC9B,IAAI,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAClF,OAAO,UAAmB,GAAG,IAAW;YACpC,IAAI,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC3C,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;YAC1B,OAAO,MAAM,CAAA;QACjB,CAAC,CAAA;IACL,CAAC;CACJ,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAgC,OAAe,EAAE,CAAI,EAAK,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,EAAE,cAAc,OAAO,2CAA2C,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;AAErP,MAAM,CAAC,MAAM,aAAa,GAAG,CAAgC,CAAI,EAAK,EAAE,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;AAE3G,MAAM,UAAU,SAAS,CAAC,CAAc,EAAE,IAA0B,IAAiB,OAAO,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA,CAAC,CAAC;AAExJ,4CAA4C;AAC5C,MAAM,OAAO,KAAK;IACK;IAAnB,YAAmB,CAAU;QAAV,MAAC,GAAD,CAAC,CAAS;IAAI,CAAC;CACrC;AAED,MAAM,UAAU,IAAI,CAAI,CAAU,IAAI,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC;AAE3D,MAAM,UAAU,KAAK,CAAC,CAAsB,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA,CAAC,CAAC","sourcesContent":["export function rebind<T extends object>(o: T, proto = Object.getPrototypeOf(o)): T {\n Object.entries(Object.getOwnPropertyDescriptors(proto))\n .filter(([name, p]) => name != 'constructor' && p.value instanceof Function)\n .forEach(([name]) => (o as any)[name] = (o as any)[name].bind(o))\n return o\n}\n\n/** wraps o so that each method call is reported to logger, after the method returned */\nexport const loggedmethodsex = <T extends Record<string, any>>(o: T, logger: (name: string, args: any[], result: any) => void) => new Proxy(o, {\n get(target, name: string, receiver) {\n if (typeof target[name] !== 'function') return Reflect.get(target, name, receiver)\n return function (this: T, ...args: any[]) {\n let result = target[name].apply(this, args)\n logger(name, args, result)\n return result\n }\n },\n})\n\nexport const loggedmethodscolored = <T extends Record<string, any>>(bgcolor: string, o: T): T => loggedmethodsex(o, (name, args, result) => console.log('%c' + name, `background:${bgcolor};color:white;padding:2px;font-weight:bold`, args, result))\n\nexport const loggedmethods = <T extends Record<string, any>>(o: T): T => loggedmethodscolored('#585059', o)\n\nexport function closestby(e: Node | null, pred: (e: Node) => boolean): Node | null { return (e == null || pred(e)) ? e : closestby(e.parentNode, pred) }\n\n/** a prop value evaluated at each render */\nexport class Thunk<T> {\n constructor(public f: () => T) { }\n}\n\nexport function live<T>(f: () => T) { return new Thunk(f) }\n\nexport function mount(o: Record<string, any>) { Object.assign(globalThis, o) }"]}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,MAAM,CAAmB,CAAI,EAAE,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;SAClD,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,aAAa,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC;SAC3E,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAE,CAAS,CAAC,IAAI,CAAC,GAAI,CAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACrE,OAAO,CAAC,CAAA;AACZ,CAAC;AAED,wFAAwF;AACxF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAgC,CAAI,EAAE,MAAwD,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE;IAC3I,GAAG,CAAC,MAAM,EAAE,IAAY,EAAE,QAAQ;QAC9B,IAAI,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAClF,OAAO,UAAmB,GAAG,IAAW;YACpC,IAAI,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC3C,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;YAC1B,OAAO,MAAM,CAAA;QACjB,CAAC,CAAA;IACL,CAAC;CACJ,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAgC,OAAe,EAAE,CAAI,EAAK,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,EAAE,cAAc,OAAO,2CAA2C,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;AAErP,MAAM,CAAC,MAAM,aAAa,GAAG,CAAgC,CAAI,EAAK,EAAE,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;AAE3G,MAAM,UAAU,SAAS,CAAC,CAAc,EAAE,IAA0B,IAAiB,OAAO,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA,CAAC,CAAC;AAExJ,4CAA4C;AAC5C,MAAM,OAAO,KAAK;IACK;IAAnB,YAAmB,CAAU;QAAV,MAAC,GAAD,CAAC,CAAS;IAAI,CAAC;CACrC;AAED,MAAM,UAAU,IAAI,CAAI,CAAU,IAAI,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC;AAI3D,MAAM,UAAU,QAAQ,CAAI,CAAU,IAAO,OAAO,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC;AAEpF,MAAM,UAAU,KAAK,CAAC,CAAsB,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA,CAAC,CAAC","sourcesContent":["export function rebind<T extends object>(o: T, proto = Object.getPrototypeOf(o)): T {\n Object.entries(Object.getOwnPropertyDescriptors(proto))\n .filter(([name, p]) => name != 'constructor' && p.value instanceof Function)\n .forEach(([name]) => (o as any)[name] = (o as any)[name].bind(o))\n return o\n}\n\n/** wraps o so that each method call is reported to logger, after the method returned */\nexport const loggedmethodsex = <T extends Record<string, any>>(o: T, logger: (name: string, args: any[], result: any) => void) => new Proxy(o, {\n get(target, name: string, receiver) {\n if (typeof target[name] !== 'function') return Reflect.get(target, name, receiver)\n return function (this: T, ...args: any[]) {\n let result = target[name].apply(this, args)\n logger(name, args, result)\n return result\n }\n },\n})\n\nexport const loggedmethodscolored = <T extends Record<string, any>>(bgcolor: string, o: T): T => loggedmethodsex(o, (name, args, result) => console.log('%c' + name, `background:${bgcolor};color:white;padding:2px;font-weight:bold`, args, result))\n\nexport const loggedmethods = <T extends Record<string, any>>(o: T): T => loggedmethodscolored('#585059', o)\n\nexport function closestby(e: Node | null, pred: (e: Node) => boolean): Node | null { return (e == null || pred(e)) ? e : closestby(e.parentNode, pred) }\n\n/** a prop value evaluated at each render */\nexport class Thunk<T> {\n constructor(public f: () => T) { }\n}\n\nexport function live<T>(f: () => T) { return new Thunk(f) }\n\nexport type Live<T> = T | Thunk<T>\n\nexport function evallive<T>(v: Live<T>): T { return v instanceof Thunk ? v.f() : v }\n\nexport function mount(o: Record<string, any>) { Object.assign(globalThis, o) }"]}
package/dist/props.js CHANGED
@@ -1,4 +1,4 @@
1
- import { Thunk } from './base.js';
1
+ import { evallive } from './base.js';
2
2
  /** settings to tweak jmc */
3
3
  export const jmcconfig = {
4
4
  /** marks component roots with a comp="Name" attribute */
@@ -22,7 +22,7 @@ let removeprop = (e, p, old) => {
22
22
  /** applies now over old and returns the applied values, with thunks evaluated, to serve as old on the next call */
23
23
  export let setprops = (e, old = {}, now) => {
24
24
  // evaluate thunks into a copy: now is h.p, which gets rendered again and must keep its thunks
25
- now = Object.fromEntries(Object.entries(now).map(([k, v]) => [k, v instanceof Thunk ? v.f() : v]));
25
+ now = Object.fromEntries(Object.entries(now).map(([k, v]) => [k, evallive(v)]));
26
26
  // removals
27
27
  for (let p in old)
28
28
  if (!(p in now))
package/dist/props.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"props.js","sourceRoot":"","sources":["../src/props.ts"],"names":[],"mappings":"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","sourcesContent":["import type { J } from './h.js'\r\nimport { Thunk } from './base.js'\r\n\r\n/** settings to tweak jmc */\r\nexport const jmcconfig = {\r\n /** marks component roots with a comp=\"Name\" attribute */\r\n debug: false,\r\n /** prop names always set as attributes, never as properties */\r\n attributes: new Set(['selected', 'viewBox', 'list']),\r\n}\r\n\r\nconst isproperty = (e: Element, name: string, value: any) =>\r\n !jmcconfig.attributes.has(name) &&\r\n (value instanceof Object || ( // objects and functions\r\n e.namespaceURI !== 'http://www.w3.org/2000/svg' &&\r\n name in e &&\r\n name !== 'style'))\r\n\r\nlet removeprop = (e: Element & J, p: string, old: any) => {\r\n if (p.startsWith('on') && typeof old == 'function') return e.removeEventListener(p.slice(2), old)\r\n if (isproperty(e, p, old)) e[p] = typeof old === 'boolean' ? false : ''\r\n if (!(old instanceof Object)) e.removeAttribute(p) // reflected properties (title, id, ...) leave an empty attribute otherwise\r\n}\r\n\r\n/** applies now over old and returns the applied values, with thunks evaluated, to serve as old on the next call */\r\nexport let setprops = (e: Element & J, old: J = {}, now: J): J => {\r\n // evaluate thunks into a copy: now is h.p, which gets rendered again and must keep its thunks\r\n now = Object.fromEntries(Object.entries(now).map(([k, v]) => [k, v instanceof Thunk ? v.f() : v]))\r\n\r\n // removals\r\n for (let p in old)\r\n if (!(p in now)) removeprop(e, p, old[p])\r\n\r\n // updates\r\n for (let p in now) {\r\n let v = now[p]\r\n if (v !== old[p] && !(v == null && old[p] == null)) { // strict: 0 vs '' or 1 vs true are changes. null vs undefined is not\r\n if (v == null) removeprop(e, p, old[p])\r\n else if (p.startsWith('on') && typeof v == 'function') {\r\n // listeners, not on* properties: those fail silently for events the element has no property for\r\n if (typeof old[p] == 'function') e.removeEventListener(p.slice(2), old[p])\r\n e.addEventListener(p.slice(2), v)\r\n }\r\n else if (isproperty(e, p, v)) e[p] = v\r\n else if (v === false && !p.startsWith('aria-')) e.removeAttribute(p) // aria-*=\"false\" is meaningful\r\n else e.setAttribute(p, v)\r\n }\r\n }\r\n return now\r\n}\r\n"]}
1
+ {"version":3,"file":"props.js","sourceRoot":"","sources":["../src/props.ts"],"names":[],"mappings":"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","sourcesContent":["import type { J } from './h.js'\r\nimport { evallive, Thunk } from './base.js'\r\n\r\n/** settings to tweak jmc */\r\nexport const jmcconfig = {\r\n /** marks component roots with a comp=\"Name\" attribute */\r\n debug: false,\r\n /** prop names always set as attributes, never as properties */\r\n attributes: new Set(['selected', 'viewBox', 'list']),\r\n}\r\n\r\nconst isproperty = (e: Element, name: string, value: any) =>\r\n !jmcconfig.attributes.has(name) &&\r\n (value instanceof Object || ( // objects and functions\r\n e.namespaceURI !== 'http://www.w3.org/2000/svg' &&\r\n name in e &&\r\n name !== 'style'))\r\n\r\nlet removeprop = (e: Element & J, p: string, old: any) => {\r\n if (p.startsWith('on') && typeof old == 'function') return e.removeEventListener(p.slice(2), old)\r\n if (isproperty(e, p, old)) e[p] = typeof old === 'boolean' ? false : ''\r\n if (!(old instanceof Object)) e.removeAttribute(p) // reflected properties (title, id, ...) leave an empty attribute otherwise\r\n}\r\n\r\n/** applies now over old and returns the applied values, with thunks evaluated, to serve as old on the next call */\r\nexport let setprops = (e: Element & J, old: J = {}, now: J): J => {\r\n // evaluate thunks into a copy: now is h.p, which gets rendered again and must keep its thunks\r\n now = Object.fromEntries(Object.entries(now).map(([k, v]) => [k, evallive(v)]))\r\n\r\n // removals\r\n for (let p in old)\r\n if (!(p in now)) removeprop(e, p, old[p])\r\n\r\n // updates\r\n for (let p in now) {\r\n let v = now[p]\r\n if (v !== old[p] && !(v == null && old[p] == null)) { // strict: 0 vs '' or 1 vs true are changes. null vs undefined is not\r\n if (v == null) removeprop(e, p, old[p])\r\n else if (p.startsWith('on') && typeof v == 'function') {\r\n // listeners, not on* properties: those fail silently for events the element has no property for\r\n if (typeof old[p] == 'function') e.removeEventListener(p.slice(2), old[p])\r\n e.addEventListener(p.slice(2), v)\r\n }\r\n else if (isproperty(e, p, v)) e[p] = v\r\n else if (v === false && !p.startsWith('aria-')) e.removeAttribute(p) // aria-*=\"false\" is meaningful\r\n else e.setAttribute(p, v)\r\n }\r\n }\r\n return now\r\n}\r\n"]}
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  },
18
18
  "homepage": "https://github.com/snuup/jmc#readme",
19
19
  "bugs": "https://github.com/snuup/jmc/issues",
20
- "version": "1.4.0",
20
+ "version": "1.4.1",
21
21
  "publishConfig": {
22
22
  "access": "public"
23
23
  },
package/src/base.ts CHANGED
@@ -30,4 +30,8 @@ export class Thunk<T> {
30
30
 
31
31
  export function live<T>(f: () => T) { return new Thunk(f) }
32
32
 
33
+ export type Live<T> = T | Thunk<T>
34
+
35
+ export function evallive<T>(v: Live<T>): T { return v instanceof Thunk ? v.f() : v }
36
+
33
37
  export function mount(o: Record<string, any>) { Object.assign(globalThis, o) }
package/src/props.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { J } from './h.js'
2
- import { Thunk } from './base.js'
2
+ import { evallive, Thunk } from './base.js'
3
3
 
4
4
  /** settings to tweak jmc */
5
5
  export const jmcconfig = {
@@ -25,7 +25,7 @@ let removeprop = (e: Element & J, p: string, old: any) => {
25
25
  /** applies now over old and returns the applied values, with thunks evaluated, to serve as old on the next call */
26
26
  export let setprops = (e: Element & J, old: J = {}, now: J): J => {
27
27
  // evaluate thunks into a copy: now is h.p, which gets rendered again and must keep its thunks
28
- now = Object.fromEntries(Object.entries(now).map(([k, v]) => [k, v instanceof Thunk ? v.f() : v]))
28
+ now = Object.fromEntries(Object.entries(now).map(([k, v]) => [k, evallive(v)]))
29
29
 
30
30
  // removals
31
31
  for (let p in old)