@promakeai/orm 1.3.0 → 1.3.2

package/dist/adapters/RestAdapter.d.ts

@@ -43,6 +43,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);
@@ -653,6 +699,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 +783,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 +794,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 +841,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 +853,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 +913,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 +929,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 +1383,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.0",
+  "version": "1.3.2",
   "description": "Database-agnostic ORM core - works in browser and Node.js",
   "type": "module",
   "main": "./dist/index.js",

package/src/adapters/RestAdapter.ts

@@ -5,9 +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 { 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>;
 
@@ -129,10 +130,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 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 ====================
 
@@ -204,12 +229,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 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,
@@ -221,12 +246,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 res.data ?? null;
-    } 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;
     }
@@ -279,17 +304,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 result 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,
@@ -302,12 +327,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 res.data;
-  }
+    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}`);
@@ -383,17 +408,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 result 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,
@@ -416,13 +441,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 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 ====================