@snupo/jmc 1.0.42 → 1.0.43

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 CHANGED
@@ -6,7 +6,7 @@ declare global {
6
6
  };
7
7
  }
8
8
  }
9
- export declare function patch(e: Node | null, h?: H, depth?: number, uc?: J): void;
9
+ export declare function patch(e: Node | null, h: H, depth?: number, uc?: J): void;
10
10
  export type Command = Selector | J | number;
11
11
  export declare function updateview(...cmds: Command[]): void;
12
12
  //# sourceMappingURL=jmc.d.ts.map
package/dist/jmc.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jmc.d.ts","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAY,CAAC,EAAE,QAAQ,EAA6B,MAAM,KAAK,CAAA;AAO9E,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,IAAI;QACV,CAAC,CAAC,EAAE,CAAC,GAAG;YAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SAAE,CAAA;KACpB;CACJ;AAyHD,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,SAAM,EAAE,EAAE,GAAS,CAAC,QASrE;AAED,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,CAAC,GAAG,MAAM,CAAA;AAE3C,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAyBnD"}
1
+ {"version":3,"file":"jmc.d.ts","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAY,CAAC,EAAE,QAAQ,EAA6B,MAAM,KAAK,CAAA;AAO9E,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,IAAI;QACV,CAAC,CAAC,EAAE,CAAC,GAAG;YAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SAAE,CAAA;KACpB;CACJ;AAwHD,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,SAAM,EAAE,EAAE,GAAS,CAAC,QASpE;AAED,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,CAAC,GAAG,MAAM,CAAA;AAE3C,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CA2BnD"}
package/dist/jmc.js CHANGED
@@ -25,15 +25,13 @@ let setprops = (e, old, now) => {
25
25
  };
26
26
  /** synchronizes children starting at the i-th element. returns the index of the last child synchronized */
27
27
  let syncchildren = (p, cn, i, ns, depth, uc) => {
28
- cn.flat(999).forEach(hc => (i = sync(p, i, hc, ns, depth, uc)));
28
+ cn.flat(999)
29
+ .filter(hc => hc !== null && hc !== undefined) // skip. keep 0 and false renderable, per comment below)
30
+ .forEach(hc => (i = sync(p, i, hc, ns, depth, uc)));
29
31
  return i;
30
32
  };
31
33
  function sync(parent, i, h, ns, depth, uc) {
32
34
  // console.log('%csync2', "background:orange", parent.tagName, i, h, depth)
33
- if (!depth)
34
- return i + 1;
35
- if (h === null || h === undefined)
36
- return i; // skip. keep 0 and false renderable, per comment below
37
35
  let c = parent.childNodes[i];
38
36
  switch (h.kind) {
39
37
  case 1:
@@ -125,8 +123,10 @@ export function updateview(...cmds) {
125
123
  f([...document.querySelectorAll(c)]);
126
124
  }
127
125
  else if (c instanceof Node) {
128
- patch(c, c.h, depth, uc);
129
- patchcount++;
126
+ if (c.h) {
127
+ patch(c, c.h, depth, uc);
128
+ patchcount++;
129
+ }
130
130
  }
131
131
  else if (typeof c === 'number') {
132
132
  depth = c;
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 type { H, HElement, J, Selector, Children, HClassComponent } from './h'\r\nimport { rebind } from './base.js'\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\ndeclare global {\r\n interface Node {\r\n h?: H & { p?: J }\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\r\n old ??= {}\r\n now ??= {}\r\n\r\n // removals\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 : ''\r\n : e.removeAttribute(p)\r\n // updates\r\n for (let p in now) {\r\n let v = now[p]\r\n if (v != old[p]) {\r\n isproperty(e, p, v)\r\n ? e[p] = v\r\n : e.setAttribute(p, v)\r\n }\r\n }\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 = (p: Element, cn: Children, i: number, ns: string, depth: number, uc: J): number => {\r\n cn.flat(999).forEach(hc => (i = sync(p, i, hc, ns, depth, uc)))\r\n return i\r\n}\r\n\r\nfunction sync(parent: Element, i: number, h: H | undefined, ns: string, depth: number, uc: J): number {\r\n\r\n // console.log('%csync2', \"background:orange\", parent.tagName, i, h, depth)\r\n\r\n if (!depth) return i + 1\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 1:\r\n {\r\n let n: Element\r\n let { tag, cn, p } = h\r\n cn ??= []\r\n\r\n if ((<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()) {\r\n n = document.createElementNS(ns = p?.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, {}, p)\r\n p?.mounted?.(n)\r\n } else {\r\n n = c as Element\r\n setprops(n, n.h?.p, p)\r\n if (p?.update?.(c, uc)) return i + 1\r\n }\r\n\r\n n.h = h // sets the new property values\r\n\r\n if (--depth && !n.h?.p?.const && !iswebcomponent(h as HElement)) {\r\n const j = syncchildren(n, cn, 0, ns, depth, uc)\r\n n.replaceChildren(...[...n.childNodes].slice(0, j)) // strip excess children\r\n }\r\n\r\n return i + 1\r\n }\r\n\r\n case 4:\r\n {\r\n return syncchildren(parent, h.cn ?? [], i, ns, --depth, uc)\r\n }\r\n\r\n case 2:\r\n {\r\n let hr = h.tag(h.p, h.cn)\r\n let j = sync(parent, i, hr, ns, depth, uc)\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 3: {\r\n let isupdate = (c?.h as any)?.tag == h.tag\r\n\r\n if (isupdate) {\r\n let ci = (c!.h as HClassComponent).i!\r\n ci.props = h.p\r\n\r\n // update() substitutes view/sync when returning truthy\r\n return (ci.update?.(uc)) ? i + 1 : sync(parent, i, ci.view(), ns, depth, uc)\r\n }\r\n\r\n let ci = h.i = rebind(new h.tag(h.p))\r\n let j = sync(parent, i, ci.view(), ns, depth, uc)\r\n let n = parent.childNodes[i]!\r\n ci.element = n\r\n n.h = h\r\n ci.mounted?.()\r\n return j\r\n }\r\n\r\n default:\r\n // textnode\r\n let s = h.toString()\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, depth = 999, uc = {} as J) {\r\n if (!e) return\r\n if (depth == 0) {\r\n (e as HTMLElement).replaceChildren()\r\n depth = 999\r\n }\r\n let p = e.parentElement as HTMLElement\r\n let i = [].indexOf.call<any, any, any>(p.childNodes, e)\r\n sync(p, i, h, p.namespaceURI!, depth, uc)\r\n}\r\n\r\nexport type Command = Selector | J | number\r\n\r\nexport function updateview(...cmds: Command[]): void {\r\n\r\n if (!cmds.length) cmds.push('body')\r\n let uc = {}\r\n let depth = 999\r\n let patchcount = 0\r\n\r\n function f(cmds: Command[]) {\r\n for (const c of cmds) {\r\n if (typeof c === 'string') {\r\n f([...document.querySelectorAll(c)])\r\n } else if (c instanceof Node) {\r\n patch(c, c.h, depth, uc)\r\n patchcount++\r\n } else if (typeof c === 'number') {\r\n depth = c\r\n } else {\r\n uc = c\r\n }\r\n }\r\n }\r\n\r\n f(cmds)\r\n\r\n if (!patchcount) console.warn(\"updateview did not update anything. cmds=\", ...cmds)\r\n}\r\n"]}
1
+ {"version":3,"file":"jmc.js","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"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","sourcesContent":["import type { H, HElement, J, Selector, Children, HClassComponent } from './h'\r\nimport { rebind } from './base.js'\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\ndeclare global {\r\n interface Node {\r\n h?: H & { p?: J }\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\r\n old ??= {}\r\n now ??= {}\r\n\r\n // removals\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 : ''\r\n : e.removeAttribute(p)\r\n // updates\r\n for (let p in now) {\r\n let v = now[p]\r\n if (v != old[p]) {\r\n isproperty(e, p, v)\r\n ? e[p] = v\r\n : e.setAttribute(p, v)\r\n }\r\n }\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 = (p: Element, cn: Children, i: number, ns: string, depth: number, uc: J): number => {\r\n cn.flat(999)\r\n .filter(hc => hc !== null && hc !== undefined) // skip. keep 0 and false renderable, per comment below)\r\n .forEach(hc => (i = sync(p, i, hc, ns, depth, uc)))\r\n return i\r\n}\r\n\r\nfunction sync(parent: Element, i: number, h: H, ns: string, depth: number, uc: J): number {\r\n\r\n // console.log('%csync2', \"background:orange\", parent.tagName, i, h, depth)\r\n\r\n let c = parent.childNodes[i]\r\n\r\n switch (h.kind) {\r\n case 1:\r\n {\r\n let n: Element\r\n let { tag, cn, p } = h\r\n cn ??= []\r\n\r\n if ((<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()) {\r\n n = document.createElementNS(ns = p?.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, {}, p)\r\n p?.mounted?.(n)\r\n } else {\r\n n = c as Element\r\n setprops(n, n.h?.p, p)\r\n if (p?.update?.(c, uc)) return i + 1\r\n }\r\n\r\n n.h = h // sets the new property values\r\n\r\n if (--depth && !n.h?.p?.const && !iswebcomponent(h as HElement)) {\r\n const j = syncchildren(n, cn, 0, ns, depth, uc)\r\n n.replaceChildren(...[...n.childNodes].slice(0, j)) // strip excess children\r\n }\r\n\r\n return i + 1\r\n }\r\n\r\n case 4:\r\n {\r\n return syncchildren(parent, h.cn ?? [], i, ns, --depth, uc)\r\n }\r\n\r\n case 2:\r\n {\r\n let hr = h.tag(h.p, h.cn)\r\n let j = sync(parent, i, hr, ns, depth, uc)\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 3: {\r\n let isupdate = (c?.h as any)?.tag == h.tag\r\n\r\n if (isupdate) {\r\n let ci = (c!.h as HClassComponent).i!\r\n ci.props = h.p\r\n\r\n // update() substitutes view/sync when returning truthy\r\n return (ci.update?.(uc)) ? i + 1 : sync(parent, i, ci.view(), ns, depth, uc)\r\n }\r\n\r\n let ci = h.i = rebind(new h.tag(h.p))\r\n let j = sync(parent, i, ci.view(), ns, depth, uc)\r\n let n = parent.childNodes[i]!\r\n ci.element = n\r\n n.h = h\r\n ci.mounted?.()\r\n return j\r\n }\r\n\r\n default:\r\n // textnode\r\n let s = h.toString()\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, depth = 999, uc = {} as J) {\r\n if (!e) return\r\n if (depth == 0) {\r\n (e as HTMLElement).replaceChildren()\r\n depth = 999\r\n }\r\n let p = e.parentElement as HTMLElement\r\n let i = [].indexOf.call<any, any, any>(p.childNodes, e)\r\n sync(p, i, h, p.namespaceURI!, depth, uc)\r\n}\r\n\r\nexport type Command = Selector | J | number\r\n\r\nexport function updateview(...cmds: Command[]): void {\r\n\r\n if (!cmds.length) cmds.push('body')\r\n let uc = {}\r\n let depth = 999\r\n let patchcount = 0\r\n\r\n function f(cmds: Command[]) {\r\n for (const c of cmds) {\r\n if (typeof c === 'string') {\r\n f([...document.querySelectorAll(c)])\r\n } else if (c instanceof Node) {\r\n if (c.h) {\r\n patch(c, c.h, depth, uc)\r\n patchcount++\r\n }\r\n } else if (typeof c === 'number') {\r\n depth = c\r\n } else {\r\n uc = c\r\n }\r\n }\r\n }\r\n\r\n f(cmds)\r\n\r\n if (!patchcount) console.warn(\"updateview did not update anything. cmds=\", ...cmds)\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.42",
4
+ "version": "1.0.43",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
package/src/jmc.ts CHANGED
@@ -43,17 +43,16 @@ let setprops = (e: Element & J, old: J | undefined, now: J | undefined) => {
43
43
 
44
44
  /** synchronizes children starting at the i-th element. returns the index of the last child synchronized */
45
45
  let syncchildren = (p: Element, cn: Children, i: number, ns: string, depth: number, uc: J): number => {
46
- cn.flat(999).forEach(hc => (i = sync(p, i, hc, ns, depth, uc)))
46
+ cn.flat(999)
47
+ .filter(hc => hc !== null && hc !== undefined) // skip. keep 0 and false renderable, per comment below)
48
+ .forEach(hc => (i = sync(p, i, hc, ns, depth, uc)))
47
49
  return i
48
50
  }
49
51
 
50
- function sync(parent: Element, i: number, h: H | undefined, ns: string, depth: number, uc: J): number {
52
+ function sync(parent: Element, i: number, h: H, ns: string, depth: number, uc: J): number {
51
53
 
52
54
  // console.log('%csync2', "background:orange", parent.tagName, i, h, depth)
53
55
 
54
- if (!depth) return i + 1
55
-
56
- if (h === null || h === undefined) return i // skip. keep 0 and false renderable, per comment below
57
56
  let c = parent.childNodes[i]
58
57
 
59
58
  switch (h.kind) {
@@ -130,7 +129,7 @@ function sync(parent: Element, i: number, h: H | undefined, ns: string, depth: n
130
129
  }
131
130
  }
132
131
 
133
- export function patch(e: Node | null, h?: H, depth = 999, uc = {} as J) {
132
+ export function patch(e: Node | null, h: H, depth = 999, uc = {} as J) {
134
133
  if (!e) return
135
134
  if (depth == 0) {
136
135
  (e as HTMLElement).replaceChildren()
@@ -155,8 +154,10 @@ export function updateview(...cmds: Command[]): void {
155
154
  if (typeof c === 'string') {
156
155
  f([...document.querySelectorAll(c)])
157
156
  } else if (c instanceof Node) {
158
- patch(c, c.h, depth, uc)
159
- patchcount++
157
+ if (c.h) {
158
+ patch(c, c.h, depth, uc)
159
+ patchcount++
160
+ }
160
161
  } else if (typeof c === 'number') {
161
162
  depth = c
162
163
  } else {