arkormx 0.2.9 → 0.2.11

package/dist/cli.mjs

@@ -1135,6 +1135,7 @@ let runtimeConfigLoaded = false;
 let runtimeConfigLoadingPromise;
 let runtimeClientResolver;
 let runtimePaginationURLDriverFactory;
+let runtimePaginationCurrentPageResolver;
 const mergePathConfig = (paths) => {
 	const defaults = baseConfig.paths ?? {};
 	const current = userConfig.paths ?? {};
@@ -1175,6 +1176,7 @@ const configureArkormRuntime = (prisma, options = {}) => {
 	Object.assign(userConfig, { ...nextConfig });
 	runtimeClientResolver = prisma;
 	runtimePaginationURLDriverFactory = nextConfig.pagination?.urlDriver;
+	runtimePaginationCurrentPageResolver = nextConfig.pagination?.resolveCurrentPage;
 };
 /**
 * Resolve and apply the ArkORM configuration from an imported module. 

package/dist/index.cjs

@@ -41,6 +41,24 @@ let node_crypto = require("node:crypto");
 let node_url = require("node:url");
 let _h3ravel_collect_js = require("@h3ravel/collect.js");
 
+//#region src/Attribute.ts
+var Attribute = class Attribute {
+	get;
+	set;
+	constructor(options = {}) {
+		this.get = options.get;
+		this.set = options.set;
+	}
+	static make(options) {
+		return new Attribute(options);
+	}
+	static isAttribute(value) {
+		if (!value || typeof value !== "object") return false;
+		return value instanceof Attribute;
+	}
+};
+
+//#endregion
 //#region src/casts.ts
 const builtinCasts = {
 	string: {
@@ -1257,6 +1275,7 @@ let runtimeConfigLoaded = false;
 let runtimeConfigLoadingPromise;
 let runtimeClientResolver;
 let runtimePaginationURLDriverFactory;
+let runtimePaginationCurrentPageResolver;
 const mergePathConfig = (paths) => {
 	const defaults = baseConfig.paths ?? {};
 	const current = userConfig.paths ?? {};
@@ -1306,6 +1325,7 @@ const configureArkormRuntime = (prisma, options = {}) => {
 	Object.assign(userConfig, { ...nextConfig });
 	runtimeClientResolver = prisma;
 	runtimePaginationURLDriverFactory = nextConfig.pagination?.urlDriver;
+	runtimePaginationCurrentPageResolver = nextConfig.pagination?.resolveCurrentPage;
 };
 /**
 * Reset the ArkORM runtime configuration. 
@@ -1320,6 +1340,7 @@ const resetArkormRuntimeForTests = () => {
 	runtimeConfigLoadingPromise = void 0;
 	runtimeClientResolver = void 0;
 	runtimePaginationURLDriverFactory = void 0;
+	runtimePaginationCurrentPageResolver = void 0;
 };
 /**
 * Resolve a Prisma client instance from the provided resolver, which can be either
@@ -1435,6 +1456,15 @@ const getRuntimePaginationURLDriverFactory = () => {
 	return runtimePaginationURLDriverFactory;
 };
 /**
+* Get the configured current-page resolver from runtime config.
+*
+* @returns
+*/
+const getRuntimePaginationCurrentPageResolver = () => {
+	if (!runtimeConfigLoaded) loadRuntimeConfigSync();
+	return runtimePaginationCurrentPageResolver;
+};
+/**
 * Check if a given value is a Prisma delegate-like object 
 * by verifying the presence of common delegate methods.
 * 
@@ -3487,6 +3517,13 @@ var QueryBuilder = class QueryBuilder {
 		this.delegate = delegate;
 		this.model = model;
 	}
+	resolvePaginationPage(page, options) {
+		if (typeof page !== "undefined") return Number.isFinite(page) ? Math.max(1, page) : 1;
+		const pageName = options.pageName ?? "page";
+		const resolvedPage = getRuntimePaginationCurrentPageResolver()?.(pageName, options);
+		if (typeof resolvedPage !== "number" || !Number.isFinite(resolvedPage)) return 1;
+		return Math.max(1, resolvedPage);
+	}
 	/**
 	* Adds a where clause to the query. Multiple calls to where will combine 
 	* the clauses with AND logic.
@@ -4605,15 +4642,14 @@ var QueryBuilder = class QueryBuilder {
 	* @param options
 	* @returns 
 	*/
-	async paginate(page = 1, perPage = 15, options = {}) {
+	async paginate(perPage = 15, page = void 0, options = {}) {
+		const currentPage = this.resolvePaginationPage(page, options);
 		if (this.hasRelationFilters() || this.hasRelationAggregates()) {
-			const currentPage = Math.max(1, page);
 			const pageSize = Math.max(1, perPage);
 			const rows = (await this.get()).all();
 			const start = (currentPage - 1) * pageSize;
 			return new LengthAwarePaginator(new ArkormCollection(rows.slice(start, start + pageSize)), rows.length, pageSize, currentPage, options);
 		}
-		const currentPage = Math.max(1, page);
 		const pageSize = Math.max(1, perPage);
 		const total = await this.count();
 		return new LengthAwarePaginator(await this.clone().skip((currentPage - 1) * pageSize).take(pageSize).get(), total, pageSize, currentPage, options);
@@ -4625,9 +4661,9 @@ var QueryBuilder = class QueryBuilder {
 	* @param page
 	* @returns
 	*/
-	async simplePaginate(perPage = 15, page = 1, options = {}) {
+	async simplePaginate(perPage = 15, page = void 0, options = {}) {
+		const currentPage = this.resolvePaginationPage(page, options);
 		if (this.hasRelationFilters() || this.hasRelationAggregates()) {
-			const currentPage = Math.max(1, page);
 			const pageSize = Math.max(1, perPage);
 			const rows = (await this.get()).all();
 			const start = (currentPage - 1) * pageSize;
@@ -4635,7 +4671,6 @@ var QueryBuilder = class QueryBuilder {
 			const hasMorePages = start + pageSize < rows.length;
 			return new Paginator(new ArkormCollection(pageRows), pageSize, currentPage, hasMorePages, options);
 		}
-		const currentPage = Math.max(1, page);
 		const pageSize = Math.max(1, perPage);
 		const items = await this.clone().skip((currentPage - 1) * pageSize).take(pageSize + 1).get();
 		const hasMorePages = items.all().length > pageSize;
@@ -4914,11 +4949,15 @@ var Model = class Model {
 		this.fill(attributes);
 		return new Proxy(this, {
 			get: (target, key, receiver) => {
-				if (typeof key !== "string" || key in target) return Reflect.get(target, key, receiver);
+				if (typeof key !== "string") return Reflect.get(target, key, receiver);
+				const attributeMutator = target.resolveAttributeMutator(key);
+				if (key in target && !attributeMutator) return Reflect.get(target, key, receiver);
 				return target.getAttribute(key);
 			},
 			set: (target, key, value, receiver) => {
-				if (typeof key !== "string" || key in target) return Reflect.set(target, key, value, receiver);
+				if (typeof key !== "string") return Reflect.set(target, key, value, receiver);
+				const attributeMutator = target.resolveAttributeMutator(key);
+				if (key in target && !attributeMutator) return Reflect.set(target, key, value, receiver);
 				target.setAttribute(key, value);
 				return true;
 			}
@@ -5107,18 +5146,22 @@ var Model = class Model {
 		return this;
 	}
 	getAttribute(key) {
+		const attributeMutator = this.resolveAttributeMutator(key);
 		const mutator = this.resolveGetMutator(key);
 		const cast = this.casts[key];
 		let value = this.attributes[key];
 		if (cast) value = resolveCast(cast).get(value);
+		if (attributeMutator?.get) return attributeMutator.get.call(this, value);
 		if (mutator) return mutator.call(this, value);
 		return value;
 	}
 	setAttribute(key, value) {
+		const attributeMutator = this.resolveAttributeMutator(key);
 		const mutator = this.resolveSetMutator(key);
 		const cast = this.casts[key];
 		let resolved = value;
-		if (mutator) resolved = mutator.call(this, resolved);
+		if (attributeMutator?.set) resolved = attributeMutator.set.call(this, resolved);
+		else if (mutator) resolved = mutator.call(this, resolved);
 		if (cast) resolved = resolveCast(cast).set(resolved);
 		this.attributes[key] = resolved;
 		return this;
@@ -5386,6 +5429,24 @@ var Model = class Model {
 		return typeof method === "function" ? method : null;
 	}
 	/**
+	* Resolve an Attribute object mutator method for a given key, if it exists.
+	*
+	* @param key
+	* @returns
+	*/
+	resolveAttributeMutator(key) {
+		if (key === "constructor") return null;
+		const methodName = `${(0, _h3ravel_support.str)(key).camel()}`;
+		const prototype = Object.getPrototypeOf(this);
+		if (!prototype) return null;
+		const method = prototype[methodName];
+		if (typeof method !== "function") return null;
+		if (method === Model.prototype[methodName]) return null;
+		const resolved = method.call(this);
+		if (Attribute.isAttribute(resolved)) return resolved;
+		return null;
+	}
+	/**
 	* Resolve a set mutator method for a given attribute key, if it exists.
 	* 
 	* @param key 
@@ -5439,6 +5500,7 @@ var Model = class Model {
 //#endregion
 exports.ArkormCollection = ArkormCollection;
 exports.ArkormException = ArkormException;
+exports.Attribute = Attribute;
 exports.CliApp = CliApp;
 exports.ForeignKeyBuilder = ForeignKeyBuilder;
 exports.InitCommand = InitCommand;
@@ -5501,6 +5563,7 @@ exports.getDefaultStubsPath = getDefaultStubsPath;
 exports.getLastMigrationRun = getLastMigrationRun;
 exports.getLatestAppliedMigrations = getLatestAppliedMigrations;
 exports.getMigrationPlan = getMigrationPlan;
+exports.getRuntimePaginationCurrentPageResolver = getRuntimePaginationCurrentPageResolver;
 exports.getRuntimePaginationURLDriverFactory = getRuntimePaginationURLDriverFactory;
 exports.getRuntimePrismaClient = getRuntimePrismaClient;
 exports.getUserConfig = getUserConfig;

package/dist/index.d.cts

@@ -2,6 +2,19 @@ import { PrismaClient } from "@prisma/client";
 import { Collection } from "@h3ravel/collect.js";
 import { Command } from "@h3ravel/musket";
 
+//#region src/Attribute.d.ts
+interface AttributeOptions<TGet = unknown, TSet = unknown> {
+  get?: (value: unknown) => TGet;
+  set?: (value: TSet) => unknown;
+}
+declare class Attribute<TGet = unknown, TSet = unknown> {
+  readonly get?: (value: unknown) => TGet;
+  readonly set?: (value: TSet) => unknown;
+  constructor(options?: AttributeOptions<TGet, TSet>);
+  static make<TGet = unknown, TSet = unknown>(options: AttributeOptions<TGet, TSet>): Attribute<TGet, TSet>;
+  static isAttribute(value: unknown): value is Attribute;
+}
+//#endregion
 //#region src/types/factories.d.ts
 type FactoryAttributes = Record<string, unknown>;
 interface FactoryModelConstructor<TModel> {
@@ -873,6 +886,13 @@ declare abstract class Model<TSchema extends PrismaDelegateLike | Record<string,
    * @returns
    */
   private resolveGetMutator;
+  /**
+   * Resolve an Attribute object mutator method for a given key, if it exists.
+   *
+   * @param key
+   * @returns
+   */
+  private resolveAttributeMutator;
   /**
    * Resolve a set mutator method for a given attribute key, if it exists.
    *
@@ -1019,6 +1039,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @param model
    */
   constructor(delegate: TDelegate, model: ModelStatic<TModel, TDelegate>);
+  private resolvePaginationPage;
   /**
    * Adds a where clause to the query. Multiple calls to where will combine
    * the clauses with AND logic.
@@ -1680,7 +1701,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @param options
    * @returns
    */
-  paginate(page?: number, perPage?: number, options?: PaginationOptions): Promise<LengthAwarePaginator<TModel>>;
+  paginate(perPage?: number, page?: number | undefined, options?: PaginationOptions): Promise<LengthAwarePaginator<TModel>>;
   /**
    * Paginates results without calculating total row count.
    *
@@ -1688,7 +1709,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @param page
    * @returns
    */
-  simplePaginate(perPage?: number, page?: number, options?: PaginationOptions): Promise<Paginator<TModel>>;
+  simplePaginate(perPage?: number, page?: number | undefined, options?: PaginationOptions): Promise<Paginator<TModel>>;
   /**
    * Creates a clone of the current query builder instance with the same state.
    *
@@ -1779,6 +1800,7 @@ interface ArkormConfig {
    */
   pagination?: {
     urlDriver?: PaginationURLDriverFactory;
+    resolveCurrentPage?: PaginationCurrentPageResolver;
   };
   /**
    * @property paths Optional custom paths for various generated files.
@@ -1846,6 +1868,7 @@ interface PaginationOptions {
   fragment?: string;
   pageName?: string;
 }
+type PaginationCurrentPageResolver = (pageName: string, options: PaginationOptions) => number | undefined;
 interface PaginationURLDriver {
   getPageName: () => string;
   url: (page: number) => string;
@@ -3108,6 +3131,12 @@ declare const getRuntimePrismaClient: () => PrismaClientLike | undefined;
  * @returns
  */
 declare const getRuntimePaginationURLDriverFactory: () => PaginationURLDriverFactory | undefined;
+/**
+ * Get the configured current-page resolver from runtime config.
+ *
+ * @returns
+ */
+declare const getRuntimePaginationCurrentPageResolver: () => PaginationCurrentPageResolver | undefined;
 /**
  * Check if a given value is a Prisma delegate-like object
  * by verifying the presence of common delegate methods.
@@ -3162,4 +3191,4 @@ declare class URLDriver {
   url(page: number): string;
 }
 //#endregion
-export { ArkormCollection, ArkormException, CliApp, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, SEEDER_BRAND, SchemaBuilder, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findModelBlock, formatDefaultValue, formatRelationAction, generateMigrationFile, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };
+export { ArkormCollection, ArkormException, Attribute, AttributeOptions, CliApp, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, SEEDER_BRAND, SchemaBuilder, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findModelBlock, formatDefaultValue, formatRelationAction, generateMigrationFile, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };

package/dist/index.d.mts

@@ -2,6 +2,19 @@ import { Command } from "@h3ravel/musket";
 import { Collection } from "@h3ravel/collect.js";
 import { PrismaClient } from "@prisma/client";
 
+//#region src/Attribute.d.ts
+interface AttributeOptions<TGet = unknown, TSet = unknown> {
+  get?: (value: unknown) => TGet;
+  set?: (value: TSet) => unknown;
+}
+declare class Attribute<TGet = unknown, TSet = unknown> {
+  readonly get?: (value: unknown) => TGet;
+  readonly set?: (value: TSet) => unknown;
+  constructor(options?: AttributeOptions<TGet, TSet>);
+  static make<TGet = unknown, TSet = unknown>(options: AttributeOptions<TGet, TSet>): Attribute<TGet, TSet>;
+  static isAttribute(value: unknown): value is Attribute;
+}
+//#endregion
 //#region src/types/factories.d.ts
 type FactoryAttributes = Record<string, unknown>;
 interface FactoryModelConstructor<TModel> {
@@ -873,6 +886,13 @@ declare abstract class Model<TSchema extends PrismaDelegateLike | Record<string,
    * @returns
    */
   private resolveGetMutator;
+  /**
+   * Resolve an Attribute object mutator method for a given key, if it exists.
+   *
+   * @param key
+   * @returns
+   */
+  private resolveAttributeMutator;
   /**
    * Resolve a set mutator method for a given attribute key, if it exists.
    *
@@ -1019,6 +1039,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @param model
    */
   constructor(delegate: TDelegate, model: ModelStatic<TModel, TDelegate>);
+  private resolvePaginationPage;
   /**
    * Adds a where clause to the query. Multiple calls to where will combine
    * the clauses with AND logic.
@@ -1680,7 +1701,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @param options
    * @returns
    */
-  paginate(page?: number, perPage?: number, options?: PaginationOptions): Promise<LengthAwarePaginator<TModel>>;
+  paginate(perPage?: number, page?: number | undefined, options?: PaginationOptions): Promise<LengthAwarePaginator<TModel>>;
   /**
    * Paginates results without calculating total row count.
    *
@@ -1688,7 +1709,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @param page
    * @returns
    */
-  simplePaginate(perPage?: number, page?: number, options?: PaginationOptions): Promise<Paginator<TModel>>;
+  simplePaginate(perPage?: number, page?: number | undefined, options?: PaginationOptions): Promise<Paginator<TModel>>;
   /**
    * Creates a clone of the current query builder instance with the same state.
    *
@@ -1779,6 +1800,7 @@ interface ArkormConfig {
    */
   pagination?: {
     urlDriver?: PaginationURLDriverFactory;
+    resolveCurrentPage?: PaginationCurrentPageResolver;
   };
   /**
    * @property paths Optional custom paths for various generated files.
@@ -1846,6 +1868,7 @@ interface PaginationOptions {
   fragment?: string;
   pageName?: string;
 }
+type PaginationCurrentPageResolver = (pageName: string, options: PaginationOptions) => number | undefined;
 interface PaginationURLDriver {
   getPageName: () => string;
   url: (page: number) => string;
@@ -3108,6 +3131,12 @@ declare const getRuntimePrismaClient: () => PrismaClientLike | undefined;
  * @returns
  */
 declare const getRuntimePaginationURLDriverFactory: () => PaginationURLDriverFactory | undefined;
+/**
+ * Get the configured current-page resolver from runtime config.
+ *
+ * @returns
+ */
+declare const getRuntimePaginationCurrentPageResolver: () => PaginationCurrentPageResolver | undefined;
 /**
  * Check if a given value is a Prisma delegate-like object
  * by verifying the presence of common delegate methods.
@@ -3162,4 +3191,4 @@ declare class URLDriver {
   url(page: number): string;
 }
 //#endregion
-export { ArkormCollection, ArkormException, CliApp, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, SEEDER_BRAND, SchemaBuilder, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findModelBlock, formatDefaultValue, formatRelationAction, generateMigrationFile, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };
+export { ArkormCollection, ArkormException, Attribute, AttributeOptions, CliApp, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, SEEDER_BRAND, SchemaBuilder, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findModelBlock, formatDefaultValue, formatRelationAction, generateMigrationFile, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };

package/dist/index.mjs

@@ -12,6 +12,24 @@ import { createHash } from "node:crypto";
 import { pathToFileURL as pathToFileURL$1 } from "node:url";
 import { Collection } from "@h3ravel/collect.js";
 
+//#region src/Attribute.ts
+var Attribute = class Attribute {
+	get;
+	set;
+	constructor(options = {}) {
+		this.get = options.get;
+		this.set = options.set;
+	}
+	static make(options) {
+		return new Attribute(options);
+	}
+	static isAttribute(value) {
+		if (!value || typeof value !== "object") return false;
+		return value instanceof Attribute;
+	}
+};
+
+//#endregion
 //#region src/casts.ts
 const builtinCasts = {
 	string: {
@@ -1228,6 +1246,7 @@ let runtimeConfigLoaded = false;
 let runtimeConfigLoadingPromise;
 let runtimeClientResolver;
 let runtimePaginationURLDriverFactory;
+let runtimePaginationCurrentPageResolver;
 const mergePathConfig = (paths) => {
 	const defaults = baseConfig.paths ?? {};
 	const current = userConfig.paths ?? {};
@@ -1277,6 +1296,7 @@ const configureArkormRuntime = (prisma, options = {}) => {
 	Object.assign(userConfig, { ...nextConfig });
 	runtimeClientResolver = prisma;
 	runtimePaginationURLDriverFactory = nextConfig.pagination?.urlDriver;
+	runtimePaginationCurrentPageResolver = nextConfig.pagination?.resolveCurrentPage;
 };
 /**
 * Reset the ArkORM runtime configuration. 
@@ -1291,6 +1311,7 @@ const resetArkormRuntimeForTests = () => {
 	runtimeConfigLoadingPromise = void 0;
 	runtimeClientResolver = void 0;
 	runtimePaginationURLDriverFactory = void 0;
+	runtimePaginationCurrentPageResolver = void 0;
 };
 /**
 * Resolve a Prisma client instance from the provided resolver, which can be either
@@ -1406,6 +1427,15 @@ const getRuntimePaginationURLDriverFactory = () => {
 	return runtimePaginationURLDriverFactory;
 };
 /**
+* Get the configured current-page resolver from runtime config.
+*
+* @returns
+*/
+const getRuntimePaginationCurrentPageResolver = () => {
+	if (!runtimeConfigLoaded) loadRuntimeConfigSync();
+	return runtimePaginationCurrentPageResolver;
+};
+/**
 * Check if a given value is a Prisma delegate-like object 
 * by verifying the presence of common delegate methods.
 * 
@@ -3458,6 +3488,13 @@ var QueryBuilder = class QueryBuilder {
 		this.delegate = delegate;
 		this.model = model;
 	}
+	resolvePaginationPage(page, options) {
+		if (typeof page !== "undefined") return Number.isFinite(page) ? Math.max(1, page) : 1;
+		const pageName = options.pageName ?? "page";
+		const resolvedPage = getRuntimePaginationCurrentPageResolver()?.(pageName, options);
+		if (typeof resolvedPage !== "number" || !Number.isFinite(resolvedPage)) return 1;
+		return Math.max(1, resolvedPage);
+	}
 	/**
 	* Adds a where clause to the query. Multiple calls to where will combine 
 	* the clauses with AND logic.
@@ -4576,15 +4613,14 @@ var QueryBuilder = class QueryBuilder {
 	* @param options
 	* @returns 
 	*/
-	async paginate(page = 1, perPage = 15, options = {}) {
+	async paginate(perPage = 15, page = void 0, options = {}) {
+		const currentPage = this.resolvePaginationPage(page, options);
 		if (this.hasRelationFilters() || this.hasRelationAggregates()) {
-			const currentPage = Math.max(1, page);
 			const pageSize = Math.max(1, perPage);
 			const rows = (await this.get()).all();
 			const start = (currentPage - 1) * pageSize;
 			return new LengthAwarePaginator(new ArkormCollection(rows.slice(start, start + pageSize)), rows.length, pageSize, currentPage, options);
 		}
-		const currentPage = Math.max(1, page);
 		const pageSize = Math.max(1, perPage);
 		const total = await this.count();
 		return new LengthAwarePaginator(await this.clone().skip((currentPage - 1) * pageSize).take(pageSize).get(), total, pageSize, currentPage, options);
@@ -4596,9 +4632,9 @@ var QueryBuilder = class QueryBuilder {
 	* @param page
 	* @returns
 	*/
-	async simplePaginate(perPage = 15, page = 1, options = {}) {
+	async simplePaginate(perPage = 15, page = void 0, options = {}) {
+		const currentPage = this.resolvePaginationPage(page, options);
 		if (this.hasRelationFilters() || this.hasRelationAggregates()) {
-			const currentPage = Math.max(1, page);
 			const pageSize = Math.max(1, perPage);
 			const rows = (await this.get()).all();
 			const start = (currentPage - 1) * pageSize;
@@ -4606,7 +4642,6 @@ var QueryBuilder = class QueryBuilder {
 			const hasMorePages = start + pageSize < rows.length;
 			return new Paginator(new ArkormCollection(pageRows), pageSize, currentPage, hasMorePages, options);
 		}
-		const currentPage = Math.max(1, page);
 		const pageSize = Math.max(1, perPage);
 		const items = await this.clone().skip((currentPage - 1) * pageSize).take(pageSize + 1).get();
 		const hasMorePages = items.all().length > pageSize;
@@ -4885,11 +4920,15 @@ var Model = class Model {
 		this.fill(attributes);
 		return new Proxy(this, {
 			get: (target, key, receiver) => {
-				if (typeof key !== "string" || key in target) return Reflect.get(target, key, receiver);
+				if (typeof key !== "string") return Reflect.get(target, key, receiver);
+				const attributeMutator = target.resolveAttributeMutator(key);
+				if (key in target && !attributeMutator) return Reflect.get(target, key, receiver);
 				return target.getAttribute(key);
 			},
 			set: (target, key, value, receiver) => {
-				if (typeof key !== "string" || key in target) return Reflect.set(target, key, value, receiver);
+				if (typeof key !== "string") return Reflect.set(target, key, value, receiver);
+				const attributeMutator = target.resolveAttributeMutator(key);
+				if (key in target && !attributeMutator) return Reflect.set(target, key, value, receiver);
 				target.setAttribute(key, value);
 				return true;
 			}
@@ -5078,18 +5117,22 @@ var Model = class Model {
 		return this;
 	}
 	getAttribute(key) {
+		const attributeMutator = this.resolveAttributeMutator(key);
 		const mutator = this.resolveGetMutator(key);
 		const cast = this.casts[key];
 		let value = this.attributes[key];
 		if (cast) value = resolveCast(cast).get(value);
+		if (attributeMutator?.get) return attributeMutator.get.call(this, value);
 		if (mutator) return mutator.call(this, value);
 		return value;
 	}
 	setAttribute(key, value) {
+		const attributeMutator = this.resolveAttributeMutator(key);
 		const mutator = this.resolveSetMutator(key);
 		const cast = this.casts[key];
 		let resolved = value;
-		if (mutator) resolved = mutator.call(this, resolved);
+		if (attributeMutator?.set) resolved = attributeMutator.set.call(this, resolved);
+		else if (mutator) resolved = mutator.call(this, resolved);
 		if (cast) resolved = resolveCast(cast).set(resolved);
 		this.attributes[key] = resolved;
 		return this;
@@ -5357,6 +5400,24 @@ var Model = class Model {
 		return typeof method === "function" ? method : null;
 	}
 	/**
+	* Resolve an Attribute object mutator method for a given key, if it exists.
+	*
+	* @param key
+	* @returns
+	*/
+	resolveAttributeMutator(key) {
+		if (key === "constructor") return null;
+		const methodName = `${str(key).camel()}`;
+		const prototype = Object.getPrototypeOf(this);
+		if (!prototype) return null;
+		const method = prototype[methodName];
+		if (typeof method !== "function") return null;
+		if (method === Model.prototype[methodName]) return null;
+		const resolved = method.call(this);
+		if (Attribute.isAttribute(resolved)) return resolved;
+		return null;
+	}
+	/**
 	* Resolve a set mutator method for a given attribute key, if it exists.
 	* 
 	* @param key 
@@ -5408,4 +5469,4 @@ var Model = class Model {
 };
 
 //#endregion
-export { ArkormCollection, ArkormException, CliApp, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_MODEL_REGEX, Paginator, QueryBuilder, SEEDER_BRAND, SchemaBuilder, SeedCommand, Seeder, TableBuilder, URLDriver, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findModelBlock, formatDefaultValue, formatRelationAction, generateMigrationFile, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };
+export { ArkormCollection, ArkormException, Attribute, CliApp, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_MODEL_REGEX, Paginator, QueryBuilder, SEEDER_BRAND, SchemaBuilder, SeedCommand, Seeder, TableBuilder, URLDriver, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findModelBlock, formatDefaultValue, formatRelationAction, generateMigrationFile, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkormx",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Modern TypeScript-first ORM for Node.js.",
   "keywords": [
     "orm",