@t4h.framework/orm 0.11.0 → 0.11.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @t4h.framework/orm
 
+## 0.11.2
+
+## 0.11.1
+
+### Patch Changes
+
+- [#203](https://github.com/tech4humans-brasil/framework/pull/203) [`952e756`](https://github.com/tech4humans-brasil/framework/commit/952e756562fac4cc143d0979c91c04036e133d90) Thanks [@gusteycamargo](https://github.com/gusteycamargo)! - `@OneToMany` receives `mappedBy` as a typed accessor in the second argument,
+  like `@OneToMany(() => Post, post => post.author)`, instead of a string in the
+  options. `orderBy` is now typed by the target entity's properties.
+
 ## 0.11.0
 
 ### Minor Changes

package/README.md

@@ -235,7 +235,7 @@ usersRef.at(0)                              // Ref<User> | undefined
 ```typescript
 @Entity({ tableName: 'users' })
 class User {
-  @OneToMany(() => Post, { mappedBy: 'author' })
+  @OneToMany(() => Post, post => post.author)
   public posts!: MapCollection<Post>
 }
 

package/dist/decorators/OneToMany.d.ts

@@ -1,7 +1,9 @@
-import type { EntityConstructor } from '../typings/ORM.js';
-export interface OneToManyOptions {
-    mappedBy: string;
-    orderBy?: Record<string, 'asc' | 'desc'>;
+import type { Ref } from '../models/Ref.js';
+import type { EntityConstructor, EntityData } from '../typings/ORM.js';
+export interface OneToManyOptions<T> {
+    orderBy?: {
+        [K in keyof EntityData<T>]?: 'asc' | 'desc';
+    };
 }
-export declare function OneToMany(entity: () => EntityConstructor, options: OneToManyOptions): PropertyDecorator;
+export declare function OneToMany<T>(entity: () => EntityConstructor<T>, mappedBy: (entity: T) => Ref<any> | null | undefined, options?: OneToManyOptions<T>): PropertyDecorator;
 //# sourceMappingURL=OneToMany.d.ts.map

package/dist/decorators/OneToMany.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OneToMany.d.ts","sourceRoot":"","sources":["../../src/decorators/OneToMany.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,CAAA;CACzC;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,iBAAiB,EAC/B,OAAO,EAAE,gBAAgB,GACxB,iBAAiB,CAmBnB"}
+{"version":3,"file":"OneToMany.d.ts","sourceRoot":"","sources":["../../src/decorators/OneToMany.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEtE,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE;SAAG,CAAC,IAAI,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM;KAAE,CAAA;CAC1D;AAID,wBAAgB,SAAS,CAAC,CAAC,EACzB,MAAM,EAAE,MAAM,iBAAiB,CAAC,CAAC,CAAC,EAClC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,SAAS,EACpD,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC5B,iBAAiB,CAmBnB"}

package/dist/decorators/OneToMany.js

@@ -1,16 +1,17 @@
 import { getEntityMetadata } from './metadata.js';
-export function OneToMany(entity, options) {
+const propertyNames = new Proxy({}, { get: (_, property) => property });
+export function OneToMany(entity, mappedBy, options) {
     return (target, propertyKey) => {
-        if (!options?.mappedBy)
-            throw new Error(`@OneToMany "${String(propertyKey)}" requires a mappedBy property`);
-        const metadata = getEntityMetadata(target.constructor);
         const name = propertyKey;
-        metadata.relations.set(name, {
+        const property = mappedBy(propertyNames);
+        if (typeof property !== 'string')
+            throw new Error(`@OneToMany "${name}" must be mapped by a property of the target entity, like \`post => post.author\``);
+        getEntityMetadata(target.constructor).relations.set(name, {
             name,
             kind: 'one-to-many',
             entity,
-            mappedBy: options.mappedBy,
-            orderBy: options.orderBy,
+            mappedBy: property,
+            orderBy: options?.orderBy,
         });
     };
 }

package/dist/decorators/OneToMany.js.map

@@ -1 +1 @@
-{"version":3,"file":"OneToMany.js","sourceRoot":"","sources":["../../src/decorators/OneToMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAQjD,MAAM,UAAU,SAAS,CACvB,MAA+B,EAC/B,OAAyB;IAEzB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC7B,IAAI,CAAC,OAAO,EAAE,QAAQ;YACpB,MAAM,IAAI,KAAK,CACb,eAAe,MAAM,CAAC,WAAW,CAAC,gCAAgC,CACnE,CAAA;QAEH,MAAM,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,WAA4B,CAAC,CAAA;QAEvE,MAAM,IAAI,GAAG,WAAqB,CAAA;QAElC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE;YAC3B,IAAI;YACJ,IAAI,EAAE,aAAa;YACnB,MAAM;YACN,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"OneToMany.js","sourceRoot":"","sources":["../../src/decorators/OneToMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAQjD,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;AAEvE,MAAM,UAAU,SAAS,CACvB,MAAkC,EAClC,QAAoD,EACpD,OAA6B;IAE7B,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,WAAqB,CAAA;QAElC,MAAM,QAAQ,GAAY,QAAQ,CAAC,aAAkB,CAAC,CAAA;QAEtD,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAC9B,MAAM,IAAI,KAAK,CACb,eAAe,IAAI,mFAAmF,CACvG,CAAA;QAEH,iBAAiB,CAAC,MAAM,CAAC,WAA4B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE;YACzE,IAAI;YACJ,IAAI,EAAE,aAAa;YACnB,MAAM;YACN,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,OAAO,EAAE,OAAqD;SACxE,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t4h.framework/orm",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "ORM module for the T4H Framework",
   "homepage": "https://github.com/tech4humans-brasil/framework/tree/main/packages/orm",
   "bugs": "https://github.com/tech4humans-brasil/framework/issues",
@@ -35,7 +35,7 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@t4h.framework/core": "^0.18.0",
+    "@t4h.framework/core": "^0.19.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   },