atom.io 0.29.0 → 0.29.2

package/internal/src/families/seek-in-store.ts

@@ -37,49 +37,49 @@ export function seekInStore<
 	store: Store,
 	token: MutableAtomFamilyToken<T, J, K>,
 	key: Key,
-): MutableAtomToken<T, J> | undefined
+): MutableAtomToken<T, J, K> | undefined
 
 export function seekInStore<T, K extends Canonical, Key extends K>(
 	store: Store,
 	token: RegularAtomFamilyToken<T, K>,
 	key: Key,
-): RegularAtomToken<T> | undefined
+): RegularAtomToken<T, K> | undefined
 
 export function seekInStore<T, K extends Canonical, Key extends K>(
 	store: Store,
 	token: AtomFamilyToken<T, K>,
 	key: Key,
-): AtomToken<T> | undefined
+): AtomToken<T, K> | undefined
 
 export function seekInStore<T, K extends Canonical, Key extends K>(
 	store: Store,
 	token: WritableSelectorFamilyToken<T, K>,
 	key: Key,
-): WritableSelectorToken<T> | undefined
+): WritableSelectorToken<T, K> | undefined
 
 export function seekInStore<T, K extends Canonical, Key extends K>(
 	store: Store,
 	token: ReadonlySelectorFamilyToken<T, K>,
 	key: Key,
-): ReadonlySelectorToken<T> | undefined
+): ReadonlySelectorToken<T, K> | undefined
 
 export function seekInStore<T, K extends Canonical, Key extends K>(
 	store: Store,
 	token: SelectorFamilyToken<T, K>,
 	key: Key,
-): SelectorToken<T> | undefined
+): SelectorToken<T, K> | undefined
 
 export function seekInStore<T, K extends Canonical, Key extends K>(
 	store: Store,
 	token: WritableFamilyToken<T, K>,
 	key: Key,
-): WritableToken<T> | undefined
+): WritableToken<T, K> | undefined
 
 export function seekInStore<T, K extends Canonical, Key extends K>(
 	store: Store,
 	token: ReadableFamilyToken<T, K>,
 	key: Key,
-): ReadableToken<T> | undefined
+): ReadableToken<T, K> | undefined
 
 export function seekInStore<M extends MoleculeConstructor>(
 	store: Store,

package/internal/src/future.ts

@@ -12,6 +12,8 @@ export class Future<T> extends Promise<T> {
 	private resolve: (value: T) => void
 	private reject: (reason?: any) => void
 
+	public done = false
+
 	public constructor(
 		executor:
 			| Promise<T>
@@ -31,11 +33,13 @@ export class Future<T> extends Promise<T> {
 	private pass(promise: Promise<T>, value: T) {
 		if (promise === this.fate) {
 			this.resolve(value)
+			this.done = true
 		}
 	}
 	private fail(promise: Promise<T>, reason: any) {
 		if (promise === this.fate) {
 			this.reject(reason)
+			this.done = true
 		}
 	}
 

package/internal/src/get-state/get-from-store.ts

@@ -6,9 +6,10 @@ import type {
 	ReadableFamilyToken,
 	ReadableToken,
 } from "atom.io"
-import { type Canonical, stringifyJson } from "atom.io/json"
+import { type Canonical, parseJson } from "atom.io/json"
 
 import { findInStore, seekInStore } from "../families"
+import { getFamilyOfToken } from "../families/get-family-of-token"
 import { NotFoundError } from "../not-found-error"
 import type { Store } from "../store"
 import { counterfeit, withdraw } from "../store"
@@ -58,11 +59,23 @@ export function getFromStore(
 		| [token: ReadableToken<any>]
 ): any {
 	let token: MoleculeToken<any> | ReadableToken<any>
+	let family:
+		| MoleculeFamilyToken<any>
+		| ReadableFamilyToken<any, Canonical>
+		| null
+	let key: Canonical | null
 	if (params.length === 1) {
 		token = params[0]
+		if (token.type !== `molecule`) {
+			family = getFamilyOfToken(store, token) ?? null
+			if (family) {
+				key = token.family ? parseJson(token.family.subKey) : null
+				token = findInStore(store, family, key)
+			}
+		}
 	} else {
-		const family = params[0]
-		const key = params[1]
+		family = params[0]
+		key = params[1]
 		let maybeToken: MoleculeToken<any> | ReadableToken<any>
 		if (family.type === `molecule_family`) {
 			maybeToken = seekInStore(store, family, key) ?? counterfeit(family, key)
@@ -72,7 +85,7 @@ export function getFromStore(
 		token = maybeToken
 	}
 	if (`counterfeit` in token && `family` in token) {
-		const family =
+		family =
 			token.type === `molecule`
 				? withdraw(token.family, store)
 				: // biome-ignore lint/style/noNonNullAssertion: family must be present

package/internal/src/set-state/set-into-store.ts

@@ -1,7 +1,8 @@
 import type { WritableFamilyToken, WritableToken } from "atom.io"
-import { type Canonical, stringifyJson } from "atom.io/json"
+import { type Canonical, parseJson, stringifyJson } from "atom.io/json"
 
 import { findInStore } from "../families"
+import { getFamilyOfToken } from "../families/get-family-of-token"
 import { closeOperation, openOperation } from "../operation"
 import type { Store } from "../store"
 import { withdraw } from "../store"
@@ -31,17 +32,24 @@ export function setIntoStore<T, New extends T>(
 		| [token: WritableToken<T>, value: New | ((oldValue: T) => New)]
 ): void {
 	let token: WritableToken<T>
+	let family: WritableFamilyToken<T, Canonical> | null
+	let key: Canonical | null
 	let value: New | ((oldValue: T) => New)
 	if (params.length === 2) {
 		token = params[0]
 		value = params[1]
+		family = getFamilyOfToken(store, token) ?? null
+		if (family) {
+			key = token.family ? parseJson(token.family.subKey) : null
+			token = findInStore(store, family, key)
+		}
 	} else {
-		const family = params[0]
-		const key = params[1]
+		family = params[0]
+		key = params[1]
 		value = params[2]
-		const maybeToken = findInStore(store, family, key)
-		token = maybeToken
+		token = findInStore(store, family, key)
 	}
+
 	if (`counterfeit` in token) {
 		const disposal = store.disposalTraces.buffer.find(
 			(item) => item?.key === token.key,

package/json/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Range, Flat, Store, Transceiver } from 'atom.io/internal';
 import * as AtomIO from 'atom.io';
 
-type Entries<K extends keyof any = keyof any, V = any> = [K, V][];
+type Entries<K extends PropertyKey = keyof any, V = any> = [K, V][];
 type KeyOfEntries<E extends Entries> = E extends [infer K, any][] ? K : never;
 type ValueOfEntry<E extends Entries, K extends KeyOfEntries<E>> = {
     [P in Range<E[`length`]>]: E[P] extends [K, infer V] ? V : never;
@@ -32,8 +32,8 @@ declare namespace Json {
     type Object<Key extends string = string, Value extends Serializable = Serializable> = Record<Key, Value>;
     type Array<Element extends Serializable = Serializable> = ReadonlyArray<Element>;
 }
-type stringified<J extends Json.Serializable> = string & {
-    __json: J;
+type stringified<J extends Json.Serializable> = J extends string ? `"${J}"` : J extends number ? `${J}` : J extends true ? `true` : J extends false ? `false` : J extends boolean ? `false` | `true` : J extends null ? `null` : string & {
+    __json?: J;
 };
 declare const parseJson: <S extends stringified<Json.Serializable>>(str: S | string) => S extends stringified<infer J> ? J : Json.Serializable;
 declare const stringifyJson: <J extends Json.Serializable>(json: J) => stringified<J>;

package/json/dist/index.js

@@ -1,4 +1,4 @@
-import { createWritableSelectorFamily } from '../../dist/chunk-XPYU2HY2.js';
+import { createWritableSelectorFamily } from '../../dist/chunk-J4B56MM5.js';
 import '../../dist/chunk-IBTHB2PI.js';
 import '../../dist/chunk-XWL6SNVU.js';
 import { createStandaloneSelector, IMPLICIT, growMoleculeInStore, initFamilyMemberInStore, withdraw, seekInStore } from 'atom.io/internal';

package/json/src/entries.ts

@@ -1,6 +1,6 @@
 import type { Flat, Range } from "atom.io/internal"
 
-export type Entries<K extends keyof any = keyof any, V = any> = [K, V][]
+export type Entries<K extends PropertyKey = keyof any, V = any> = [K, V][]
 
 export type KeyOfEntries<E extends Entries> = E extends [infer K, any][]
 	? K

package/json/src/index.ts

@@ -27,7 +27,19 @@ export namespace Json {
 		ReadonlyArray<Element>
 }
 
-export type stringified<J extends Json.Serializable> = string & { __json: J }
+export type stringified<J extends Json.Serializable> = J extends string
+	? `"${J}"`
+	: J extends number
+		? `${J}`
+		: J extends true
+			? `true`
+			: J extends false
+				? `false`
+				: J extends boolean
+					? `false` | `true`
+					: J extends null
+						? `null`
+						: string & { __json?: J }
 
 export const parseJson = <S extends stringified<Json.Serializable>>(
 	str: S | string,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.29.0",
+  "version": "0.29.2",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -59,32 +59,32 @@
     "@types/npmlog": "7.0.0",
     "@types/react": "18.3.5",
     "@types/tmp": "0.2.6",
-    "@typescript-eslint/parser": "8.4.0",
-    "@typescript-eslint/rule-tester": "8.4.0",
-    "@vitest/coverage-v8": "2.0.5",
-    "@vitest/ui": "2.0.5",
-    "concurrently": "8.2.2",
+    "@typescript-eslint/parser": "8.5.0",
+    "@typescript-eslint/rule-tester": "8.5.0",
+    "@vitest/coverage-v8": "2.1.1",
+    "@vitest/ui": "2.1.1",
+    "concurrently": "9.0.1",
     "drizzle-kit": "0.24.2",
     "drizzle-orm": "0.33.0",
-    "eslint": "9.9.1",
-    "framer-motion": "11.5.2",
-    "happy-dom": "15.7.3",
+    "eslint": "9.10.0",
+    "framer-motion": "11.5.4",
+    "happy-dom": "15.7.4",
     "http-proxy": "1.18.1",
     "npmlog": "7.0.1",
     "postgres": "3.4.4",
-    "preact": "10.23.2",
+    "preact": "10.24.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.26.1",
+    "react-router-dom": "6.26.2",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
     "tmp": "0.2.3",
     "tsup": "8.2.4",
-    "tsx": "4.19.0",
-    "typescript": "5.5.4",
-    "vite": "5.4.3",
+    "tsx": "4.19.1",
+    "typescript": "5.6.2",
+    "vite": "5.4.5",
     "vite-tsconfig-paths": "5.0.1",
-    "vitest": "2.0.5"
+    "vitest": "2.1.1"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/react-devtools/dist/index.css

@@ -108,7 +108,7 @@ main.atom_io_devtools {
               cursor: default;
             }
           }
-          label {
+          > main {
             display: flex;
             flex-flow: row;
             gap: 5px;
@@ -186,7 +186,7 @@ main.atom_io_devtools {
       section.timeline_log {
         header {
           display: flex;
-          label {
+          > main {
             display: flex;
             width: 100%;
             flex-grow: 1;

package/react-devtools/dist/index.js

@@ -150,7 +150,7 @@ var NumberInput = ({
   testid,
   value = null
 }) => {
-  const id = useId();
+  const htmlId = useId();
   const [temporaryEntry, setTemporaryEntry] = useState(null);
   const userHasMadeDeliberateChange = useRef(false);
   const refine = initRefinery({ max, min, decimalPlaces, nullable: true });
@@ -183,7 +183,7 @@ var NumberInput = ({
   };
   const displayValue = temporaryEntry ?? valueToText(value ? refine(value) : value);
   return /* @__PURE__ */ jsxs("span", { children: [
-    label && /* @__PURE__ */ jsx("label", { htmlFor: id, children: label }),
+    label ? /* @__PURE__ */ jsx("label", { htmlFor: htmlId, children: label }) : null,
     autoSize ? /* @__PURE__ */ jsx(
       ElasticInput,
       {
@@ -193,8 +193,8 @@ var NumberInput = ({
         onChange: handleChange,
         onBlur: handleBlur,
         disabled,
-        name: name ?? id,
-        id,
+        name: name ?? htmlId,
+        id: htmlId,
         onClick,
         "data-testid": testid
       }
@@ -207,8 +207,8 @@ var NumberInput = ({
         onChange: handleChange,
         onBlur: handleBlur,
         disabled,
-        name: name ?? id,
-        id,
+        name: name ?? htmlId,
+        id: htmlId,
         onClick,
         "data-testid": testid
       }
@@ -223,11 +223,13 @@ var TextInput = ({
   autoSize = false,
   testid
 }) => {
+  const htmlId = useId();
   return /* @__PURE__ */ jsxs("span", { children: [
-    /* @__PURE__ */ jsx("label", { children: label }),
+    label ? /* @__PURE__ */ jsx("label", { htmlFor: htmlId, children: label }) : null,
     autoSize ? /* @__PURE__ */ jsx(
       ElasticInput,
       {
+        id: htmlId,
         type: "text",
         value,
         onChange: (e) => set?.(e.target.value),
@@ -238,6 +240,7 @@ var TextInput = ({
     ) : /* @__PURE__ */ jsx(
       "input",
       {
+        id: htmlId,
         type: "text",
         value,
         onChange: (e) => set?.(e.target.value),
@@ -980,7 +983,7 @@ var StateIndexLeafNode = ({ node, isOpenState, typeState }) => {
         }
       ),
       /* @__PURE__ */ jsxs(
-        "label",
+        "main",
         {
           onClick: () => {
             console.log(node, getState(node));
@@ -1021,7 +1024,7 @@ var StateIndexTreeNode = ({ node, isOpenState }) => {
           setIsOpen
         }
       ),
-      /* @__PURE__ */ jsxs("label", { children: [
+      /* @__PURE__ */ jsxs("main", { children: [
         /* @__PURE__ */ jsx("h2", { children: node.key }),
         /* @__PURE__ */ jsx("span", { className: "type detail", children: " (family)" })
       ] })
@@ -1236,7 +1239,7 @@ var TimelineLog = ({ token, isOpenState, timelineState }) => {
           setIsOpen
         }
       ),
-      /* @__PURE__ */ jsxs("label", { children: [
+      /* @__PURE__ */ jsxs("main", { children: [
         /* @__PURE__ */ jsx("h2", { children: token.key }),
         /* @__PURE__ */ jsxs("span", { className: "detail length", children: [
           "(",
@@ -1321,7 +1324,7 @@ var TransactionLog = ({ token, isOpenState, logState }) => {
               setIsOpen
             }
           ),
-          /* @__PURE__ */ jsxs("label", { children: [
+          /* @__PURE__ */ jsxs("main", { children: [
             /* @__PURE__ */ jsx("h2", { children: token.key }),
             /* @__PURE__ */ jsxs("span", { className: "detail length", children: [
               "(",

package/react-devtools/src/StateIndex.tsx

@@ -38,7 +38,7 @@ export const StateIndexLeafNode: FC<{
 					setIsOpen={setIsOpen}
 					disabled={isPrimitive}
 				/>
-				<label
+				<main
 					onClick={() => {
 						console.log(node, getState(node))
 					}}
@@ -48,7 +48,7 @@ export const StateIndexLeafNode: FC<{
 				>
 					<h2>{node.family?.subKey ?? node.key}</h2>
 					<span className="type detail">({stateType})</span>
-				</label>
+				</main>
 				<StoreEditor token={node} />
 			</header>
 			{isOpen && !isPrimitive ? (
@@ -80,10 +80,10 @@ export const StateIndexTreeNode: FC<{
 					testid={`open-close-state-family-${node.key}`}
 					setIsOpen={setIsOpen}
 				/>
-				<label>
+				<main>
 					<h2>{node.key}</h2>
 					<span className="type detail"> (family)</span>
-				</label>
+				</main>
 			</header>
 			{isOpen
 				? [...node.familyMembers.entries()].map(([key, childNode]) => (

package/react-devtools/src/TimelineIndex.tsx

@@ -33,7 +33,7 @@ export const TimelineLog: FC<{
 					testid={`open-close-timeline-${token.key}`}
 					setIsOpen={setIsOpen}
 				/>
-				<label>
+				<main>
 					<h2>{token.key}</h2>
 					<span className="detail length">
 						({timeline.at}/{timeline.history.length})
@@ -59,7 +59,7 @@ export const TimelineLog: FC<{
 							redo
 						</button>
 					</nav>
-				</label>
+				</main>
 			</header>
 			{isOpen ? (
 				<main>

package/react-devtools/src/TransactionIndex.tsx

@@ -32,10 +32,10 @@ export const TransactionLog: FC<{
 					testid={`open-close-transaction-${token.key}`}
 					setIsOpen={setIsOpen}
 				/>
-				<label>
+				<main>
 					<h2>{token.key}</h2>
 					<span className="detail length">({log.length})</span>
-				</label>
+				</main>
 			</header>
 			{isOpen ? (
 				<main>

package/react-devtools/src/devtools.scss

@@ -107,7 +107,7 @@ main.atom_io_devtools {
               cursor: default;
             }
           }
-          label {
+          > main {
             display: flex;
             flex-flow: row;
             gap: 5px;
@@ -185,7 +185,7 @@ main.atom_io_devtools {
       section.timeline_log {
         header {
           display: flex;
-          label {
+          > main {
             display: flex;
             width: 100%;
             flex-grow: 1;

package/react-devtools/src/elastic-input/NumberInput.tsx

@@ -115,7 +115,7 @@ export const NumberInput: FC<NumberInputProps> = ({
 	testid,
 	value = null,
 }) => {
-	const id = useId()
+	const htmlId = useId()
 	const [temporaryEntry, setTemporaryEntry] = useState<
 		DecimalInProgress | ValidNonNumber | null
 	>(null)
@@ -142,7 +142,7 @@ export const NumberInput: FC<NumberInputProps> = ({
 			setTemporaryEntry(input)
 			const textInterpretation = isDecimalInProgress(input)
 				? input
-				: min?.toString() ?? `0`
+				: (min?.toString() ?? `0`)
 			const newValue = textToValue(textInterpretation, allowDecimal)
 			set(refine(newValue))
 			return
@@ -166,7 +166,8 @@ export const NumberInput: FC<NumberInputProps> = ({
 
 	return (
 		<span>
-			{label && <label htmlFor={id}>{label}</label>}
+			{/* biome-ignore lint/a11y/noLabelWithoutControl: it's associated via htmlFor */}
+			{label ? <label htmlFor={htmlId}>{label}</label> : null}
 			{autoSize ? (
 				<ElasticInput
 					type="text"
@@ -175,8 +176,8 @@ export const NumberInput: FC<NumberInputProps> = ({
 					onChange={handleChange}
 					onBlur={handleBlur}
 					disabled={disabled}
-					name={name ?? id}
-					id={id}
+					name={name ?? htmlId}
+					id={htmlId}
 					onClick={onClick}
 					data-testid={testid}
 				/>
@@ -188,8 +189,8 @@ export const NumberInput: FC<NumberInputProps> = ({
 					onChange={handleChange}
 					onBlur={handleBlur}
 					disabled={disabled}
-					name={name ?? id}
-					id={id}
+					name={name ?? htmlId}
+					id={htmlId}
 					onClick={onClick}
 					data-testid={testid}
 				/>

package/react-devtools/src/elastic-input/TextInput.tsx

@@ -1,4 +1,4 @@
-import type { FC } from "react"
+import { type FC, useId } from "react"
 
 import { ElasticInput } from "."
 
@@ -20,11 +20,14 @@ export const TextInput: FC<TextInputProps> = ({
 	autoSize = false,
 	testid,
 }) => {
+	const htmlId = useId()
 	return (
 		<span>
-			<label>{label}</label>
+			{/* biome-ignore lint/a11y/noLabelWithoutControl: it's associated via htmlFor */}
+			{label ? <label htmlFor={htmlId}>{label}</label> : null}
 			{autoSize ? (
 				<ElasticInput
+					id={htmlId}
 					type="text"
 					value={value}
 					onChange={(e) => set?.(e.target.value)}
@@ -34,6 +37,7 @@ export const TextInput: FC<TextInputProps> = ({
 				/>
 			) : (
 				<input
+					id={htmlId}
 					type="text"
 					value={value}
 					onChange={(e) => set?.(e.target.value)}

package/realtime-server/dist/index.d.ts

@@ -14,21 +14,19 @@ interface EventBuffer<Key extends string, Params extends Json.Serializable[]> ex
     toString(): StringifiedEvent<Key, Params>;
 }
 declare class CustomSocket<I extends Events, O extends Events> implements Socket {
-    emit: <Event extends keyof O>(event: Event, ...args: O[Event]) => CustomSocket<I, O>;
-    protected listeners: Map<keyof I, Set<(...args: Json.Array) => void>>;
+    emit: <Event extends keyof I>(event: Event, ...args: I[Event]) => CustomSocket<I, O>;
+    protected listeners: Map<keyof O, Set<(...args: Json.Array) => void>>;
     protected globalListeners: Set<(event: string, ...args: Json.Array) => void>;
     protected handleEvent<Event extends keyof I>(event: string, ...args: I[Event]): void;
     id: string;
-    constructor(emit: <Event extends keyof O>(event: Event, ...args: O[Event]) => CustomSocket<I, O>);
-    on<Event extends keyof I>(event: Event, listener: (...args: I[Event]) => void): this;
+    constructor(emit: <Event extends keyof I>(event: Event, ...args: I[Event]) => CustomSocket<I, O>);
+    on<Event extends keyof O>(event: Event, listener: (...args: O[Event]) => void): this;
     onAny(listener: (event: string, ...args: Json.Array) => void): this;
-    off<Event extends keyof I>(event: Event, listener?: (...args: I[Event]) => void): this;
+    off<Event extends keyof O>(event: Event, listener?: (...args: O[Event]) => void): this;
     offAny(listener: (event: string, ...args: Json.Array) => void): this;
 }
 
-declare class ChildSocket<I extends Events, O extends Events & {
-    "setup-relay": [string];
-}> extends CustomSocket<I, O> {
+declare class ChildSocket<I extends Events, O extends Events> extends CustomSocket<I, O> {
     process: ChildProcessWithoutNullStreams;
     key: string;
     logger: {
@@ -58,12 +56,12 @@ declare class SubjectSocket<I extends Events, O extends Events> extends CustomSo
     dispose(): void;
 }
 declare class ParentSocket<I extends Events & {
+    [id in string as `relay:${id}`]: [string, ...Json.Serializable[]];
+}, O extends Events & {
     [id in string as `user:${id}`]: [string, ...Json.Serializable[]];
 } & {
     "user-joins": [string];
     "user-leaves": [string];
-}, O extends Events & {
-    [id in string as `relay:${id}`]: [string, ...Json.Serializable[]];
 }> extends CustomSocket<I, O> {
     protected incompleteData: string;
     protected unprocessedEvents: string[];

package/realtime-server/src/ipc-sockets/child-socket.ts

@@ -10,11 +10,7 @@ import { CustomSocket } from "./custom-socket"
 
 export class ChildSocket<
 	I extends Events,
-	O extends Events & {
-		/* eslint-disable quotes */
-		"setup-relay": [string]
-		/* eslint-enable quotes */
-	},
+	O extends Events,
 > extends CustomSocket<I, O> {
 	protected incompleteData = ``
 	protected unprocessedEvents: string[] = []

package/realtime-server/src/ipc-sockets/custom-socket.ts

@@ -17,7 +17,7 @@ export interface EventBuffer<
 }
 
 export class CustomSocket<I extends Events, O extends Events> implements Socket {
-	protected listeners: Map<keyof I, Set<(...args: Json.Array) => void>>
+	protected listeners: Map<keyof O, Set<(...args: Json.Array) => void>>
 	protected globalListeners: Set<(event: string, ...args: Json.Array) => void>
 	protected handleEvent<Event extends keyof I>(
 		event: string,
@@ -37,18 +37,18 @@ export class CustomSocket<I extends Events, O extends Events> implements Socket
 	public id = `no_id_retrieved`
 
 	public constructor(
-		public emit: <Event extends keyof O>(
+		public emit: <Event extends keyof I>(
 			event: Event,
-			...args: O[Event]
+			...args: I[Event]
 		) => CustomSocket<I, O>,
 	) {
 		this.listeners = new Map()
 		this.globalListeners = new Set()
 	}
 
-	public on<Event extends keyof I>(
+	public on<Event extends keyof O>(
 		event: Event,
-		listener: (...args: I[Event]) => void,
+		listener: (...args: O[Event]) => void,
 	): this {
 		const listeners = this.listeners.get(event)
 		if (listeners) {
@@ -64,9 +64,9 @@ export class CustomSocket<I extends Events, O extends Events> implements Socket
 		return this
 	}
 
-	public off<Event extends keyof I>(
+	public off<Event extends keyof O>(
 		event: Event,
-		listener?: (...args: I[Event]) => void,
+		listener?: (...args: O[Event]) => void,
 	): this {
 		const listeners = this.listeners.get(event)
 		if (listeners) {