resora 1.3.0 → 1.3.2

package/dist/index.cjs

@@ -1466,6 +1466,7 @@ var BaseSerializer = class {
 	static ctx;
 	instanceConfig;
 	additionalMeta;
+	serializationPromise;
 	called = {};
 	constructor() {
 		loadRuntimeConfig();
@@ -1566,6 +1567,12 @@ 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.
 	*
@@ -1641,27 +1648,28 @@ var BaseSerializer = class {
 	runThen(input) {
 		this.called.then = true;
 		input.ensureJson();
-		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;
+		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);
 	}
 	/**
 	* Get or set the resource-level configuration for this serializer instance.
@@ -1851,17 +1859,10 @@ var GenericResource = class GenericResource extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	/**
-	* 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));
+	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);
@@ -1892,6 +1893,32 @@ 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));
+			if (collected.some((item) => this.isPromiseLike(item))) return Promise.all(collected).then(serialize);
+			data = collected;
+		}
+		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) => {
+				const result = this.serializeGenericResource(resolved, ctx);
+				if (this.isPromiseLike(result)) return result;
+			});
+			else {
+				const result = this.serializeGenericResource(resource, ctx);
+				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
+			}
 		}
 		return this;
 	}
@@ -2185,6 +2212,46 @@ 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);
+	}
+	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
 	* 
@@ -2194,38 +2261,19 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			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 data = this.data(ctx);
+			const serialize = (items) => {
+				const resolvedData = this.resolveCollectionDataForSerialization(items, ctx);
+				if (this.isPromiseLike(resolvedData)) return resolvedData.then((resolved) => {
+					this.serializeCollectionData(resolved);
+				});
+				this.serializeCollectionData(resolvedData);
+			};
+			if (this.isPromiseLike(data)) this.serializationPromise = Promise.resolve(data).then(serialize);
+			else {
+				const result = serialize(data);
+				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
 			}
-			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;
 	}
@@ -2496,6 +2544,30 @@ 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);
+	}
 	/**
 	* Convert resource to JSON response format
 	* 
@@ -2505,28 +2577,11 @@ var Resource = class Resource extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			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
-				}
+			const resource = this.data(ctx);
+			if (this.isPromiseLike(resource)) this.serializationPromise = Promise.resolve(resource).then((resolved) => {
+				this.serializeResource(resolved);
 			});
-			this.body = appendRootProperties(this.body, customMeta, rootKey);
-			this.body = this.applySerializePlugins(this.body);
+			else this.serializeResource(resource);
 		}
 		return this;
 	}

package/dist/index.d.cts

@@ -519,6 +519,7 @@ 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;
@@ -605,6 +606,8 @@ 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.
    *
@@ -746,7 +749,7 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
   /**
    * Get the original resource data
    */
-  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)[];
+  data(_ctx?: any): any;
   /**
    * Get the current serialized output body.
    */
@@ -786,6 +789,8 @@ 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 resolveCollectionDataForSerialization;
   /**
    * Convert resource to JSON response format
    *
@@ -883,7 +888,7 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   /**
    * Get the original resource data
    */
-  data(_ctx?: unknown): R extends NonCollectible ? R["data"] : R;
+  data(_ctx?: any): any;
   /**
    * Get the current serialized output body.
    */
@@ -903,6 +908,7 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   protected getResourceForMeta(): R;
   protected getSerializerType(): "resource";
   private getPayloadKey;
+  private serializeResource;
   /**
    * Convert resource to JSON response format
    *
@@ -992,7 +998,7 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   /**
    * Get the original resource data
    */
-  data(_ctx?: unknown): R;
+  data(_ctx?: any): any;
   /**
    * Get the current serialized output body.
    */
@@ -1024,6 +1030,7 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   protected getResourceForMeta(): R;
   protected getSerializerType(): "generic";
   private getPayloadKey;
+  private serializeGenericResource;
   /**
    * Convert resource to JSON response format
    *

package/dist/index.d.mts

@@ -519,6 +519,7 @@ 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;
@@ -605,6 +606,8 @@ 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.
    *
@@ -746,7 +749,7 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
   /**
    * Get the original resource data
    */
-  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)[];
+  data(_ctx?: any): any;
   /**
    * Get the current serialized output body.
    */
@@ -786,6 +789,8 @@ 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 resolveCollectionDataForSerialization;
   /**
    * Convert resource to JSON response format
    *
@@ -883,7 +888,7 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   /**
    * Get the original resource data
    */
-  data(_ctx?: unknown): R extends NonCollectible ? R["data"] : R;
+  data(_ctx?: any): any;
   /**
    * Get the current serialized output body.
    */
@@ -903,6 +908,7 @@ declare class Resource<R extends ResourceData | NonCollectible = ResourceData> e
   protected getResourceForMeta(): R;
   protected getSerializerType(): "resource";
   private getPayloadKey;
+  private serializeResource;
   /**
    * Convert resource to JSON response format
    *
@@ -992,7 +998,7 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   /**
    * Get the original resource data
    */
-  data(_ctx?: unknown): R;
+  data(_ctx?: any): any;
   /**
    * Get the current serialized output body.
    */
@@ -1024,6 +1030,7 @@ declare class GenericResource<R extends NonCollectible | Collectible | Collectio
   protected getResourceForMeta(): R;
   protected getSerializerType(): "generic";
   private getPayloadKey;
+  private serializeGenericResource;
   /**
    * Convert resource to JSON response format
    *

package/dist/index.mjs

@@ -1437,6 +1437,7 @@ var BaseSerializer = class {
 	static ctx;
 	instanceConfig;
 	additionalMeta;
+	serializationPromise;
 	called = {};
 	constructor() {
 		loadRuntimeConfig();
@@ -1537,6 +1538,12 @@ 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.
 	*
@@ -1612,27 +1619,28 @@ var BaseSerializer = class {
 	runThen(input) {
 		this.called.then = true;
 		input.ensureJson();
-		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;
+		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);
 	}
 	/**
 	* Get or set the resource-level configuration for this serializer instance.
@@ -1822,17 +1830,10 @@ var GenericResource = class GenericResource extends BaseSerializer {
 		const { wrap, rootKey, factory } = this.resolveResponseStructure();
 		return factory || !wrap ? void 0 : rootKey;
 	}
-	/**
-	* 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));
+	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);
@@ -1863,6 +1864,32 @@ 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));
+			if (collected.some((item) => this.isPromiseLike(item))) return Promise.all(collected).then(serialize);
+			data = collected;
+		}
+		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) => {
+				const result = this.serializeGenericResource(resolved, ctx);
+				if (this.isPromiseLike(result)) return result;
+			});
+			else {
+				const result = this.serializeGenericResource(resource, ctx);
+				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
+			}
 		}
 		return this;
 	}
@@ -2156,6 +2183,46 @@ 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);
+	}
+	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
 	* 
@@ -2165,38 +2232,19 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			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 data = this.data(ctx);
+			const serialize = (items) => {
+				const resolvedData = this.resolveCollectionDataForSerialization(items, ctx);
+				if (this.isPromiseLike(resolvedData)) return resolvedData.then((resolved) => {
+					this.serializeCollectionData(resolved);
+				});
+				this.serializeCollectionData(resolvedData);
+			};
+			if (this.isPromiseLike(data)) this.serializationPromise = Promise.resolve(data).then(serialize);
+			else {
+				const result = serialize(data);
+				if (this.isPromiseLike(result)) this.serializationPromise = Promise.resolve(result);
 			}
-			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;
 	}
@@ -2467,6 +2515,30 @@ 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);
+	}
 	/**
 	* Convert resource to JSON response format
 	* 
@@ -2476,28 +2548,11 @@ var Resource = class Resource extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			const ctx = this.resolveSerializationContext();
-			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
-				}
+			const resource = this.data(ctx);
+			if (this.isPromiseLike(resource)) this.serializationPromise = Promise.resolve(resource).then((resolved) => {
+				this.serializeResource(resolved);
 			});
-			this.body = appendRootProperties(this.body, customMeta, rootKey);
-			this.body = this.applySerializePlugins(this.body);
+			else this.serializeResource(resource);
 		}
 		return this;
 	}

package/package.json

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