tagu-tagu 1.0.7 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tagu-tagu",
-	"version": "1.0.7",
+	"version": "2.0.0",
 	"description": "A lightweight helper for vanilla `HTMLElement`, with reactivity.",
 	"keywords": [
 		"vanilla",

package/src/Modify.ts

@@ -1,4 +1,4 @@
-import { type DataRecord, initializeData } from "./data/data";
+import { type DataRecord, initializeData, waitForData } from "./data/data";
 import { Binding } from "./data/useBinding";
 import { type ChildType, initializeChildBlock } from "./initializeChildBlock";
 import { FromStates, State } from "./State";
@@ -65,7 +65,7 @@ function applyStringOrStateOrBinding(
 	initialize: (text: string) => void,
 ) {
 	if (value instanceof Binding) {
-		initializeData(element, {
+		waitForData(element, {
 			[value.key]: (data: any) => {
 				const isState = data instanceof State;
 				const stringOrState = isState

package/src/data/data.ts

@@ -81,45 +81,21 @@ function resolveCallbacksByData(
 	}
 }
 
-export type DataRecord = Record<string, DataCallback | any>;
+export type DataRecord = Record<string, any>;
 export const nodeData = new NodeData();
 export function initializeData(element: Node, data: DataRecord | undefined) {
-	nodeData.addCallbacks(element, extractCallbackRecord(data));
-	nodeData.setDataRecord(element, extractDataValueRecord(data));
+	nodeData.setDataRecord(element, data);
 }
 
 export function extractCallbackRecord(
-	record: DataRecord | undefined,
+	record: Record<string, DataCallback> | undefined,
 ): Record<string, DataCallback[]> | undefined {
-	return extractRecordFromDataRecord(
-		record,
-		(value) => typeof value === "function",
-		(callback) => [callback],
-	);
-}
-
-export function extractDataValueRecord(
-	record: DataRecord | undefined,
-): Record<string, any> | undefined {
-	return extractRecordFromDataRecord(
-		record,
-		(value) => typeof value !== "function",
-	);
-}
-
-function extractRecordFromDataRecord(
-	record: DataRecord | undefined,
-	predicate: (value: any) => boolean,
-	map = (value: any) => value,
-) {
 	if (!record) return;
 
 	const result = {} as Record<string, any>;
 	for (const key in record) {
 		const value = record[key];
-		if (predicate(value)) {
-			result[key] = map(value);
-		}
+		result[key] = [value];
 	}
 
 	if (!Object.keys(result).length) return;
@@ -127,16 +103,6 @@ function extractRecordFromDataRecord(
 	return result;
 }
 
-export function createDescendantCallbacks(
-	record: Record<string, DataCallback> | undefined,
-) {
-	return extractRecordFromDataRecord(
-		record,
-		() => true,
-		(value) => [value],
-	);
-}
-
 export function appendCallbacksRecord(
 	record1: Record<string, DataCallback[]>,
 	record2: Record<string, DataCallback[]> | undefined,
@@ -158,3 +124,10 @@ export function findData(node: Node | null, key: string) {
 	}
 	return findData(node.parentElement, key);
 }
+
+export function waitForData(
+	node: Node,
+	callbackRecord: Record<string, (data: any) => void>,
+) {
+	nodeData.addCallbacks(node, extractCallbackRecord(callbackRecord));
+}