@ez4/database 0.18.0 → 0.19.0

package/dist/services/table.d.ts

@@ -3,6 +3,7 @@ import type { RelationMetadata, RelationTables } from './relations.js';
 import type { IndexedTables } from './indexes.js';
 import type { TableSchemas } from './schemas.js';
 import type { Database } from './database.js';
+import type { DatabaseEngine } from './engine.js';
 import type { Query } from './query.js';
 /**
  * Given an indexed table `T` and a property `P`, it returns all the indexes corresponding
@@ -18,42 +19,56 @@ export type TableRelation<P, T extends AnyObject> = PropertyExists<P, T> extends
  * Given a database service `T`, it returns all table clients.
  */
 export type TableClients<T extends Database.Service> = {
-    [P in keyof TableSchemas<T>]: TableSchemas<T>[P] extends Database.Schema ? Table<TableSchemas<T>[P], TableIndex<P, IndexedTables<T>>, TableRelation<P, RelationTables<T>>> : never;
+    [P in keyof TableSchemas<T>]: TableSchemas<T>[P] extends Database.Schema ? Table<{
+        schema: TableSchemas<T>[P];
+        indexes: TableIndex<P, IndexedTables<T>>;
+        relations: TableRelation<P, RelationTables<T>>;
+        engine: T['engine'];
+    }> : never;
+};
+/**
+ * Internal table metadata.
+ */
+export type TableMetadata = {
+    schema: Database.Schema;
+    indexes: Database.Indexes;
+    relations: RelationMetadata;
+    engine: DatabaseEngine;
 };
 /**
  * Table client.
  */
-export interface Table<T extends Database.Schema, I extends Database.Indexes, R extends RelationMetadata> {
+export interface Table<T extends TableMetadata> {
     /**
      * Insert one record into the database.
      *
      * @param query Input query.
      */
-    insertOne<S extends Query.SelectInput<T, R> = never>(query: Query.InsertOneInput<T, S, R>): Promise<Query.InsertOneResult<T, S, R>>;
+    insertOne<S extends Query.SelectInput<T> = never>(query: Query.InsertOneInput<S, T>): Promise<Query.InsertOneResult<S, T>>;
     /**
      * Find one database record.
      *
      * @param query Input query.
      */
-    findOne<S extends Query.SelectInput<T, R>>(query: Query.FindOneInput<T, S, I, R>): Promise<Query.FindOneResult<T, S, R>>;
+    findOne<S extends Query.SelectInput<T>>(query: Query.FindOneInput<S, T>): Promise<Query.FindOneResult<S, T>>;
     /**
      * Update one database record.
      *
      * @param query Input query.
      */
-    updateOne<S extends Query.SelectInput<T, R> = never>(query: Query.UpdateOneInput<T, S, I, R>): Promise<Query.UpdateOneResult<T, S, R>>;
+    updateOne<S extends Query.SelectInput<T> = never>(query: Query.UpdateOneInput<S, T>): Promise<Query.UpdateOneResult<S, T>>;
     /**
      * Try to insert a database record, and if it already exists, perform an update instead.
      *
      * @param query Input query.
      */
-    upsertOne<S extends Query.SelectInput<T, R> = never>(query: Query.UpsertOneInput<T, S, I, R>): Promise<Query.UpsertOneResult<T, S, R>>;
+    upsertOne<S extends Query.SelectInput<T> = never>(query: Query.UpsertOneInput<S, T>): Promise<Query.UpsertOneResult<S, T>>;
     /**
      * Delete one database record.
      *
      * @param query Input query.
      */
-    deleteOne<S extends Query.SelectInput<T, R> = never>(query: Query.DeleteOneInput<T, S, I, R>): Promise<Query.DeleteOneResult<T, S, R>>;
+    deleteOne<S extends Query.SelectInput<T> = never>(query: Query.DeleteOneInput<S, T>): Promise<Query.DeleteOneResult<S, T>>;
     /**
      * Insert multiple records into the database.
      *
@@ -65,23 +80,23 @@ export interface Table<T extends Database.Schema, I extends Database.Indexes, R
      *
      * @param query Input query.
      */
-    findMany<S extends Query.SelectInput<T, R>, C extends boolean = false>(query: Query.FindManyInput<T, S, I, R, C>): Promise<Query.FindManyResult<T, S, R, C>>;
+    findMany<S extends Query.SelectInput<T>, C extends boolean = false>(query: Query.FindManyInput<S, T, C>): Promise<Query.FindManyResult<S, T, C>>;
     /**
      * Update multiple database records.
      *
      * @param query Input query.
      */
-    updateMany<S extends Query.SelectInput<T, R> = never>(query: Query.UpdateManyInput<T, S, R>): Promise<Query.UpdateManyResult<T, S, R>>;
+    updateMany<S extends Query.SelectInput<T> = never>(query: Query.UpdateManyInput<S, T>): Promise<Query.UpdateManyResult<S, T>>;
     /**
      * Delete multiple database records.
      *
      * @param query Input query.
      */
-    deleteMany<S extends Query.SelectInput<T, R> = never>(query: Query.DeleteManyInput<T, S, R>): Promise<Query.DeleteManyResult<T, S, R>>;
+    deleteMany<S extends Query.SelectInput<T> = never>(query: Query.DeleteManyInput<S, T>): Promise<Query.DeleteManyResult<S, T>>;
     /**
      * Count database records.
      *
      * @param query Input query.
      */
-    count(query: Query.CountInput<T, R>): Promise<number>;
+    count(query: Query.CountInput<T>): Promise<number>;
 }

package/dist/services/transaction.d.ts

@@ -1,16 +1,22 @@
-import type { AnyObject } from '@ez4/utils';
-import type { TableIndex, TableRelation } from './table.js';
-import type { RelationMetadata, RelationTables } from './relations.js';
+import type { TableIndex, TableMetadata, TableRelation } from './table.js';
+import type { RelationTables } from './relations.js';
 import type { IndexedTables } from './indexes.js';
-import type { TransactionType } from './engine.js';
+import type { EngineUtils } from './engine.js';
 import type { TableSchemas } from './schemas.js';
 import type { Database } from './database.js';
 import type { Client } from './client.js';
 import type { Query } from './query.js';
 /**
- * Transaction builder types.
+ * Transaction mode.
  */
-export declare namespace Transaction {
+export declare const enum TransactionMode {
+    Interactive = "interactive",
+    Static = "static"
+}
+/**
+ * Transaction utils.
+ */
+export declare namespace TransactionUtils {
     /**
      * Extract the operation result from an interactive transaction.
      */
@@ -18,7 +24,7 @@ export declare namespace Transaction {
     /**
      * Determines the transaction operation based on the given database service.
      */
-    export type Type<T extends Database.Service, R> = EngineTransactionType<T> extends TransactionType.Interactive ? StaticOperationType<T> | InteractiveOperationType<T, R> : StaticOperationType<T>;
+    export type Type<T extends Database.Service, R> = EngineUtils.GetTransactionMode<T> extends TransactionMode.Interactive ? StaticOperationType<T> | InteractiveOperationType<T, R> : StaticOperationType<T>;
     /**
      * Interactive operation type.
      */
@@ -27,23 +33,22 @@ export declare namespace Transaction {
      * Static operation type.
      */
     export type StaticOperationType<T extends Database.Service> = {
-        [P in keyof TableSchemas<T>]?: (TableSchemas<T>[P] extends Database.Schema ? AnyOperationType<TableSchemas<T>[P], TableIndex<P, IndexedTables<T>>, TableRelation<P, RelationTables<T>>> : AnyObject)[];
+        [P in keyof TableSchemas<T>]?: (TableSchemas<T>[P] extends Database.Schema ? AnyOperationType<{
+            schema: TableSchemas<T>[P];
+            indexes: TableIndex<P, IndexedTables<T>>;
+            relations: TableRelation<P, RelationTables<T>>;
+            engine: T['engine'];
+        }> : never)[];
     };
-    /**
-     * Extract the transaction type from the given database service.
-     */
-    type EngineTransactionType<T extends Database.Service> = T['engine'] extends {
-        transaction: infer O;
-    } ? O : never;
-    type AnyOperationType<T extends Database.Schema, I extends Database.Indexes, R extends RelationMetadata> = InsertOperationType<T, R> | UpdateOperationType<T, I, R> | DeleteOperationType<T, I, R>;
-    type InsertOperationType<T extends Database.Schema, R extends RelationMetadata> = {
-        insert: Omit<Query.InsertOneInput<T, Query.SelectInput<T, R>, R>, 'select'>;
+    type AnyOperationType<T extends TableMetadata> = InsertOperationType<T> | UpdateOperationType<T> | DeleteOperationType<T>;
+    type InsertOperationType<T extends TableMetadata> = {
+        insert: Omit<Query.InsertOneInput<Query.SelectInput<T>, T>, 'select'>;
     };
-    type UpdateOperationType<T extends Database.Schema, I extends Database.Indexes, R extends RelationMetadata> = {
-        update: Omit<Query.UpdateOneInput<T, Query.SelectInput<T, R>, I, R>, 'select' | 'include'>;
+    type UpdateOperationType<T extends TableMetadata> = {
+        update: Omit<Query.UpdateOneInput<Query.SelectInput<T>, T>, 'select' | 'include'>;
     };
-    type DeleteOperationType<T extends Database.Schema, I extends Database.Indexes, R extends RelationMetadata> = {
-        delete: Omit<Query.DeleteOneInput<T, Query.SelectInput<T, R>, I, R>, 'select' | 'include'>;
+    type DeleteOperationType<T extends TableMetadata> = {
+        delete: Omit<Query.DeleteOneInput<Query.SelectInput<T>, T>, 'select' | 'include'>;
     };
     export {};
 }

package/dist/types/engine.d.ts

@@ -1,6 +1,13 @@
-import type { ParametersType, TransactionType } from '../services/engine.js';
+import { ParametersMode } from '../services/parameters.js';
+import { TransactionMode } from '../services/transaction.js';
+import { InsensitiveMode } from '../services/insensitive.js';
+import { PaginationMode } from '../services/pagination.js';
+import { OrderMode } from '../services/order.js';
 export type DatabaseEngine = {
-    transaction: TransactionType;
-    parameters: ParametersType;
+    parametersMode: ParametersMode;
+    transactionMode: TransactionMode;
+    insensitiveMode: InsensitiveMode;
+    paginationMode: PaginationMode;
+    orderMode: OrderMode;
     name: string;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ez4/database",
   "description": "EZ4: Components to build database services",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "author": "Silas B.",
   "license": "MIT",
   "type": "module",
@@ -42,10 +42,10 @@
     "live:publish": "npm run test && npm publish --access public"
   },
   "dependencies": {
-    "@ez4/common": "^0.18.0",
-    "@ez4/project": "^0.18.0",
-    "@ez4/reflection": "^0.18.0",
-    "@ez4/schema": "^0.18.0",
-    "@ez4/utils": "^0.18.0"
+    "@ez4/common": "^0.19.0",
+    "@ez4/project": "^0.19.0",
+    "@ez4/reflection": "^0.19.0",
+    "@ez4/schema": "^0.19.0",
+    "@ez4/utils": "^0.19.0"
   }
 }