metal-orm 1.0.32 → 1.0.34

package/src/schema/types.ts

@@ -30,37 +30,37 @@ export type ColumnToTs<T extends ColumnDef> =
   T['type'] extends 'BLOB' | 'blob' | 'BINARY' | 'binary' | 'VARBINARY' | 'varbinary' | 'BYTEA' | 'bytea' ? Buffer :
   T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string :
   string;
-
-/**
- * Infers a row shape from a table definition
- */
-export type InferRow<TTable extends TableDef> = {
-  [K in keyof TTable['columns']]: ColumnToTs<TTable['columns'][K]>;
-};
-
+
+/**
+ * Infers a row shape from a table definition
+ */
+export type InferRow<TTable extends TableDef> = {
+  [K in keyof TTable['columns']]: ColumnToTs<TTable['columns'][K]>;
+};
+
 type RelationResult<T extends RelationDef> =
   T extends HasManyRelation<infer TTarget>        ? InferRow<TTarget>[] :
   T extends HasOneRelation<infer TTarget>         ? InferRow<TTarget> | null :
   T extends BelongsToRelation<infer TTarget>      ? InferRow<TTarget> | null :
   T extends BelongsToManyRelation<infer TTarget>  ? (InferRow<TTarget> & { _pivot?: any })[] :
   never;
-
-/**
- * Maps relation names to the expected row results
- */
-export type RelationMap<TTable extends TableDef> = {
-  [K in keyof TTable['relations']]: RelationResult<TTable['relations'][K]>;
-};
-
-export interface HasManyCollection<TChild> {
-  load(): Promise<TChild[]>;
-  getItems(): TChild[];
-  add(data: Partial<TChild>): TChild;
-  attach(entity: TChild): void;
-  remove(entity: TChild): void;
-  clear(): void;
-}
-
+
+/**
+ * Maps relation names to the expected row results
+ */
+export type RelationMap<TTable extends TableDef> = {
+  [K in keyof TTable['relations']]: RelationResult<TTable['relations'][K]>;
+};
+
+export interface HasManyCollection<TChild> {
+  load(): Promise<TChild[]>;
+  getItems(): TChild[];
+  add(data: Partial<TChild>): TChild;
+  attach(entity: TChild): void;
+  remove(entity: TChild): void;
+  clear(): void;
+}
+
 export interface BelongsToReference<TParent> {
   load(): Promise<TParent | null>;
   get(): TParent | null;
@@ -72,28 +72,28 @@ export interface HasOneReference<TChild> {
   get(): TChild | null;
   set(data: Partial<TChild> | TChild | null): TChild | null;
 }
-
-export interface ManyToManyCollection<TTarget> {
-  load(): Promise<TTarget[]>;
-  getItems(): TTarget[];
-  attach(target: TTarget | number | string): void;
-  detach(target: TTarget | number | string): void;
-  syncByIds(ids: (number | string)[]): Promise<void>;
-}
-
-export type Entity<
+
+export interface ManyToManyCollection<TTarget> {
+  load(): Promise<TTarget[]>;
+  getItems(): TTarget[];
+  attach(target: TTarget | number | string): void;
+  detach(target: TTarget | number | string): void;
+  syncByIds(ids: (number | string)[]): Promise<void>;
+}
+
+export type EntityInstance<
   TTable extends TableDef,
   TRow = InferRow<TTable>
 > = TRow & {
   [K in keyof RelationMap<TTable>]:
     TTable['relations'][K] extends HasManyRelation<infer TTarget>
-      ? HasManyCollection<Entity<TTarget>>
+      ? HasManyCollection<EntityInstance<TTarget>>
       : TTable['relations'][K] extends HasOneRelation<infer TTarget>
-        ? HasOneReference<Entity<TTarget>>
+        ? HasOneReference<EntityInstance<TTarget>>
         : TTable['relations'][K] extends BelongsToManyRelation<infer TTarget>
-          ? ManyToManyCollection<Entity<TTarget>>
+          ? ManyToManyCollection<EntityInstance<TTarget>>
           : TTable['relations'][K] extends BelongsToRelation<infer TTarget>
-            ? BelongsToReference<Entity<TTarget>>
+            ? BelongsToReference<EntityInstance<TTarget>>
             : never;
 } & {
   $load<K extends keyof RelationMap<TTable>>(relation: K): Promise<RelationMap<TTable>[K]>;