resora 1.0.0 → 1.1.0

package/dist/index.cjs

@@ -457,6 +457,17 @@ const isArkormLikeCollection = (value) => {
 	return typeof value.all === "function";
 };
 /**
+* Type guard to check if a value is a Resora collection-like serializer.
+*
+* @param value
+* @returns
+*/
+const isResoraCollectionLike = (value) => {
+	if (!value || typeof value !== "object") return false;
+	const candidate = value;
+	return typeof candidate.toObject === "function" && typeof candidate.getBody === "function" && typeof candidate.json === "function" && typeof candidate.setCollects === "function";
+};
+/**
 * Normalize a value for serialization by recursively converting Arkorm-like models and 
 * collections to plain objects, while preserving the structure of arrays and plain objects.
 * 
@@ -465,6 +476,7 @@ const isArkormLikeCollection = (value) => {
 */
 const normalizeSerializableData = (value) => {
 	if (Array.isArray(value)) return value.map((item) => normalizeSerializableData(item));
+	if (isResoraCollectionLike(value)) return normalizeSerializableData(value.toObject());
 	if (isArkormLikeModel(value)) return normalizeSerializableData(value.toObject());
 	if (isArkormLikeCollection(value)) {
 		const collectionData = value.all();
@@ -974,12 +986,12 @@ const resolveAndApply = (imported) => {
 * @returns 
 */
 const loadRuntimeConfigSync = () => {
-	const require = (0, module$1.createRequire)(require("url").pathToFileURL(__filename).href);
+	const req = (0, module$1.createRequire)(require("url").pathToFileURL(__filename).href);
 	const syncConfigPaths = [path.default.join(process.cwd(), "resora.config.cjs")];
 	for (const configPath of syncConfigPaths) {
 		if (!(0, fs.existsSync)(configPath)) continue;
 		try {
-			resolveAndApply(require(configPath));
+			resolveAndApply(req(configPath));
 			return true;
 		} catch {
 			continue;
@@ -2062,11 +2074,19 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 			this.res = extractResponseFromCtx(ctx);
 		}
 	}
+	getSourceData() {
+		return Array.isArray(this.resource) ? this.resource : isArkormLikeCollection(this.resource) ? this.resource.all() : this.resource.data;
+	}
+	resolveObjectData() {
+		let data = this.getSourceData();
+		if (this.collects) data = data.map((item) => new this.collects(item).data());
+		return normalizeSerializableData(data);
+	}
 	/**
 	* Get the original resource data
 	*/
 	data() {
-		return this.toObject();
+		return this.getSourceData();
 	}
 	/**
 	* Get the current serialized output body.
@@ -2146,7 +2166,7 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			let data = this.data();
-			if (this.collects) data = data.map((item) => new this.collects(item).data());
+			if (this.collects && this.data === ResourceCollection.prototype.data) data = data.map((item) => new this.collects(item).data());
 			data = normalizeSerializableData(data);
 			data = sanitizeConditionalAttributes(data);
 			const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
@@ -2187,8 +2207,7 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 	*/
 	toObject() {
 		this.called.toObject = true;
-		this.json();
-		return normalizeSerializableData(Array.isArray(this.resource) ? this.resource : isArkormLikeCollection(this.resource) ? this.resource.all() : this.resource.data);
+		return this.resolveObjectData();
 	}
 	/**
 	* Convert resource to object format and return original data.
@@ -2687,6 +2706,7 @@ exports.hasPaginationLink = hasPaginationLink;
 exports.isArkormLikeCollection = isArkormLikeCollection;
 exports.isArkormLikeModel = isArkormLikeModel;
 exports.isPlainObject = isPlainObject;
+exports.isResoraCollectionLike = isResoraCollectionLike;
 exports.loadRuntimeConfig = loadRuntimeConfig;
 exports.mergeMetadata = mergeMetadata;
 exports.normalizeSerializableData = normalizeSerializableData;

package/dist/index.d.cts

@@ -736,6 +736,8 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
   isPaginatedCollectible(value: unknown): value is Collectible;
   constructor(rsc: R);
   constructor(rsc: R, ctx: Response | H3Event | Record<string, any>);
+  private getSourceData;
+  private resolveObjectData;
   /**
    * Get the original resource data
    */
@@ -1216,6 +1218,12 @@ type ArkormLikeModel = {
 type ArkormLikeCollection = {
   all: () => unknown;
 };
+type ResoraCollectionLike = {
+  toObject: () => unknown;
+  getBody: () => unknown;
+  json: () => unknown;
+  setCollects: (...args: unknown[]) => unknown;
+};
 /**
  * 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
@@ -1232,6 +1240,13 @@ declare const isArkormLikeModel: (value: unknown) => value is ArkormLikeModel;
  * @returns
  */
 declare const isArkormLikeCollection: (value: unknown) => value is ArkormLikeCollection;
+/**
+ * Type guard to check if a value is a Resora collection-like serializer.
+ *
+ * @param value
+ * @returns
+ */
+declare const isResoraCollectionLike: (value: unknown) => value is ResoraCollectionLike;
 /**
  * Normalize a value for serialization by recursively converting Arkorm-like models and
  * collections to plain objects, while preserving the structure of arrays and plain objects.
@@ -1573,4 +1588,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, 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 };
+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

@@ -736,6 +736,8 @@ declare class ResourceCollection<R extends ResourceData[] | Collectible | Collec
   isPaginatedCollectible(value: unknown): value is Collectible;
   constructor(rsc: R);
   constructor(rsc: R, ctx: Response | H3Event | Record<string, any>);
+  private getSourceData;
+  private resolveObjectData;
   /**
    * Get the original resource data
    */
@@ -1216,6 +1218,12 @@ type ArkormLikeModel = {
 type ArkormLikeCollection = {
   all: () => unknown;
 };
+type ResoraCollectionLike = {
+  toObject: () => unknown;
+  getBody: () => unknown;
+  json: () => unknown;
+  setCollects: (...args: unknown[]) => unknown;
+};
 /**
  * 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
@@ -1232,6 +1240,13 @@ declare const isArkormLikeModel: (value: unknown) => value is ArkormLikeModel;
  * @returns
  */
 declare const isArkormLikeCollection: (value: unknown) => value is ArkormLikeCollection;
+/**
+ * Type guard to check if a value is a Resora collection-like serializer.
+ *
+ * @param value
+ * @returns
+ */
+declare const isResoraCollectionLike: (value: unknown) => value is ResoraCollectionLike;
 /**
  * Normalize a value for serialization by recursively converting Arkorm-like models and
  * collections to plain objects, while preserving the structure of arrays and plain objects.
@@ -1573,4 +1588,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, 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 };
+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

@@ -428,6 +428,17 @@ const isArkormLikeCollection = (value) => {
 	return typeof value.all === "function";
 };
 /**
+* Type guard to check if a value is a Resora collection-like serializer.
+*
+* @param value
+* @returns
+*/
+const isResoraCollectionLike = (value) => {
+	if (!value || typeof value !== "object") return false;
+	const candidate = value;
+	return typeof candidate.toObject === "function" && typeof candidate.getBody === "function" && typeof candidate.json === "function" && typeof candidate.setCollects === "function";
+};
+/**
 * Normalize a value for serialization by recursively converting Arkorm-like models and 
 * collections to plain objects, while preserving the structure of arrays and plain objects.
 * 
@@ -436,6 +447,7 @@ const isArkormLikeCollection = (value) => {
 */
 const normalizeSerializableData = (value) => {
 	if (Array.isArray(value)) return value.map((item) => normalizeSerializableData(item));
+	if (isResoraCollectionLike(value)) return normalizeSerializableData(value.toObject());
 	if (isArkormLikeModel(value)) return normalizeSerializableData(value.toObject());
 	if (isArkormLikeCollection(value)) {
 		const collectionData = value.all();
@@ -945,12 +957,12 @@ const resolveAndApply = (imported) => {
 * @returns 
 */
 const loadRuntimeConfigSync = () => {
-	const require = createRequire(import.meta.url);
+	const req = createRequire(import.meta.url);
 	const syncConfigPaths = [path.join(process.cwd(), "resora.config.cjs")];
 	for (const configPath of syncConfigPaths) {
 		if (!existsSync(configPath)) continue;
 		try {
-			resolveAndApply(require(configPath));
+			resolveAndApply(req(configPath));
 			return true;
 		} catch {
 			continue;
@@ -2033,11 +2045,19 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 			this.res = extractResponseFromCtx(ctx);
 		}
 	}
+	getSourceData() {
+		return Array.isArray(this.resource) ? this.resource : isArkormLikeCollection(this.resource) ? this.resource.all() : this.resource.data;
+	}
+	resolveObjectData() {
+		let data = this.getSourceData();
+		if (this.collects) data = data.map((item) => new this.collects(item).data());
+		return normalizeSerializableData(data);
+	}
 	/**
 	* Get the original resource data
 	*/
 	data() {
-		return this.toObject();
+		return this.getSourceData();
 	}
 	/**
 	* Get the current serialized output body.
@@ -2117,7 +2137,7 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 		if (!this.called.json) {
 			this.called.json = true;
 			let data = this.data();
-			if (this.collects) data = data.map((item) => new this.collects(item).data());
+			if (this.collects && this.data === ResourceCollection.prototype.data) data = data.map((item) => new this.collects(item).data());
 			data = normalizeSerializableData(data);
 			data = sanitizeConditionalAttributes(data);
 			const paginationExtras = !Array.isArray(this.resource) ? buildPaginationExtras(this.resource) : {};
@@ -2158,8 +2178,7 @@ var ResourceCollection = class ResourceCollection extends BaseSerializer {
 	*/
 	toObject() {
 		this.called.toObject = true;
-		this.json();
-		return normalizeSerializableData(Array.isArray(this.resource) ? this.resource : isArkormLikeCollection(this.resource) ? this.resource.all() : this.resource.data);
+		return this.resolveObjectData();
 	}
 	/**
 	* Convert resource to object format and return original data.
@@ -2618,4 +2637,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, 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 };
+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.0.0",
+  "version": "1.1.0",
   "description": "A structured API response layer for Node.js and TypeScript with automatic JSON responses, collection support, and pagination handling.",
   "keywords": [
     "api",