arkormx 0.2.9 → 0.2.10

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: {
@@ -4914,11 +4932,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 +5129,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 +5412,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 +5483,7 @@ var Model = class Model {
 //#endregion
 exports.ArkormCollection = ArkormCollection;
 exports.ArkormException = ArkormException;
+exports.Attribute = Attribute;
 exports.CliApp = CliApp;
 exports.ForeignKeyBuilder = ForeignKeyBuilder;
 exports.InitCommand = InitCommand;

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.
    *
@@ -3162,4 +3182,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, 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.
    *
@@ -3162,4 +3182,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, 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: {
@@ -4885,11 +4903,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 +5100,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 +5383,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 +5452,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, 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.10",
   "description": "Modern TypeScript-first ORM for Node.js.",
   "keywords": [
     "orm",