metal-orm 1.0.13 → 1.0.15

package/src/schema/types.ts

@@ -1,11 +1,12 @@
 import { ColumnDef } from './column.js';
 import { TableDef } from './table.js';
-import {
-  RelationDef,
-  HasManyRelation,
-  BelongsToRelation,
-  BelongsToManyRelation
-} from './relation.js';
+import {
+  RelationDef,
+  HasManyRelation,
+  HasOneRelation,
+  BelongsToRelation,
+  BelongsToManyRelation
+} from './relation.js';
 
 /**
  * Maps a ColumnDef to its TypeScript type representation
@@ -26,11 +27,12 @@ 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 BelongsToRelation<infer TTarget>      ? InferRow<TTarget> | null :
-  T extends BelongsToManyRelation<infer TTarget>  ? (InferRow<TTarget> & { _pivot?: any })[] :
-  never;
+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
@@ -48,11 +50,17 @@ export interface HasManyCollection<TChild> {
   clear(): void;
 }
 
-export interface BelongsToReference<TParent> {
-  load(): Promise<TParent | null>;
-  get(): TParent | null;
-  set(data: Partial<TParent> | TParent | null): TParent | null;
-}
+export interface BelongsToReference<TParent> {
+  load(): Promise<TParent | null>;
+  get(): TParent | null;
+  set(data: Partial<TParent> | TParent | null): TParent | null;
+}
+
+export interface HasOneReference<TChild> {
+  load(): Promise<TChild | null>;
+  get(): TChild | null;
+  set(data: Partial<TChild> | TChild | null): TChild | null;
+}
 
 export interface ManyToManyCollection<TTarget> {
   load(): Promise<TTarget[]>;
@@ -62,18 +70,20 @@ export interface ManyToManyCollection<TTarget> {
   syncByIds(ids: (number | string)[]): Promise<void>;
 }
 
-export type Entity<
-  TTable extends TableDef,
-  TRow = InferRow<TTable>
-> = TRow & {
-  [K in keyof RelationMap<TTable>]:
-    TTable['relations'][K] extends HasManyRelation<infer TTarget>
-      ? HasManyCollection<Entity<TTarget>>
-      : TTable['relations'][K] extends BelongsToManyRelation<infer TTarget>
-        ? ManyToManyCollection<Entity<TTarget>>
-        : TTable['relations'][K] extends BelongsToRelation<infer TTarget>
-          ? BelongsToReference<Entity<TTarget>>
-          : never;
-} & {
-  $load<K extends keyof RelationMap<TTable>>(relation: K): Promise<RelationMap<TTable>[K]>;
-};
+export type Entity<
+  TTable extends TableDef,
+  TRow = InferRow<TTable>
+> = TRow & {
+  [K in keyof RelationMap<TTable>]:
+    TTable['relations'][K] extends HasManyRelation<infer TTarget>
+      ? HasManyCollection<Entity<TTarget>>
+      : TTable['relations'][K] extends HasOneRelation<infer TTarget>
+        ? HasOneReference<Entity<TTarget>>
+        : TTable['relations'][K] extends BelongsToManyRelation<infer TTarget>
+          ? ManyToManyCollection<Entity<TTarget>>
+          : TTable['relations'][K] extends BelongsToRelation<infer TTarget>
+            ? BelongsToReference<Entity<TTarget>>
+            : never;
+} & {
+  $load<K extends keyof RelationMap<TTable>>(relation: K): Promise<RelationMap<TTable>[K]>;
+};

package/src/orm/db-executor.ts

@@ -1,11 +0,0 @@
-export type QueryResult = {
-  columns: string[];
-  values: unknown[][];
-};
-
-export interface DbExecutor {
-  executeSql(sql: string, params?: unknown[]): Promise<QueryResult[]>;
-  beginTransaction?(): Promise<void>;
-  commitTransaction?(): Promise<void>;
-  rollbackTransaction?(): Promise<void>;
-}