@promakeai/orm 1.3.1 → 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;
@@ -43,6 +46,8 @@ export declare class RestAdapter implements IDataAdapter {
     private request;
     private buildQueryParams;
     private urlWithParams;
+    private deserializeRecord;
+    private deserializeRecords;
     setSchema(schema: SchemaDefinition): void;
     connect(): Promise<void>;
     private mapFieldType;

package/dist/index.js

@@ -293,6 +293,52 @@ class ORM {
     this.schema = schema;
   }
 }
+// src/utils/deserializer.ts
+function deserializeValue(value, fieldType) {
+  if (value === null || value === undefined)
+    return value;
+  if (fieldType === "bool") {
+    return value === 1 || value === true;
+  }
+  if (isJsonType(fieldType) && typeof value === "string") {
+    try {
+      return JSON.parse(value);
+    } catch {
+      return value;
+    }
+  }
+  return value;
+}
+function deserializeRow(row, fields) {
+  const result = { ...row };
+  for (const [fieldName, field] of Object.entries(fields)) {
+    if (fieldName in result) {
+      result[fieldName] = deserializeValue(result[fieldName], field.type);
+    }
+  }
+  return result;
+}
+function serializeValue(value, fieldType) {
+  if (value === null || value === undefined)
+    return value;
+  if (fieldType === "bool") {
+    return value ? 1 : 0;
+  }
+  if (isJsonType(fieldType) && typeof value !== "string") {
+    return JSON.stringify(value);
+  }
+  return value;
+}
+function serializeRow(data, fields) {
+  const result = { ...data };
+  for (const [fieldName, field] of Object.entries(fields)) {
+    if (fieldName in result) {
+      result[fieldName] = serializeValue(result[fieldName], field.type);
+    }
+  }
+  return result;
+}
+
 // src/schema/schemaHelpers.ts
 function getTranslatableFields(table) {
   return Object.entries(table.fields).filter(([_, field]) => field.translatable).map(([name]) => name);
@@ -575,6 +621,7 @@ class RestAdapter {
   token;
   getTokenFn;
   customHeaders;
+  getHeadersFn;
   fetchFn;
   timeout;
   schema;
@@ -585,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;
@@ -600,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}`;
@@ -653,6 +704,24 @@ class RestAdapter {
     const qs = params.toString();
     return qs ? `${base}?${qs}` : base;
   }
+  deserializeRecord(table, record) {
+    if (record == null)
+      return null;
+    const tableSchema = this.schema?.tables[table];
+    if (!tableSchema) {
+      return record;
+    }
+    return deserializeRow(record, tableSchema.fields);
+  }
+  deserializeRecords(table, records) {
+    if (!records?.length)
+      return records ?? [];
+    const tableSchema = this.schema?.tables[table];
+    if (!tableSchema) {
+      return records;
+    }
+    return records.map((record) => deserializeRow(record, tableSchema.fields));
+  }
   setSchema(schema) {
     this.schema = schema;
   }
@@ -719,7 +788,7 @@ class RestAdapter {
     const params = this.buildQueryParams(options);
     const url = this.urlWithParams(this.buildUrl(`/${table}/list`), params);
     const res = await this.request(url);
-    return res.data;
+    return this.deserializeRecords(table, res.data);
   }
   async get(table, id, options) {
     const params = new URLSearchParams;
@@ -730,7 +799,7 @@ class RestAdapter {
     const url = this.urlWithParams(this.buildUrl(`/${table}/${id}`), params);
     try {
       const res = await this.request(url);
-      return res.data ?? null;
+      return this.deserializeRecord(table, res.data);
     } catch (err) {
       if (err instanceof Error && err.message.includes("404")) {
         return null;
@@ -777,7 +846,7 @@ class RestAdapter {
     if (res.id !== undefined && !("id" in result)) {
       result.id = res.id;
     }
-    return result;
+    return this.deserializeRecord(table, result);
   }
   async update(table, id, data, options) {
     const url = this.buildUrl(`/${table}/${id}`);
@@ -789,7 +858,7 @@ class RestAdapter {
       method: "PUT",
       body: JSON.stringify(body)
     });
-    return res.data;
+    return this.deserializeRecord(table, res.data);
   }
   async delete(table, id) {
     const url = this.buildUrl(`/${table}/${id}`);
@@ -849,7 +918,7 @@ class RestAdapter {
     if (res.id !== undefined && !("id" in result)) {
       result.id = res.id;
     }
-    return result;
+    return this.deserializeRecord(table, result);
   }
   async upsertTranslation(table, id, lang, data) {
     const url = this.buildUrl(`/${table}/${id}`);
@@ -865,7 +934,7 @@ class RestAdapter {
     params.set("where", JSON.stringify({ [fkName]: id }));
     const url = this.urlWithParams(this.buildUrl(`/${translationTable}/list`), params);
     const res = await this.request(url);
-    return res.data;
+    return this.deserializeRecords(table, res.data);
   }
   async raw(query, params) {
     const url = this.buildUrl("/exec");
@@ -1319,51 +1388,6 @@ function convertJSONField(jsonField) {
     ref
   };
 }
-// src/utils/deserializer.ts
-function deserializeValue(value, fieldType) {
-  if (value === null || value === undefined)
-    return value;
-  if (fieldType === "bool") {
-    return value === 1 || value === true;
-  }
-  if (isJsonType(fieldType) && typeof value === "string") {
-    try {
-      return JSON.parse(value);
-    } catch {
-      return value;
-    }
-  }
-  return value;
-}
-function deserializeRow(row, fields) {
-  const result = { ...row };
-  for (const [fieldName, field] of Object.entries(fields)) {
-    if (fieldName in result) {
-      result[fieldName] = deserializeValue(result[fieldName], field.type);
-    }
-  }
-  return result;
-}
-function serializeValue(value, fieldType) {
-  if (value === null || value === undefined)
-    return value;
-  if (fieldType === "bool") {
-    return value ? 1 : 0;
-  }
-  if (isJsonType(fieldType) && typeof value !== "string") {
-    return JSON.stringify(value);
-  }
-  return value;
-}
-function serializeRow(data, fields) {
-  const result = { ...data };
-  for (const [fieldName, field] of Object.entries(fields)) {
-    if (fieldName in result) {
-      result[fieldName] = serializeValue(result[fieldName], field.type);
-    }
-  }
-  return result;
-}
 export {
   validateTable,
   validateSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promakeai/orm",
-  "version": "1.3.1",
+  "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

@@ -7,6 +7,7 @@
 
 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>;
@@ -22,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 */
@@ -38,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;
 
@@ -50,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;
@@ -69,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}`;
@@ -134,6 +142,30 @@ export class RestAdapter implements IDataAdapter {
     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 ====================
 
   setSchema(schema: SchemaDefinition): void {
@@ -208,7 +240,7 @@ export class RestAdapter implements IDataAdapter {
     const params = this.buildQueryParams(options);
     const url = this.urlWithParams(this.buildUrl(`/${table}/list`), params);
     const res = await this.request<{ data: T[] }>(url);
-    return res.data;
+    return this.deserializeRecords(table, res.data);
   }
 
   async get<T = unknown>(
@@ -223,7 +255,7 @@ export class RestAdapter implements IDataAdapter {
 
     try {
       const res = await this.request<{ data: T }>(url);
-      return res.data ?? null;
+      return this.deserializeRecord(table, res.data);
     } catch (err) {
       if (err instanceof Error && err.message.includes("404")) {
         return null;
@@ -288,7 +320,7 @@ export class RestAdapter implements IDataAdapter {
     if (res.id !== undefined && !("id" in result)) {
       result.id = res.id;
     }
-    return result as T;
+    return this.deserializeRecord(table, result as T) as T;
   }
 
   async update<T = unknown>(
@@ -306,7 +338,7 @@ export class RestAdapter implements IDataAdapter {
       method: "PUT",
       body: JSON.stringify(body),
     });
-    return res.data;
+    return this.deserializeRecord(table, res.data) as T;
   }
 
   async delete(table: string, id: string | number): Promise<boolean> {
@@ -392,7 +424,7 @@ export class RestAdapter implements IDataAdapter {
     if (res.id !== undefined && !("id" in result)) {
       result.id = res.id;
     }
-    return result as T;
+    return this.deserializeRecord(table, result as T) as T;
   }
 
   async upsertTranslation(
@@ -421,7 +453,7 @@ export class RestAdapter implements IDataAdapter {
       params
     );
     const res = await this.request<{ data: T[] }>(url);
-    return res.data;
+    return this.deserializeRecords(table, res.data);
   }
 
   // ==================== Raw Query Methods ====================