@decaf-ts/for-http 0.3.0 → 0.3.1

package/lib/esm/RestService.d.ts

@@ -1,10 +1,8 @@
-import { BulkCrudOperator, Context, CrudOperator } from "@decaf-ts/db-decorators";
 import { Model } from "@decaf-ts/decorator-validation";
 import { Constructor } from "@decaf-ts/decoration";
-import { Observable, Observer } from "@decaf-ts/core";
+import { FlagsOf } from "@decaf-ts/core";
 import { HttpAdapter } from "./adapter";
-import { HttpFlags } from "./types";
-import { LoggedClass, Logger } from "@decaf-ts/logging";
+import { RestRepository } from "./RestRepository";
 /**
  * @description Service class for REST API operations
  * @summary Provides a comprehensive implementation for interacting with REST APIs.
@@ -53,44 +51,8 @@ import { LoggedClass, Logger } from "@decaf-ts/logging";
  *   Adapter-->>Service: record
  *   Service-->>Client: revert(record)
  */
-export declare class RestService<M extends Model, Q, A extends HttpAdapter<any, any, Q, F, C>, F extends HttpFlags = HttpFlags, C extends Context<F> = Context<F>> extends LoggedClass implements CrudOperator<M>, BulkCrudOperator<M>, Observable {
-    private readonly _class;
-    private _pk;
-    private logger?;
-    /**
-     * @description Gets the model class constructor
-     * @summary Retrieves the model class constructor associated with this service.
-     * Throws an error if no class definition is found.
-     * @return {Constructor<M>} The model class constructor
-     * @throws {InternalError} If no class definition is found
-     */
-    get class(): Constructor<M>;
-    protected get log(): Logger;
-    /**
-     * @description Gets the primary key property name
-     * @summary Retrieves the name of the primary key property for the model.
-     * If not already determined, it finds the primary key using the model class.
-     * @return The primary key property name
-     */
-    get pk(): keyof M;
-    protected observers: Observer[];
-    private readonly _adapter;
-    private _tableName;
-    /**
-     * @description Gets the HTTP adapter
-     * @summary Retrieves the HTTP adapter associated with this service.
-     * Throws an error if no adapter is found.
-     * @return {A} The HTTP adapter instance
-     * @throws {InternalError} If no adapter is found
-     */
-    protected get adapter(): A;
-    /**
-     * @description Gets the table name for the model
-     * @summary Retrieves the table name associated with the model class.
-     * If not already determined, it gets the table name from the Repository utility.
-     * @return {string} The table name
-     */
-    protected get tableName(): string;
+export declare class RestService<M extends Model, A extends HttpAdapter<any, any, any, any>, Q = A extends HttpAdapter<any, any, infer Q, any> ? Q : never> extends RestRepository<M, A, Q> {
+    protected _overrides: Partial<FlagsOf<A>>;
     /**
      * @description Initializes a new RestService instance
      * @summary Creates a new service instance with the specified adapter and optional model class.
@@ -99,119 +61,5 @@ export declare class RestService<M extends Model, Q, A extends HttpAdapter<any,
      * @param {Constructor<M>} [clazz] - Optional constructor for the model class
      */
     constructor(adapter: A, clazz?: Constructor<M>);
-    url(path: string, queryParams?: Record<string, string | number>): string;
-    /**
-     * @description Creates a new resource
-     * @summary Creates a new resource in the REST API using the provided model.
-     * The method prepares the model for the adapter, sends the create request,
-     * and then converts the response back to a model instance.
-     * @param {M} model - The model instance to create
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the created model instance
-     */
-    create(model: M, ...args: any[]): Promise<M>;
-    /**
-     * @description Retrieves a resource by ID
-     * @summary Fetches a resource from the REST API using the provided ID.
-     * The method sends the read request and converts the response to a model instance.
-     * @param {string|number} id - The identifier of the resource to retrieve
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the retrieved model instance
-     */
-    read(id: string | number, ...args: any[]): Promise<M>;
-    /**
-     * @description Updates an existing resource
-     * @summary Updates an existing resource in the REST API using the provided model.
-     * The method prepares the model for the adapter, sends the update request,
-     * and then converts the response back to a model instance.
-     * @param {M} model - The model instance with updated data
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the updated model instance
-     */
-    update(model: M, ...args: any[]): Promise<M>;
-    /**
-     * @description Deletes a resource by ID
-     * @summary Removes a resource from the REST API using the provided ID.
-     * The method sends the delete request and converts the response to a model instance.
-     * @param {string|number} id - The identifier of the resource to delete
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the deleted model instance
-     */
-    delete(id: string | number, ...args: any[]): Promise<M>;
-    request<V>(details: Q): Promise<V>;
-    /**
-     * @description Creates multiple resources
-     * @summary Creates multiple resources in the REST API using the provided models.
-     * The method prepares each model for the adapter, sends a bulk create request,
-     * and then converts the responses back to model instances.
-     * @param {M[]} models - The model instances to create
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of created model instances
-     * @mermaid
-     * sequenceDiagram
-     *   participant Client
-     *   participant Service as RestService
-     *   participant Adapter as HttpAdapter
-     *   Client->>Service: createAll(models)
-     *   Service->>Adapter: prepare(model, pk) x N
-     *   Service->>Adapter: createAll(table, ids[], records[])
-     *   Adapter-->>Service: records[]
-     *   Service-->>Client: revert(records[])
-     */
-    createAll(models: M[], ...args: any[]): Promise<M[]>;
-    /**
-     * @description Deletes multiple resources by IDs
-     * @summary Removes multiple resources from the REST API using the provided IDs.
-     * The method sends a bulk delete request and converts the responses to model instances.
-     * @param {string[]|number[]} keys - The identifiers of the resources to delete
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of deleted model instances
-     */
-    deleteAll(keys: string[] | number[], ...args: any[]): Promise<M[]>;
-    /**
-     * @description Retrieves multiple resources by IDs
-     * @summary Fetches multiple resources from the REST API using the provided IDs.
-     * The method sends a bulk read request and converts the responses to model instances.
-     * @param {string[]|number[]} keys - The identifiers of the resources to retrieve
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of retrieved model instances
-     */
-    readAll(keys: string[] | number[], ...args: any[]): Promise<M[]>;
-    /**
-     * @description Updates multiple resources
-     * @summary Updates multiple resources in the REST API using the provided models.
-     * The method prepares each model for the adapter, sends a bulk update request,
-     * and then converts the responses back to model instances.
-     * @param {M[]} models - The model instances with updated data
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of updated model instances
-     */
-    updateAll(models: M[], ...args: any[]): Promise<M[]>;
-    /**
-     * @description Registers an observer
-     * @summary Adds an observer to the list of observers that will be notified of changes.
-     * Throws an error if the observer is already registered.
-     * @param {Observer} observer - The observer to register
-     * @return {void}
-     * @throws {InternalError} If the observer is already registered
-     */
-    observe(observer: Observer): void;
-    /**
-     * @description Unregisters an observer
-     * @summary Removes an observer from the list of observers.
-     * Throws an error if the observer is not found.
-     * @param {Observer} observer - The observer to unregister
-     * @return {void}
-     * @throws {InternalError} If the observer is not found
-     */
-    unObserve(observer: Observer): void;
-    /**
-     * @description Notifies all registered observers
-     * @summary Calls the refresh method on all registered observers to update themselves.
-     * Any errors during observer refresh are logged as warnings but don't stop the process.
-     * @param {...any[]} [args] - Optional arguments to pass to the observer refresh method
-     * @return {Promise<void>} A promise that resolves when all observers have been updated
-     */
-    updateObservers(...args: any[]): Promise<void>;
     toString(): string;
 }

package/lib/esm/RestService.js

@@ -1,7 +1,5 @@
-import { InternalError, } from "@decaf-ts/db-decorators";
 import { Model } from "@decaf-ts/decorator-validation";
-import { Repository } from "@decaf-ts/core";
-import { LoggedClass } from "@decaf-ts/logging";
+import { RestRepository } from "./RestRepository.js";
 /**
  * @description Service class for REST API operations
  * @summary Provides a comprehensive implementation for interacting with REST APIs.
@@ -50,58 +48,7 @@ import { LoggedClass } from "@decaf-ts/logging";
  *   Adapter-->>Service: record
  *   Service-->>Client: revert(record)
  */
-export class RestService extends LoggedClass {
-    /**
-     * @description Gets the model class constructor
-     * @summary Retrieves the model class constructor associated with this service.
-     * Throws an error if no class definition is found.
-     * @return {Constructor<M>} The model class constructor
-     * @throws {InternalError} If no class definition is found
-     */
-    get class() {
-        if (!this._class)
-            throw new InternalError("No class definition found for this repository");
-        return this._class;
-    }
-    get log() {
-        if (!this.logger)
-            this.logger = this.adapter["log"].for(this.toString());
-        return this.logger;
-    }
-    /**
-     * @description Gets the primary key property name
-     * @summary Retrieves the name of the primary key property for the model.
-     * If not already determined, it finds the primary key using the model class.
-     * @return The primary key property name
-     */
-    get pk() {
-        if (!this._pk)
-            this._pk = Model.pk(this.class);
-        return this._pk;
-    }
-    /**
-     * @description Gets the HTTP adapter
-     * @summary Retrieves the HTTP adapter associated with this service.
-     * Throws an error if no adapter is found.
-     * @return {A} The HTTP adapter instance
-     * @throws {InternalError} If no adapter is found
-     */
-    get adapter() {
-        if (!this._adapter)
-            throw new InternalError("No adapter found for this repository. did you use the @uses decorator or pass it in the constructor?");
-        return this._adapter;
-    }
-    /**
-     * @description Gets the table name for the model
-     * @summary Retrieves the table name associated with the model class.
-     * If not already determined, it gets the table name from the Repository utility.
-     * @return {string} The table name
-     */
-    get tableName() {
-        if (!this._tableName)
-            this._tableName = Repository.table(this.class);
-        return this._tableName;
-    }
+export class RestService extends RestRepository {
     /**
      * @description Initializes a new RestService instance
      * @summary Creates a new service instance with the specified adapter and optional model class.
@@ -110,182 +57,14 @@ export class RestService extends LoggedClass {
      * @param {Constructor<M>} [clazz] - Optional constructor for the model class
      */
     constructor(adapter, clazz) {
-        super();
-        this.observers = [];
-        this._adapter = adapter;
-        if (clazz)
-            this._class = clazz;
-    }
-    url(path, queryParams) {
-        return this.adapter.url(path, queryParams);
-    }
-    /**
-     * @description Creates a new resource
-     * @summary Creates a new resource in the REST API using the provided model.
-     * The method prepares the model for the adapter, sends the create request,
-     * and then converts the response back to a model instance.
-     * @param {M} model - The model instance to create
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the created model instance
-     */
-    async create(model, ...args) {
-        // eslint-disable-next-line prefer-const
-        let { record, id } = this.adapter.prepare(model, this.pk);
-        record = await this.adapter.create(this.tableName, id, record, ...args);
-        return this.adapter.revert(record, this.class, this.pk, id);
-    }
-    /**
-     * @description Retrieves a resource by ID
-     * @summary Fetches a resource from the REST API using the provided ID.
-     * The method sends the read request and converts the response to a model instance.
-     * @param {string|number} id - The identifier of the resource to retrieve
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the retrieved model instance
-     */
-    async read(id, ...args) {
-        const m = await this.adapter.read(this.tableName, id, ...args);
-        return this.adapter.revert(m, this.class, this.pk, id);
-    }
-    /**
-     * @description Updates an existing resource
-     * @summary Updates an existing resource in the REST API using the provided model.
-     * The method prepares the model for the adapter, sends the update request,
-     * and then converts the response back to a model instance.
-     * @param {M} model - The model instance with updated data
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the updated model instance
-     */
-    async update(model, ...args) {
-        // eslint-disable-next-line prefer-const
-        let { record, id } = this.adapter.prepare(model, this.pk);
-        record = await this.adapter.update(this.tableName, id, record, ...args);
-        return this.adapter.revert(record, this.class, this.pk, id);
-    }
-    /**
-     * @description Deletes a resource by ID
-     * @summary Removes a resource from the REST API using the provided ID.
-     * The method sends the delete request and converts the response to a model instance.
-     * @param {string|number} id - The identifier of the resource to delete
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M>} A promise that resolves with the deleted model instance
-     */
-    async delete(id, ...args) {
-        const m = await this.adapter.delete(this.tableName, id, ...args);
-        return this.adapter.revert(m, this.class, this.pk, id);
-    }
-    async request(details) {
-        return this.adapter.request(details);
-    }
-    /**
-     * @description Creates multiple resources
-     * @summary Creates multiple resources in the REST API using the provided models.
-     * The method prepares each model for the adapter, sends a bulk create request,
-     * and then converts the responses back to model instances.
-     * @param {M[]} models - The model instances to create
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of created model instances
-     * @mermaid
-     * sequenceDiagram
-     *   participant Client
-     *   participant Service as RestService
-     *   participant Adapter as HttpAdapter
-     *   Client->>Service: createAll(models)
-     *   Service->>Adapter: prepare(model, pk) x N
-     *   Service->>Adapter: createAll(table, ids[], records[])
-     *   Adapter-->>Service: records[]
-     *   Service-->>Client: revert(records[])
-     */
-    async createAll(models, ...args) {
-        if (!models.length)
-            return models;
-        const prepared = models.map((m) => this.adapter.prepare(m, this.pk));
-        const ids = prepared.map((p) => p.id);
-        let records = prepared.map((p) => p.record);
-        records = await this.adapter.createAll(this.tableName, ids, records, ...args);
-        return records.map((r, i) => this.adapter.revert(r, this.class, this.pk, ids[i]));
-    }
-    /**
-     * @description Deletes multiple resources by IDs
-     * @summary Removes multiple resources from the REST API using the provided IDs.
-     * The method sends a bulk delete request and converts the responses to model instances.
-     * @param {string[]|number[]} keys - The identifiers of the resources to delete
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of deleted model instances
-     */
-    async deleteAll(keys, ...args) {
-        const results = await this.adapter.deleteAll(this.tableName, keys, ...args);
-        return results.map((r, i) => this.adapter.revert(r, this.class, this.pk, keys[i]));
-    }
-    /**
-     * @description Retrieves multiple resources by IDs
-     * @summary Fetches multiple resources from the REST API using the provided IDs.
-     * The method sends a bulk read request and converts the responses to model instances.
-     * @param {string[]|number[]} keys - The identifiers of the resources to retrieve
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of retrieved model instances
-     */
-    async readAll(keys, ...args) {
-        const records = await this.adapter.readAll(this.tableName, keys, ...args);
-        return records.map((r, i) => this.adapter.revert(r, this.class, this.pk, keys[i]));
-    }
-    /**
-     * @description Updates multiple resources
-     * @summary Updates multiple resources in the REST API using the provided models.
-     * The method prepares each model for the adapter, sends a bulk update request,
-     * and then converts the responses back to model instances.
-     * @param {M[]} models - The model instances with updated data
-     * @param {...any[]} args - Additional arguments to pass to the adapter
-     * @return {Promise<M[]>} A promise that resolves with an array of updated model instances
-     */
-    async updateAll(models, ...args) {
-        const records = models.map((m) => this.adapter.prepare(m, this.pk));
-        const updated = await this.adapter.updateAll(this.tableName, records.map((r) => r.id), records.map((r) => r.record), ...args);
-        return updated.map((u, i) => this.adapter.revert(u, this.class, this.pk, records[i].id));
-    }
-    /**
-     * @description Registers an observer
-     * @summary Adds an observer to the list of observers that will be notified of changes.
-     * Throws an error if the observer is already registered.
-     * @param {Observer} observer - The observer to register
-     * @return {void}
-     * @throws {InternalError} If the observer is already registered
-     */
-    observe(observer) {
-        const index = this.observers.indexOf(observer);
-        if (index !== -1)
-            throw new InternalError("Observer already registered");
-        this.observers.push(observer);
-    }
-    /**
-     * @description Unregisters an observer
-     * @summary Removes an observer from the list of observers.
-     * Throws an error if the observer is not found.
-     * @param {Observer} observer - The observer to unregister
-     * @return {void}
-     * @throws {InternalError} If the observer is not found
-     */
-    unObserve(observer) {
-        const index = this.observers.indexOf(observer);
-        if (index === -1)
-            throw new InternalError("Failed to find Observer");
-        this.observers.splice(index, 1);
-    }
-    /**
-     * @description Notifies all registered observers
-     * @summary Calls the refresh method on all registered observers to update themselves.
-     * Any errors during observer refresh are logged as warnings but don't stop the process.
-     * @param {...any[]} [args] - Optional arguments to pass to the observer refresh method
-     * @return {Promise<void>} A promise that resolves when all observers have been updated
-     */
-    async updateObservers(...args) {
-        const results = await Promise.allSettled(this.observers.map((o) => o.refresh(...args)));
-        results.forEach((result, i) => {
-            if (result.status === "rejected")
-                console.warn(`Failed to update observable ${this.observers[i]}: ${result.reason}`);
-        });
+        super(adapter, clazz);
+        this._overrides = {
+            ignoreValidation: true,
+            ignoreHandlers: true,
+        };
     }
     toString() {
-        return `${this.class.name} rest service`;
+        return `${Model.tableName(this.class)} REST service`;
     }
 }
 //# sourceMappingURL=RestService.js.map

package/lib/esm/RestService.js.map

@@ -1 +1 @@
-{"version":3,"file":"RestService.js","sourceRoot":"","sources":["../../src/RestService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RestService.js","sourceRoot":"","sources":["../../src/RestService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAIvD,OAAO,EAAE,cAAc,EAAE,4BAAyB;AAElD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,MAAM,OAAO,WAIX,SAAQ,cAAuB;IAM/B;;;;;;OAMG;IACH,YAAY,OAAU,EAAE,KAAsB;QAC5C,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAbL,eAAU,GAAwB;YACnD,gBAAgB,EAAE,IAAI;YACtB,cAAc,EAAE,IAAI;SACE,CAAC;IAWzB,CAAC;IAEQ,QAAQ;QACf,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;IACvD,CAAC;CACF"}

package/lib/esm/adapter.d.ts

@@ -1,5 +1,5 @@
-import { Adapter, Condition, Repository, Sequence, SequenceOptions } from "@decaf-ts/core";
-import { Context, OperationKeys } from "@decaf-ts/db-decorators";
+import { Adapter, Condition, ContextualArgs, PreparedModel, Repository, Sequence, SequenceOptions } from "@decaf-ts/core";
+import { Context, FlagsOf, OperationKeys, PrimaryKeyType } from "@decaf-ts/db-decorators";
 import { HttpConfig, HttpFlags } from "./types";
 import { Model } from "@decaf-ts/decorator-validation";
 import { Constructor } from "@decaf-ts/decoration";
@@ -36,8 +36,8 @@ import { Statement } from "@decaf-ts/core";
  * }
  * ```
  */
-export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extends HttpFlags = HttpFlags, C extends Context<F> = Context<F>> extends Adapter<Y, CON, Q, F, C> {
-    protected constructor(config: Y, flavour: string, alias?: string);
+export declare abstract class HttpAdapter<CONF extends HttpConfig, CON, Q, C extends Context<HttpFlags> = Context<HttpFlags>> extends Adapter<CONF, CON, Q, C> {
+    protected constructor(config: CONF, flavour: string, alias?: string);
     /**
      * @description Generates operation flags with HTTP headers
      * @summary Extends the base flags method to include HTTP-specific headers for operations.
@@ -49,17 +49,17 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @param {Partial<F>} overrides - Optional flag overrides
      * @return {F} The flags object with headers
      */
-    flags<M extends Model>(operation: OperationKeys.CREATE | OperationKeys.READ | OperationKeys.UPDATE | OperationKeys.DELETE, model: Constructor<M>, overrides: Partial<F>): Promise<F> & {
+    flags<M extends Model>(operation: OperationKeys.CREATE | OperationKeys.READ | OperationKeys.UPDATE | OperationKeys.DELETE, model: Constructor<M>, overrides: Partial<FlagsOf<C>>): Promise<import("@decaf-ts/core").FlagsOf<C>> & {
         headers: {};
     };
     /**
      * @description Returns the repository constructor for this adapter
      * @summary Provides the RestService class as the repository implementation for this HTTP adapter.
      * This method is used to create repository instances that work with this adapter type.
-     * @template M - The model type
-     * @return {Constructor<Repository<M, Q, HttpAdapter<Y, Q, F, C>, F, C>>} The repository constructor
+     * @template R - Repository subtype working with this adapter
+     * @return {Constructor<R>} The repository constructor
      */
-    repository<M extends Model>(): Constructor<Repository<M, Q, HttpAdapter<Y, CON, Q, F, C>, F, C>>;
+    repository<R extends Repository<any, Adapter<CONF, CON, Q, C>>>(): Constructor<R>;
     /**
      * @description Prepares a model for persistence
      * @summary Converts a model instance into a format suitable for database storage,
@@ -67,13 +67,10 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @template M - The model type
      * @param {M} model - The model instance to prepare
      * @param pk - The primary key property name
+     * @param args
      * @return The prepared data
      */
-    prepare<M extends Model>(model: M, pk: keyof M): {
-        record: Record<string, any>;
-        id: string;
-        transient?: Record<string, any>;
-    };
+    prepare<M extends Model>(model: M, ...args: ContextualArgs<C>): PreparedModel;
     /**
      * @description Converts database data back into a model instance
      * @summary Reconstructs a model instance from database data, handling column mapping
@@ -85,7 +82,8 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @param {string|number|bigint} id - The primary key value
      * @return {M} The reconstructed model instance
      */
-    revert<M extends Model>(obj: Record<string, any>, clazz: string | Constructor<M>, pk: keyof M, id: string | number | bigint): M;
+    revert<M extends Model>(obj: Record<string, any>, clazz: string | Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<C>): M;
+    protected toTableName<M extends Model>(t: string | Constructor<M>): string;
     /**
      * @description Constructs a URL for API requests
      * @summary Builds a complete URL for API requests using the configured protocol and host,
@@ -94,7 +92,7 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @param {Record<string, string | number>} [queryParams] - Optional query parameters
      * @return {string} The encoded URL string
      */
-    url(tableName: string, queryParams?: Record<string, string | number>): string;
+    url<M extends Model>(tableName: string | Constructor<M>, queryParams?: Record<string, string | number>): string;
     /**
      * @description Sends an HTTP request
      * @summary Abstract method that must be implemented by subclasses to send HTTP requests
@@ -114,7 +112,7 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @param {...any[]} args - Additional arguments
      * @return {Promise<Record<string, any>>} A promise that resolves with the created resource
      */
-    abstract create(tableName: string, id: string | number, model: Record<string, any>, ...args: any[]): Promise<Record<string, any>>;
+    abstract create<M extends Model>(tableName: Constructor<M> | string, id: PrimaryKeyType, model: Record<string, any>, ...args: ContextualArgs<C>): Promise<Record<string, any>>;
     /**
      * @description Retrieves a resource by ID
      * @summary Abstract method that must be implemented by subclasses to retrieve a resource
@@ -124,7 +122,7 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @param {...any[]} args - Additional arguments
      * @return {Promise<Record<string, any>>} A promise that resolves with the retrieved resource
      */
-    abstract read(tableName: string, id: string | number | bigint, ...args: any[]): Promise<Record<string, any>>;
+    abstract read<M extends Model>(tableName: Constructor<M> | string, id: PrimaryKeyType, ...args: ContextualArgs<C>): Promise<Record<string, any>>;
     /**
      * @description Updates an existing resource
      * @summary Abstract method that must be implemented by subclasses to update a resource
@@ -135,7 +133,7 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @param {...any[]} args - Additional arguments
      * @return {Promise<Record<string, any>>} A promise that resolves with the updated resource
      */
-    abstract update(tableName: string, id: string | number, model: Record<string, any>, ...args: any[]): Promise<Record<string, any>>;
+    abstract update<M extends Model>(tableName: Constructor<M> | string, id: string | number, model: Record<string, any>, ...args: ContextualArgs<C>): Promise<Record<string, any>>;
     /**
      * @description Deletes a resource by ID
      * @summary Abstract method that must be implemented by subclasses to delete a resource
@@ -145,7 +143,7 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @param {...any[]} args - Additional arguments
      * @return {Promise<Record<string, any>>} A promise that resolves with the deletion result
      */
-    abstract delete(tableName: string, id: string | number | bigint, ...args: any[]): Promise<Record<string, any>>;
+    abstract delete<M extends Model>(tableName: Constructor<M> | string, id: PrimaryKeyType, ...args: ContextualArgs<C>): Promise<Record<string, any>>;
     /**
      * @description Executes a raw query
      * @summary Method for executing raw queries directly with the HTTP client.
@@ -158,7 +156,7 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @return {Promise<R>} A promise that resolves with the query result
      * @throws {UnsupportedError} Always throws as this method is not supported by default
      */
-    raw<R>(rawInput: Q, process: boolean, ...args: any[]): Promise<R>;
+    raw<R>(rawInput: Q, ...args: ContextualArgs<C>): Promise<R>;
     /**
      * @description Creates a sequence
      * @summary Method for creating a sequence for generating unique identifiers.
@@ -179,7 +177,7 @@ export declare abstract class HttpAdapter<Y extends HttpConfig, CON, Q, F extend
      * @return {Statement<Q, M, any>} A statement object for building queries
      * @throws {UnsupportedError} Always throws as this method is not supported by default
      */
-    Statement<M extends Model>(): Statement<Q, M, any>;
+    Statement<M extends Model>(): Statement<M, Adapter<CONF, CON, Q, C>, any>;
     /**
      * @description Parses a condition into a query
      * @summary Method for parsing a condition object into a query format understood by the HTTP client.

package/lib/esm/adapter.js

@@ -1,5 +1,5 @@
 import { Adapter, PersistenceKeys, UnsupportedError, } from "@decaf-ts/core";
-import { InternalError } from "@decaf-ts/db-decorators";
+import { InternalError, } from "@decaf-ts/db-decorators";
 import { Model } from "@decaf-ts/decorator-validation";
 import { RestService } from "./RestService.js";
 /**
@@ -58,8 +58,8 @@ export class HttpAdapter extends Adapter {
      * @description Returns the repository constructor for this adapter
      * @summary Provides the RestService class as the repository implementation for this HTTP adapter.
      * This method is used to create repository instances that work with this adapter type.
-     * @template M - The model type
-     * @return {Constructor<Repository<M, Q, HttpAdapter<Y, Q, F, C>, F, C>>} The repository constructor
+     * @template R - Repository subtype working with this adapter
+     * @return {Constructor<R>} The repository constructor
      */
     repository() {
         return RestService;
@@ -71,10 +71,11 @@ export class HttpAdapter extends Adapter {
      * @template M - The model type
      * @param {M} model - The model instance to prepare
      * @param pk - The primary key property name
+     * @param args
      * @return The prepared data
      */
-    prepare(model, pk) {
-        const log = this.log.for(this.prepare);
+    prepare(model, ...args) {
+        const { log } = this.logCtx(args, this.prepare);
         const result = Object.assign({}, model);
         if (model[PersistenceKeys.METADATA]) {
             log.silly(`Passing along persistence metadata for ${model[PersistenceKeys.METADATA]}`);
@@ -87,7 +88,7 @@ export class HttpAdapter extends Adapter {
         }
         return {
             record: model,
-            id: model[pk],
+            id: model[Model.pk(model.constructor)],
         };
     }
     /**
@@ -101,8 +102,8 @@ export class HttpAdapter extends Adapter {
      * @param {string|number|bigint} id - The primary key value
      * @return {M} The reconstructed model instance
      */
-    revert(obj, clazz, pk, id) {
-        const log = this.log.for(this.revert);
+    revert(obj, clazz, id, ...args) {
+        const { log } = this.logCtx(args, this.revert);
         const ob = {};
         const m = (typeof clazz === "string" ? Model.build(ob, clazz) : new clazz(ob));
         log.silly(`Rebuilding model ${m.constructor.name} id ${id}`);
@@ -122,6 +123,9 @@ export class HttpAdapter extends Adapter {
         }
         return result;
     }
+    toTableName(t) {
+        return typeof t === "string" ? t : Model.tableName(t);
+    }
     /**
      * @description Constructs a URL for API requests
      * @summary Builds a complete URL for API requests using the configured protocol and host,
@@ -131,6 +135,7 @@ export class HttpAdapter extends Adapter {
      * @return {string} The encoded URL string
      */
     url(tableName, queryParams) {
+        tableName = this.toTableName(tableName);
         const url = new URL(`${this.config.protocol}://${this.config.host}/${tableName}`);
         if (queryParams)
             Object.entries(queryParams).forEach(([key, value]) => url.searchParams.append(key, value.toString()));
@@ -150,7 +155,7 @@ export class HttpAdapter extends Adapter {
      * @throws {UnsupportedError} Always throws as this method is not supported by default
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    raw(rawInput, process, ...args) {
+    raw(rawInput, ...args) {
         return Promise.reject(new UnsupportedError("Api is not natively available for HttpAdapters. If required, please extends this class"));
     }
     /**