@@ -3,32 +3,32 @@
 */
 
 "use strict";
+/** @import { ObjectDeserializerContext, ObjectSerializerContext } from "./ObjectMiddleware" */
 
-/** @typedef {EXPECTED_FUNCTION} CacheAssoc */
+/** @typedef {ObjectSerializerContext<EXPECTED_ANY>["write"]} CacheAssoc */
 
 /**
  * Defines the shared type used by this module.
- * @template T
- * @typedef {WeakMap<CacheAssoc, ObjectStructure<T>>}
+ * @type {WeakMap<CacheAssoc, ObjectStructure<PropertyKey>>}
  */
 const cache = new WeakMap();
 
 /**
  * Represents ObjectStructure.
- * @template T
+ * @template {PropertyKey} K
  */
 class ObjectStructure {
 	constructor() {
-		/** @type {undefined | keyof T[]} */
+		/** @type {undefined | K[]} */
 		this.keys = undefined;
-		/** @type {undefined | Map<keyof T, ObjectStructure<T>>} */
+		/** @type {undefined | Map<K, ObjectStructure<K>>} */
 		this.children = undefined;
 	}
 
 	/**
 	 * Returns keys.
-	 * @param {keyof T[]} keys keys
-	 * @returns {keyof T[]} keys
+	 * @param {K[]} keys keys
+	 * @returns {K[]} keys
 	 */
 	getKeys(keys) {
 		if (this.keys === undefined) this.keys = keys;
@@ -37,13 +37,14 @@ class ObjectStructure {
 
 	/**
 	 * Returns object structure.
-	 * @param {keyof T} key key
-	 * @returns {ObjectStructure<T>} object structure
+	 * @param {K} key key
+	 * @returns {ObjectStructure<K>} object structure
 	 */
 	key(key) {
 		if (this.children === undefined) this.children = new Map();
 		const child = this.children.get(key);
 		if (child !== undefined) return child;
+		/** @type {ObjectStructure<K>} */
 		const newChild = new ObjectStructure();
 		this.children.set(key, newChild);
 		return newChild;
@@ -52,13 +53,15 @@ class ObjectStructure {
 
 /**
  * Returns keys.
- * @template T
- * @param {(keyof T)[]} keys keys
+ * @template {PropertyKey} K
+ * @param {K[]} keys keys
  * @param {CacheAssoc} cacheAssoc cache assoc fn
- * @returns {(keyof T)[]} keys
+ * @returns {K[]} keys
  */
 const getCachedKeys = (keys, cacheAssoc) => {
-	let root = cache.get(cacheAssoc);
+	let root = /** @type {ObjectStructure<K> | undefined} */ (
+		cache.get(cacheAssoc)
+	);
 	if (root === undefined) {
 		root = new ObjectStructure();
 		cache.set(cacheAssoc, root);
@@ -75,7 +78,7 @@ class PlainObjectSerializer {
 	 * Serializes this instance into the provided serializer context.
 	 * @template {object} T
 	 * @param {T} obj plain object
-	 * @param {import("./ObjectMiddleware").ObjectSerializerContext<((keyof T)[] | keyof T | null | T[keyof T])[]>} context context
+	 * @param {ObjectSerializerContext<((keyof T)[] | keyof T | null | T[keyof T])[]>} context context
 	 */
 	serialize(obj, context) {
 		const keys = /** @type {(keyof T)[]} */ (Object.keys(obj));
@@ -103,7 +106,7 @@ class PlainObjectSerializer {
 	/**
 	 * Restores this instance from the provided deserializer context.
 	 * @template {object} T
-	 * @param {import("./ObjectMiddleware").ObjectDeserializerContext<((keyof T)[] | keyof T | null | T[keyof T])[]>} context context
+	 * @param {ObjectDeserializerContext<((keyof T)[] | keyof T | null | T[keyof T])[]>} context context
 	 * @returns {T} plain object
 	 */
 	deserialize(context) {
 
@@ -100,7 +100,7 @@ const cachedSetProperty = (obj, property, value) => {
  * @property {ByValues | undefined} byValues value depending on selector property, merged with base
  */
 
-/** @typedef {(function(...EXPECTED_ANY): object) & { [DYNAMIC_INFO]: [DynamicFunction, object] }} DynamicFunction */
+/** @typedef {((...x: EXPECTED_ANY) => object) & { [DYNAMIC_INFO]: [DynamicFunction, object] }} DynamicFunction */
 
 /**
  * Defines the parsed object static type used by this module.