metal-orm 1.1.8 → 1.1.10

package/src/decorators/relations.ts

@@ -1,149 +1,231 @@
-import { CascadeMode, RelationKinds } from '../schema/relation.js';
-import {
-  EntityOrTableTarget,
-  EntityOrTableTargetResolver,
-  RelationMetadata
-} from '../orm/entity-metadata.js';
-import { getOrCreateMetadataBag } from './decorator-metadata.js';
-
-interface BaseRelationOptions {
-  target: EntityOrTableTargetResolver;
-  cascade?: CascadeMode;
-  localKey?: string;
-}
-
-/**
- * Options for HasMany relation.
- */
-export interface HasManyOptions extends BaseRelationOptions {
-  foreignKey?: string;
-}
-
-/**
- * Options for HasOne relation.
- */
-export interface HasOneOptions extends BaseRelationOptions {
-  foreignKey?: string;
-}
-
-/**
- * Options for BelongsTo relation.
- */
-export interface BelongsToOptions extends BaseRelationOptions {
-  foreignKey?: string;
-}
-
-/**
- * Options for BelongsToMany relation.
- */
-export interface BelongsToManyOptions<
-  TTarget extends EntityOrTableTarget = EntityOrTableTarget,
-  TPivot extends EntityOrTableTarget = EntityOrTableTarget
-> {
-  target: EntityOrTableTargetResolver<TTarget>;
-  pivotTable: EntityOrTableTargetResolver<TPivot>;
-  pivotForeignKeyToRoot?: string;
-  pivotForeignKeyToTarget?: string;
-  localKey?: string;
-  targetKey?: string;
-  pivotPrimaryKey?: string;
-  defaultPivotColumns?: string[];
-  cascade?: CascadeMode;
-}
-
-const normalizePropertyName = (name: string | symbol): string => {
-  if (typeof name === 'symbol') {
-    return name.description ?? name.toString();
-  }
-  return name;
-};
-
-const createFieldDecorator = (metadataFactory: (propertyName: string) => RelationMetadata) => {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    if (!context.name) {
-      throw new Error('Relation decorator requires a property name');
-    }
-    if (context.private) {
-      throw new Error('Relation decorator does not support private fields');
-    }
-    const propertyName = normalizePropertyName(context.name);
-    const bag = getOrCreateMetadataBag(context);
-    const relationMetadata = metadataFactory(propertyName);
-
-    if (!bag.relations.some(entry => entry.propertyName === propertyName)) {
-      bag.relations.push({ propertyName, relation: relationMetadata });
-    }
-  };
-};
-
-/**
- * Decorator to define a HasMany relation on an entity property.
- * @param options - The relation options.
- * @returns A property decorator that registers the relation metadata.
- */
-export function HasMany(options: HasManyOptions) {
-  return createFieldDecorator(propertyName => ({
-    kind: RelationKinds.HasMany,
-    propertyKey: propertyName,
-    target: options.target,
-    foreignKey: options.foreignKey,
-    localKey: options.localKey,
-    cascade: options.cascade
-  }));
-}
-
-/**
- * Decorator to define a HasOne relation on an entity property.
- * @param options - The relation options.
- * @returns A property decorator that registers the relation metadata.
- */
-export function HasOne(options: HasOneOptions) {
-  return createFieldDecorator(propertyName => ({
-    kind: RelationKinds.HasOne,
-    propertyKey: propertyName,
-    target: options.target,
-    foreignKey: options.foreignKey,
-    localKey: options.localKey,
-    cascade: options.cascade
-  }));
-}
-
-/**
- * Decorator to define a BelongsTo relation on an entity property.
- * @param options - The relation options.
- * @returns A property decorator that registers the relation metadata.
- */
-export function BelongsTo(options: BelongsToOptions) {
-  return createFieldDecorator(propertyName => ({
-    kind: RelationKinds.BelongsTo,
-    propertyKey: propertyName,
-    target: options.target,
-    foreignKey: options.foreignKey ?? `${propertyName}_id`,
-    localKey: options.localKey,
-    cascade: options.cascade
-  }));
-}
-
-/**
- * Decorator to define a BelongsToMany relation on an entity property.
- * @param options - The relation options.
- * @returns A property decorator that registers the relation metadata.
- */
-export function BelongsToMany<
-  TTarget extends EntityOrTableTarget = EntityOrTableTarget,
-  TPivot extends EntityOrTableTarget = EntityOrTableTarget
->(options: BelongsToManyOptions<TTarget, TPivot>) {
-  return createFieldDecorator(propertyName => ({
-    kind: RelationKinds.BelongsToMany,
-    propertyKey: propertyName,
-    target: options.target,
-    pivotTable: options.pivotTable,
-    pivotForeignKeyToRoot: options.pivotForeignKeyToRoot,
-    pivotForeignKeyToTarget: options.pivotForeignKeyToTarget,
-    localKey: options.localKey,
-    targetKey: options.targetKey,
-    pivotPrimaryKey: options.pivotPrimaryKey,
-    defaultPivotColumns: options.defaultPivotColumns,
-    cascade: options.cascade
-  }));
-}
+import { CascadeMode, RelationKinds } from '../schema/relation.js';
+import {
+  EntityOrTableTarget,
+  EntityOrTableTargetResolver,
+  RelationMetadata
+} from '../orm/entity-metadata.js';
+import { resolveFieldDecoratorInfo } from './decorator-metadata.js';
+
+interface BaseRelationOptions {
+  target: EntityOrTableTargetResolver;
+  cascade?: CascadeMode;
+  localKey?: string;
+}
+
+/**
+ * Options for HasMany relation.
+ */
+export interface HasManyOptions extends BaseRelationOptions {
+  foreignKey?: string;
+}
+
+/**
+ * Options for HasOne relation.
+ */
+export interface HasOneOptions extends BaseRelationOptions {
+  foreignKey?: string;
+}
+
+/**
+ * Options for BelongsTo relation.
+ */
+export interface BelongsToOptions extends BaseRelationOptions {
+  foreignKey?: string;
+}
+
+/**
+ * Options for BelongsToMany relation.
+ */
+export interface BelongsToManyOptions<
+  TTarget extends EntityOrTableTarget = EntityOrTableTarget,
+  TPivot extends EntityOrTableTarget = EntityOrTableTarget
+> {
+  target: EntityOrTableTargetResolver<TTarget>;
+  pivotTable: EntityOrTableTargetResolver<TPivot>;
+  pivotForeignKeyToRoot?: string;
+  pivotForeignKeyToTarget?: string;
+  localKey?: string;
+  targetKey?: string;
+  pivotPrimaryKey?: string;
+  defaultPivotColumns?: string[];
+  cascade?: CascadeMode;
+}
+
+const createFieldDecorator = (metadataFactory: (propertyName: string) => RelationMetadata) => {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    const { propertyName, bag } = resolveFieldDecoratorInfo(
+      targetOrValue,
+      contextOrProperty,
+      'Relation'
+    );
+    const relationMetadata = metadataFactory(propertyName);
+
+    if (!bag.relations.some(entry => entry.propertyName === propertyName)) {
+      bag.relations.push({ propertyName, relation: relationMetadata });
+    }
+  };
+};
+
+/**
+ * Decorator to define a HasMany relation on an entity property.
+ * @param options - The relation options.
+ * @returns A property decorator that registers the relation metadata.
+ */
+export function HasMany(options: HasManyOptions) {
+  return createFieldDecorator(propertyName => ({
+    kind: RelationKinds.HasMany,
+    propertyKey: propertyName,
+    target: options.target,
+    foreignKey: options.foreignKey,
+    localKey: options.localKey,
+    cascade: options.cascade
+  }));
+}
+
+/**
+ * Decorator to define a HasOne relation on an entity property.
+ * @param options - The relation options.
+ * @returns A property decorator that registers the relation metadata.
+ */
+export function HasOne(options: HasOneOptions) {
+  return createFieldDecorator(propertyName => ({
+    kind: RelationKinds.HasOne,
+    propertyKey: propertyName,
+    target: options.target,
+    foreignKey: options.foreignKey,
+    localKey: options.localKey,
+    cascade: options.cascade
+  }));
+}
+
+/**
+ * Decorator to define a BelongsTo relation on an entity property.
+ * @param options - The relation options.
+ * @returns A property decorator that registers the relation metadata.
+ */
+export function BelongsTo(options: BelongsToOptions) {
+  return createFieldDecorator(propertyName => ({
+    kind: RelationKinds.BelongsTo,
+    propertyKey: propertyName,
+    target: options.target,
+    foreignKey: options.foreignKey ?? `${propertyName}_id`,
+    localKey: options.localKey,
+    cascade: options.cascade
+  }));
+}
+
+/**
+ * Decorator to define a BelongsToMany relation on an entity property.
+ * @param options - The relation options.
+ * @returns A property decorator that registers the relation metadata.
+ */
+export function BelongsToMany<
+  TTarget extends EntityOrTableTarget = EntityOrTableTarget,
+  TPivot extends EntityOrTableTarget = EntityOrTableTarget
+>(options: BelongsToManyOptions<TTarget, TPivot>) {
+  return createFieldDecorator(propertyName => ({
+    kind: RelationKinds.BelongsToMany,
+    propertyKey: propertyName,
+    target: options.target,
+    pivotTable: options.pivotTable,
+    pivotForeignKeyToRoot: options.pivotForeignKeyToRoot,
+    pivotForeignKeyToTarget: options.pivotForeignKeyToTarget,
+    localKey: options.localKey,
+    targetKey: options.targetKey,
+    pivotPrimaryKey: options.pivotPrimaryKey,
+    defaultPivotColumns: options.defaultPivotColumns,
+    cascade: options.cascade
+  }));
+}
+
+/**
+ * Options for MorphTo relation.
+ */
+export interface MorphToOptions {
+  typeField: string;
+  idField: string;
+  targets: Record<string, EntityOrTableTargetResolver>;
+  targetKey?: string;
+  cascade?: CascadeMode;
+}
+
+/**
+ * Options for MorphOne relation.
+ */
+export interface MorphOneOptions {
+  target: EntityOrTableTargetResolver;
+  morphName: string;
+  typeValue: string;
+  typeField?: string;
+  idField?: string;
+  localKey?: string;
+  cascade?: CascadeMode;
+}
+
+/**
+ * Options for MorphMany relation.
+ */
+export interface MorphManyOptions {
+  target: EntityOrTableTargetResolver;
+  morphName: string;
+  typeValue: string;
+  typeField?: string;
+  idField?: string;
+  localKey?: string;
+  cascade?: CascadeMode;
+}
+
+/**
+ * Decorator to define a MorphTo relation on an entity property.
+ * @param options - The relation options.
+ * @returns A property decorator that registers the relation metadata.
+ */
+export function MorphTo(options: MorphToOptions) {
+  return createFieldDecorator(propertyName => ({
+    kind: RelationKinds.MorphTo,
+    propertyKey: propertyName,
+    typeField: options.typeField,
+    idField: options.idField,
+    targets: options.targets,
+    targetKey: options.targetKey,
+    cascade: options.cascade
+  }));
+}
+
+/**
+ * Decorator to define a MorphOne relation on an entity property.
+ * @param options - The relation options.
+ * @returns A property decorator that registers the relation metadata.
+ */
+export function MorphOne(options: MorphOneOptions) {
+  return createFieldDecorator(propertyName => ({
+    kind: RelationKinds.MorphOne,
+    propertyKey: propertyName,
+    target: options.target,
+    morphName: options.morphName,
+    typeValue: options.typeValue,
+    typeField: options.typeField,
+    idField: options.idField,
+    localKey: options.localKey,
+    cascade: options.cascade
+  }));
+}
+
+/**
+ * Decorator to define a MorphMany relation on an entity property.
+ * @param options - The relation options.
+ * @returns A property decorator that registers the relation metadata.
+ */
+export function MorphMany(options: MorphManyOptions) {
+  return createFieldDecorator(propertyName => ({
+    kind: RelationKinds.MorphMany,
+    propertyKey: propertyName,
+    target: options.target,
+    morphName: options.morphName,
+    typeValue: options.typeValue,
+    typeField: options.typeField,
+    idField: options.idField,
+    localKey: options.localKey,
+    cascade: options.cascade
+  }));
+}

package/src/decorators/transformers/transformer-decorators.ts

@@ -1,4 +1,4 @@
-import { getOrCreateMetadataBag } from '../decorator-metadata.js';
+import { resolveFieldDecoratorInfo } from '../decorator-metadata.js';
 import type { TransformerMetadata } from './transformer-metadata.js';
 import { 
   TrimTransformer, 
@@ -9,19 +9,16 @@ import {
   PatternValidator 
 } from './built-in/string-transformers.js';
 
-const normalizePropertyName = (name: string | symbol): string => {
-  if (typeof name === 'symbol') {
-    return name.description ?? name.toString();
-  }
-  return name;
-};
-
 const registerTransformerMetadata = (
-  context: ClassFieldDecoratorContext, 
+  targetOrValue: unknown,
+  contextOrProperty: unknown,
   metadata: Partial<TransformerMetadata>
 ): void => {
-  const propertyName = normalizePropertyName(context.name);
-  const bag = getOrCreateMetadataBag(context);
+  const { propertyName, bag } = resolveFieldDecoratorInfo(
+    targetOrValue,
+    contextOrProperty,
+    'Transformer'
+  );
   
   // Find existing transformer metadata for this property
   let existing = bag.transformers.find(t => t.propertyName === propertyName);
@@ -57,8 +54,8 @@ const registerTransformerMetadata = (
 
 // Trim decorator
 export function Trim(options?: { trimStart?: boolean; trimEnd?: boolean; trimAll?: boolean }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       sanitizers: [new TrimTransformer(options)]
     });
   };
@@ -66,8 +63,8 @@ export function Trim(options?: { trimStart?: boolean; trimEnd?: boolean; trimAll
 
 // Lower case decorator
 export function Lower() {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       sanitizers: [new CaseTransformer('lower')]
     });
   };
@@ -75,8 +72,8 @@ export function Lower() {
 
 // Upper case decorator
 export function Upper() {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       sanitizers: [new CaseTransformer('upper')]
     });
   };
@@ -84,8 +81,8 @@ export function Upper() {
 
 // Capitalize decorator
 export function Capitalize() {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       sanitizers: [new CaseTransformer('capitalize')]
     });
   };
@@ -93,8 +90,8 @@ export function Capitalize() {
 
 // Title case decorator
 export function Title() {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       sanitizers: [new CaseTransformer('title')]
     });
   };
@@ -102,8 +99,8 @@ export function Title() {
 
 // Alphanumeric decorator
 export function Alphanumeric(options?: { allowSpaces?: boolean; allowUnderscores?: boolean; allowHyphens?: boolean }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       validators: [new AlphanumericValidator(options)]
     });
   };
@@ -111,8 +108,8 @@ export function Alphanumeric(options?: { allowSpaces?: boolean; allowUnderscores
 
 // Email decorator
 export function Email(options?: { allowPlus?: boolean; requireTLD?: boolean }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       validators: [new EmailValidator(options)]
     });
   };
@@ -120,8 +117,8 @@ export function Email(options?: { allowPlus?: boolean; requireTLD?: boolean }) {
 
 // Length decorator
 export function Length(options: { min?: number; max?: number; exact?: number }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       validators: [new LengthValidator(options)]
     });
   };
@@ -129,8 +126,8 @@ export function Length(options: { min?: number; max?: number; exact?: number })
 
 // Pattern decorator
 export function Pattern(options: { pattern: RegExp; flags?: string; errorMessage?: string; replacement?: string }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    registerTransformerMetadata(context, {
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    registerTransformerMetadata(targetOrValue, contextOrProperty, {
       validators: [new PatternValidator(options)]
     });
   };

package/src/decorators/validators/country-validators-decorators.ts

@@ -1,4 +1,4 @@
-import { getOrCreateMetadataBag } from '../decorator-metadata.js';
+import { resolveFieldDecoratorInfo } from '../decorator-metadata.js';
 import { registerValidator } from './country-validator-registry.js';
 import { CPFValidator } from './built-in/br-cpf-validator.js';
 import { CNPJValidator } from './built-in/br-cnpj-validator.js';
@@ -9,11 +9,8 @@ registerValidator('BR', 'cpf', () => new CPFValidator());
 registerValidator('BR', 'cnpj', () => new CNPJValidator());
 registerValidator('BR', 'cep', () => new CEPValidator());
 
-const normalizePropertyName = (name: string | symbol): string => {
-  if (typeof name === 'symbol') {
-    return name.description ?? name.toString();
-  }
-  return name;
+const resolveCountryDecoratorInfo = (targetOrValue: unknown, contextOrProperty: unknown) => {
+  return resolveFieldDecoratorInfo(targetOrValue, contextOrProperty, 'Country validator');
 };
 
 /**
@@ -22,9 +19,8 @@ const normalizePropertyName = (name: string | symbol): string => {
  * @returns Property decorator for CPF validation
  */
 export function CPF(options?: { strict?: boolean; errorMessage?: string }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    const propertyName = normalizePropertyName(context.name);
-    const bag = getOrCreateMetadataBag(context);
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    const { propertyName, bag } = resolveCountryDecoratorInfo(targetOrValue, contextOrProperty);
     
     // Find or create transformer metadata for this property
     let existing = bag.transformers.find(t => t.propertyName === propertyName);
@@ -86,9 +82,8 @@ export function CPF(options?: { strict?: boolean; errorMessage?: string }) {
  * @returns Property decorator for CNPJ validation
  */
 export function CNPJ(options?: { strict?: boolean; errorMessage?: string }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    const propertyName = normalizePropertyName(context.name);
-    const bag = getOrCreateMetadataBag(context);
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    const { propertyName, bag } = resolveCountryDecoratorInfo(targetOrValue, contextOrProperty);
     
     // Find or create transformer metadata for this property
     let existing = bag.transformers.find(t => t.propertyName === propertyName);
@@ -150,9 +145,8 @@ export function CNPJ(options?: { strict?: boolean; errorMessage?: string }) {
  * @returns Property decorator for CEP validation
  */
 export function CEP(options?: { strict?: boolean; errorMessage?: string }) {
-  return function (_value: unknown, context: ClassFieldDecoratorContext) {
-    const propertyName = normalizePropertyName(context.name);
-    const bag = getOrCreateMetadataBag(context);
+  return function (targetOrValue: unknown, contextOrProperty: unknown) {
+    const { propertyName, bag } = resolveCountryDecoratorInfo(targetOrValue, contextOrProperty);
     
     // Find or create transformer metadata for this property
     let existing = bag.transformers.find(t => t.propertyName === propertyName);