Merge branch 'main' into node-component

Author: zefir-git

src/Component.ts

@@ -20,6 +20,10 @@ type ElementToTagName<T extends HTMLElement> = {
     [K in keyof HTMLElementTagNameMap]: HTMLElementTagNameMap[K] extends T ? K : never
 }[keyof HTMLElementTagNameMap];
 
+type HtmlTagString<T extends HTMLElement> =
+    `<${{ [K in keyof HTMLElementTagNameMap]: HTMLElementTagNameMap[K] extends T ? K : never }[keyof HTMLElementTagNameMap]}>${string}`
+    | `<${{ [K in keyof HTMLElementTagNameMap]: HTMLElementTagNameMap[K] extends T ? K : never }[keyof HTMLElementTagNameMap]} ${string}`;
+
 /**
  * An {@link !HTMLElement} component.
  *
@@ -44,7 +48,7 @@ export class Component<T extends HTMLElement = HTMLElement> extends ElementCompo
      *
      * Note: only the first child of the HTML code will be used.
      */
-    public static from<T extends HTMLElement = HTMLElement>(html: `<${ElementToTagName<T>}${">" | " "}${string}`) {
+    public static from<T extends HTMLElement = HTMLElement>(html: HtmlTagString<T>) {
         return new Component<T>(document.createRange().createContextualFragment(html).children[0] as T);
     }
 

src/ElementComponent.ts

@@ -19,21 +19,22 @@ import {NodeComponent} from "./NodeComponent.js";
 /**
  * Non-readonly non-method keys
  */
-type WritableKeys<T> = Extract<
-    {
-        [Prop in keyof T]: (
-        (<G>() => G extends Pick<T, Prop> ? 1 : 2) extends
-            (<G>() => G extends Record<Prop, T[Prop]> ? 1 : 2)
-            ? true
-            : false
+type WritableKeys<T> = {
+    [Prop in keyof T]: (
+        (<G>() => G extends Pick<T, Prop> ? 1 : 2) extends (
+            <G>() => G extends Record<Prop, T[Prop]> ? 1 : 2
+            ) ? true : false
         ) extends false
         ? never
-        : Prop;
-    }[keyof T],
-    {
-        [K in keyof T]: T[K] extends Function ? never : K;
-    }[keyof T]
->;
+        : (T[Prop] extends Function | null | undefined ? never : Prop);
+}[keyof T];
+
+/**
+ * Non-method keys
+ */
+type ReadableKeys<T> = {
+    [Prop in keyof T]: T[Prop] extends Function | null | undefined ? never : Prop;
+}[keyof T];
 
 
 /**
@@ -147,7 +148,7 @@ export abstract class ElementComponent<T extends Element> extends NodeComponent<
      * Get element property
      * @param name property name
      */
-    public get<K extends WritableKeys<T>>(name: K): T[K] {
+    public get<K extends ReadableKeys<T>>(name: K): T[K] {
         return this.node[name];
     }