taon-typeorm 19.0.5 → 19.0.7

package/browser/lib/typeorm/find-options/FindOneOptions.d.ts

@@ -4,6 +4,7 @@ import { FindOptionsWhere } from "./FindOptionsWhere";
 import { FindOptionsSelect, FindOptionsSelectByString } from "./FindOptionsSelect";
 import { FindOptionsRelationByString, FindOptionsRelations } from "./FindOptionsRelations";
 import { FindOptionsOrder } from "./FindOptionsOrder";
+import { RelationPath } from "../relation-path";
 /**
  * Defines a special criteria to find specific entity.
  */
@@ -25,7 +26,7 @@ export interface FindOneOptions<Entity = any> {
     /**
      * Indicates what relations of entity should be loaded (simplified left join form).
      */
-    relations?: FindOptionsRelations<Entity> | FindOptionsRelationByString;
+    relations?: RelationPath<Entity>[] | FindOptionsRelations<Entity> | FindOptionsRelationByString;
     /**
      * Specifies how relations must be loaded - using "joins" or separate queries.
      * If you are loading too much data with nested joins it's better to load relations

package/browser/lib/typeorm/index.d.ts

@@ -1,6 +1,9 @@
 // @ts-nocheck
 export { OrignalClassKey } from './constants';
 export * from './globals';
+export * from './query-builder/QueryPartialEntity';
+export * from './repository/UpsertOptions';
+export * from './relation-path';
 export * from './common/EntityTarget';
 export * from './common/ObjectType';
 export * from './common/ObjectLiteral';

package/browser/lib/typeorm/query-builder/QueryBuilder.d.ts

@@ -19,6 +19,7 @@ import { ColumnMetadata } from "../metadata/ColumnMetadata";
 import { WhereClause, WhereClauseCondition } from "./WhereClause";
 import { NotBrackets } from "./NotBrackets";
 import { ReturningType } from "../driver/Driver";
+import { RelationPath } from "../relation-path";
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
@@ -105,6 +106,7 @@ export declare abstract class QueryBuilder<Entity extends ObjectLiteral> {
      * Sets entity's relation with which this query builder gonna work.
      */
     relation(propertyPath: string): RelationQueryBuilder<Entity>;
+    relation(propertyPath: RelationPath<Entity>): RelationQueryBuilder<Entity>;
     /**
      * Sets entity's relation with which this query builder gonna work.
      */

package/browser/lib/typeorm/query-builder/SelectQueryBuilder.d.ts

@@ -16,6 +16,7 @@ import { RelationMetadata } from "../metadata/RelationMetadata";
 import { FindOptionsOrder } from "../find-options/FindOptionsOrder";
 import { FindOptionsWhere } from "../find-options/FindOptionsWhere";
 import { FindOptionsRelations } from "../find-options/FindOptionsRelations";
+import { RelationPath } from "../relation-path";
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
@@ -177,6 +178,7 @@ export declare class SelectQueryBuilder<Entity extends ObjectLiteral> extends Qu
      * Optionally, you can add condition and parameters used in condition.
      */
     innerJoinAndSelect(property: string, alias: string, condition?: string, parameters?: ObjectLiteral): this;
+    innerJoinAndSelect(property: RelationPath<Entity>, alias: string, condition?: string, parameters?: ObjectLiteral): this;
     /**
      * INNER JOINs entity and adds all selection properties to SELECT.
      * You also need to specify an alias of the joined data.
@@ -202,6 +204,7 @@ export declare class SelectQueryBuilder<Entity extends ObjectLiteral> extends Qu
      * Optionally, you can add condition and parameters used in condition.
      */
     leftJoinAndSelect(property: string, alias: string, condition?: string, parameters?: ObjectLiteral): this;
+    leftJoinAndSelect(property: RelationPath<Entity>, alias: string, condition?: string, parameters?: ObjectLiteral): this;
     /**
      * LEFT JOINs entity and adds all selection properties to SELECT.
      * You also need to specify an alias of the joined data.

package/browser/lib/typeorm/relation-path.d.ts

@@ -0,0 +1,7 @@
+// @ts-nocheck
+type Join<K, P> = K extends string ? P extends string ? `${K}.${P}` : never : never;
+export type RelationPath<T, Depth extends number = 3> = Depth extends 0 ? never : {
+    [K in keyof T]: T[K] extends object ? T[K] extends Array<infer U> ? K | Join<K, RelationPath<U, Prev[Depth]>> : K | Join<K, RelationPath<T[K], Prev[Depth]>> : K;
+}[keyof T];
+type Prev = [never, 0, 1, 2, 3, 4, 5, 6];
+export {};

package/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taon-typeorm/browser",
-  "version": "19.0.5",
+  "version": "19.0.7",
   "module": "fesm2022/taon-typeorm.mjs",
   "typings": "index.d.ts",
   "exports": {

package/client/fesm2022/taon-typeorm.mjs

@@ -21756,6 +21756,7 @@ let SelectQueryBuilder = SelectQueryBuilder_1 = class SelectQueryBuilder extends
     subQuery() {
         const qb = this.createQueryBuilder();
         qb.expressionMap.subQuery = true;
+        // @ts-ignore
         qb.parentQueryBuilder = this;
         return qb;
     }
@@ -26513,6 +26514,7 @@ let RelationQueryBuilder = class RelationQueryBuilder extends QueryBuilder {
             (!ObjectUtils.isObject(value) ||
                 Object.keys(value).length < relation.joinColumns.length))
             throw new TypeORMError(`Value to be set into the relation must be a map of relation ids, for example: .set({ firstName: "...", lastName: "..." })`);
+        // @ts-ignore
         const updater = new RelationUpdater(this, this.expressionMap);
         return updater.update(value);
     }
@@ -26540,6 +26542,7 @@ let RelationQueryBuilder = class RelationQueryBuilder extends QueryBuilder {
             (!ObjectUtils.isObject(value) ||
                 Object.keys(value).length < relation.joinColumns.length))
             throw new TypeORMError(`Value to be set into the relation must be a map of relation ids, for example: .set({ firstName: "...", lastName: "..." })`);
+        // @ts-ignore
         const updater = new RelationUpdater(this, this.expressionMap);
         return updater.update(value);
     }
@@ -26561,6 +26564,7 @@ let RelationQueryBuilder = class RelationQueryBuilder extends QueryBuilder {
             throw new TypeORMError(`Add operation is only supported for many-to-many and one-to-many relations. ` +
                 `However given "${relation.propertyPath}" has ${relation.relationType} relation. ` +
                 `Use .set(null) method instead.`);
+        // @ts-ignore
         const remover = new RelationRemover(this, this.expressionMap);
         return remover.remove(value);
     }