resora 1.3.4 → 1.3.5

package/dist/index.cjs

@@ -436,17 +436,17 @@ const mergeMetadata = (base, incoming) => {
 //#endregion
 //#region src/utilities/arkorm.ts
 /**
-* Type guard to check if a value is an Arkorm-like model.
-*
-* Arkorm models expose `toObject()`. Some production model variants/proxies do
-* not expose `getRawAttributes()`, so the serializer should not require it.
+* Type guard to check if a value is an Arkorm-like model, which is defined as an object 
+* that has a toObject method and optionally getRawAttributes, getAttribute, and 
+* setAttribute methods.
 * 
 * @param value  The value to check
 * @returns True if the value is an Arkorm-like model, false otherwise
 */
 const isArkormLikeModel = (value) => {
 	if (!value || typeof value !== "object") return false;
-	return typeof value.toObject === "function";
+	const candidate = value;
+	return typeof candidate.toObject === "function" && typeof candidate.getRawAttributes === "function";
 };
 /**
 * Type guard to check if a value is an Arkorm-like collection, which is defined as an object
@@ -491,30 +491,6 @@ const normalizeSerializableData = (value) => {
 	}, {});
 	return value;
 };
-const isPromiseLike = (value) => {
-	return !!value && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
-};
-/**
-* Async variant of normalizeSerializableData. It resolves promise-like values at
-* every nesting level before converting Arkorm-like models and collections.
-*
-* @param value The value to normalize
-* @returns The normalized value, ready for serialization
-*/
-const normalizeSerializableDataAsync = async (value) => {
-	const resolvedValue = isPromiseLike(value) ? await value : value;
-	if (Array.isArray(resolvedValue)) return Promise.all(resolvedValue.map((item) => normalizeSerializableDataAsync(item)));
-	if (isResoraCollectionLike(resolvedValue)) return normalizeSerializableDataAsync(resolvedValue.toObject());
-	if (isArkormLikeModel(resolvedValue)) return normalizeSerializableDataAsync(resolvedValue.toObject());
-	if (isArkormLikeCollection(resolvedValue)) return normalizeSerializableDataAsync(resolvedValue.all());
-	if (isPlainObject(resolvedValue)) return (await Promise.all(Object.entries(resolvedValue).map(async ([key, nestedValue]) => {
-		return [key, await normalizeSerializableDataAsync(nestedValue)];
-	}))).reduce((accumulator, [key, nestedValue]) => {
-		accumulator[key] = nestedValue;
-		return accumulator;
-	}, {});
-	return resolvedValue;
-};
 
 //#endregion
 //#region src/utilities/pagination.ts
@@ -1490,7 +1466,6 @@ var BaseSerializer = class {
 	static ctx;
 	instanceConfig;
 	additionalMeta;
-	serializationPromise;
 	called = {};
 	constructor() {
 		loadRuntimeConfig();
@@ -1591,12 +1566,6 @@ var BaseSerializer = class {
 	resolveSerializationContext() {
 		return getCtx() ?? this.constructor.ctx;
 	}
-	isPromiseLike(value) {
-		return !!value && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
-	}
-	waitForSerialization() {
-		return this.serializationPromise ?? Promise.resolve();
-	}
 	/**
 	* Dispatch a body to a raw response object when it exposes a send() transport method.
 	*
@@ -1672,28 +1641,27 @@ var BaseSerializer = class {
 	runThen(input) {
 		this.called.then = true;
 		input.ensureJson();
-		return this.waitForSerialization().then(() => {
-			const initialBody = input.body();
-			let response;
-			if (typeof input.rawResponse !== "undefined") {
-				response = input.createServerResponse(input.rawResponse, initialBody);
-				this.called.withResponse = true;
-				input.callWithResponse(response, input.rawResponse);
-			} else {
-				this.called.withResponse = true;
-				input.callWithResponse();
-			}
-			const resolvedBody = input.body();
-			if (typeof response?.setBody === "function") response.setBody(resolvedBody);
-			const dispatchedBody = this.applyResponsePlugins({
-				body: resolvedBody,
-				rawResponse: input.rawResponse,
-				response
-			});
-			if (typeof response?.send === "function") response.send(dispatchedBody);
-			else if (typeof input.rawResponse !== "undefined" && input.sendRawResponse) input.sendRawResponse(input.rawResponse, dispatchedBody);
-			return dispatchedBody;
-		}).then(input.onfulfilled, input.onrejected);
+		const initialBody = input.body();
+		let response;
+		if (typeof input.rawResponse !== "undefined") {
+			response = input.createServerResponse(input.rawResponse, initialBody);
+			this.called.withResponse = true;
+			input.callWithResponse(response, input.rawResponse);
+		} else {
+			this.called.withResponse = true;
+			input.callWithResponse();
+		}
+		const resolvedBody = input.body();
+		if (typeof response?.setBody === "function") response.setBody(resolvedBody);
+		const dispatchedBody = this.applyResponsePlugins({
+			body: resolvedBody,
+			rawResponse: input.rawResponse,
+			response
+		});
+		const resolved = Promise.resolve(dispatchedBody).then(input.onfulfilled, input.onrejected);
+		if (typeof response?.send === "function") response.send(dispatchedBody);
+		else if (typeof input.rawResponse !== "undefined" && input.sendRawResponse) input.sendRawResponse(input.rawResponse, dispatchedBody);
+		return resolved;
 	}
 	/**
 	* Get or set the resource-level configuration for this serializer instance.
@@ -1883,52 +1851,17 @@ var GenericResource = class GenericResource extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	serializeGenericResource(resource, ctx) {
-		let data = normalizeSerializableData(resource);
-		const serialize = (resolvedData) => {
-			data = resolvedData;
-			if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
-			data = sanitizeConditionalAttributes(data);
-			const paginationExtras = buildPaginationExtras(this.resource);
-			const { metaKey } = getPaginationExtraKeys();
-			const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
-			if (metaKey) delete paginationExtras[metaKey];
-			const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
-			if (caseStyle) {
-				const transformer = getCaseTransformer(caseStyle);
-				data = transformKeys(data, transformer);
-			}
-			const customMeta = this.resolveMergedMeta(GenericResource.prototype.with);
-			const { wrap, rootKey, factory } = this.resolveResponseStructure();
-			this.body = buildResponseEnvelope({
-				payload: data,
-				meta: configuredMeta,
-				metaKey,
-				wrap,
-				rootKey,
-				factory,
-				context: {
-					type: "generic",
-					resource: this.resource
-				}
-			});
-			this.body = appendRootProperties(this.body, {
-				...paginationExtras,
-				...customMeta || {}
-			}, rootKey);
-			this.body = this.applySerializePlugins(this.body);
-		};
-		if (Array.isArray(data) && this.collects) {
-			const collected = data.map((item) => new this.collects(item).data(ctx));
-			if (collected.some((item) => this.isPromiseLike(item))) return Promise.all(collected).then(serialize);
-			data = collected;
-		}
-		serialize(data);
-	}
-	async serializeGenericResourceAsync(resource, ctx) {
-		let data = await normalizeSerializableDataAsync(resource);
-		const serialize = (resolvedData) => {
-			data = resolvedData;
+	/**
+	* Convert resource to JSON response format
+	* 
+	* @returns 
+	*/
+	json() {
+		if (!this.called.json) {
+			this.called.json = true;
+			const ctx = this.resolveSerializationContext();
+			let data = normalizeSerializableData(this.data(ctx));
+			if (Array.isArray(data) && this.collects) data = data.map((item) => new this.collects(item).data(ctx));
 			if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
 			data = sanitizeConditionalAttributes(data);
 			const paginationExtras = buildPaginationExtras(this.resource);
@@ -1959,31 +1892,6 @@ var GenericResource = class GenericResource extends BaseSerializer {
 				...customMeta || {}
 			}, rootKey);
 			this.body = this.applySerializePlugins(this.body);
-		};
-		if (Array.isArray(data) && this.collects) {
-			const collected = data.map((item) => new this.collects(item).data(ctx));
-			data = await Promise.all(collected);
-			data = await normalizeSerializableDataAsync(data);
-		}
-		serialize(data);
-	}
-	/**
-	* Convert resource to JSON response format
-	* 
-	* @returns 
-	*/
-	json() {
-		if (!this.called.json) {
-			this.called.json = true;
-			const ctx = this.resolveSerializationContext();
-			const resource = this.data(ctx);
-			if (this.isPromiseLike(resource)) this.serializationPromise = Promise.resolve(resource).then((resolved) => {
-				return this.serializeGenericResourceAsync(resolved, ctx);
-			});
-			else {
-				const result = this.serializeGenericResource(resource, ctx);
-				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
-			}
 		}
 		return this;
 	}
@@ -2277,78 +2185,6 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	serializeCollectionData(items) {
-		let data = normalizeSerializableData(items);
-		data = sanitizeConditionalAttributes(data);
-		const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
-		const { metaKey } = getPaginationExtraKeys();
-		const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
-		if (metaKey) delete paginationExtras[metaKey];
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(ResourceCollection.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			meta: configuredMeta,
-			metaKey,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "collection",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, {
-			...paginationExtras,
-			...customMeta || {}
-		}, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
-	async serializeCollectionDataAsync(items) {
-		let data = await normalizeSerializableDataAsync(items);
-		data = sanitizeConditionalAttributes(data);
-		const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
-		const { metaKey } = getPaginationExtraKeys();
-		const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
-		if (metaKey) delete paginationExtras[metaKey];
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(ResourceCollection.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			meta: configuredMeta,
-			metaKey,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "collection",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, {
-			...paginationExtras,
-			...customMeta || {}
-		}, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
-	resolveCollectionDataForSerialization(items, ctx) {
-		if (this.collects && this.data === ResourceCollection.prototype.data) {
-			const collected = items.map((item) => new this.collects(item).data(ctx));
-			if (collected.some((item) => this.isPromiseLike(item))) return Promise.all(collected);
-			return collected;
-		}
-		return items;
-	}
 	/**
 	* Convert resource to JSON response format
 	* 
@@ -2358,24 +2194,38 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			const data = this.data(ctx);
-			const serialize = (items) => {
-				const resolvedData = this.resolveCollectionDataForSerialization(items, ctx);
-				if (this.isPromiseLike(resolvedData)) return resolvedData.then((resolved) => {
-					return this.serializeCollectionDataAsync(resolved);
-				});
-				this.serializeCollectionData(resolvedData);
-			};
-			if (this.isPromiseLike(data)) this.serializationPromise = Promise.resolve(data).then((items) => {
-				const resolvedData = this.resolveCollectionDataForSerialization(items, ctx);
-				return Promise.resolve(resolvedData).then((resolved) => {
-					return this.serializeCollectionDataAsync(resolved);
-				});
-			});
-			else {
-				const result = serialize(data);
-				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
+			let data = this.data(ctx);
+			if (this.collects && this.data === ResourceCollection.prototype.data) data = data.map((item) => new this.collects(item).data(ctx));
+			data = normalizeSerializableData(data);
+			data = sanitizeConditionalAttributes(data);
+			const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
+			const { metaKey } = getPaginationExtraKeys();
+			const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
+			if (metaKey) delete paginationExtras[metaKey];
+			const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
+			if (caseStyle) {
+				const transformer = getCaseTransformer(caseStyle);
+				data = transformKeys(data, transformer);
 			}
+			const customMeta = this.resolveMergedMeta(ResourceCollection.prototype.with);
+			const { wrap, rootKey, factory } = this.resolveResponseStructure();
+			this.body = buildResponseEnvelope({
+				payload: data,
+				meta: configuredMeta,
+				metaKey,
+				wrap,
+				rootKey,
+				factory,
+				context: {
+					type: "collection",
+					resource: this.resource
+				}
+			});
+			this.body = appendRootProperties(this.body, {
+				...paginationExtras,
+				...customMeta || {}
+			}, rootKey);
+			this.body = this.applySerializePlugins(this.body);
 		}
 		return this;
 	}
@@ -2646,54 +2496,6 @@ var Resource = class Resource extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	serializeResource(resource) {
-		let data = normalizeSerializableData(resource);
-		if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
-		data = sanitizeConditionalAttributes(data);
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor);
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(Resource.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "resource",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, customMeta, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
-	async serializeResourceAsync(resource) {
-		let data = await normalizeSerializableDataAsync(resource);
-		if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
-		data = sanitizeConditionalAttributes(data);
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor);
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(Resource.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "resource",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, customMeta, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
 	/**
 	* Convert resource to JSON response format
 	* 
@@ -2703,11 +2505,28 @@ var Resource = class Resource extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			const resource = this.data(ctx);
-			if (this.isPromiseLike(resource)) this.serializationPromise = Promise.resolve(resource).then((resolved) => {
-				return this.serializeResourceAsync(resolved);
+			let data = normalizeSerializableData(this.data(ctx));
+			if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
+			data = sanitizeConditionalAttributes(data);
+			const caseStyle = this.resolveSerializerCaseStyle(this.constructor);
+			if (caseStyle) {
+				const transformer = getCaseTransformer(caseStyle);
+				data = transformKeys(data, transformer);
+			}
+			const customMeta = this.resolveMergedMeta(Resource.prototype.with);
+			const { wrap, rootKey, factory } = this.resolveResponseStructure();
+			this.body = buildResponseEnvelope({
+				payload: data,
+				wrap,
+				rootKey,
+				factory,
+				context: {
+					type: "resource",
+					resource: this.resource
+				}
 			});
-			else this.serializeResource(resource);
+			this.body = appendRootProperties(this.body, customMeta, rootKey);
+			this.body = this.applySerializePlugins(this.body);
 		}
 		return this;
 	}
@@ -2921,7 +2740,6 @@ exports.isResoraCollectionLike = isResoraCollectionLike;
 exports.loadRuntimeConfig = loadRuntimeConfig;
 exports.mergeMetadata = mergeMetadata;
 exports.normalizeSerializableData = normalizeSerializableData;
-exports.normalizeSerializableDataAsync = normalizeSerializableDataAsync;
 exports.registerPlugin = registerPlugin;
 exports.registerUtility = registerUtility;
 exports.resetPluginsForTests = resetPluginsForTests;

package/dist/index.d.cts

@@ -519,7 +519,6 @@ declare abstract class BaseSerializer<TResource = any> {
   protected static ctx?: Response | H3Event | Record<string, any>;
   protected instanceConfig?: ResourceLevelConfig;
   protected additionalMeta?: MetaData;
-  protected serializationPromise?: Promise<void>;
   protected called: {
     json?: boolean;
     data?: boolean;
@@ -606,8 +605,6 @@ declare abstract class BaseSerializer<TResource = any> {
    * Resolve the active request context for data transformation hooks.
    */
   protected resolveSerializationContext(): unknown;
-  protected isPromiseLike<T = any>(value: unknown): value is PromiseLike<T>;
-  protected waitForSerialization(): Promise<void>;
   /**
    * Dispatch a body to a raw response object when it exposes a send() transport method.
    *
@@ -749,7 +746,7 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
   /**
    * Get the original resource data
    */
-  data(_ctx?: any): any;
+  data(_ctx?: unknown): (R extends Collectible ? R["data"][number] : R extends PaginatorLike<infer TPaginatorData> ? TPaginatorData : R extends CollectionLike<infer TCollectionData> ? TCollectionData : R extends ResourceData[] ? R[number] : never)[];
   /**
    * Get the current serialized output body.
    */
@@ -789,9 +786,6 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
    * @returns The key to use for the response payload, or undefined if no key is needed.
    */
   private getPayloadKey;
-  private serializeCollectionData;
-  private serializeCollectionDataAsync;
-  private resolveCollectionDataForSerialization;
   /**
    * Convert resource to JSON response format
    *
@@ -889,7 +883,7 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   /**
    * Get the original resource data
    */
-  data(_ctx?: any): any;
+  data(_ctx?: unknown): R extends NonCollectible ? R["data"] : R;
   /**
    * Get the current serialized output body.
    */
@@ -909,8 +903,6 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   protected getResourceForMeta(): R;
   protected getSerializerType(): "resource";
   private getPayloadKey;
-  private serializeResource;
-  private serializeResourceAsync;
   /**
    * Convert resource to JSON response format
    *
@@ -1000,7 +992,7 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   /**
    * Get the original resource data
    */
-  data(_ctx?: any): any;
+  data(_ctx?: unknown): R;
   /**
    * Get the current serialized output body.
    */
@@ -1032,8 +1024,6 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   protected getResourceForMeta(): R;
   protected getSerializerType(): "generic";
   private getPayloadKey;
-  private serializeGenericResource;
-  private serializeGenericResourceAsync;
   /**
    * Convert resource to JSON response format
    *
@@ -1225,7 +1215,7 @@ declare const defineConfig: (config: ResoraConfig) => Config;
 //#endregion
 //#region src/utilities/arkorm.d.ts
 type ArkormLikeModel = {
-  toObject: () => Record<string, any> | PromiseLike<Record<string, any>>;
+  toObject: () => Record<string, any>;
   getRawAttributes?: () => Record<string, any>;
   getAttribute?: (key: string) => unknown;
   setAttribute?: (key: string, value: unknown) => unknown;
@@ -1240,10 +1230,9 @@ type ResoraCollectionLike = {
   setCollects: (...args: unknown[]) => unknown;
 };
 /**
- * Type guard to check if a value is an Arkorm-like model.
- *
- * Arkorm models expose `toObject()`. Some production model variants/proxies do
- * not expose `getRawAttributes()`, so the serializer should not require it.
+ * Type guard to check if a value is an Arkorm-like model, which is defined as an object
+ * that has a toObject method and optionally getRawAttributes, getAttribute, and
+ * setAttribute methods.
  *
  * @param value  The value to check
  * @returns True if the value is an Arkorm-like model, false otherwise
@@ -1271,14 +1260,6 @@ declare const isResoraCollectionLike: (value: unknown) => value is ResoraCollect
  * @returns The normalized value, ready for serialization
  */
 declare const normalizeSerializableData: (value: unknown) => unknown;
-/**
- * Async variant of normalizeSerializableData. It resolves promise-like values at
- * every nesting level before converting Arkorm-like models and collections.
- *
- * @param value The value to normalize
- * @returns The normalized value, ready for serialization
- */
-declare const normalizeSerializableDataAsync: (value: unknown) => Promise<unknown>;
 //#endregion
 //#region src/utilities/metadata.d.ts
 /**
@@ -1612,4 +1593,4 @@ declare const extractResponseFromCtx: (ctx: unknown) => any | undefined;
  */
 declare const setCtx: (ctx: unknown) => void;
 //#endregion
-export { ApiResource, CONDITIONAL_ATTRIBUTE_MISSING, CaseStyle, CliApp, Collectible, CollectionBody, CollectionLike, Config, Cursor, GenericBody, GenericResource, InitCommand, MakeResource, MetaData, NonCollectible, PaginatedMetaData, Pagination, PaginatorLike, ResoraConfig, ResoraPlugin, ResoraPluginApi, ResoraPluginUtility, Resource, ResourceBody, ResourceCollection, ResourceData, ResourceDef, ResourceLevelConfig, ResponseData, ResponseDataCollection, ResponseFactory, ResponseFactoryContext, ResponseKind, ResponsePluginEvent, ResponseStructureConfig, SendPluginEvent, SerializePluginEvent, ServerResponse, appendRootProperties, applyRuntimeConfig, buildPaginationExtras, buildResponseEnvelope, createArkormCurrentPageResolver, defineConfig, definePlugin, extractRequestUrl, extractResponseFromCtx, getCaseTransformer, getCtx, getDefaultConfig, getGlobalBaseUrl, getGlobalCase, getGlobalCursorMeta, getGlobalPageName, getGlobalPaginatedExtras, getGlobalPaginatedLinks, getGlobalPaginatedMeta, getGlobalResponseFactory, getGlobalResponseRootKey, getGlobalResponseStructure, getGlobalResponseWrap, getPaginationExtraKeys, getRegisteredPlugins, getRequestUrl, getUtility, hasPaginationLink, isArkormLikeCollection, isArkormLikeModel, isPlainObject, isResoraCollectionLike, loadRuntimeConfig, mergeMetadata, normalizeSerializableData, normalizeSerializableDataAsync, registerPlugin, registerUtility, resetPluginsForTests, resetRuntimeConfigForTests, resolveCurrentPage, resolveMergeWhen, resolveWhen, resolveWhenNotNull, resolveWithHookMetadata, runPluginHook, runWithCtx, sanitizeConditionalAttributes, setCtx, setGlobalBaseUrl, setGlobalCase, setGlobalCursorMeta, setGlobalPageName, setGlobalPaginatedExtras, setGlobalPaginatedLinks, setGlobalPaginatedMeta, setGlobalResponseFactory, setGlobalResponseRootKey, setGlobalResponseStructure, setGlobalResponseWrap, setRequestUrl, splitWords, toCamelCase, toKebabCase, toPascalCase, toSnakeCase, transformKeys };
+export { ApiResource, CONDITIONAL_ATTRIBUTE_MISSING, CaseStyle, CliApp, Collectible, CollectionBody, CollectionLike, Config, Cursor, GenericBody, GenericResource, InitCommand, MakeResource, MetaData, NonCollectible, PaginatedMetaData, Pagination, PaginatorLike, ResoraConfig, ResoraPlugin, ResoraPluginApi, ResoraPluginUtility, Resource, ResourceBody, ResourceCollection, ResourceData, ResourceDef, ResourceLevelConfig, ResponseData, ResponseDataCollection, ResponseFactory, ResponseFactoryContext, ResponseKind, ResponsePluginEvent, ResponseStructureConfig, SendPluginEvent, SerializePluginEvent, ServerResponse, appendRootProperties, applyRuntimeConfig, buildPaginationExtras, buildResponseEnvelope, createArkormCurrentPageResolver, defineConfig, definePlugin, extractRequestUrl, extractResponseFromCtx, getCaseTransformer, getCtx, getDefaultConfig, getGlobalBaseUrl, getGlobalCase, getGlobalCursorMeta, getGlobalPageName, getGlobalPaginatedExtras, getGlobalPaginatedLinks, getGlobalPaginatedMeta, getGlobalResponseFactory, getGlobalResponseRootKey, getGlobalResponseStructure, getGlobalResponseWrap, getPaginationExtraKeys, getRegisteredPlugins, getRequestUrl, getUtility, hasPaginationLink, isArkormLikeCollection, isArkormLikeModel, isPlainObject, isResoraCollectionLike, loadRuntimeConfig, mergeMetadata, normalizeSerializableData, registerPlugin, registerUtility, resetPluginsForTests, resetRuntimeConfigForTests, resolveCurrentPage, resolveMergeWhen, resolveWhen, resolveWhenNotNull, resolveWithHookMetadata, runPluginHook, runWithCtx, sanitizeConditionalAttributes, setCtx, setGlobalBaseUrl, setGlobalCase, setGlobalCursorMeta, setGlobalPageName, setGlobalPaginatedExtras, setGlobalPaginatedLinks, setGlobalPaginatedMeta, setGlobalResponseFactory, setGlobalResponseRootKey, setGlobalResponseStructure, setGlobalResponseWrap, setRequestUrl, splitWords, toCamelCase, toKebabCase, toPascalCase, toSnakeCase, transformKeys };

package/dist/index.d.mts

@@ -519,7 +519,6 @@ declare abstract class BaseSerializer<TResource = any> {
   protected static ctx?: Response | H3Event | Record<string, any>;
   protected instanceConfig?: ResourceLevelConfig;
   protected additionalMeta?: MetaData;
-  protected serializationPromise?: Promise<void>;
   protected called: {
     json?: boolean;
     data?: boolean;
@@ -606,8 +605,6 @@ declare abstract class BaseSerializer<TResource = any> {
    * Resolve the active request context for data transformation hooks.
    */
   protected resolveSerializationContext(): unknown;
-  protected isPromiseLike<T = any>(value: unknown): value is PromiseLike<T>;
-  protected waitForSerialization(): Promise<void>;
   /**
    * Dispatch a body to a raw response object when it exposes a send() transport method.
    *
@@ -749,7 +746,7 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
   /**
    * Get the original resource data
    */
-  data(_ctx?: any): any;
+  data(_ctx?: unknown): (R extends Collectible ? R["data"][number] : R extends PaginatorLike<infer TPaginatorData> ? TPaginatorData : R extends CollectionLike<infer TCollectionData> ? TCollectionData : R extends ResourceData[] ? R[number] : never)[];
   /**
    * Get the current serialized output body.
    */
@@ -789,9 +786,6 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
    * @returns The key to use for the response payload, or undefined if no key is needed.
    */
   private getPayloadKey;
-  private serializeCollectionData;
-  private serializeCollectionDataAsync;
-  private resolveCollectionDataForSerialization;
   /**
    * Convert resource to JSON response format
    *
@@ -889,7 +883,7 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   /**
    * Get the original resource data
    */
-  data(_ctx?: any): any;
+  data(_ctx?: unknown): R extends NonCollectible ? R["data"] : R;
   /**
    * Get the current serialized output body.
    */
@@ -909,8 +903,6 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   protected getResourceForMeta(): R;
   protected getSerializerType(): "resource";
   private getPayloadKey;
-  private serializeResource;
-  private serializeResourceAsync;
   /**
    * Convert resource to JSON response format
    *
@@ -1000,7 +992,7 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   /**
    * Get the original resource data
    */
-  data(_ctx?: any): any;
+  data(_ctx?: unknown): R;
   /**
    * Get the current serialized output body.
    */
@@ -1032,8 +1024,6 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   protected getResourceForMeta(): R;
   protected getSerializerType(): "generic";
   private getPayloadKey;
-  private serializeGenericResource;
-  private serializeGenericResourceAsync;
   /**
    * Convert resource to JSON response format
    *
@@ -1225,7 +1215,7 @@ declare const defineConfig: (config: ResoraConfig) => Config;
 //#endregion
 //#region src/utilities/arkorm.d.ts
 type ArkormLikeModel = {
-  toObject: () => Record<string, any> | PromiseLike<Record<string, any>>;
+  toObject: () => Record<string, any>;
   getRawAttributes?: () => Record<string, any>;
   getAttribute?: (key: string) => unknown;
   setAttribute?: (key: string, value: unknown) => unknown;
@@ -1240,10 +1230,9 @@ type ResoraCollectionLike = {
   setCollects: (...args: unknown[]) => unknown;
 };
 /**
- * Type guard to check if a value is an Arkorm-like model.
- *
- * Arkorm models expose `toObject()`. Some production model variants/proxies do
- * not expose `getRawAttributes()`, so the serializer should not require it.
+ * Type guard to check if a value is an Arkorm-like model, which is defined as an object
+ * that has a toObject method and optionally getRawAttributes, getAttribute, and
+ * setAttribute methods.
  *
  * @param value  The value to check
  * @returns True if the value is an Arkorm-like model, false otherwise
@@ -1271,14 +1260,6 @@ declare const isResoraCollectionLike: (value: unknown) => value is ResoraCollect
  * @returns The normalized value, ready for serialization
  */
 declare const normalizeSerializableData: (value: unknown) => unknown;
-/**
- * Async variant of normalizeSerializableData. It resolves promise-like values at
- * every nesting level before converting Arkorm-like models and collections.
- *
- * @param value The value to normalize
- * @returns The normalized value, ready for serialization
- */
-declare const normalizeSerializableDataAsync: (value: unknown) => Promise<unknown>;
 //#endregion
 //#region src/utilities/metadata.d.ts
 /**
@@ -1612,4 +1593,4 @@ declare const extractResponseFromCtx: (ctx: unknown) => any | undefined;
  */
 declare const setCtx: (ctx: unknown) => void;
 //#endregion
-export { ApiResource, CONDITIONAL_ATTRIBUTE_MISSING, CaseStyle, CliApp, Collectible, CollectionBody, CollectionLike, Config, Cursor, GenericBody, GenericResource, InitCommand, MakeResource, MetaData, NonCollectible, PaginatedMetaData, Pagination, PaginatorLike, ResoraConfig, ResoraPlugin, ResoraPluginApi, ResoraPluginUtility, Resource, ResourceBody, ResourceCollection, ResourceData, ResourceDef, ResourceLevelConfig, ResponseData, ResponseDataCollection, ResponseFactory, ResponseFactoryContext, ResponseKind, ResponsePluginEvent, ResponseStructureConfig, SendPluginEvent, SerializePluginEvent, ServerResponse, appendRootProperties, applyRuntimeConfig, buildPaginationExtras, buildResponseEnvelope, createArkormCurrentPageResolver, defineConfig, definePlugin, extractRequestUrl, extractResponseFromCtx, getCaseTransformer, getCtx, getDefaultConfig, getGlobalBaseUrl, getGlobalCase, getGlobalCursorMeta, getGlobalPageName, getGlobalPaginatedExtras, getGlobalPaginatedLinks, getGlobalPaginatedMeta, getGlobalResponseFactory, getGlobalResponseRootKey, getGlobalResponseStructure, getGlobalResponseWrap, getPaginationExtraKeys, getRegisteredPlugins, getRequestUrl, getUtility, hasPaginationLink, isArkormLikeCollection, isArkormLikeModel, isPlainObject, isResoraCollectionLike, loadRuntimeConfig, mergeMetadata, normalizeSerializableData, normalizeSerializableDataAsync, registerPlugin, registerUtility, resetPluginsForTests, resetRuntimeConfigForTests, resolveCurrentPage, resolveMergeWhen, resolveWhen, resolveWhenNotNull, resolveWithHookMetadata, runPluginHook, runWithCtx, sanitizeConditionalAttributes, setCtx, setGlobalBaseUrl, setGlobalCase, setGlobalCursorMeta, setGlobalPageName, setGlobalPaginatedExtras, setGlobalPaginatedLinks, setGlobalPaginatedMeta, setGlobalResponseFactory, setGlobalResponseRootKey, setGlobalResponseStructure, setGlobalResponseWrap, setRequestUrl, splitWords, toCamelCase, toKebabCase, toPascalCase, toSnakeCase, transformKeys };
+export { ApiResource, CONDITIONAL_ATTRIBUTE_MISSING, CaseStyle, CliApp, Collectible, CollectionBody, CollectionLike, Config, Cursor, GenericBody, GenericResource, InitCommand, MakeResource, MetaData, NonCollectible, PaginatedMetaData, Pagination, PaginatorLike, ResoraConfig, ResoraPlugin, ResoraPluginApi, ResoraPluginUtility, Resource, ResourceBody, ResourceCollection, ResourceData, ResourceDef, ResourceLevelConfig, ResponseData, ResponseDataCollection, ResponseFactory, ResponseFactoryContext, ResponseKind, ResponsePluginEvent, ResponseStructureConfig, SendPluginEvent, SerializePluginEvent, ServerResponse, appendRootProperties, applyRuntimeConfig, buildPaginationExtras, buildResponseEnvelope, createArkormCurrentPageResolver, defineConfig, definePlugin, extractRequestUrl, extractResponseFromCtx, getCaseTransformer, getCtx, getDefaultConfig, getGlobalBaseUrl, getGlobalCase, getGlobalCursorMeta, getGlobalPageName, getGlobalPaginatedExtras, getGlobalPaginatedLinks, getGlobalPaginatedMeta, getGlobalResponseFactory, getGlobalResponseRootKey, getGlobalResponseStructure, getGlobalResponseWrap, getPaginationExtraKeys, getRegisteredPlugins, getRequestUrl, getUtility, hasPaginationLink, isArkormLikeCollection, isArkormLikeModel, isPlainObject, isResoraCollectionLike, loadRuntimeConfig, mergeMetadata, normalizeSerializableData, registerPlugin, registerUtility, resetPluginsForTests, resetRuntimeConfigForTests, resolveCurrentPage, resolveMergeWhen, resolveWhen, resolveWhenNotNull, resolveWithHookMetadata, runPluginHook, runWithCtx, sanitizeConditionalAttributes, setCtx, setGlobalBaseUrl, setGlobalCase, setGlobalCursorMeta, setGlobalPageName, setGlobalPaginatedExtras, setGlobalPaginatedLinks, setGlobalPaginatedMeta, setGlobalResponseFactory, setGlobalResponseRootKey, setGlobalResponseStructure, setGlobalResponseWrap, setRequestUrl, splitWords, toCamelCase, toKebabCase, toPascalCase, toSnakeCase, transformKeys };

package/dist/index.mjs

@@ -407,17 +407,17 @@ const mergeMetadata = (base, incoming) => {
 //#endregion
 //#region src/utilities/arkorm.ts
 /**
-* Type guard to check if a value is an Arkorm-like model.
-*
-* Arkorm models expose `toObject()`. Some production model variants/proxies do
-* not expose `getRawAttributes()`, so the serializer should not require it.
+* Type guard to check if a value is an Arkorm-like model, which is defined as an object 
+* that has a toObject method and optionally getRawAttributes, getAttribute, and 
+* setAttribute methods.
 * 
 * @param value  The value to check
 * @returns True if the value is an Arkorm-like model, false otherwise
 */
 const isArkormLikeModel = (value) => {
 	if (!value || typeof value !== "object") return false;
-	return typeof value.toObject === "function";
+	const candidate = value;
+	return typeof candidate.toObject === "function" && typeof candidate.getRawAttributes === "function";
 };
 /**
 * Type guard to check if a value is an Arkorm-like collection, which is defined as an object
@@ -462,30 +462,6 @@ const normalizeSerializableData = (value) => {
 	}, {});
 	return value;
 };
-const isPromiseLike = (value) => {
-	return !!value && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
-};
-/**
-* Async variant of normalizeSerializableData. It resolves promise-like values at
-* every nesting level before converting Arkorm-like models and collections.
-*
-* @param value The value to normalize
-* @returns The normalized value, ready for serialization
-*/
-const normalizeSerializableDataAsync = async (value) => {
-	const resolvedValue = isPromiseLike(value) ? await value : value;
-	if (Array.isArray(resolvedValue)) return Promise.all(resolvedValue.map((item) => normalizeSerializableDataAsync(item)));
-	if (isResoraCollectionLike(resolvedValue)) return normalizeSerializableDataAsync(resolvedValue.toObject());
-	if (isArkormLikeModel(resolvedValue)) return normalizeSerializableDataAsync(resolvedValue.toObject());
-	if (isArkormLikeCollection(resolvedValue)) return normalizeSerializableDataAsync(resolvedValue.all());
-	if (isPlainObject(resolvedValue)) return (await Promise.all(Object.entries(resolvedValue).map(async ([key, nestedValue]) => {
-		return [key, await normalizeSerializableDataAsync(nestedValue)];
-	}))).reduce((accumulator, [key, nestedValue]) => {
-		accumulator[key] = nestedValue;
-		return accumulator;
-	}, {});
-	return resolvedValue;
-};
 
 //#endregion
 //#region src/utilities/pagination.ts
@@ -1461,7 +1437,6 @@ var BaseSerializer = class {
 	static ctx;
 	instanceConfig;
 	additionalMeta;
-	serializationPromise;
 	called = {};
 	constructor() {
 		loadRuntimeConfig();
@@ -1562,12 +1537,6 @@ var BaseSerializer = class {
 	resolveSerializationContext() {
 		return getCtx() ?? this.constructor.ctx;
 	}
-	isPromiseLike(value) {
-		return !!value && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
-	}
-	waitForSerialization() {
-		return this.serializationPromise ?? Promise.resolve();
-	}
 	/**
 	* Dispatch a body to a raw response object when it exposes a send() transport method.
 	*
@@ -1643,28 +1612,27 @@ var BaseSerializer = class {
 	runThen(input) {
 		this.called.then = true;
 		input.ensureJson();
-		return this.waitForSerialization().then(() => {
-			const initialBody = input.body();
-			let response;
-			if (typeof input.rawResponse !== "undefined") {
-				response = input.createServerResponse(input.rawResponse, initialBody);
-				this.called.withResponse = true;
-				input.callWithResponse(response, input.rawResponse);
-			} else {
-				this.called.withResponse = true;
-				input.callWithResponse();
-			}
-			const resolvedBody = input.body();
-			if (typeof response?.setBody === "function") response.setBody(resolvedBody);
-			const dispatchedBody = this.applyResponsePlugins({
-				body: resolvedBody,
-				rawResponse: input.rawResponse,
-				response
-			});
-			if (typeof response?.send === "function") response.send(dispatchedBody);
-			else if (typeof input.rawResponse !== "undefined" && input.sendRawResponse) input.sendRawResponse(input.rawResponse, dispatchedBody);
-			return dispatchedBody;
-		}).then(input.onfulfilled, input.onrejected);
+		const initialBody = input.body();
+		let response;
+		if (typeof input.rawResponse !== "undefined") {
+			response = input.createServerResponse(input.rawResponse, initialBody);
+			this.called.withResponse = true;
+			input.callWithResponse(response, input.rawResponse);
+		} else {
+			this.called.withResponse = true;
+			input.callWithResponse();
+		}
+		const resolvedBody = input.body();
+		if (typeof response?.setBody === "function") response.setBody(resolvedBody);
+		const dispatchedBody = this.applyResponsePlugins({
+			body: resolvedBody,
+			rawResponse: input.rawResponse,
+			response
+		});
+		const resolved = Promise.resolve(dispatchedBody).then(input.onfulfilled, input.onrejected);
+		if (typeof response?.send === "function") response.send(dispatchedBody);
+		else if (typeof input.rawResponse !== "undefined" && input.sendRawResponse) input.sendRawResponse(input.rawResponse, dispatchedBody);
+		return resolved;
 	}
 	/**
 	* Get or set the resource-level configuration for this serializer instance.
@@ -1854,52 +1822,17 @@ var GenericResource = class GenericResource extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	serializeGenericResource(resource, ctx) {
-		let data = normalizeSerializableData(resource);
-		const serialize = (resolvedData) => {
-			data = resolvedData;
-			if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
-			data = sanitizeConditionalAttributes(data);
-			const paginationExtras = buildPaginationExtras(this.resource);
-			const { metaKey } = getPaginationExtraKeys();
-			const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
-			if (metaKey) delete paginationExtras[metaKey];
-			const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
-			if (caseStyle) {
-				const transformer = getCaseTransformer(caseStyle);
-				data = transformKeys(data, transformer);
-			}
-			const customMeta = this.resolveMergedMeta(GenericResource.prototype.with);
-			const { wrap, rootKey, factory } = this.resolveResponseStructure();
-			this.body = buildResponseEnvelope({
-				payload: data,
-				meta: configuredMeta,
-				metaKey,
-				wrap,
-				rootKey,
-				factory,
-				context: {
-					type: "generic",
-					resource: this.resource
-				}
-			});
-			this.body = appendRootProperties(this.body, {
-				...paginationExtras,
-				...customMeta || {}
-			}, rootKey);
-			this.body = this.applySerializePlugins(this.body);
-		};
-		if (Array.isArray(data) && this.collects) {
-			const collected = data.map((item) => new this.collects(item).data(ctx));
-			if (collected.some((item) => this.isPromiseLike(item))) return Promise.all(collected).then(serialize);
-			data = collected;
-		}
-		serialize(data);
-	}
-	async serializeGenericResourceAsync(resource, ctx) {
-		let data = await normalizeSerializableDataAsync(resource);
-		const serialize = (resolvedData) => {
-			data = resolvedData;
+	/**
+	* Convert resource to JSON response format
+	* 
+	* @returns 
+	*/
+	json() {
+		if (!this.called.json) {
+			this.called.json = true;
+			const ctx = this.resolveSerializationContext();
+			let data = normalizeSerializableData(this.data(ctx));
+			if (Array.isArray(data) && this.collects) data = data.map((item) => new this.collects(item).data(ctx));
 			if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
 			data = sanitizeConditionalAttributes(data);
 			const paginationExtras = buildPaginationExtras(this.resource);
@@ -1930,31 +1863,6 @@ var GenericResource = class GenericResource extends BaseSerializer {
 				...customMeta || {}
 			}, rootKey);
 			this.body = this.applySerializePlugins(this.body);
-		};
-		if (Array.isArray(data) && this.collects) {
-			const collected = data.map((item) => new this.collects(item).data(ctx));
-			data = await Promise.all(collected);
-			data = await normalizeSerializableDataAsync(data);
-		}
-		serialize(data);
-	}
-	/**
-	* Convert resource to JSON response format
-	* 
-	* @returns 
-	*/
-	json() {
-		if (!this.called.json) {
-			this.called.json = true;
-			const ctx = this.resolveSerializationContext();
-			const resource = this.data(ctx);
-			if (this.isPromiseLike(resource)) this.serializationPromise = Promise.resolve(resource).then((resolved) => {
-				return this.serializeGenericResourceAsync(resolved, ctx);
-			});
-			else {
-				const result = this.serializeGenericResource(resource, ctx);
-				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
-			}
 		}
 		return this;
 	}
@@ -2248,78 +2156,6 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	serializeCollectionData(items) {
-		let data = normalizeSerializableData(items);
-		data = sanitizeConditionalAttributes(data);
-		const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
-		const { metaKey } = getPaginationExtraKeys();
-		const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
-		if (metaKey) delete paginationExtras[metaKey];
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(ResourceCollection.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			meta: configuredMeta,
-			metaKey,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "collection",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, {
-			...paginationExtras,
-			...customMeta || {}
-		}, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
-	async serializeCollectionDataAsync(items) {
-		let data = await normalizeSerializableDataAsync(items);
-		data = sanitizeConditionalAttributes(data);
-		const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
-		const { metaKey } = getPaginationExtraKeys();
-		const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
-		if (metaKey) delete paginationExtras[metaKey];
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(ResourceCollection.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			meta: configuredMeta,
-			metaKey,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "collection",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, {
-			...paginationExtras,
-			...customMeta || {}
-		}, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
-	resolveCollectionDataForSerialization(items, ctx) {
-		if (this.collects && this.data === ResourceCollection.prototype.data) {
-			const collected = items.map((item) => new this.collects(item).data(ctx));
-			if (collected.some((item) => this.isPromiseLike(item))) return Promise.all(collected);
-			return collected;
-		}
-		return items;
-	}
 	/**
 	* Convert resource to JSON response format
 	* 
@@ -2329,24 +2165,38 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			const data = this.data(ctx);
-			const serialize = (items) => {
-				const resolvedData = this.resolveCollectionDataForSerialization(items, ctx);
-				if (this.isPromiseLike(resolvedData)) return resolvedData.then((resolved) => {
-					return this.serializeCollectionDataAsync(resolved);
-				});
-				this.serializeCollectionData(resolvedData);
-			};
-			if (this.isPromiseLike(data)) this.serializationPromise = Promise.resolve(data).then((items) => {
-				const resolvedData = this.resolveCollectionDataForSerialization(items, ctx);
-				return Promise.resolve(resolvedData).then((resolved) => {
-					return this.serializeCollectionDataAsync(resolved);
-				});
-			});
-			else {
-				const result = serialize(data);
-				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
+			let data = this.data(ctx);
+			if (this.collects && this.data === ResourceCollection.prototype.data) data = data.map((item) => new this.collects(item).data(ctx));
+			data = normalizeSerializableData(data);
+			data = sanitizeConditionalAttributes(data);
+			const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
+			const { metaKey } = getPaginationExtraKeys();
+			const configuredMeta = metaKey ? paginationExtras[metaKey] : void 0;
+			if (metaKey) delete paginationExtras[metaKey];
+			const caseStyle = this.resolveSerializerCaseStyle(this.constructor, this.resolveCollectsConfig());
+			if (caseStyle) {
+				const transformer = getCaseTransformer(caseStyle);
+				data = transformKeys(data, transformer);
 			}
+			const customMeta = this.resolveMergedMeta(ResourceCollection.prototype.with);
+			const { wrap, rootKey, factory } = this.resolveResponseStructure();
+			this.body = buildResponseEnvelope({
+				payload: data,
+				meta: configuredMeta,
+				metaKey,
+				wrap,
+				rootKey,
+				factory,
+				context: {
+					type: "collection",
+					resource: this.resource
+				}
+			});
+			this.body = appendRootProperties(this.body, {
+				...paginationExtras,
+				...customMeta || {}
+			}, rootKey);
+			this.body = this.applySerializePlugins(this.body);
 		}
 		return this;
 	}
@@ -2617,54 +2467,6 @@ var Resource = class Resource extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	serializeResource(resource) {
-		let data = normalizeSerializableData(resource);
-		if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
-		data = sanitizeConditionalAttributes(data);
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor);
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(Resource.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "resource",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, customMeta, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
-	async serializeResourceAsync(resource) {
-		let data = await normalizeSerializableDataAsync(resource);
-		if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
-		data = sanitizeConditionalAttributes(data);
-		const caseStyle = this.resolveSerializerCaseStyle(this.constructor);
-		if (caseStyle) {
-			const transformer = getCaseTransformer(caseStyle);
-			data = transformKeys(data, transformer);
-		}
-		const customMeta = this.resolveMergedMeta(Resource.prototype.with);
-		const { wrap, rootKey, factory } = this.resolveResponseStructure();
-		this.body = buildResponseEnvelope({
-			payload: data,
-			wrap,
-			rootKey,
-			factory,
-			context: {
-				type: "resource",
-				resource: this.resource
-			}
-		});
-		this.body = appendRootProperties(this.body, customMeta, rootKey);
-		this.body = this.applySerializePlugins(this.body);
-	}
 	/**
 	* Convert resource to JSON response format
 	* 
@@ -2674,11 +2476,28 @@ var Resource = class Resource extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			const resource = this.data(ctx);
-			if (this.isPromiseLike(resource)) this.serializationPromise = Promise.resolve(resource).then((resolved) => {
-				return this.serializeResourceAsync(resolved);
+			let data = normalizeSerializableData(this.data(ctx));
+			if (!Array.isArray(data) && data && typeof data.data !== "undefined") data = data.data;
+			data = sanitizeConditionalAttributes(data);
+			const caseStyle = this.resolveSerializerCaseStyle(this.constructor);
+			if (caseStyle) {
+				const transformer = getCaseTransformer(caseStyle);
+				data = transformKeys(data, transformer);
+			}
+			const customMeta = this.resolveMergedMeta(Resource.prototype.with);
+			const { wrap, rootKey, factory } = this.resolveResponseStructure();
+			this.body = buildResponseEnvelope({
+				payload: data,
+				wrap,
+				rootKey,
+				factory,
+				context: {
+					type: "resource",
+					resource: this.resource
+				}
 			});
-			else this.serializeResource(resource);
+			this.body = appendRootProperties(this.body, customMeta, rootKey);
+			this.body = this.applySerializePlugins(this.body);
 		}
 		return this;
 	}
@@ -2848,4 +2667,4 @@ var Resource = class Resource extends BaseSerializer {
 };
 
 //#endregion
-export { ApiResource, CONDITIONAL_ATTRIBUTE_MISSING, CliApp, GenericResource, InitCommand, MakeResource, Resource, ResourceCollection, ServerResponse, appendRootProperties, applyRuntimeConfig, buildPaginationExtras, buildResponseEnvelope, createArkormCurrentPageResolver, defineConfig, definePlugin, extractRequestUrl, extractResponseFromCtx, getCaseTransformer, getCtx, getDefaultConfig, getGlobalBaseUrl, getGlobalCase, getGlobalCursorMeta, getGlobalPageName, getGlobalPaginatedExtras, getGlobalPaginatedLinks, getGlobalPaginatedMeta, getGlobalResponseFactory, getGlobalResponseRootKey, getGlobalResponseStructure, getGlobalResponseWrap, getPaginationExtraKeys, getRegisteredPlugins, getRequestUrl, getUtility, hasPaginationLink, isArkormLikeCollection, isArkormLikeModel, isPlainObject, isResoraCollectionLike, loadRuntimeConfig, mergeMetadata, normalizeSerializableData, normalizeSerializableDataAsync, registerPlugin, registerUtility, resetPluginsForTests, resetRuntimeConfigForTests, resolveCurrentPage, resolveMergeWhen, resolveWhen, resolveWhenNotNull, resolveWithHookMetadata, runPluginHook, runWithCtx, sanitizeConditionalAttributes, setCtx, setGlobalBaseUrl, setGlobalCase, setGlobalCursorMeta, setGlobalPageName, setGlobalPaginatedExtras, setGlobalPaginatedLinks, setGlobalPaginatedMeta, setGlobalResponseFactory, setGlobalResponseRootKey, setGlobalResponseStructure, setGlobalResponseWrap, setRequestUrl, splitWords, toCamelCase, toKebabCase, toPascalCase, toSnakeCase, transformKeys };
+export { ApiResource, CONDITIONAL_ATTRIBUTE_MISSING, CliApp, GenericResource, InitCommand, MakeResource, Resource, ResourceCollection, ServerResponse, appendRootProperties, applyRuntimeConfig, buildPaginationExtras, buildResponseEnvelope, createArkormCurrentPageResolver, defineConfig, definePlugin, extractRequestUrl, extractResponseFromCtx, getCaseTransformer, getCtx, getDefaultConfig, getGlobalBaseUrl, getGlobalCase, getGlobalCursorMeta, getGlobalPageName, getGlobalPaginatedExtras, getGlobalPaginatedLinks, getGlobalPaginatedMeta, getGlobalResponseFactory, getGlobalResponseRootKey, getGlobalResponseStructure, getGlobalResponseWrap, getPaginationExtraKeys, getRegisteredPlugins, getRequestUrl, getUtility, hasPaginationLink, isArkormLikeCollection, isArkormLikeModel, isPlainObject, isResoraCollectionLike, loadRuntimeConfig, mergeMetadata, normalizeSerializableData, registerPlugin, registerUtility, resetPluginsForTests, resetRuntimeConfigForTests, resolveCurrentPage, resolveMergeWhen, resolveWhen, resolveWhenNotNull, resolveWithHookMetadata, runPluginHook, runWithCtx, sanitizeConditionalAttributes, setCtx, setGlobalBaseUrl, setGlobalCase, setGlobalCursorMeta, setGlobalPageName, setGlobalPaginatedExtras, setGlobalPaginatedLinks, setGlobalPaginatedMeta, setGlobalResponseFactory, setGlobalResponseRootKey, setGlobalResponseStructure, setGlobalResponseWrap, setRequestUrl, splitWords, toCamelCase, toKebabCase, toPascalCase, toSnakeCase, transformKeys };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resora",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "A structured API response layer for Node.js and TypeScript with automatic JSON responses, collection support, and pagination handling.",
   "keywords": [
     "api",