@snupo/jmc 1.0.41 → 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/h.d.ts CHANGED
@@ -6,10 +6,6 @@ type HKindElement = 1;
6
6
  type HKindFunctionComponent = 2;
7
7
  type HKindClassComponent = 3;
8
8
  type HKindFragment = 4;
9
- export declare const kindelement: HKindElement;
10
- export declare const kindfc: HKindFunctionComponent;
11
- export declare const kindcc: HKindClassComponent;
12
- export declare const kindfragment: HKindFragment;
13
9
  export type HKind = HKindElement | HKindFunctionComponent | HKindClassComponent | HKindFragment;
14
10
  export interface IClassComponent {
15
11
  element: Node;
package/dist/h.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"h.d.ts","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAGnC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAA;AAEpC,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAA;AAChF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,KAAK,CAAC,GAAG,IAAI,CAAA;AAEhE,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,eAAO,MAAM,WAAW,EAAG,YAAgB,CAAA;AAC3C,eAAO,MAAM,MAAM,EAAG,sBAA0B,CAAA;AAChD,eAAO,MAAM,MAAM,EAAG,mBAAuB,CAAA;AAC7C,eAAO,MAAM,YAAY,EAAG,aAAiB,CAAA;AAE7C,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,CAAC,CAAA;IACT,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,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,CAAA;AAExC,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,CAAC,EAAE,CAAC,CAAA;IACL,EAAE,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,sBAAsB,CAAA;IAC5B,GAAG,EAAE,UAAU,CAAA;IACf,CAAC,CAAC,EAAE,CAAC,CAAA;IACL,EAAE,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,mBAAmB,CAAA;IACzB,GAAG,EAAE,UAAU,CAAA;IACf,CAAC,CAAC,EAAE,CAAC,CAAA;IACL,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;AAIf,wBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,QAAQ,GAAG,kBAAkB,GAAG,eAAe,GAAG,SAAS,CAU/G;AAGD,eAAO,IAAI,IAAI,QAAW,CAAA"}
1
+ {"version":3,"file":"h.d.ts","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAGnC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAA;AAEpC,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAA;AAChF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,KAAK,CAAC,GAAG,IAAI,CAAA;AAEhE,KAAK,YAAY,GAAG,CAAC,CAAA;AACrB,KAAK,sBAAsB,GAAG,CAAC,CAAA;AAC/B,KAAK,mBAAmB,GAAG,CAAC,CAAA;AAC5B,KAAK,aAAa,GAAG,CAAC,CAAA;AAOtB,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,CAAC,CAAA;IACT,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,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,CAAA;AAExC,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,CAAC,EAAE,CAAC,CAAA;IACL,EAAE,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,sBAAsB,CAAA;IAC5B,GAAG,EAAE,UAAU,CAAA;IACf,CAAC,CAAC,EAAE,CAAC,CAAA;IACL,EAAE,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,mBAAmB,CAAA;IACzB,GAAG,EAAE,UAAU,CAAA;IACf,CAAC,CAAC,EAAE,CAAC,CAAA;IACL,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;AAIf,wBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,QAAQ,GAAG,kBAAkB,GAAG,eAAe,GAAG,SAAS,CAU/G;AAGD,eAAO,IAAI,IAAI,QAAW,CAAA"}
package/dist/h.js CHANGED
@@ -1,14 +1,10 @@
1
- export const kindelement = 1;
2
- export const kindfc = 2;
3
- export const kindcc = 3;
4
- export const kindfragment = 4;
5
1
  let isclass = (f) => /^class\s|^class\{/.test(f.toString());
6
2
  export function jsx(tag, p, ...cn) {
7
3
  if (tag?.kind)
8
4
  return tag; // already an H node, flatten tree
9
- let kind = tag == jsxf ? kindfragment : tag instanceof Function ? (isclass(tag) ? kindcc : kindfc) : kindelement;
5
+ let kind = tag == jsxf ? 4 : tag instanceof Function ? (isclass(tag) ? 3 : 2) : 1;
10
6
  let h = { kind };
11
- if (kind != kindfragment)
7
+ if (kind != 4)
12
8
  h.tag = tag;
13
9
  if (p)
14
10
  h.p = p;
package/dist/h.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"h.js","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,WAAW,GAAkB,CAAC,CAAA;AAC3C,MAAM,CAAC,MAAM,MAAM,GAA4B,CAAC,CAAA;AAChD,MAAM,CAAC,MAAM,MAAM,GAAyB,CAAC,CAAA;AAC7C,MAAM,CAAC,MAAM,YAAY,GAAmB,CAAC,CAAA;AA2D7C,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,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;IAEvH,IAAI,CAAC,GAAQ,EAAE,IAAI,EAAE,CAAA;IACrB,IAAI,IAAI,IAAI,YAAY;QAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAA;IACrC,IAAI,CAAC;QAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACd,IAAI,EAAE,EAAE,MAAM;QAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAA;IACzB,OAAO,CAAC,CAAA;AACZ,CAAC;AAED,4CAA4C;AAC5C,MAAM,CAAC,IAAI,IAAI,GAAG,MAAM,EAAE,CAAA","sourcesContent":["export type J = Record<string, any> // a json record\r\n\r\n// Overload signatures\r\nexport type Selector = string | Node\r\n\r\nexport type FComponent = (props: J | undefined, children?: Children) => HElement // show an example for usage of children\r\nexport type FComponentT<P> = (pcn: P, cn?: Children) => H | void\r\n\r\ntype HKindElement = 1\r\ntype HKindFunctionComponent = 2\r\ntype HKindClassComponent = 3\r\ntype HKindFragment = 4\r\n\r\nexport const kindelement : HKindElement = 1\r\nexport const kindfc : HKindFunctionComponent = 2\r\nexport const kindcc : HKindClassComponent = 3\r\nexport const kindfragment : 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(): H\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 = (H | undefined)[]\r\n\r\nexport type HText =\r\n | string // text node\r\n | number // text node\r\n | boolean // do not allow boolean, that\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\nlet isclass = (f: Function) => /^class\\s|^class\\{/.test(f.toString())\r\n\r\nexport function jsx(tag: any, p: any, ...cn: any[]): HElement | HFunctionComponent | HClassComponent | HFragment {\r\n if (tag?.kind) return tag // already an H node, flatten tree\r\n\r\n let kind: HKind = tag == jsxf ? kindfragment : tag instanceof Function ? (isclass(tag) ? kindcc : kindfc) : kindelement\r\n\r\n let h: any = { kind }\r\n if (kind != kindfragment) h.tag = tag\r\n if (p) h.p = p\r\n if (cn?.length) h.cn = cn\r\n return h\r\n}\r\n\r\n// fragment is only used above as a sentinel\r\nexport let jsxf = Symbol()"]}
1
+ {"version":3,"file":"h.js","sourceRoot":"","sources":["../src/h.ts"],"names":[],"mappings":"AA2EA,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,CAAA;IACrB,IAAI,IAAI,IAAI,CAAC;QAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAA;IAC1B,IAAI,CAAC;QAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACd,IAAI,EAAE,EAAE,MAAM;QAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAA;IACzB,OAAO,CAAC,CAAA;AACZ,CAAC;AAED,4CAA4C;AAC5C,MAAM,CAAC,IAAI,IAAI,GAAG,MAAM,EAAE,CAAA","sourcesContent":["export type J = Record<string, any> // a json record\r\n\r\n// Overload signatures\r\nexport type Selector = string | Node\r\n\r\nexport type FComponent = (props: J | undefined, children?: Children) => HElement // show an example for usage of children\r\nexport type FComponentT<P> = (pcn: P, cn?: Children) => H | void\r\n\r\ntype HKindElement = 1\r\ntype HKindFunctionComponent = 2\r\ntype HKindClassComponent = 3\r\ntype HKindFragment = 4\r\n\r\n// export const kindelement : HKindElement = 1\r\n// export const kindfc : HKindFunctionComponent = 2\r\n// export const kindcc : HKindClassComponent = 3\r\n// export const kindfragment : 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(): H\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 = (H | undefined)[]\r\n\r\nexport type HText =\r\n | string // text node\r\n | number // text node\r\n | boolean // do not allow boolean, that\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\nlet isclass = (f: Function) => /^class\\s|^class\\{/.test(f.toString())\r\n\r\nexport function jsx(tag: any, p: any, ...cn: any[]): HElement | HFunctionComponent | HClassComponent | 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 }\r\n if (kind != 4) h.tag = tag\r\n if (p) h.p = p\r\n if (cn?.length) h.cn = cn\r\n return h\r\n}\r\n\r\n// fragment is only used above as a sentinel\r\nexport let jsxf = Symbol()"]}
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;AAQ9E,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
@@ -1,5 +1,4 @@
1
1
  import { rebind } from './base.js';
2
- import { kindcc, kindelement, kindfc, kindfragment } from './h.js';
3
2
  let iswebcomponent = (h) => h.tag.includes('-');
4
3
  const isproperty = (e, name, value) => name !== "viewBox" &&
5
4
  (value instanceof Object ||
@@ -26,18 +25,16 @@ let setprops = (e, old, now) => {
26
25
  };
27
26
  /** synchronizes children starting at the i-th element. returns the index of the last child synchronized */
28
27
  let syncchildren = (p, cn, i, ns, depth, uc) => {
29
- 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)));
30
31
  return i;
31
32
  };
32
33
  function sync(parent, i, h, ns, depth, uc) {
33
34
  // console.log('%csync2', "background:orange", parent.tagName, i, h, depth)
34
- if (!depth)
35
- return i + 1;
36
- if (h === null || h === undefined)
37
- return i; // skip. keep 0 and false renderable, per comment below
38
35
  let c = parent.childNodes[i];
39
36
  switch (h.kind) {
40
- case kindelement:
37
+ case 1:
41
38
  {
42
39
  let n;
43
40
  let { tag, cn, p } = h;
@@ -61,11 +58,11 @@ function sync(parent, i, h, ns, depth, uc) {
61
58
  }
62
59
  return i + 1;
63
60
  }
64
- case kindfragment:
61
+ case 4:
65
62
  {
66
63
  return syncchildren(parent, h.cn ?? [], i, ns, --depth, uc);
67
64
  }
68
- case kindfc:
65
+ case 2:
69
66
  {
70
67
  let hr = h.tag(h.p, h.cn);
71
68
  let j = sync(parent, i, hr, ns, depth, uc);
@@ -74,7 +71,7 @@ function sync(parent, i, h, ns, depth, uc) {
74
71
  n.h = h;
75
72
  return j;
76
73
  }
77
- case kindcc: {
74
+ case 3: {
78
75
  let isupdate = c?.h?.tag == h.tag;
79
76
  if (isupdate) {
80
77
  let ci = c.h.i;
@@ -126,8 +123,10 @@ export function updateview(...cmds) {
126
123
  f([...document.querySelectorAll(c)]);
127
124
  }
128
125
  else if (c instanceof Node) {
129
- patch(c, c.h, depth, uc);
130
- patchcount++;
126
+ if (c.h) {
127
+ patch(c, c.h, depth, uc);
128
+ patchcount++;
129
+ }
131
130
  }
132
131
  else if (typeof c === 'number') {
133
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\nimport { kindcc, kindelement, kindfc, kindfragment } from './h.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 kindelement:\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 kindfragment:\r\n {\r\n return syncchildren(parent, h.cn ?? [], i, ns, --depth, uc)\r\n }\r\n\r\n case kindfc:\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 kindcc: {\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/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,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAItE,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,UAAU;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,IAAI,QAAQ,KAAG,SAAS,GAAG,IAAgD,CAAA;AAE7H,8BAAsB,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAE,YAAW,eAAe;IAGnD,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,CAAC;IAGlB,UAAU;IACV,IAAI,SAAS,IAAI,OAAO,CAA+B;CAC1D;AAED,wBAAgB,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,GAAG,MAAM,CAE9D;AAED,eAAO,MAAM,YAAY,GAAI,GAAG,IAAI,SAA+B,CAAA"}
1
+ {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAGtE,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,UAAU;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,IAAI,QAAQ,KAAG,SAAS,GAAG,IAAqC,CAAA;AAElH,8BAAsB,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAE,YAAW,eAAe;IAGnD,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,CAAC;IAGlB,UAAU;IACV,IAAI,SAAS,IAAI,OAAO,CAA+B;CAC1D;AAED,wBAAgB,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,GAAG,MAAM,CAE9D;AAED,eAAO,MAAM,YAAY,GAAI,GAAG,IAAI,SAA+B,CAAA"}
package/dist/lib.js CHANGED
@@ -1,6 +1,5 @@
1
- import { kindfragment } from './h.js';
2
1
  import { updateview } from './jmc.js';
3
- export const When = ({ cond }, cn) => cond ? { kind: kindfragment, cn } : null;
2
+ export const When = ({ cond }, cn) => cond ? { kind: 4, cn } : null;
4
3
  export class JMXComp {
5
4
  props;
6
5
  element; // assigned by jmx framework
package/dist/lib.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAIrC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,EAAqB,EAAE,EAAY,EAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAE7H,MAAM,OAAgB,OAAO;IAGN;IADnB,OAAO,CAAc,CAAC,4BAA4B;IAClD,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,IAAI,CAAC,OAAc,CAAA,CAAC,CAAC;CAC1D;AAED,MAAM,UAAU,EAAE,CAAC,GAAG,cAAgC;IAClD,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA,CAAC,4CAA4C;AAC9I,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAO,EAAE,EAAE,CAAE,CAAiB,CAAC,KAAK,EAAE,CAAA","sourcesContent":["import type { Children, IClassComponent, H, J, HFragment } from './h';\r\nimport { kindfragment } from './h.js'\r\nimport { updateview } from './jmc.js'\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 }: { cond: boolean }, cn: Children): HFragment | null => cond ? { kind: kindfragment, cn } : null\r\n\r\nexport abstract class JMXComp<P extends J = {}> implements IClassComponent {\r\n\r\n element!: HTMLElement // assigned by jmx framework\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(): H\r\n\r\n // utility: updates the component's view\r\n updateview() { updateview(this.element) }\r\n get ismounted(): boolean { return this.element as any }\r\n}\r\n\r\nexport function cc(...namesOrObjects: (string | any)[]): string {\r\n return namesOrObjects.flatMap(n => (n.trim ? n : Object.keys(n).filter(k => n[k]))).join(' ') // n.trim distinguishes strings from objects\r\n}\r\n\r\nexport const focuselement = (e: Node) => (e as HTMLElement).focus()"]}
1
+ {"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAIrC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,EAAqB,EAAE,EAAY,EAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAElH,MAAM,OAAgB,OAAO;IAGN;IADnB,OAAO,CAAc,CAAC,4BAA4B;IAClD,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,IAAI,CAAC,OAAc,CAAA,CAAC,CAAC;CAC1D;AAED,MAAM,UAAU,EAAE,CAAC,GAAG,cAAgC;IAClD,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA,CAAC,4CAA4C;AAC9I,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAO,EAAE,EAAE,CAAE,CAAiB,CAAC,KAAK,EAAE,CAAA","sourcesContent":["import type { Children, IClassComponent, H, J, HFragment } from './h';\r\nimport { updateview } from './jmc.js'\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 }: { cond: boolean }, cn: Children): HFragment | null => cond ? { kind: 4, cn } : null\r\n\r\nexport abstract class JMXComp<P extends J = {}> implements IClassComponent {\r\n\r\n element!: HTMLElement // assigned by jmx framework\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(): H\r\n\r\n // utility: updates the component's view\r\n updateview() { updateview(this.element) }\r\n get ismounted(): boolean { return this.element as any }\r\n}\r\n\r\nexport function cc(...namesOrObjects: (string | any)[]): string {\r\n return namesOrObjects.flatMap(n => (n.trim ? n : Object.keys(n).filter(k => n[k]))).join(' ') // n.trim distinguishes strings from objects\r\n}\r\n\r\nexport const focuselement = (e: Node) => (e as HTMLElement).focus()"]}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@snupo/jmc",
3
3
  "author": "snupo",
4
- "version": "1.0.41",
4
+ "version": "1.0.43",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
package/src/h.ts CHANGED
@@ -11,10 +11,10 @@ type HKindFunctionComponent = 2
11
11
  type HKindClassComponent = 3
12
12
  type HKindFragment = 4
13
13
 
14
- export const kindelement : HKindElement = 1
15
- export const kindfc : HKindFunctionComponent = 2
16
- export const kindcc : HKindClassComponent = 3
17
- export const kindfragment : HKindFragment = 4
14
+ // export const kindelement : HKindElement = 1
15
+ // export const kindfc : HKindFunctionComponent = 2
16
+ // export const kindcc : HKindClassComponent = 3
17
+ // export const kindfragment : HKindFragment = 4
18
18
 
19
19
  export type HKind = HKindElement | HKindFunctionComponent | HKindClassComponent | HKindFragment
20
20
 
@@ -78,10 +78,10 @@ let isclass = (f: Function) => /^class\s|^class\{/.test(f.toString())
78
78
  export function jsx(tag: any, p: any, ...cn: any[]): HElement | HFunctionComponent | HClassComponent | HFragment {
79
79
  if (tag?.kind) return tag // already an H node, flatten tree
80
80
 
81
- let kind: HKind = tag == jsxf ? kindfragment : tag instanceof Function ? (isclass(tag) ? kindcc : kindfc) : kindelement
81
+ let kind: HKind = tag == jsxf ? 4 : tag instanceof Function ? (isclass(tag) ? 3 : 2) : 1
82
82
 
83
83
  let h: any = { kind }
84
- if (kind != kindfragment) h.tag = tag
84
+ if (kind != 4) h.tag = tag
85
85
  if (p) h.p = p
86
86
  if (cn?.length) h.cn = cn
87
87
  return h
package/src/jmc.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import type { H, HElement, J, Selector, Children, HClassComponent } from './h'
2
2
  import { rebind } from './base.js'
3
- import { kindcc, kindelement, kindfc, kindfragment } from './h.js'
4
3
 
5
4
  const enum NodeType { // vaporizes (but for that must be in this file, otherwise not)
6
5
  TextNode = 3
@@ -44,21 +43,20 @@ let setprops = (e: Element & J, old: J | undefined, now: J | undefined) => {
44
43
 
45
44
  /** synchronizes children starting at the i-th element. returns the index of the last child synchronized */
46
45
  let syncchildren = (p: Element, cn: Children, i: number, ns: string, depth: number, uc: J): number => {
47
- 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)))
48
49
  return i
49
50
  }
50
51
 
51
- 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 {
52
53
 
53
54
  // console.log('%csync2', "background:orange", parent.tagName, i, h, depth)
54
55
 
55
- if (!depth) return i + 1
56
-
57
- if (h === null || h === undefined) return i // skip. keep 0 and false renderable, per comment below
58
56
  let c = parent.childNodes[i]
59
57
 
60
58
  switch (h.kind) {
61
- case kindelement:
59
+ case 1:
62
60
  {
63
61
  let n: Element
64
62
  let { tag, cn, p } = h
@@ -85,12 +83,12 @@ function sync(parent: Element, i: number, h: H | undefined, ns: string, depth: n
85
83
  return i + 1
86
84
  }
87
85
 
88
- case kindfragment:
86
+ case 4:
89
87
  {
90
88
  return syncchildren(parent, h.cn ?? [], i, ns, --depth, uc)
91
89
  }
92
90
 
93
- case kindfc:
91
+ case 2:
94
92
  {
95
93
  let hr = h.tag(h.p, h.cn)
96
94
  let j = sync(parent, i, hr, ns, depth, uc)
@@ -99,7 +97,7 @@ function sync(parent: Element, i: number, h: H | undefined, ns: string, depth: n
99
97
  return j
100
98
  }
101
99
 
102
- case kindcc: {
100
+ case 3: {
103
101
  let isupdate = (c?.h as any)?.tag == h.tag
104
102
 
105
103
  if (isupdate) {
@@ -131,7 +129,7 @@ function sync(parent: Element, i: number, h: H | undefined, ns: string, depth: n
131
129
  }
132
130
  }
133
131
 
134
- 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) {
135
133
  if (!e) return
136
134
  if (depth == 0) {
137
135
  (e as HTMLElement).replaceChildren()
@@ -156,8 +154,10 @@ export function updateview(...cmds: Command[]): void {
156
154
  if (typeof c === 'string') {
157
155
  f([...document.querySelectorAll(c)])
158
156
  } else if (c instanceof Node) {
159
- patch(c, c.h, depth, uc)
160
- patchcount++
157
+ if (c.h) {
158
+ patch(c, c.h, depth, uc)
159
+ patchcount++
160
+ }
161
161
  } else if (typeof c === 'number') {
162
162
  depth = c
163
163
  } else {
package/src/lib.ts CHANGED
@@ -1,10 +1,9 @@
1
1
  import type { Children, IClassComponent, H, J, HFragment } from './h';
2
- import { kindfragment } from './h.js'
3
2
  import { updateview } from './jmc.js'
4
3
 
5
4
  export type DeepReadonly<T> = { readonly [K in keyof T]: T[K] extends Record<string, unknown> ? DeepReadonly<T[K]> : T[K]; }
6
5
 
7
- export const When = ({ cond }: { cond: boolean }, cn: Children): HFragment | null => cond ? { kind: kindfragment, cn } : null
6
+ export const When = ({ cond }: { cond: boolean }, cn: Children): HFragment | null => cond ? { kind: 4, cn } : null
8
7
 
9
8
  export abstract class JMXComp<P extends J = {}> implements IClassComponent {
10
9