@snupo/jmc 1.0.10 → 1.0.12

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/jmc.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jmc.d.ts","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,CAAC,EAAY,cAAc,EAAe,SAAS,EAAY,IAAI,EAAE,MAAM,KAAK,CAAA;AAoD9F,eAAO,MAAM,IAAI,GAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,KAAG,CAAc,CAAA;AAsFtD,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,GAAS,cAAc,QAQpE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,SAAS,GAAG,IAAI,CAAmC;AAC5G,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,IAAI,CAAoC"}
1
+ {"version":3,"file":"jmc.d.ts","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,CAAC,EAAY,cAAc,EAAe,SAAS,EAAY,IAAI,EAAE,MAAM,KAAK,CAAA;AAqD9F,eAAO,MAAM,IAAI,GAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,KAAG,CAKvC,CAAA;AAyFD,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,GAAS,cAAc,QAQpE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,SAAS,GAAG,IAAI,CAAmC;AAC5G,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,IAAI,CAAoC"}
package/dist/jmc.js CHANGED
@@ -37,11 +37,16 @@ function evalprops(p) {
37
37
  return p;
38
38
  const pr = {};
39
39
  for (const k in p) {
40
- pr[k] = p[k] instanceof Function ? p[k]() : p[k];
40
+ let v = p[k];
41
+ pr[k] = v instanceof Function && v.lazy === true ? p[k]() : p[k];
41
42
  }
42
43
  return pr;
43
44
  }
44
- export const lazy = (expr) => expr; // fake alert! in fact we pass the expression through, the framework evaluates the props later lazily
45
+ export const lazy = (expr) => {
46
+ let e = expr;
47
+ e.lazy = true; // tbd: symbol
48
+ return e; // fake alert! in fact we pass the expression through, the framework evaluates the props later lazily
49
+ }; // fake alert! in fact we pass the expression through, the framework evaluates the props later lazily
45
50
  function sync(uc, parent, i, h, ns) {
46
51
  // console.log('%csync2', "background:orange", parent.tagName, i, h)
47
52
  if (h === null || h === undefined)
@@ -95,11 +100,11 @@ function sync(uc, parent, i, h, ns) {
95
100
  let hr = ci.view();
96
101
  let j = sync(uc, parent, i, hr, ns);
97
102
  let n = parent.childNodes[i];
98
- if (n)
99
- n.h = h; // tbd: this could disallow component updates ?? i guess it is right
100
103
  ci.element = n;
101
- if (!isupdate)
102
- ci?.mounted?.();
104
+ if (!isupdate) {
105
+ n.h = h;
106
+ ci.mounted?.();
107
+ }
103
108
  return j;
104
109
  }
105
110
  case undefined:
package/dist/jmc.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jmc.js","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"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","sourcesContent":["import { rebind } from './base.js'\r\nimport type { H, HElement, IUpdateContext, J, Selector, Selectors, Children, Func } from './h'\r\nimport { HKind } from './h'\r\n\r\nconst enum NodeType { // vaporizes (but for that must be in this file, otherwise not)\r\n TextNode = 3\r\n}\r\n\r\nlet removeexcesschildren = (n: Element, i: number) => {\r\n let c: ChildNode\r\n while ((c = n.childNodes[i])) {\r\n try { c.remove() } catch (_) { } // due to blur-event-handlers, this can fail\r\n }\r\n}\r\n\r\nlet iswebcomponent = (h: HElement) => h.tag.includes('-')\r\n\r\nconst isproperty = (e: Element, name: string, value: any) =>\r\n name !== \"viewBox\" &&\r\n (value instanceof Object ||\r\n value instanceof Function ||\r\n (e.namespaceURI !== \"http://www.w3.org/2000/svg\" && name in e && name != 'style'))\r\n\r\nlet setprops = (e: Element & J, old: J | undefined, now: J | undefined) => {\r\n old ??= {}\r\n now ??= {}\r\n for (let p in old)\r\n if (!(p in now))\r\n isproperty(e, p, old[p])\r\n ? e[p] = typeof old[p] === 'boolean' ? false : '' // not sure about this. safest handling of initial values would be to track them. tbd: unit test\r\n : e.removeAttribute(p)\r\n for (let p in now)\r\n isproperty(e, p, now[p])\r\n ? e[p] = now[p]\r\n : e.setAttribute(p, now[p])\r\n}\r\n\r\n/** synchronizes children starting at the i-th element. returns the index of the last child synchronized */\r\nlet syncchildren = (uc: IUpdateContext, p: Element, cn: Children, i: number, ns: string): number => {\r\n cn.flat().forEach(hc => (i = sync(uc, p, i, hc, ns)))\r\n return i\r\n}\r\n\r\n// tbd: is update in place possible? - add tests for lazy update\r\nfunction evalprops(p: J | undefined): J | undefined {\r\n if (!p) return p\r\n const pr = {} as J\r\n for (const k in p) {\r\n pr[k] = p[k] instanceof Function ? p[k]() : p[k]\r\n }\r\n return pr\r\n}\r\n\r\nexport const lazy = <T>(expr: Func<T>): T => expr as T // fake alert! in fact we pass the expression through, the framework evaluates the props later lazily\r\n\r\nfunction sync(uc: IUpdateContext, parent: Element, i: number, h: H | undefined, ns: string): number {\r\n\r\n // console.log('%csync2', \"background:orange\", parent.tagName, i, h)\r\n\r\n if (h === null || h === undefined) return i // skip. keep 0 and false renderable, per comment below\r\n let c = parent.childNodes[i]\r\n\r\n switch (h.kind) {\r\n case HKind.Element:\r\n\r\n let n: Element\r\n let { tag, cn, p } = h\r\n cn ??= []\r\n\r\n let pr = evalprops(p)\r\n\r\n if ((<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()) {\r\n n = document.createElementNS(ns = pr?.xmlns ?? ns, tag) // replace namespace with propertyvalue if set. otherwise pass forward to children\r\n c ? c.replaceWith(n) : parent.appendChild(n)\r\n setprops(n, {}, pr)\r\n pr?.mounted?.(n)\r\n } else {\r\n n = c as Element\r\n setprops(n, n.h?.p, pr) // tbd: this is wrong - try to break this with property updates, just patch sequences - create an own patch test file\r\n if (pr?.update?.(c, uc)) return i + 1\r\n }\r\n\r\n n.h = h\r\n\r\n if (!uc.patchElementOnly && !iswebcomponent(h as HElement)) {\r\n // tbd: make \"island\" attribute\r\n const j = syncchildren(uc, n, cn, 0, ns)\r\n removeexcesschildren(n, j)\r\n }\r\n\r\n return i + 1\r\n\r\n case HKind.Fragment:\r\n return syncchildren(uc, parent, h.cn ?? [], i, ns)\r\n\r\n case HKind.FunctionComponent:\r\n {\r\n let hr = h.tag(evalprops(h.p), h.cn)\r\n let j = sync(uc, parent, i, hr, ns)\r\n let n = parent.childNodes[i]! // now the dom element exists, unless the function returned undefined or null\r\n if (n) n.h = h\r\n return j\r\n }\r\n\r\n case HKind.ClassComponent:\r\n {\r\n let isupdate = (c?.h as any)?.tag == h.tag\r\n\r\n let pr = evalprops(h.p)\r\n\r\n let ci = h.i = isupdate ? h.i! : rebind(new h.tag(pr))\r\n ci.props = pr // for the update case we set props\r\n\r\n // if component instance returns truthy for update(), then this update substitutes syncing\r\n if (isupdate && ci.update?.(uc)) return i + 1\r\n\r\n let hr = ci.view()\r\n let j = sync(uc, parent, i, hr, ns)\r\n let n = parent.childNodes[i]!\r\n if (n) n.h = h // tbd: this could disallow component updates ?? i guess it is right\r\n\r\n ci.element = n\r\n if (!isupdate) ci?.mounted?.()\r\n\r\n return j\r\n }\r\n\r\n case undefined:\r\n // textnode\r\n let s = h as string // coerce type as the js runtime does\r\n if (c?.nodeType == NodeType.TextNode) {\r\n if (c.textContent != s) c.textContent = s // firefox updates equal text, loosing existing text selection\r\n } else {\r\n c ? c.replaceWith(s) : parent.append(s)\r\n }\r\n return i + 1\r\n }\r\n}\r\n\r\nexport function patch(e: Node | null, h: H, uc = {} as IUpdateContext) {\r\n if (!e) return\r\n delete uc.patchElementOnly\r\n if (uc.replace) (e as HTMLElement).replaceChildren()\r\n const p = e.parentElement as HTMLElement\r\n const i = [].indexOf.call<any, any, any>(p.childNodes, e)\r\n // always called deferred, because removing elements can trigger events and their handlers (like blur)\r\n sync(uc, p, i, h, p.namespaceURI!) // is this safe? use default html namespace?\r\n}\r\n\r\nexport function updateviewuc(u: IUpdateContext, ...sels: Selectors): void { updateviewinternal(u, ...sels) }\r\nexport function updateview(...sels: Selectors): void { updateviewinternal({}, ...sels) }\r\n\r\nfunction updateviewinternal(uc: IUpdateContext, ...sels: Selector[]): void {\r\n if (!sels.length) sels.push('body')\r\n sels.flatMap(s => (typeof s == 'string' ? [...document.querySelectorAll(s)] : s ? [s] : []))\r\n .forEach(e => { patch(e, e.h!, uc) })\r\n}\r\n"]}
1
+ {"version":3,"file":"jmc.js","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"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","sourcesContent":["import { rebind } from './base.js'\r\nimport type { H, HElement, IUpdateContext, J, Selector, Selectors, Children, Func } from './h'\r\nimport { HKind } from './h'\r\n\r\nconst enum NodeType { // vaporizes (but for that must be in this file, otherwise not)\r\n TextNode = 3\r\n}\r\n\r\nlet removeexcesschildren = (n: Element, i: number) => {\r\n let c: ChildNode\r\n while ((c = n.childNodes[i])) {\r\n try { c.remove() } catch (_) { } // due to blur-event-handlers, this can fail\r\n }\r\n}\r\n\r\nlet iswebcomponent = (h: HElement) => h.tag.includes('-')\r\n\r\nconst isproperty = (e: Element, name: string, value: any) =>\r\n name !== \"viewBox\" &&\r\n (value instanceof Object ||\r\n value instanceof Function ||\r\n (e.namespaceURI !== \"http://www.w3.org/2000/svg\" && name in e && name != 'style'))\r\n\r\nlet setprops = (e: Element & J, old: J | undefined, now: J | undefined) => {\r\n old ??= {}\r\n now ??= {}\r\n for (let p in old)\r\n if (!(p in now))\r\n isproperty(e, p, old[p])\r\n ? e[p] = typeof old[p] === 'boolean' ? false : '' // not sure about this. safest handling of initial values would be to track them. tbd: unit test\r\n : e.removeAttribute(p)\r\n for (let p in now)\r\n isproperty(e, p, now[p])\r\n ? e[p] = now[p]\r\n : e.setAttribute(p, now[p])\r\n}\r\n\r\n/** synchronizes children starting at the i-th element. returns the index of the last child synchronized */\r\nlet syncchildren = (uc: IUpdateContext, p: Element, cn: Children, i: number, ns: string): number => {\r\n cn.flat().forEach(hc => (i = sync(uc, p, i, hc, ns)))\r\n return i\r\n}\r\n\r\n// tbd: is update in place possible? - add tests for lazy update\r\nfunction evalprops(p: J | undefined): J | undefined {\r\n if (!p) return p\r\n const pr = {} as J\r\n for (const k in p) {\r\n let v = p[k]\r\n pr[k] = v instanceof Function && v.lazy === true ? p[k]() : p[k]\r\n }\r\n return pr\r\n}\r\n\r\nexport const lazy = <T>(expr: Func<T>): T => {\r\n let e: any = expr\r\n e.lazy = true // tbd: symbol\r\n return e // fake alert! in fact we pass the expression through, the framework evaluates the props later lazily\r\n\r\n} // fake alert! in fact we pass the expression through, the framework evaluates the props later lazily\r\n\r\nfunction sync(uc: IUpdateContext, parent: Element, i: number, h: H | undefined, ns: string): number {\r\n\r\n // console.log('%csync2', \"background:orange\", parent.tagName, i, h)\r\n\r\n if (h === null || h === undefined) return i // skip. keep 0 and false renderable, per comment below\r\n let c = parent.childNodes[i]\r\n\r\n switch (h.kind) {\r\n case HKind.Element:\r\n\r\n let n: Element\r\n let { tag, cn, p } = h\r\n cn ??= []\r\n\r\n let pr = evalprops(p)\r\n\r\n if ((<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()) {\r\n n = document.createElementNS(ns = pr?.xmlns ?? ns, tag) // replace namespace with propertyvalue if set. otherwise pass forward to children\r\n c ? c.replaceWith(n) : parent.appendChild(n)\r\n setprops(n, {}, pr)\r\n pr?.mounted?.(n)\r\n } else {\r\n n = c as Element\r\n setprops(n, n.h?.p, pr) // tbd: this is wrong - try to break this with property updates, just patch sequences - create an own patch test file\r\n if (pr?.update?.(c, uc)) return i + 1\r\n }\r\n\r\n n.h = h\r\n\r\n if (!uc.patchElementOnly && !iswebcomponent(h as HElement)) {\r\n // tbd: make \"island\" attribute\r\n const j = syncchildren(uc, n, cn, 0, ns)\r\n removeexcesschildren(n, j)\r\n }\r\n\r\n return i + 1\r\n\r\n case HKind.Fragment:\r\n return syncchildren(uc, parent, h.cn ?? [], i, ns)\r\n\r\n case HKind.FunctionComponent:\r\n {\r\n let hr = h.tag(evalprops(h.p), h.cn)\r\n let j = sync(uc, parent, i, hr, ns)\r\n let n = parent.childNodes[i]! // now the dom element exists, unless the function returned undefined or null\r\n if (n) n.h = h\r\n return j\r\n }\r\n\r\n case HKind.ClassComponent:\r\n {\r\n let isupdate = (c?.h as any)?.tag == h.tag\r\n\r\n let pr = evalprops(h.p)\r\n\r\n let ci = h.i = isupdate ? h.i! : rebind(new h.tag(pr))\r\n ci.props = pr // for the update case we set props\r\n\r\n // if component instance returns truthy for update(), then this update substitutes syncing\r\n if (isupdate && ci.update?.(uc)) return i + 1\r\n\r\n let hr = ci.view()\r\n let j = sync(uc, parent, i, hr, ns)\r\n let n = parent.childNodes[i]!\r\n\r\n ci.element = n\r\n\r\n if (!isupdate) {\r\n n.h = h\r\n ci.mounted?.()\r\n }\r\n\r\n return j\r\n }\r\n\r\n case undefined:\r\n // textnode\r\n let s = h as string // coerce type as the js runtime does\r\n if (c?.nodeType == NodeType.TextNode) {\r\n if (c.textContent != s) c.textContent = s // firefox updates equal text, loosing existing text selection\r\n } else {\r\n c ? c.replaceWith(s) : parent.append(s)\r\n }\r\n return i + 1\r\n }\r\n}\r\n\r\nexport function patch(e: Node | null, h: H, uc = {} as IUpdateContext) {\r\n if (!e) return\r\n delete uc.patchElementOnly\r\n if (uc.replace) (e as HTMLElement).replaceChildren()\r\n const p = e.parentElement as HTMLElement\r\n const i = [].indexOf.call<any, any, any>(p.childNodes, e)\r\n // always called deferred, because removing elements can trigger events and their handlers (like blur)\r\n sync(uc, p, i, h, p.namespaceURI!) // is this safe? use default html namespace?\r\n}\r\n\r\nexport function updateviewuc(u: IUpdateContext, ...sels: Selectors): void { updateviewinternal(u, ...sels) }\r\nexport function updateview(...sels: Selectors): void { updateviewinternal({}, ...sels) }\r\n\r\nfunction updateviewinternal(uc: IUpdateContext, ...sels: Selector[]): void {\r\n if (!sels.length) sels.push('body')\r\n sels.flatMap(s => (typeof s == 'string' ? [...document.querySelectorAll(s)] : s ? [s] : []))\r\n .forEach(e => { patch(e, e.h!, uc) })\r\n}\r\n"]}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@snupo/jmc",
3
3
  "author": "snupo",
4
- "version": "1.0.10",
4
+ "version": "1.0.12",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },