fix: use State instead of Ref

MKRhere · MKRhere · commit c639d1b7c9b3 · 2023-11-12T22:41:11.000+05:30
diff --git a/hyper/node.ts b/hyper/node.ts
@@ -2,7 +2,7 @@ import { Tag } from "./lib/tags.ts";
 import { EmptyElements } from "./lib/emptyElements.ts";
 import { Attr } from "./lib/attributes.ts";
 import { Falsy, isFalsy } from "./util.ts";
-import { Ref, ReadonlyRef } from "./state.ts";
+import { State, ReadonlyState } from "./state.ts";
 
 export type NonEmptyElement = Exclude<Tag, EmptyElements>;
 
@@ -30,7 +30,9 @@ interface HN<T extends Tag = Tag> {
 	children: (HyperNode<Tag> | HyperTextNode)[];
 }
 
-export type HyperNode<T extends Tag = Tag> = { [T in Tag]: HN<T> }[T];
+export type HyperNodes = { [T in Tag]: HN<T> };
+
+export type HyperNode<T extends Tag = Tag> = HyperNodes[T];
 
 // TypeScript constructors cannot return custom types, including unions.
 // Instead, we create a class expression and assert it to the correct constructor type which returns the HyperNode union.
@@ -44,16 +46,16 @@ export type HyperNodeish<T extends Tag = Tag> =
 	| HyperTextNode
 	| HyperHTMLStringNode
 	| Falsy
-	| Ref<HyperNode<T> | HyperTextNode | HyperHTMLStringNode | Falsy>
-	| ReadonlyRef<HyperNode<T> | HyperTextNode | HyperHTMLStringNode | Falsy>;
+	| State<HyperNode<T> | HyperTextNode | HyperHTMLStringNode | Falsy>
+	| ReadonlyState<HyperNode<T> | HyperTextNode | HyperHTMLStringNode | Falsy>;
 
 // deno-lint-ignore no-explicit-any
 const isHyperNode = (n: any): n is HyperNode | HyperHTMLStringNode | HyperTextNode =>
 	n instanceof HyperNode || n instanceof HyperHTMLStringNode || typeof n === "string";
 
 export function normaliseParams<T extends Tag>(props?: Attr<T> | HyperNodeish, childNodes?: HyperNodeish[]) {
 	const [attrs, children]: [Attr<T>, HyperNodeish[]] =
-		isHyperNode(props) || isFalsy(props) || Ref.isRef(props)
+		isHyperNode(props) || isFalsy(props) || State.isState(props)
 			? [{}, [props, ...(childNodes || [])]]
 			: [props || {}, childNodes || []];
 
diff --git a/hyper/render/dom.ts b/hyper/render/dom.ts
@@ -1,6 +1,6 @@
 import { guessEnv } from "../guessEnv.ts";
 import { Falsy, isFalsy } from "../util.ts";
-import { Ref, ReadonlyRef } from "../state.ts";
+import { State, ReadonlyState } from "../state.ts";
 import { Document, HTMLElement, Node, Text } from "../lib/dom.ts";
 import { HyperHTMLStringNode, HyperNodeish } from "../node.ts";
 
@@ -17,7 +17,7 @@ type NodeToDOM<N extends HyperNodeish> = N extends Falsy
 	? null
 	: N extends string
 	? Text
-	: N extends ReadonlyRef<string>
+	: N extends ReadonlyState<string>
 	? Text
 	: HTMLElement;
 
@@ -48,7 +48,7 @@ const toDOM = function toDOM(parent: HTMLElement, node: HyperNodeish): Node | nu
 	if (typeof node === "string") return document.createTextNode(node);
 	if (isFalsy(node)) return null;
 	if (node instanceof HyperHTMLStringNode) return htmlStringToElement(node.htmlString);
-	if (Ref.isRef(node)) {
+	if (State.isState(node)) {
 		let init = toDOM(parent, node.value);
 
 		node.listen(val => {
diff --git a/hyper/render/html.ts b/hyper/render/html.ts
@@ -1,6 +1,6 @@
 import { HyperHTMLStringNode, HyperNodeish } from "../node.ts";
 import { EmptyElements } from "../lib/emptyElements.ts";
-import { Ref } from "../state.ts";
+import { State } from "../state.ts";
 import { escapeAttr, escapeTextNode, type Falsy, isFalsy } from "../util.ts";
 
 // deno-lint-ignore no-explicit-any
@@ -30,7 +30,7 @@ export function renderHTML(node: HyperNodeish): string {
 	if (isFalsy(node)) return "";
 	if (typeof node === "string") return escapeTextNode(node);
 	if (node instanceof HyperHTMLStringNode) return node.htmlString;
-	if (Ref.isRef(node)) return renderHTML(node.value);
+	if (State.isState(node)) return renderHTML(node.value);
 
 	let stringified = "<" + node.tag;
 
diff --git a/hyper/state.ts b/hyper/state.ts
@@ -39,7 +39,7 @@ export class State<T = any> extends ReadonlyState<T> {
 	}
 
 	/**
-	 * Merge multiple refs into a single Ref
+	 * Merge multiple states into a single state
 	 */
 	static merge<T>(...states: [State<T>, ...State<T>[]]): MergedState<MapEntries<State<T>[]>>;
 
diff --git a/hyper/util.ts b/hyper/util.ts
@@ -19,3 +19,5 @@ export type Falsy = SetContents<typeof Falsy>;
 
 // deno-lint-ignore no-explicit-any
 export const isFalsy = (n: any): n is Falsy => Falsy.has(n);
+
+export type Keyof<O> = Extract<keyof O, string>;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class State<T = any> extends ReadonlyState<T> {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
`42`		`- * Merge multiple refs into a single Ref`
	`42`	`+ * Merge multiple states into a single state`
`43`	`43`	`*/`
`44`	`44`	`static merge<T>(...states: [State<T>, ...State<T>[]]): MergedState<MapEntries<State<T>[]>>;`
`45`	`45`