@snupo/jmc 1.0.51 → 1.0.53
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 +1 -1
- package/dist/jmc.js +16 -20
- package/dist/jmc.js.map +1 -1
- package/package.json +48 -48
- package/src/jmc.ts +16 -22
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,EAAiC,MAAM,KAAK,CAAA;AAOlF,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,IAAI;QACV,CAAC,CAAC,EAAE,CAAC,GAAG;YAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SAAE,CAAA;KACpB;CACJ;
|
|
1
|
+
{"version":3,"file":"jmc.d.ts","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAY,CAAC,EAAE,QAAQ,EAAiC,MAAM,KAAK,CAAA;AAOlF,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,IAAI;QACV,CAAC,CAAC,EAAE,CAAC,GAAG;YAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SAAE,CAAA;KACpB;CACJ;AAkID,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
|
@@ -36,11 +36,11 @@ let removeexcesschildren = (n, i) => {
|
|
|
36
36
|
let syncchildren = (p, cn, i, depth, uc) => {
|
|
37
37
|
cn.flat(999)
|
|
38
38
|
.filter(hc => hc !== null && hc !== undefined) // skip. keep 0 and false renderable, per comment below)
|
|
39
|
-
.forEach(hc => (i = sync(p, i, hc, depth, uc)));
|
|
39
|
+
.forEach(hc => (i = sync(p, i, hc, undefined, depth, uc)));
|
|
40
40
|
return i;
|
|
41
41
|
};
|
|
42
|
-
function sync(parent, i, h, depth, uc) {
|
|
43
|
-
// console.log('%
|
|
42
|
+
function sync(parent, i, h, hfun, depth, uc) {
|
|
43
|
+
// console.log('%csync', "background:orange", parent.tagName, i, h, hfun, depth)
|
|
44
44
|
if (h === null || h === undefined)
|
|
45
45
|
return i; // skip. keep 0 and false renderable, per comment below
|
|
46
46
|
let c = parent.childNodes[i];
|
|
@@ -52,8 +52,8 @@ function sync(parent, i, h, depth, uc) {
|
|
|
52
52
|
cn ??= [];
|
|
53
53
|
let process = () => {
|
|
54
54
|
setprops(n, n.h?.p, p);
|
|
55
|
-
n.h = h; // sets the new property values
|
|
56
|
-
if (--depth && !n.
|
|
55
|
+
n.h = hfun ?? h; // sets the new property values
|
|
56
|
+
if (--depth && !n.hasAttribute('const') && !iswebcomponent(h)) {
|
|
57
57
|
const j = syncchildren(n, cn, 0, depth, uc);
|
|
58
58
|
removeexcesschildren(n, j);
|
|
59
59
|
}
|
|
@@ -80,30 +80,26 @@ function sync(parent, i, h, depth, uc) {
|
|
|
80
80
|
case 2:
|
|
81
81
|
{
|
|
82
82
|
let hr = h.tag(h.p, h.cn);
|
|
83
|
-
|
|
84
|
-
let n = parent.childNodes[i]; // now the dom element exists, unless the function returned undefined or null
|
|
85
|
-
if (n)
|
|
86
|
-
n.h = h;
|
|
87
|
-
return j;
|
|
83
|
+
return sync(parent, i, hr, hfun ?? h, depth, uc);
|
|
88
84
|
}
|
|
89
85
|
case 3: {
|
|
90
86
|
let isupdate = c?.h?.tag == h.tag;
|
|
91
87
|
if (isupdate) {
|
|
92
88
|
let ci = c.h.i;
|
|
93
89
|
ci.props = h.p;
|
|
90
|
+
let hv = ci.view();
|
|
94
91
|
// update() substitutes view/sync when returning truthy
|
|
95
|
-
return (ci.update?.(uc)) ? i + 1 : sync(parent, i,
|
|
92
|
+
return (ci.update?.(uc)) ? i + 1 : sync(parent, i, hv, c.h, depth, uc); // hfun because outermost function shall be attached
|
|
96
93
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
n.h = h;
|
|
94
|
+
else {
|
|
95
|
+
let ci = h.i = rebind(new h.tag(h.p));
|
|
96
|
+
let hv = ci.view();
|
|
97
|
+
let j = sync(parent, i, hv, h, depth, uc);
|
|
98
|
+
let n = parent.childNodes[i];
|
|
99
|
+
ci.element = n;
|
|
104
100
|
ci.mounted?.();
|
|
101
|
+
return j;
|
|
105
102
|
}
|
|
106
|
-
return j;
|
|
107
103
|
}
|
|
108
104
|
default:
|
|
109
105
|
// textnode
|
|
@@ -127,7 +123,7 @@ export function patch(e, h, depth = 999, uc = {}) {
|
|
|
127
123
|
}
|
|
128
124
|
let p = e.parentElement;
|
|
129
125
|
let i = [].indexOf.call(p.childNodes, e);
|
|
130
|
-
sync(p, i, h, depth, uc);
|
|
126
|
+
sync(p, i, h, undefined, depth, uc);
|
|
131
127
|
}
|
|
132
128
|
export function updateview(...cmds) {
|
|
133
129
|
if (!cmds.length)
|
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, HU } 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\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\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, 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, depth, uc)))\r\n return i\r\n}\r\n\r\nfunction sync(parent: Element, i: number, h: HU, depth: number, uc: J): number {\r\n\r\n // console.log('%csync2', \"background:orange\", parent.tagName, i, h, depth)\r\n\r\n if (h === null || h === undefined) return i // skip. keep 0 and false renderable, per comment below\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 let process = () => {\r\n setprops(n, n.h?.p, p)\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, depth, uc)\r\n removeexcesschildren(n, j)\r\n }\r\n }\r\n\r\n if ((<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()) {\r\n let ns = p?.xmlns ?? (parent.tagName == \"foreignObject\" ? 'http://www.w3.org/1999/xhtml' : parent.namespaceURI)\r\n n = document.createElementNS(ns, tag)\r\n c ? c.replaceWith(n) : parent.appendChild(n)\r\n process()\r\n p?.mounted?.(n)\r\n } else {\r\n n = c as Element\r\n process()\r\n if (p?.update?.(c, uc)) return i + 1\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, --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, 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(), depth, uc)\r\n }\r\n\r\n let ci = h.i = rebind(new h.tag(h.p))\r\n let hv = ci.view()\r\n let j = sync(parent, i, hv, depth, uc)\r\n let n = parent.childNodes[i]!\r\n ci.element = n\r\n if (hv) {\r\n n.h = h\r\n ci.mounted?.()\r\n }\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, 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"]}
|
|
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, HU } 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\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\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, 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, undefined, depth, uc)))\r\n return i\r\n}\r\n\r\nfunction sync(parent: Element, i: number, h: HU, hfun: H | undefined, depth: number, uc: J): number {\r\n\r\n // console.log('%csync', \"background:orange\", parent.tagName, i, h, hfun, depth)\r\n\r\n if (h === null || h === undefined) return i // skip. keep 0 and false renderable, per comment below\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 let process = () => {\r\n setprops(n, n.h?.p, p)\r\n n.h = hfun ?? h // sets the new property values\r\n if (--depth && !n.hasAttribute('const') && !iswebcomponent(h as HElement)) {\r\n const j = syncchildren(n, cn, 0, depth, uc)\r\n removeexcesschildren(n, j)\r\n }\r\n }\r\n\r\n if ((<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()) {\r\n let ns = p?.xmlns ?? (parent.tagName == \"foreignObject\" ? 'http://www.w3.org/1999/xhtml' : parent.namespaceURI)\r\n n = document.createElementNS(ns, tag)\r\n c ? c.replaceWith(n) : parent.appendChild(n)\r\n process()\r\n p?.mounted?.(n)\r\n } else {\r\n n = c as Element\r\n process()\r\n if (p?.update?.(c, uc)) return i + 1\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, --depth, uc)\r\n }\r\n\r\n case 2:\r\n {\r\n let hr = h.tag(h.p, h.cn)\r\n return sync(parent, i, hr, hfun ?? h, depth, uc)\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 let hv = ci.view()\r\n // update() substitutes view/sync when returning truthy\r\n return (ci.update?.(uc)) ? i + 1 : sync(parent, i, hv, c.h, depth, uc) // hfun because outermost function shall be attached\r\n }\r\n else {\r\n let ci = h.i = rebind(new h.tag(h.p))\r\n let hv = ci.view()\r\n let j = sync(parent, i, hv, h, depth, uc)\r\n let n = parent.childNodes[i]!\r\n ci.element = n\r\n ci.mounted?.()\r\n return j\r\n }\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, undefined, 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,48 +1,48 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "@snupo/jmc",
|
|
3
|
-
"author": "snupo",
|
|
4
|
-
"version": "1.0.
|
|
5
|
-
"publishConfig": {
|
|
6
|
-
"access": "public"
|
|
7
|
-
},
|
|
8
|
-
"type": "module",
|
|
9
|
-
"main": "./dist/index.js",
|
|
10
|
-
"types": "./dist/index.d.ts",
|
|
11
|
-
"exports": {
|
|
12
|
-
".": {
|
|
13
|
-
"types": "./dist/index.d.ts",
|
|
14
|
-
"import": "./dist/index.js"
|
|
15
|
-
}
|
|
16
|
-
},
|
|
17
|
-
"files": [
|
|
18
|
-
"dist",
|
|
19
|
-
"src"
|
|
20
|
-
],
|
|
21
|
-
"scripts": {
|
|
22
|
-
"prebuild": "rimraf dist",
|
|
23
|
-
"build": "tsc -p tsconfig.json",
|
|
24
|
-
"release": "release-it patch"
|
|
25
|
-
},
|
|
26
|
-
"devDependencies": {
|
|
27
|
-
"@vitest/coverage-v8": "^4.1.10",
|
|
28
|
-
"happy-dom": "^16.8.1",
|
|
29
|
-
"release-it": "^21.0.2",
|
|
30
|
-
"rimraf": "^6.1.3",
|
|
31
|
-
"typescript": "^6.0.3",
|
|
32
|
-
"vitest": "4.1.10"
|
|
33
|
-
},
|
|
34
|
-
"release-it": {
|
|
35
|
-
"hooks": {
|
|
36
|
-
"before:init": [
|
|
37
|
-
"pnpm vitest"
|
|
38
|
-
],
|
|
39
|
-
"after:bump": "pnpm build"
|
|
40
|
-
},
|
|
41
|
-
"git": {
|
|
42
|
-
"commitMessage": "chore: release v${version}"
|
|
43
|
-
},
|
|
44
|
-
"github": {
|
|
45
|
-
"release": true
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "@snupo/jmc",
|
|
3
|
+
"author": "snupo",
|
|
4
|
+
"version": "1.0.53",
|
|
5
|
+
"publishConfig": {
|
|
6
|
+
"access": "public"
|
|
7
|
+
},
|
|
8
|
+
"type": "module",
|
|
9
|
+
"main": "./dist/index.js",
|
|
10
|
+
"types": "./dist/index.d.ts",
|
|
11
|
+
"exports": {
|
|
12
|
+
".": {
|
|
13
|
+
"types": "./dist/index.d.ts",
|
|
14
|
+
"import": "./dist/index.js"
|
|
15
|
+
}
|
|
16
|
+
},
|
|
17
|
+
"files": [
|
|
18
|
+
"dist",
|
|
19
|
+
"src"
|
|
20
|
+
],
|
|
21
|
+
"scripts": {
|
|
22
|
+
"prebuild": "rimraf dist",
|
|
23
|
+
"build": "tsc -p tsconfig.json",
|
|
24
|
+
"release": "release-it patch"
|
|
25
|
+
},
|
|
26
|
+
"devDependencies": {
|
|
27
|
+
"@vitest/coverage-v8": "^4.1.10",
|
|
28
|
+
"happy-dom": "^16.8.1",
|
|
29
|
+
"release-it": "^21.0.2",
|
|
30
|
+
"rimraf": "^6.1.3",
|
|
31
|
+
"typescript": "^6.0.3",
|
|
32
|
+
"vitest": "4.1.10"
|
|
33
|
+
},
|
|
34
|
+
"release-it": {
|
|
35
|
+
"hooks": {
|
|
36
|
+
"before:init": [
|
|
37
|
+
"pnpm vitest"
|
|
38
|
+
],
|
|
39
|
+
"after:bump": "pnpm build"
|
|
40
|
+
},
|
|
41
|
+
"git": {
|
|
42
|
+
"commitMessage": "chore: release v${version}"
|
|
43
|
+
},
|
|
44
|
+
"github": {
|
|
45
|
+
"release": true
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
package/src/jmc.ts
CHANGED
|
@@ -52,13 +52,13 @@ let removeexcesschildren = (n: Element, i: number) => {
|
|
|
52
52
|
let syncchildren = (p: Element, cn: Children, i: number, depth: number, uc: J): number => {
|
|
53
53
|
cn.flat(999)
|
|
54
54
|
.filter(hc => hc !== null && hc !== undefined) // skip. keep 0 and false renderable, per comment below)
|
|
55
|
-
.forEach(hc => (i = sync(p, i, hc, depth, uc)))
|
|
55
|
+
.forEach(hc => (i = sync(p, i, hc, undefined, depth, uc)))
|
|
56
56
|
return i
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
function sync(parent: Element, i: number, h: HU, depth: number, uc: J): number {
|
|
59
|
+
function sync(parent: Element, i: number, h: HU, hfun: H | undefined, depth: number, uc: J): number {
|
|
60
60
|
|
|
61
|
-
// console.log('%
|
|
61
|
+
// console.log('%csync', "background:orange", parent.tagName, i, h, hfun, depth)
|
|
62
62
|
|
|
63
63
|
if (h === null || h === undefined) return i // skip. keep 0 and false renderable, per comment below
|
|
64
64
|
|
|
@@ -73,9 +73,8 @@ function sync(parent: Element, i: number, h: HU, depth: number, uc: J): number {
|
|
|
73
73
|
|
|
74
74
|
let process = () => {
|
|
75
75
|
setprops(n, n.h?.p, p)
|
|
76
|
-
n.h = h // sets the new property values
|
|
77
|
-
|
|
78
|
-
if (--depth && !n.h?.p?.const && !iswebcomponent(h as HElement)) {
|
|
76
|
+
n.h = hfun ?? h // sets the new property values
|
|
77
|
+
if (--depth && !n.hasAttribute('const') && !iswebcomponent(h as HElement)) {
|
|
79
78
|
const j = syncchildren(n, cn, 0, depth, uc)
|
|
80
79
|
removeexcesschildren(n, j)
|
|
81
80
|
}
|
|
@@ -104,10 +103,7 @@ function sync(parent: Element, i: number, h: HU, depth: number, uc: J): number {
|
|
|
104
103
|
case 2:
|
|
105
104
|
{
|
|
106
105
|
let hr = h.tag(h.p, h.cn)
|
|
107
|
-
|
|
108
|
-
let n = parent.childNodes[i]! // now the dom element exists, unless the function returned undefined or null
|
|
109
|
-
if (n) n.h = h
|
|
110
|
-
return j
|
|
106
|
+
return sync(parent, i, hr, hfun ?? h, depth, uc)
|
|
111
107
|
}
|
|
112
108
|
|
|
113
109
|
case 3: {
|
|
@@ -116,21 +112,19 @@ function sync(parent: Element, i: number, h: HU, depth: number, uc: J): number {
|
|
|
116
112
|
if (isupdate) {
|
|
117
113
|
let ci = (c!.h as HClassComponent).i!
|
|
118
114
|
ci.props = h.p
|
|
119
|
-
|
|
115
|
+
let hv = ci.view()
|
|
120
116
|
// update() substitutes view/sync when returning truthy
|
|
121
|
-
return (ci.update?.(uc)) ? i + 1 : sync(parent, i,
|
|
117
|
+
return (ci.update?.(uc)) ? i + 1 : sync(parent, i, hv, c.h, depth, uc) // hfun because outermost function shall be attached
|
|
122
118
|
}
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
if (hv) {
|
|
130
|
-
n.h = h
|
|
119
|
+
else {
|
|
120
|
+
let ci = h.i = rebind(new h.tag(h.p))
|
|
121
|
+
let hv = ci.view()
|
|
122
|
+
let j = sync(parent, i, hv, h, depth, uc)
|
|
123
|
+
let n = parent.childNodes[i]!
|
|
124
|
+
ci.element = n
|
|
131
125
|
ci.mounted?.()
|
|
126
|
+
return j
|
|
132
127
|
}
|
|
133
|
-
return j
|
|
134
128
|
}
|
|
135
129
|
|
|
136
130
|
default:
|
|
@@ -153,7 +147,7 @@ export function patch(e: Node | null, h: H, depth = 999, uc = {} as J) {
|
|
|
153
147
|
}
|
|
154
148
|
let p = e.parentElement as HTMLElement
|
|
155
149
|
let i = [].indexOf.call<any, any, any>(p.childNodes, e)
|
|
156
|
-
sync(p, i, h, depth, uc)
|
|
150
|
+
sync(p, i, h, undefined, depth, uc)
|
|
157
151
|
}
|
|
158
152
|
|
|
159
153
|
export type Command = Selector | J | number
|