@type32/tauri-sqlite-orm 0.2.11 → 0.2.13

package/dist/index.js

@@ -269,6 +269,107 @@ var between = (column, min2, max2) => ({
   params: [min2, max2]
 });
 
+// src/serialization.ts
+function serializeValue(value, column) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  const { dataType, mode } = column._;
+  if (dataType === "TEXT") {
+    if (mode === "json") {
+      return typeof value === "string" ? value : JSON.stringify(value);
+    }
+    return String(value);
+  }
+  if (dataType === "INTEGER") {
+    if (mode === "timestamp" || mode === "timestamp_ms") {
+      if (value instanceof Date) {
+        return mode === "timestamp_ms" ? value.getTime() : Math.floor(value.getTime() / 1e3);
+      }
+      return typeof value === "number" ? value : parseInt(String(value), 10);
+    }
+    if (mode === "boolean") {
+      return value ? 1 : 0;
+    }
+    return typeof value === "number" ? Math.floor(value) : parseInt(String(value), 10);
+  }
+  if (dataType === "REAL") {
+    return typeof value === "number" ? value : parseFloat(String(value));
+  }
+  if (dataType === "BOOLEAN") {
+    return value ? 1 : 0;
+  }
+  if (dataType === "BLOB") {
+    if (mode === "json") {
+      return typeof value === "string" ? value : JSON.stringify(value);
+    }
+    if (mode === "bigint") {
+      return String(value);
+    }
+    return value;
+  }
+  if (dataType === "NUMERIC") {
+    if (mode === "bigint") {
+      return String(value);
+    }
+    return typeof value === "number" ? value : parseFloat(String(value));
+  }
+  return value;
+}
+function deserializeValue(value, column) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  const { dataType, mode } = column._;
+  if (dataType === "TEXT") {
+    if (mode === "json") {
+      try {
+        return JSON.parse(value);
+      } catch {
+        return value;
+      }
+    }
+    return value;
+  }
+  if (dataType === "INTEGER") {
+    if (mode === "timestamp" || mode === "timestamp_ms") {
+      const num = typeof value === "string" ? parseInt(value, 10) : value;
+      if (isNaN(num)) return null;
+      return mode === "timestamp_ms" ? new Date(num) : new Date(num * 1e3);
+    }
+    if (mode === "boolean") {
+      return value === 1 || value === "1" || value === true;
+    }
+    return typeof value === "string" ? parseInt(value, 10) : value;
+  }
+  if (dataType === "REAL") {
+    return typeof value === "string" ? parseFloat(value) : value;
+  }
+  if (dataType === "BOOLEAN") {
+    return value === 1 || value === "1" || value === true;
+  }
+  if (dataType === "BLOB") {
+    if (mode === "json") {
+      try {
+        return JSON.parse(value);
+      } catch {
+        return value;
+      }
+    }
+    if (mode === "bigint") {
+      return typeof value === "string" ? BigInt(value) : BigInt(value);
+    }
+    return value;
+  }
+  if (dataType === "NUMERIC") {
+    if (mode === "bigint") {
+      return typeof value === "string" ? BigInt(value) : BigInt(value);
+    }
+    return typeof value === "string" ? parseFloat(value) : value;
+  }
+  return value;
+}
+
 // src/builders/select.ts
 var SelectQueryBuilder = class extends BaseQueryBuilder {
   constructor(db, table, columns) {
@@ -428,9 +529,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   async execute() {
     const { sql: joinSql, params: joinParams } = this.buildJoins();
     const distinct = this.isDistinct ? "DISTINCT " : "";
-    this.query = `SELECT ${distinct}${this.selectedColumns.join(", ")} ${this.query}`;
-    this.query += joinSql;
-    this.params.push(...joinParams);
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    this.query = `SELECT ${distinct}${this.selectedColumns.join(", ")} ${fromPart}${joinSql}${wherePart}`;
+    this.params = [...joinParams, ...this.params];
     const { sql: sql2, params } = this.build();
     const rawResults = await this.db.select(sql2, params);
     const hasIncludes = Object.values(this.includeRelations).some((i) => i);
@@ -445,10 +552,12 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     return rawResults.map((row) => {
       const newRow = {};
       for (const key in row) {
-        if (key.startsWith(prefix)) {
-          newRow[key.substring(prefix.length)] = row[key];
+        const columnName = key.startsWith(prefix) ? key.substring(prefix.length) : key;
+        const column = this.table._.columns[columnName];
+        if (column) {
+          newRow[columnName] = deserializeValue(row[key], column);
         } else {
-          newRow[key] = row[key];
+          newRow[columnName] = row[key];
         }
       }
       return newRow;
@@ -502,18 +611,23 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
         if (key.includes(".")) {
           const [tableAlias, columnName] = key.split(".");
           if (tableAlias === this.selectedTableAlias) {
-            result[columnName] = value;
+            const column = this.table._.columns[columnName];
+            result[columnName] = column ? deserializeValue(value, column) : value;
           } else {
             const relationPath = parseRelationPath(tableAlias, this.selectedTableAlias);
             if (relationPath.length > 0) {
-              setNestedValue(relations2, relationPath, value, columnName);
+              const relationConfig = getNestedRelation(this.table, relationPath);
+              const column = relationConfig?.foreignTable?._.columns?.[columnName];
+              const deserializedValue = column ? deserializeValue(value, column) : value;
+              setNestedValue(relations2, relationPath, deserializedValue, columnName);
             } else {
               if (!result[tableAlias]) result[tableAlias] = {};
               result[tableAlias][columnName] = value;
             }
           }
         } else {
-          result[key] = value;
+          const column = this.table._.columns[key];
+          result[key] = column ? deserializeValue(value, column) : value;
         }
       }
       const attachRelations = (target, relationsData, table, pathPrefix = []) => {
@@ -598,8 +712,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const originalColumns = this.selectedColumns;
     this.selectedColumns = ["1"];
     const { sql: joinSql, params: joinParams } = this.buildJoins();
-    const query = `SELECT 1 ${this.query}${joinSql} LIMIT 1`;
-    const params = [...this.params, ...joinParams];
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    const query = `SELECT 1 ${fromPart}${joinSql}${wherePart} LIMIT 1`;
+    const params = [...joinParams, ...this.params];
     this.selectedColumns = originalColumns;
     const result = await this.db.select(query, params);
     return result.length > 0;
@@ -608,8 +729,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const originalColumns = this.selectedColumns;
     this.selectedColumns = ["COUNT(*) as count"];
     const { sql: joinSql, params: joinParams } = this.buildJoins();
-    const query = `SELECT COUNT(*) as count ${this.query}${joinSql}`;
-    const params = [...this.params, ...joinParams];
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    const query = `SELECT COUNT(*) as count ${fromPart}${joinSql}${wherePart}`;
+    const params = [...joinParams, ...this.params];
     this.selectedColumns = originalColumns;
     const result = await this.db.select(query, params);
     return result[0]?.count || 0;
@@ -622,11 +750,19 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const originalColumns = this.selectedColumns;
     this.selectedColumns = [`${this.selectedTableAlias}.${columnName} AS "${columnName}"`];
     const { sql: joinSql, params: joinParams } = this.buildJoins();
-    const query = `SELECT ${this.selectedColumns.join(", ")} ${this.query}${joinSql}`;
-    const params = [...this.params, ...joinParams];
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    const query = `SELECT ${this.selectedColumns.join(", ")} ${fromPart}${joinSql}${wherePart}`;
+    const params = [...joinParams, ...this.params];
     this.selectedColumns = originalColumns;
     const results = await this.db.select(query, params);
-    return results.map((row) => row[columnName]);
+    const col = this.table._.columns[column];
+    return results.map((row) => col ? deserializeValue(row[columnName], col) : row[columnName]);
   }
   async paginate(page = 1, pageSize = 10) {
     if (page < 1) page = 1;
@@ -799,7 +935,7 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
           throw new ColumnNotFoundError(key, this.table._.name);
         }
         setClauses.push(`${column._.name} = ?`);
-        setParams.push(value);
+        setParams.push(serializeValue(value, column));
       }
     }
     for (const op of this.incrementDecrementOps) {
@@ -946,11 +1082,18 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
         ", "
       )}) VALUES ${valuesSql}${conflictClause}`;
       const params = dataSets.flatMap(
-        (data) => columns.map((col) => data[col] ?? null)
+        (data) => columns.map((col) => {
+          const value = data[col] ?? null;
+          const column = this.table._.columns[col];
+          return column ? serializeValue(value, column) : value;
+        })
       );
       if (this.onConflictAction === "update") {
         const setValues = Object.entries(this.updateSet).map(
-          ([, value]) => value
+          ([key, value]) => {
+            const column = this.table._.columns[key];
+            return column ? serializeValue(value, column) : value;
+          }
         );
         params.push(...setValues);
       }
@@ -1002,11 +1145,18 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
       ", "
     )}) VALUES ${valuesSql}${conflictClause}`;
     const params = processedDataSets.flatMap(
-      (data) => columns.map((col) => data[col] ?? null)
+      (data) => columns.map((col) => {
+        const value = data[col] ?? null;
+        const column = this.table._.columns[col];
+        return column ? serializeValue(value, column) : value;
+      })
     );
     if (this.onConflictAction === "update") {
       const setValues = Object.entries(this.updateSet).map(
-        ([, value]) => value
+        ([key, value]) => {
+          const column = this.table._.columns[key];
+          return column ? serializeValue(value, column) : value;
+        }
       );
       params.push(...setValues);
     }

package/dist/index.mjs

@@ -170,6 +170,107 @@ var between = (column, min2, max2) => ({
   params: [min2, max2]
 });
 
+// src/serialization.ts
+function serializeValue(value, column) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  const { dataType, mode } = column._;
+  if (dataType === "TEXT") {
+    if (mode === "json") {
+      return typeof value === "string" ? value : JSON.stringify(value);
+    }
+    return String(value);
+  }
+  if (dataType === "INTEGER") {
+    if (mode === "timestamp" || mode === "timestamp_ms") {
+      if (value instanceof Date) {
+        return mode === "timestamp_ms" ? value.getTime() : Math.floor(value.getTime() / 1e3);
+      }
+      return typeof value === "number" ? value : parseInt(String(value), 10);
+    }
+    if (mode === "boolean") {
+      return value ? 1 : 0;
+    }
+    return typeof value === "number" ? Math.floor(value) : parseInt(String(value), 10);
+  }
+  if (dataType === "REAL") {
+    return typeof value === "number" ? value : parseFloat(String(value));
+  }
+  if (dataType === "BOOLEAN") {
+    return value ? 1 : 0;
+  }
+  if (dataType === "BLOB") {
+    if (mode === "json") {
+      return typeof value === "string" ? value : JSON.stringify(value);
+    }
+    if (mode === "bigint") {
+      return String(value);
+    }
+    return value;
+  }
+  if (dataType === "NUMERIC") {
+    if (mode === "bigint") {
+      return String(value);
+    }
+    return typeof value === "number" ? value : parseFloat(String(value));
+  }
+  return value;
+}
+function deserializeValue(value, column) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  const { dataType, mode } = column._;
+  if (dataType === "TEXT") {
+    if (mode === "json") {
+      try {
+        return JSON.parse(value);
+      } catch {
+        return value;
+      }
+    }
+    return value;
+  }
+  if (dataType === "INTEGER") {
+    if (mode === "timestamp" || mode === "timestamp_ms") {
+      const num = typeof value === "string" ? parseInt(value, 10) : value;
+      if (isNaN(num)) return null;
+      return mode === "timestamp_ms" ? new Date(num) : new Date(num * 1e3);
+    }
+    if (mode === "boolean") {
+      return value === 1 || value === "1" || value === true;
+    }
+    return typeof value === "string" ? parseInt(value, 10) : value;
+  }
+  if (dataType === "REAL") {
+    return typeof value === "string" ? parseFloat(value) : value;
+  }
+  if (dataType === "BOOLEAN") {
+    return value === 1 || value === "1" || value === true;
+  }
+  if (dataType === "BLOB") {
+    if (mode === "json") {
+      try {
+        return JSON.parse(value);
+      } catch {
+        return value;
+      }
+    }
+    if (mode === "bigint") {
+      return typeof value === "string" ? BigInt(value) : BigInt(value);
+    }
+    return value;
+  }
+  if (dataType === "NUMERIC") {
+    if (mode === "bigint") {
+      return typeof value === "string" ? BigInt(value) : BigInt(value);
+    }
+    return typeof value === "string" ? parseFloat(value) : value;
+  }
+  return value;
+}
+
 // src/builders/select.ts
 var SelectQueryBuilder = class extends BaseQueryBuilder {
   constructor(db, table, columns) {
@@ -329,9 +430,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   async execute() {
     const { sql: joinSql, params: joinParams } = this.buildJoins();
     const distinct = this.isDistinct ? "DISTINCT " : "";
-    this.query = `SELECT ${distinct}${this.selectedColumns.join(", ")} ${this.query}`;
-    this.query += joinSql;
-    this.params.push(...joinParams);
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    this.query = `SELECT ${distinct}${this.selectedColumns.join(", ")} ${fromPart}${joinSql}${wherePart}`;
+    this.params = [...joinParams, ...this.params];
     const { sql: sql2, params } = this.build();
     const rawResults = await this.db.select(sql2, params);
     const hasIncludes = Object.values(this.includeRelations).some((i) => i);
@@ -346,10 +453,12 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     return rawResults.map((row) => {
       const newRow = {};
       for (const key in row) {
-        if (key.startsWith(prefix)) {
-          newRow[key.substring(prefix.length)] = row[key];
+        const columnName = key.startsWith(prefix) ? key.substring(prefix.length) : key;
+        const column = this.table._.columns[columnName];
+        if (column) {
+          newRow[columnName] = deserializeValue(row[key], column);
         } else {
-          newRow[key] = row[key];
+          newRow[columnName] = row[key];
         }
       }
       return newRow;
@@ -403,18 +512,23 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
         if (key.includes(".")) {
           const [tableAlias, columnName] = key.split(".");
           if (tableAlias === this.selectedTableAlias) {
-            result[columnName] = value;
+            const column = this.table._.columns[columnName];
+            result[columnName] = column ? deserializeValue(value, column) : value;
           } else {
             const relationPath = parseRelationPath(tableAlias, this.selectedTableAlias);
             if (relationPath.length > 0) {
-              setNestedValue(relations2, relationPath, value, columnName);
+              const relationConfig = getNestedRelation(this.table, relationPath);
+              const column = relationConfig?.foreignTable?._.columns?.[columnName];
+              const deserializedValue = column ? deserializeValue(value, column) : value;
+              setNestedValue(relations2, relationPath, deserializedValue, columnName);
             } else {
               if (!result[tableAlias]) result[tableAlias] = {};
               result[tableAlias][columnName] = value;
             }
           }
         } else {
-          result[key] = value;
+          const column = this.table._.columns[key];
+          result[key] = column ? deserializeValue(value, column) : value;
         }
       }
       const attachRelations = (target, relationsData, table, pathPrefix = []) => {
@@ -499,8 +613,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const originalColumns = this.selectedColumns;
     this.selectedColumns = ["1"];
     const { sql: joinSql, params: joinParams } = this.buildJoins();
-    const query = `SELECT 1 ${this.query}${joinSql} LIMIT 1`;
-    const params = [...this.params, ...joinParams];
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    const query = `SELECT 1 ${fromPart}${joinSql}${wherePart} LIMIT 1`;
+    const params = [...joinParams, ...this.params];
     this.selectedColumns = originalColumns;
     const result = await this.db.select(query, params);
     return result.length > 0;
@@ -509,8 +630,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const originalColumns = this.selectedColumns;
     this.selectedColumns = ["COUNT(*) as count"];
     const { sql: joinSql, params: joinParams } = this.buildJoins();
-    const query = `SELECT COUNT(*) as count ${this.query}${joinSql}`;
-    const params = [...this.params, ...joinParams];
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    const query = `SELECT COUNT(*) as count ${fromPart}${joinSql}${wherePart}`;
+    const params = [...joinParams, ...this.params];
     this.selectedColumns = originalColumns;
     const result = await this.db.select(query, params);
     return result[0]?.count || 0;
@@ -523,11 +651,19 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const originalColumns = this.selectedColumns;
     this.selectedColumns = [`${this.selectedTableAlias}.${columnName} AS "${columnName}"`];
     const { sql: joinSql, params: joinParams } = this.buildJoins();
-    const query = `SELECT ${this.selectedColumns.join(", ")} ${this.query}${joinSql}`;
-    const params = [...this.params, ...joinParams];
+    const whereIndex = this.query.indexOf(" WHERE ");
+    let fromPart = this.query;
+    let wherePart = "";
+    if (whereIndex !== -1) {
+      fromPart = this.query.substring(0, whereIndex);
+      wherePart = this.query.substring(whereIndex);
+    }
+    const query = `SELECT ${this.selectedColumns.join(", ")} ${fromPart}${joinSql}${wherePart}`;
+    const params = [...joinParams, ...this.params];
     this.selectedColumns = originalColumns;
     const results = await this.db.select(query, params);
-    return results.map((row) => row[columnName]);
+    const col = this.table._.columns[column];
+    return results.map((row) => col ? deserializeValue(row[columnName], col) : row[columnName]);
   }
   async paginate(page = 1, pageSize = 10) {
     if (page < 1) page = 1;
@@ -700,7 +836,7 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
           throw new ColumnNotFoundError(key, this.table._.name);
         }
         setClauses.push(`${column._.name} = ?`);
-        setParams.push(value);
+        setParams.push(serializeValue(value, column));
       }
     }
     for (const op of this.incrementDecrementOps) {
@@ -847,11 +983,18 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
         ", "
       )}) VALUES ${valuesSql}${conflictClause}`;
       const params = dataSets.flatMap(
-        (data) => columns.map((col) => data[col] ?? null)
+        (data) => columns.map((col) => {
+          const value = data[col] ?? null;
+          const column = this.table._.columns[col];
+          return column ? serializeValue(value, column) : value;
+        })
       );
       if (this.onConflictAction === "update") {
         const setValues = Object.entries(this.updateSet).map(
-          ([, value]) => value
+          ([key, value]) => {
+            const column = this.table._.columns[key];
+            return column ? serializeValue(value, column) : value;
+          }
         );
         params.push(...setValues);
       }
@@ -903,11 +1046,18 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
       ", "
     )}) VALUES ${valuesSql}${conflictClause}`;
     const params = processedDataSets.flatMap(
-      (data) => columns.map((col) => data[col] ?? null)
+      (data) => columns.map((col) => {
+        const value = data[col] ?? null;
+        const column = this.table._.columns[col];
+        return column ? serializeValue(value, column) : value;
+      })
     );
     if (this.onConflictAction === "update") {
       const setValues = Object.entries(this.updateSet).map(
-        ([, value]) => value
+        ([key, value]) => {
+          const column = this.table._.columns[key];
+          return column ? serializeValue(value, column) : value;
+        }
       );
       params.push(...setValues);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@type32/tauri-sqlite-orm",
-    "version": "0.2.11",
+    "version": "0.2.13",
     "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",