@snupo/jmc 1.4.2 → 1.5.0
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/h.d.ts +2 -1
- package/dist/h.d.ts.map +1 -1
- package/dist/h.js.map +1 -1
- package/dist/jmc.d.ts.map +1 -1
- package/dist/jmc.js +1 -2
- package/dist/jmc.js.map +1 -1
- package/dist/lib.d.ts +4 -3
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +1 -1
- package/dist/lib.js.map +1 -1
- package/package.json +1 -1
- package/src/h.ts +2 -3
- package/src/jmc.ts +1 -2
- package/src/lib.ts +2 -2
package/dist/h.d.ts
CHANGED
|
@@ -3,7 +3,8 @@ export type J = Record<string, any>;
|
|
|
3
3
|
export type Selector = string | Node;
|
|
4
4
|
/** an updateview command: a target (selector or node), a depth (number) or an update context (object) */
|
|
5
5
|
export type Command = Selector | J | number;
|
|
6
|
-
|
|
6
|
+
/** a function component. it gets its children in props.children */
|
|
7
|
+
export type FComponent = (props: J) => HU;
|
|
7
8
|
type HKindElement = 1;
|
|
8
9
|
type HKindFunctionComponent = 2;
|
|
9
10
|
type HKindClassComponent = 3;
|
package/dist/h.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h.d.ts","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAEpD,MAAM,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEnC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAA;AAEpC,yGAAyG;AACzG,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,CAAC,GAAG,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"h.d.ts","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAEpD,MAAM,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEnC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAA;AAEpC,yGAAyG;AACzG,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,CAAC,GAAG,MAAM,CAAA;AAE3C,mEAAmE;AACnE,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAA;AAEzC,KAAK,YAAY,GAAG,CAAC,CAAA;AACrB,KAAK,sBAAsB,GAAG,CAAC,CAAA;AAC/B,KAAK,mBAAmB,GAAG,CAAC,CAAA;AAC5B,KAAK,aAAa,GAAG,CAAC,CAAA;AAEtB,MAAM,MAAM,KAAK,GAAG,YAAY,GAAG,sBAAsB,GAAG,mBAAmB,GAAG,aAAa,CAAA;AAE/F,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,IAAI,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,IAAI,IAAI,EAAE,CAAA;IACV,MAAM,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,GAAG,IAAI,CAAA;IAC/B,OAAO,CAAC,IAAI,IAAI,CAAA;CACnB;AAED,MAAM,WAAW,UAAU;IACvB,KAAI,KAAK,EAAE,GAAG,GAAG,eAAe,CAAA;CACnC;AAED,MAAM,MAAM,QAAQ,GAAG,EAAE,EAAE,CAAA;AAE3B,MAAM,MAAM,KAAK,GACX,MAAM,GACN,MAAM,GACN,OAAO,CAAA;AAEb,MAAM,MAAM,SAAS,GAAG;IACpB,IAAI,EAAE,aAAa,CAAA;IACnB,EAAE,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,YAAY,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,CAAC,EAAE,CAAC,CAAA;IACJ,EAAE,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,sBAAsB,CAAA;IAC5B,GAAG,EAAE,UAAU,CAAA;IACf,CAAC,EAAE,CAAC,CAAA;IACJ,EAAE,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,mBAAmB,CAAA;IACzB,GAAG,EAAE,UAAU,CAAA;IACf,CAAC,EAAE,CAAC,CAAA;IACJ,EAAE,CAAC,EAAE,QAAQ,CAAA;IACb,CAAC,CAAC,EAAE,eAAe,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG,kBAAkB,GAAG,eAAe,CAAA;AAExD,MAAM,MAAM,CAAC,GACP,KAAK,GAAG;IAAE,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,GAC5B,QAAQ,GACR,kBAAkB,GAClB,eAAe,GACf,SAAS,CAAA;AAEf,MAAM,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,IAAI,CAAA;AAIrC,wBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,CAchF;AAID,yBAAiB,GAAG,CAAC;IACjB,UAAiB,GAAG,CAAC;QACjB,UAAiB,iBAAkB,SAAQ,oBAAoB;SAAI;KACtE;CACJ;AAGD,eAAO,IAAI,IAAI,QAAW,CAAA"}
|
package/dist/h.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h.js","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"h.js","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"AA4EA,IAAI,OAAO,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;AAErE,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,CAAM,EAAE,GAAG,EAAS;IAC9C,IAAI,GAAG,EAAE,IAAI;QAAE,OAAO,GAAG,CAAA,CAAC,kCAAkC;IAE5D,IAAI,IAAI,GAAU,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAExF,IAAI,CAAC,GAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAA;IACjC,IAAI,IAAI,IAAI,CAAC;QAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAA;IAC1B,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC;QACb,CAAC,CAAC,EAAE,GAAG,EAAE,CAAA;QACT,mGAAmG;QACnG,0FAA0F;QAC1F,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;YAAE,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IAC9D,CAAC;IACD,OAAO,CAAC,CAAA;AACZ,CAAC;AAUD,4CAA4C;AAC5C,MAAM,CAAC,IAAI,IAAI,GAAG,MAAM,EAAE,CAAA","sourcesContent":["import type { JmcIntrinsicElements } from './jsx.js'\r\n\r\nexport type J = Record<string, any> // a json record\r\n\r\nexport type Selector = string | Node\r\n\r\n/** an updateview command: a target (selector or node), a depth (number) or an update context (object) */\r\nexport type Command = Selector | J | number\r\n\r\n/** a function component. it gets its children in props.children */\r\nexport type FComponent = (props: J) => HU\r\n\r\ntype HKindElement = 1\r\ntype HKindFunctionComponent = 2\r\ntype HKindClassComponent = 3\r\ntype HKindFragment = 4\r\n\r\nexport type HKind = HKindElement | HKindFunctionComponent | HKindClassComponent | HKindFragment\r\n\r\nexport interface IClassComponent {\r\n element: Node\r\n props?: Record<string, any>\r\n view(): HU\r\n update(uc: any): boolean | void\r\n mounted?(): void\r\n}\r\n\r\nexport interface CComponent {\r\n new(props: any): IClassComponent\r\n}\r\n\r\nexport type Children = HU[]\r\n\r\nexport type HText =\r\n | string // text node\r\n | number // text node\r\n | boolean // renders nothing, like null and undefined\r\n\r\nexport type HFragment = {\r\n kind: HKindFragment\r\n cn?: Children\r\n}\r\n\r\nexport type HElement = {\r\n kind: HKindElement\r\n tag: string\r\n p: J\r\n cn?: Children\r\n}\r\n\r\nexport type HFunctionComponent = {\r\n kind: HKindFunctionComponent\r\n tag: FComponent\r\n p: J\r\n cn?: Children\r\n}\r\n\r\nexport type HClassComponent = {\r\n kind: HKindClassComponent\r\n tag: CComponent\r\n p: J\r\n cn?: Children\r\n i?: IClassComponent\r\n}\r\n\r\nexport type HComp = HFunctionComponent | HClassComponent\r\n\r\nexport type H =\r\n | HText & { kind?: undefined } // text nodes never have a kind. but this type addition makes H a full DU\r\n | HElement\r\n | HFunctionComponent\r\n | HClassComponent\r\n | HFragment\r\n\r\nexport type HU = H | undefined | null\r\n\r\nlet isclass = (f: Function) => /^class\\s|^class\\{/.test(f.toString())\r\n\r\nexport function jsx(tag: any, p: any, ...cn: any[]): HElement | HComp | HFragment {\r\n if (tag?.kind) return tag // already an H node, flatten tree\r\n\r\n let kind: HKind = tag == jsxf ? 4 : tag instanceof Function ? (isclass(tag) ? 3 : 2) : 1\r\n\r\n let h: any = { kind, p: p ?? {} }\r\n if (kind != 4) h.tag = tag\r\n if (cn?.length) {\r\n h.cn = cn\r\n // components get their children in props.children, as with the automatic runtime (jsx-runtime.ts).\r\n // elements do not: setprops would write them to the element's read-only children property\r\n if (kind == 2 || kind == 3) h.p = { ...h.p, children: cn }\r\n }\r\n return h\r\n}\r\n\r\n// typescript looks up the JSX types on the factory function first: jsx.JSX instead of a global JSX namespace.\r\n// so jmc's element types cannot clash with other libraries. add your own elements by augmenting jsx.JSX.IntrinsicElements\r\nexport namespace jsx {\r\n export namespace JSX {\r\n export interface IntrinsicElements extends JmcIntrinsicElements { }\r\n }\r\n}\r\n\r\n// fragment is only used above as a sentinel\r\nexport let jsxf = Symbol()"]}
|
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,EACR,CAAC,EAGD,CAAC,EACD,OAAO,EAIV,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"jmc.d.ts","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,CAAC,EAGD,CAAC,EACD,OAAO,EAIV,MAAM,QAAQ,CAAA;AAiKf,wBAAgB,KAAK,CACjB,CAAC,EAAE,IAAI,GAAG,IAAI,EACd,CAAC,EAAE,CAAC,EACJ,KAAK,SAAM,EACX,EAAE,GAAE,CAAM,GACX,WAAW,GAAG,SAAS,CAgBzB;AAED,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAanD"}
|
package/dist/jmc.js
CHANGED
|
@@ -80,8 +80,7 @@ depth, uc) {
|
|
|
80
80
|
}
|
|
81
81
|
case 2: {
|
|
82
82
|
// function component
|
|
83
|
-
|
|
84
|
-
let hr = h.tag(h.p, h.cn);
|
|
83
|
+
let hr = h.tag(h.p);
|
|
85
84
|
return sync(parent, i, hr, [...hs, h], depth, uc);
|
|
86
85
|
}
|
|
87
86
|
case 3: {
|
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 {\n H,\n HElement,\n HComp,\n J,\n Command,\n Children,\n HClassComponent,\n HU,\n} from './h.js'\nimport { rebind } from './base.js'\nimport { jmcconfig, setprops } from './props.js'\n\nconst enum NodeType {\n // vaporizes (but for that must be in this file, otherwise not)\n TextNode = 3,\n Comment = 8,\n}\n\n/** a node as jmc sees it. kept module-local, so consumers' Node type stays untouched */\ntype JNode<N extends Node = ChildNode> = N & {\n /** the H this node updates from: the element's own H, or the outermost component rendering it */\n h?: HElement | HComp\n /** the class components rendering this node, outermost first. they hold the instances, found again by position */\n cs?: HClassComponent[]\n /** props last applied to this element. kept apart from h, which may be the owning component's H */\n ep?: J\n}\n\n/** mounted callbacks collected by sync, run after it in the lifecycle phase. children before their parents */\nlet mounts: (() => void)[] = []\n\nlet removeexcesschildren = (n: Element, i: number) => {\n let c: ChildNode\n while ((c = n.childNodes[i])) {\n try {\n c.remove()\n } catch { } // due to blur-event-handlers, this can fail\n }\n}\n\n/** attaches node n, rendered from h by the components hs (outermost first), to them */\nlet attach = (n: JNode, h: HElement | HComp, hs: HComp[]) => {\n n.h = hs[0] ?? h\n n.cs = hs.filter(x => x.kind == 3)\n}\n\n/** synchronizes children starting at the i-th node. returns the index after the last child synchronized */\nlet syncchildren = (\n p: Element,\n cn: Children,\n i: number,\n depth: number,\n uc: J,\n): number => {\n cn.flat(999).forEach((hc) => (i = sync(p, i, hc, [], depth, uc)))\n return i\n}\n\n/** class components must render exactly one root node, they are attached to it and update through it */\nlet assertnonfragment = (h: HClassComponent, hv: HU, i: number, j: number) => {\n if (j - i != 1 || hv?.kind == 4) throw new Error(`${h.tag.name}.view() must render exactly one root element`)\n}\n\nfunction sync(\n parent: Element,\n i: number,\n h: HU,\n hs: HComp[], // the components rendering h, outermost first\n depth: number,\n uc: J,\n): number {\n let c: JNode | undefined = parent.childNodes[i]\n\n // null, undefined and booleans render nothing, like in React, so {cond && <b />} works. 0 is still rendered.\n // nothing still takes its slot, as a placeholder: so the siblings after it keep their position, and with it their state\n if (h == null || typeof h == 'boolean') {\n if (!hs.some(x => x.kind == 3)) h = '' // an empty text node, invisible\n else {\n // a class component rendering nothing is attached to a comment, so it keeps its state and can show itself again\n if (c?.nodeType != NodeType.Comment) {\n let n = new Comment()\n c ? c.replaceWith(n) : parent.append(n)\n c = n\n }\n attach(c, hs[0], hs)\n return i + 1\n }\n }\n\n switch (h.kind) {\n case 1: {\n // element\n let n: Element & JNode\n let { tag, cn = [], p } = h\n\n let fresh = (<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()\n if (fresh) {\n let ns =\n p.xmlns ??\n (parent.tagName == 'foreignObject'\n ? 'http://www.w3.org/1999/xhtml'\n : parent.namespaceURI)\n n = document.createElementNS(ns, tag)\n c ? c.replaceWith(n) : parent.appendChild(n)\n } else n = c as Element & JNode\n\n attach(n, h, hs) // before update(), which may handle the update itself\n if (jmcconfig.debug && hs[0]) n.setAttribute('comp', hs[0].tag.name)\n if (!fresh && p.update?.(n, uc)) return i + 1\n\n // a const element is an island: jmc renders it once, then foreign code owns it. update() still runs\n if (fresh || !p.const) {\n n.ep = setprops(n, n.ep, p)\n if (--depth && !tag.includes('-')) { // web components render their own children\n const j = syncchildren(n, cn, 0, depth, uc)\n removeexcesschildren(n, j)\n }\n }\n if (fresh && p.mounted) mounts.push(() => p.mounted(n))\n\n return i + 1\n }\n\n case 2: {\n // function component\n // TBD REMOVE the second argument once we know it is unused: the children are in h.p.children\n let hr = h.tag(h.p, h.cn)\n return sync(parent, i, hr, [...hs, h], depth, uc)\n }\n\n case 3: {\n // class component. reuses the instance attached to c, if c renders the same class at the same position\n let outer = hs.filter(x => x.kind == 3)\n let old = c?.cs?.[outer.length]\n if (old?.tag != h.tag) old = undefined\n let ci = old ? old.i! : (h.i = rebind(new h.tag(h.p)))\n if (old) {\n ci.props = old.p = h.p // set attached p too, for a repeatable update through the node\n if (ci.update?.(uc)) { // update() substitutes view/sync when returning truthy\n c!.h = hs[0] ?? old // the components below old stay attached\n c!.cs = [...outer, ...c!.cs!.slice(outer.length)]\n return i + 1\n }\n }\n let hv = ci.view()\n let j = sync(parent, i, hv, [...hs, old ?? h], depth, uc) // the attached H, so updates find the instance\n assertnonfragment(h, hv, i, j)\n ci.element = parent.childNodes[i]\n if (!old && ci.mounted) mounts.push(() => ci.mounted!())\n return j\n }\n\n case 4: {\n // fragment. hs is deliberately not passed on: a component returning a fragment is not attached\n // to any node, so it cannot update itself, only its parent can update it\n return syncchildren(parent, h.cn ?? [], i, --depth, uc)\n }\n\n default:\n // textnode\n let s = h.toString()\n if (c?.nodeType == NodeType.TextNode) {\n if (c.textContent != s) c.textContent = s // firefox updates equal text, loosing existing text selection\n } else {\n c ? c.replaceWith(s) : parent.append(s)\n }\n return i + 1\n }\n}\n\nexport function patch(\n e: Node | null,\n h: H,\n depth = 999,\n uc: J = {},\n): HTMLElement | undefined {\n if (!e) return\n if (depth == 0) {\n (e as Element).replaceChildren()\n depth = 999\n }\n let p = e.parentElement!\n let i = [...p.childNodes].indexOf(e as ChildNode)\n sync(p, i, h, [], depth, uc)\n\n // lifecycle phase: the dom is complete now. taken first, a mounted callback calling updateview collects anew\n let ms = mounts\n mounts = []\n ms.forEach(m => m())\n\n return p.childNodes[i] as HTMLElement\n}\n\nexport function updateview(...cmds: Command[]): void {\n if (!cmds.some(c => typeof c == 'string' || c instanceof Node)) cmds.push('body') // no target given: body\n let uc: J = {}\n let depth = 999\n\n // isConnected: a selector's matches are collected upfront, patching one can replace a later one\n let up = (n: JNode<Node>) => { if (n.h && n.isConnected) patch(n, n.h, depth, uc) }\n\n for (const c of cmds)\n if (typeof c == 'string') document.querySelectorAll(c).forEach(up)\n else if (c instanceof Node) up(c)\n else if (typeof c == 'number') depth = c\n else uc = c\n}\n"]}
|
|
1
|
+
{"version":3,"file":"jmc.js","sourceRoot":"","sources":["../src/jmc.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n H,\n HElement,\n HComp,\n J,\n Command,\n Children,\n HClassComponent,\n HU,\n} from './h.js'\nimport { rebind } from './base.js'\nimport { jmcconfig, setprops } from './props.js'\n\nconst enum NodeType {\n // vaporizes (but for that must be in this file, otherwise not)\n TextNode = 3,\n Comment = 8,\n}\n\n/** a node as jmc sees it. kept module-local, so consumers' Node type stays untouched */\ntype JNode<N extends Node = ChildNode> = N & {\n /** the H this node updates from: the element's own H, or the outermost component rendering it */\n h?: HElement | HComp\n /** the class components rendering this node, outermost first. they hold the instances, found again by position */\n cs?: HClassComponent[]\n /** props last applied to this element. kept apart from h, which may be the owning component's H */\n ep?: J\n}\n\n/** mounted callbacks collected by sync, run after it in the lifecycle phase. children before their parents */\nlet mounts: (() => void)[] = []\n\nlet removeexcesschildren = (n: Element, i: number) => {\n let c: ChildNode\n while ((c = n.childNodes[i])) {\n try {\n c.remove()\n } catch { } // due to blur-event-handlers, this can fail\n }\n}\n\n/** attaches node n, rendered from h by the components hs (outermost first), to them */\nlet attach = (n: JNode, h: HElement | HComp, hs: HComp[]) => {\n n.h = hs[0] ?? h\n n.cs = hs.filter(x => x.kind == 3)\n}\n\n/** synchronizes children starting at the i-th node. returns the index after the last child synchronized */\nlet syncchildren = (\n p: Element,\n cn: Children,\n i: number,\n depth: number,\n uc: J,\n): number => {\n cn.flat(999).forEach((hc) => (i = sync(p, i, hc, [], depth, uc)))\n return i\n}\n\n/** class components must render exactly one root node, they are attached to it and update through it */\nlet assertnonfragment = (h: HClassComponent, hv: HU, i: number, j: number) => {\n if (j - i != 1 || hv?.kind == 4) throw new Error(`${h.tag.name}.view() must render exactly one root element`)\n}\n\nfunction sync(\n parent: Element,\n i: number,\n h: HU,\n hs: HComp[], // the components rendering h, outermost first\n depth: number,\n uc: J,\n): number {\n let c: JNode | undefined = parent.childNodes[i]\n\n // null, undefined and booleans render nothing, like in React, so {cond && <b />} works. 0 is still rendered.\n // nothing still takes its slot, as a placeholder: so the siblings after it keep their position, and with it their state\n if (h == null || typeof h == 'boolean') {\n if (!hs.some(x => x.kind == 3)) h = '' // an empty text node, invisible\n else {\n // a class component rendering nothing is attached to a comment, so it keeps its state and can show itself again\n if (c?.nodeType != NodeType.Comment) {\n let n = new Comment()\n c ? c.replaceWith(n) : parent.append(n)\n c = n\n }\n attach(c, hs[0], hs)\n return i + 1\n }\n }\n\n switch (h.kind) {\n case 1: {\n // element\n let n: Element & JNode\n let { tag, cn = [], p } = h\n\n let fresh = (<Element>c)?.tagName?.toLowerCase() != tag.toLowerCase()\n if (fresh) {\n let ns =\n p.xmlns ??\n (parent.tagName == 'foreignObject'\n ? 'http://www.w3.org/1999/xhtml'\n : parent.namespaceURI)\n n = document.createElementNS(ns, tag)\n c ? c.replaceWith(n) : parent.appendChild(n)\n } else n = c as Element & JNode\n\n attach(n, h, hs) // before update(), which may handle the update itself\n if (jmcconfig.debug && hs[0]) n.setAttribute('comp', hs[0].tag.name)\n if (!fresh && p.update?.(n, uc)) return i + 1\n\n // a const element is an island: jmc renders it once, then foreign code owns it. update() still runs\n if (fresh || !p.const) {\n n.ep = setprops(n, n.ep, p)\n if (--depth && !tag.includes('-')) { // web components render their own children\n const j = syncchildren(n, cn, 0, depth, uc)\n removeexcesschildren(n, j)\n }\n }\n if (fresh && p.mounted) mounts.push(() => p.mounted(n))\n\n return i + 1\n }\n\n case 2: {\n // function component\n let hr = h.tag(h.p)\n return sync(parent, i, hr, [...hs, h], depth, uc)\n }\n\n case 3: {\n // class component. reuses the instance attached to c, if c renders the same class at the same position\n let outer = hs.filter(x => x.kind == 3)\n let old = c?.cs?.[outer.length]\n if (old?.tag != h.tag) old = undefined\n let ci = old ? old.i! : (h.i = rebind(new h.tag(h.p)))\n if (old) {\n ci.props = old.p = h.p // set attached p too, for a repeatable update through the node\n if (ci.update?.(uc)) { // update() substitutes view/sync when returning truthy\n c!.h = hs[0] ?? old // the components below old stay attached\n c!.cs = [...outer, ...c!.cs!.slice(outer.length)]\n return i + 1\n }\n }\n let hv = ci.view()\n let j = sync(parent, i, hv, [...hs, old ?? h], depth, uc) // the attached H, so updates find the instance\n assertnonfragment(h, hv, i, j)\n ci.element = parent.childNodes[i]\n if (!old && ci.mounted) mounts.push(() => ci.mounted!())\n return j\n }\n\n case 4: {\n // fragment. hs is deliberately not passed on: a component returning a fragment is not attached\n // to any node, so it cannot update itself, only its parent can update it\n return syncchildren(parent, h.cn ?? [], i, --depth, uc)\n }\n\n default:\n // textnode\n let s = h.toString()\n if (c?.nodeType == NodeType.TextNode) {\n if (c.textContent != s) c.textContent = s // firefox updates equal text, loosing existing text selection\n } else {\n c ? c.replaceWith(s) : parent.append(s)\n }\n return i + 1\n }\n}\n\nexport function patch(\n e: Node | null,\n h: H,\n depth = 999,\n uc: J = {},\n): HTMLElement | undefined {\n if (!e) return\n if (depth == 0) {\n (e as Element).replaceChildren()\n depth = 999\n }\n let p = e.parentElement!\n let i = [...p.childNodes].indexOf(e as ChildNode)\n sync(p, i, h, [], depth, uc)\n\n // lifecycle phase: the dom is complete now. taken first, a mounted callback calling updateview collects anew\n let ms = mounts\n mounts = []\n ms.forEach(m => m())\n\n return p.childNodes[i] as HTMLElement\n}\n\nexport function updateview(...cmds: Command[]): void {\n if (!cmds.some(c => typeof c == 'string' || c instanceof Node)) cmds.push('body') // no target given: body\n let uc: J = {}\n let depth = 999\n\n // isConnected: a selector's matches are collected upfront, patching one can replace a later one\n let up = (n: JNode<Node>) => { if (n.h && n.isConnected) patch(n, n.h, depth, uc) }\n\n for (const c of cmds)\n if (typeof c == 'string') document.querySelectorAll(c).forEach(up)\n else if (c instanceof Node) up(c)\n else if (typeof c == 'number') depth = c\n else uc = c\n}\n"]}
|
package/dist/lib.d.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { Children, IClassComponent, HU, J, HFragment } from './h.js';
|
|
2
2
|
export type UC = J;
|
|
3
|
-
export type FComponentT<P> = (
|
|
3
|
+
export type FComponentT<P> = (props: P) => HU;
|
|
4
4
|
export type DeepReadonly<T> = {
|
|
5
5
|
readonly [K in keyof T]: T[K] extends Record<string, unknown> ? DeepReadonly<T[K]> : T[K];
|
|
6
6
|
};
|
|
7
|
-
export declare const When: ({ cond }: {
|
|
7
|
+
export declare const When: ({ cond, children }: {
|
|
8
8
|
cond: boolean;
|
|
9
|
-
|
|
9
|
+
children?: Children;
|
|
10
|
+
}) => HFragment | null;
|
|
10
11
|
export declare abstract class Component<P extends J = {}> implements IClassComponent {
|
|
11
12
|
props: P;
|
|
12
13
|
element: HTMLElement;
|
package/dist/lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGzE,MAAM,MAAM,EAAE,GAAG,CAAC,CAAA;AAClB,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGzE,MAAM,MAAM,EAAE,GAAG,CAAC,CAAA;AAClB,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAA;AAE7C,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI;IAAE,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,CAAA;AAE5H,eAAO,MAAM,IAAI,GAAI,oBAAoB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,KAAG,SAAS,GAAG,IAA+C,CAAA;AAE7I,8BAAsB,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAE,YAAW,eAAe;IAGrD,KAAK,EAAE,CAAC;IAD3B,OAAO,EAAG,WAAW,CAAA;gBACF,KAAK,EAAE,CAAC;IAG3B,OAAO;IACP,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,GAAG,IAAI;IAChC,QAAQ,CAAC,IAAI,IAAI,EAAE;IAGnB,UAAU;IACV,IAAI,SAAS,IAAI,OAAO,CAA0B;CACrD;AAED,wBAAgB,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,CAIxE;AAED,eAAO,MAAM,YAAY,GAAI,GAAG,IAAI,SAA+B,CAAA"}
|
package/dist/lib.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { updateview } from './jmc.js';
|
|
2
|
-
export const When = ({ cond }
|
|
2
|
+
export const When = ({ cond, children }) => cond ? { kind: 4, cn: children } : null;
|
|
3
3
|
export class Component {
|
|
4
4
|
props;
|
|
5
5
|
element; // assigned by jmc. a placeholder Comment while view() renders nothing
|
package/dist/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAOrC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAOrC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAA0C,EAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAE7I,MAAM,OAAgB,SAAS;IAGR;IADnB,OAAO,CAAc,CAAC,sEAAsE;IAC5F,YAAmB,KAAQ;QAAR,UAAK,GAAL,KAAK,CAAG;IAAI,CAAC;IAEhC,YAAY;IACZ,OAAO,KAAK,CAAC;IACb,MAAM,CAAC,EAAQ,IAAoB,CAAC;IAGpC,wCAAwC;IACxC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC,CAAC;IACzC,IAAI,SAAS,KAAc,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAA,CAAC,CAAC;CACrD;AAED,MAAM,UAAU,EAAE,CAAC,GAAG,cAA0C;IAC5D,OAAO,cAAc;SAChB,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAuC;SACzH,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAO,EAAE,EAAE,CAAE,CAAiB,CAAC,KAAK,EAAE,CAAA","sourcesContent":["import type { Children, IClassComponent, HU, J, HFragment } from './h.js'\r\nimport { updateview } from './jmc.js'\r\n\r\nexport type UC = J // update context\r\nexport type FComponentT<P> = (props: P) => HU // a function component with typed props. children come in props.children\r\n\r\nexport type DeepReadonly<T> = { readonly [K in keyof T]: T[K] extends Record<string, unknown> ? DeepReadonly<T[K]> : T[K]; }\r\n\r\nexport const When = ({ cond, children }: { cond: boolean, children?: Children }): HFragment | null => cond ? { kind: 4, cn: children } : null\r\n\r\nexport abstract class Component<P extends J = {}> implements IClassComponent {\r\n\r\n element!: HTMLElement // assigned by jmc. a placeholder Comment while view() renders nothing\r\n constructor(public props: P) { }\r\n\r\n // overrides\r\n mounted() { }\r\n update(uc?: any): boolean | void { }\r\n abstract view(): HU\r\n\r\n // utility: updates the component's view\r\n updateview() { updateview(this.element) }\r\n get ismounted(): boolean { return !!this.element }\r\n}\r\n\r\nexport function cc(...namesOrObjects: (string | J | undefined)[]): string {\r\n return namesOrObjects\r\n .flatMap(n => typeof n == 'string' ? n : Object.keys(n ?? {}).filter(k => n?.[k])) // objects contribute their truthy keys\r\n .join(' ')\r\n}\r\n\r\nexport const focuselement = (e: Node) => (e as HTMLElement).focus()"]}
|
package/package.json
CHANGED
package/src/h.ts
CHANGED
|
@@ -7,9 +7,8 @@ export type Selector = string | Node
|
|
|
7
7
|
/** an updateview command: a target (selector or node), a depth (number) or an update context (object) */
|
|
8
8
|
export type Command = Selector | J | number
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
export type FComponent = (props: J, children?: Children) => HU
|
|
10
|
+
/** a function component. it gets its children in props.children */
|
|
11
|
+
export type FComponent = (props: J) => HU
|
|
13
12
|
|
|
14
13
|
type HKindElement = 1
|
|
15
14
|
type HKindFunctionComponent = 2
|
package/src/jmc.ts
CHANGED
|
@@ -124,8 +124,7 @@ function sync(
|
|
|
124
124
|
|
|
125
125
|
case 2: {
|
|
126
126
|
// function component
|
|
127
|
-
|
|
128
|
-
let hr = h.tag(h.p, h.cn)
|
|
127
|
+
let hr = h.tag(h.p)
|
|
129
128
|
return sync(parent, i, hr, [...hs, h], depth, uc)
|
|
130
129
|
}
|
|
131
130
|
|
package/src/lib.ts
CHANGED
|
@@ -2,11 +2,11 @@ import type { Children, IClassComponent, HU, J, HFragment } from './h.js'
|
|
|
2
2
|
import { updateview } from './jmc.js'
|
|
3
3
|
|
|
4
4
|
export type UC = J // update context
|
|
5
|
-
export type FComponentT<P> = (
|
|
5
|
+
export type FComponentT<P> = (props: P) => HU // a function component with typed props. children come in props.children
|
|
6
6
|
|
|
7
7
|
export type DeepReadonly<T> = { readonly [K in keyof T]: T[K] extends Record<string, unknown> ? DeepReadonly<T[K]> : T[K]; }
|
|
8
8
|
|
|
9
|
-
export const When = ({ cond }: { cond: boolean
|
|
9
|
+
export const When = ({ cond, children }: { cond: boolean, children?: Children }): HFragment | null => cond ? { kind: 4, cn: children } : null
|
|
10
10
|
|
|
11
11
|
export abstract class Component<P extends J = {}> implements IClassComponent {
|
|
12
12
|
|