@promakeai/orm 1.3.2 → 1.4.0

package/dist/adapters/RestAdapter.d.ts

@@ -18,6 +18,8 @@ export interface RestAdapterConfig {
     getToken?: () => string | null;
     /** Custom headers to include in all requests */
     headers?: Record<string, string>;
+    /** Dynamic headers getter - called on every request. Merged after static headers. */
+    getHeaders?: () => Record<string, string>;
     /** Schema definition for translation support */
     schema?: SchemaDefinition;
     /** Default language for translations */
@@ -33,6 +35,7 @@ export declare class RestAdapter implements IDataAdapter {
     private token?;
     private getTokenFn?;
     private customHeaders;
+    private getHeadersFn?;
     private fetchFn;
     private timeout;
     schema?: SchemaDefinition;

package/dist/index.js

@@ -621,6 +621,7 @@ class RestAdapter {
   token;
   getTokenFn;
   customHeaders;
+  getHeadersFn;
   fetchFn;
   timeout;
   schema;
@@ -631,6 +632,7 @@ class RestAdapter {
     this.token = config.token;
     this.getTokenFn = config.getToken;
     this.customHeaders = config.headers ?? {};
+    this.getHeadersFn = config.getHeaders;
     const gf = globalThis;
     this.fetchFn = config.fetch ?? gf.fetch.bind(gf);
     this.timeout = config.timeout ?? 30000;
@@ -646,6 +648,9 @@ class RestAdapter {
       Accept: "application/json",
       ...this.customHeaders
     };
+    if (this.getHeadersFn) {
+      Object.assign(headers, this.getHeadersFn());
+    }
     const token = this.getTokenFn ? this.getTokenFn() : this.token;
     if (token) {
       headers["Authorization"] = `Bearer ${token}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promakeai/orm",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Database-agnostic ORM core - works in browser and Node.js",
   "type": "module",
   "main": "./dist/index.js",

package/src/adapters/RestAdapter.ts

@@ -5,10 +5,10 @@
  * Works in both Node.js and browser environments (uses fetch).
  */
 
-import type { IDataAdapter } from "./IDataAdapter";
-import type { QueryOptions, PaginatedResult, SchemaDefinition } from "../types";
-import { deserializeRow } from "../utils/deserializer";
-import { toTranslationTableName, toTranslationFKName } from "../schema";
+import type { IDataAdapter } from "./IDataAdapter";
+import type { QueryOptions, PaginatedResult, SchemaDefinition } from "../types";
+import { deserializeRow } from "../utils/deserializer";
+import { toTranslationTableName, toTranslationFKName } from "../schema";
 
 type FetchFn = (input: string, init?: any) => Promise<any>;
 
@@ -23,6 +23,8 @@ export interface RestAdapterConfig {
   getToken?: () => string | null;
   /** Custom headers to include in all requests */
   headers?: Record<string, string>;
+  /** Dynamic headers getter - called on every request. Merged after static headers. */
+  getHeaders?: () => Record<string, string>;
   /** Schema definition for translation support */
   schema?: SchemaDefinition;
   /** Default language for translations */
@@ -39,6 +41,7 @@ export class RestAdapter implements IDataAdapter {
   private token?: string;
   private getTokenFn?: () => string | null;
   private customHeaders: Record<string, string>;
+  private getHeadersFn?: () => Record<string, string>;
   private fetchFn: FetchFn;
   private timeout: number;
 
@@ -51,6 +54,7 @@ export class RestAdapter implements IDataAdapter {
     this.token = config.token;
     this.getTokenFn = config.getToken;
     this.customHeaders = config.headers ?? {};
+    this.getHeadersFn = config.getHeaders;
     const gf = globalThis as any;
     this.fetchFn = config.fetch ?? gf.fetch.bind(gf);
     this.timeout = config.timeout ?? 30000;
@@ -70,6 +74,9 @@ export class RestAdapter implements IDataAdapter {
       Accept: "application/json",
       ...this.customHeaders,
     };
+    if (this.getHeadersFn) {
+      Object.assign(headers, this.getHeadersFn());
+    }
     const token = this.getTokenFn ? this.getTokenFn() : this.token;
     if (token) {
       headers["Authorization"] = `Bearer ${token}`;
@@ -130,34 +137,34 @@ export class RestAdapter implements IDataAdapter {
     return params;
   }
 
-  private urlWithParams(base: string, params: URLSearchParams): string {
-    const qs = params.toString();
-    return qs ? `${base}?${qs}` : base;
-  }
-
-  private deserializeRecord<T>(table: string, record: T | null | undefined): T | null {
-    if (record == null) return null;
-
-    const tableSchema = this.schema?.tables[table];
-    if (!tableSchema) {
-      return record;
-    }
-
-    return deserializeRow<T>(record as Record<string, unknown>, tableSchema.fields);
-  }
-
-  private deserializeRecords<T>(table: string, records: T[] | undefined): T[] {
-    if (!records?.length) return records ?? [];
-
-    const tableSchema = this.schema?.tables[table];
-    if (!tableSchema) {
-      return records;
-    }
-
-    return records.map((record) =>
-      deserializeRow<T>(record as Record<string, unknown>, tableSchema.fields)
-    );
-  }
+  private urlWithParams(base: string, params: URLSearchParams): string {
+    const qs = params.toString();
+    return qs ? `${base}?${qs}` : base;
+  }
+
+  private deserializeRecord<T>(table: string, record: T | null | undefined): T | null {
+    if (record == null) return null;
+
+    const tableSchema = this.schema?.tables[table];
+    if (!tableSchema) {
+      return record;
+    }
+
+    return deserializeRow<T>(record as Record<string, unknown>, tableSchema.fields);
+  }
+
+  private deserializeRecords<T>(table: string, records: T[] | undefined): T[] {
+    if (!records?.length) return records ?? [];
+
+    const tableSchema = this.schema?.tables[table];
+    if (!tableSchema) {
+      return records;
+    }
+
+    return records.map((record) =>
+      deserializeRow<T>(record as Record<string, unknown>, tableSchema.fields)
+    );
+  }
 
   // ==================== Lifecycle ====================
 
@@ -229,12 +236,12 @@ export class RestAdapter implements IDataAdapter {
 
   // ==================== Query Methods ====================
 
-  async list<T = unknown>(table: string, options?: QueryOptions): Promise<T[]> {
-    const params = this.buildQueryParams(options);
-    const url = this.urlWithParams(this.buildUrl(`/${table}/list`), params);
-    const res = await this.request<{ data: T[] }>(url);
-    return this.deserializeRecords(table, res.data);
-  }
+  async list<T = unknown>(table: string, options?: QueryOptions): Promise<T[]> {
+    const params = this.buildQueryParams(options);
+    const url = this.urlWithParams(this.buildUrl(`/${table}/list`), params);
+    const res = await this.request<{ data: T[] }>(url);
+    return this.deserializeRecords(table, res.data);
+  }
 
   async get<T = unknown>(
     table: string,
@@ -246,12 +253,12 @@ export class RestAdapter implements IDataAdapter {
     if (options?.fallbackLang) params.set("fallback_lang", options.fallbackLang);
     const url = this.urlWithParams(this.buildUrl(`/${table}/${id}`), params);
 
-    try {
-      const res = await this.request<{ data: T }>(url);
-      return this.deserializeRecord(table, res.data);
-    } catch (err) {
-      if (err instanceof Error && err.message.includes("404")) {
-        return null;
+    try {
+      const res = await this.request<{ data: T }>(url);
+      return this.deserializeRecord(table, res.data);
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("404")) {
+        return null;
       }
       throw err;
     }
@@ -304,17 +311,17 @@ export class RestAdapter implements IDataAdapter {
     data: Record<string, unknown>
   ): Promise<T> {
     const url = this.buildUrl(`/${table}/create`);
-    const res = await this.request<{ data: T; id: unknown }>(url, {
-      method: "POST",
-      body: JSON.stringify({ data }),
-    });
+    const res = await this.request<{ data: T; id: unknown }>(url, {
+      method: "POST",
+      body: JSON.stringify({ data }),
+    });
     // Backend returns id at top level, merge it into data
-    const result = (res.data ?? {}) as Record<string, unknown>;
-    if (res.id !== undefined && !("id" in result)) {
-      result.id = res.id;
-    }
-    return this.deserializeRecord(table, result as T) as T;
-  }
+    const result = (res.data ?? {}) as Record<string, unknown>;
+    if (res.id !== undefined && !("id" in result)) {
+      result.id = res.id;
+    }
+    return this.deserializeRecord(table, result as T) as T;
+  }
 
   async update<T = unknown>(
     table: string,
@@ -327,12 +334,12 @@ export class RestAdapter implements IDataAdapter {
     if (options?.translations) {
       body.translations = options.translations;
     }
-    const res = await this.request<{ data: T }>(url, {
-      method: "PUT",
-      body: JSON.stringify(body),
-    });
-    return this.deserializeRecord(table, res.data) as T;
-  }
+    const res = await this.request<{ data: T }>(url, {
+      method: "PUT",
+      body: JSON.stringify(body),
+    });
+    return this.deserializeRecord(table, res.data) as T;
+  }
 
   async delete(table: string, id: string | number): Promise<boolean> {
     const url = this.buildUrl(`/${table}/${id}`);
@@ -408,17 +415,17 @@ export class RestAdapter implements IDataAdapter {
     translations?: Record<string, Record<string, unknown>>
   ): Promise<T> {
     const url = this.buildUrl(`/${table}/create`);
-    const res = await this.request<{ data: T; id: unknown }>(url, {
-      method: "POST",
-      body: JSON.stringify({ data, translations }),
-    });
+    const res = await this.request<{ data: T; id: unknown }>(url, {
+      method: "POST",
+      body: JSON.stringify({ data, translations }),
+    });
     // Backend returns id at top level, merge it into data
-    const result = (res.data ?? {}) as Record<string, unknown>;
-    if (res.id !== undefined && !("id" in result)) {
-      result.id = res.id;
-    }
-    return this.deserializeRecord(table, result as T) as T;
-  }
+    const result = (res.data ?? {}) as Record<string, unknown>;
+    if (res.id !== undefined && !("id" in result)) {
+      result.id = res.id;
+    }
+    return this.deserializeRecord(table, result as T) as T;
+  }
 
   async upsertTranslation(
     table: string,
@@ -441,13 +448,13 @@ export class RestAdapter implements IDataAdapter {
     const fkName = toTranslationFKName(table);
     const params = new URLSearchParams();
     params.set("where", JSON.stringify({ [fkName]: id }));
-    const url = this.urlWithParams(
-      this.buildUrl(`/${translationTable}/list`),
-      params
-    );
-    const res = await this.request<{ data: T[] }>(url);
-    return this.deserializeRecords(table, res.data);
-  }
+    const url = this.urlWithParams(
+      this.buildUrl(`/${translationTable}/list`),
+      params
+    );
+    const res = await this.request<{ data: T[] }>(url);
+    return this.deserializeRecords(table, res.data);
+  }
 
   // ==================== Raw Query Methods ====================