@ignisia/sql 0.3.0 → 0.4.1

package/dist/cjs/query/utilities.js

@@ -1,7 +1,6 @@
 'use strict';
 
 require('.');
-var constants$1 = require('../table/constants');
 var utilities = require('../utilities');
 var constants = require('./constants');
 
@@ -15,50 +14,6 @@ function getTableColumnNames(column, baseAlias, baseTable, joinedTables) {
     columns
   };
 }
-function getCondition(dialect, column, operator, value) {
-  switch (operator) {
-    case constants.AcceptedOperator.EQ:
-      return `${column} = ?`;
-    case constants.AcceptedOperator.NE:
-      return `${column} != ?`;
-    case constants.AcceptedOperator.GT:
-      return `${column} > ?`;
-    case constants.AcceptedOperator.LT:
-      return `${column} < ?`;
-    case constants.AcceptedOperator.GTE:
-      return `${column} >= ?`;
-    case constants.AcceptedOperator.LTE:
-      return `${column} <= ?`;
-    case constants.AcceptedOperator.IN:
-      return `${column} IN (${value.map(() => "?").join(", ")})`;
-    case constants.AcceptedOperator.NOT_IN:
-      return `${column} NOT IN (${value.map(() => "?").join(", ")})`;
-    case constants.AcceptedOperator.LIKE:
-      return `${column} LIKE ?`;
-    case constants.AcceptedOperator.NOT_LIKE:
-      return `${column} NOT LIKE ?`;
-    case constants.AcceptedOperator.ILIKE:
-      if (dialect === constants$1.Dialect.POSTGRES) {
-        return `${column} ILIKE ?`;
-      }
-      return `LOWER(${column}) LIKE LOWER(?)`;
-    case constants.AcceptedOperator.NOT_ILIKE:
-      if (dialect === constants$1.Dialect.POSTGRES) {
-        return `${column} NOT ILIKE ?`;
-      }
-      return `LOWER(${column}) NOT LIKE LOWER(?)`;
-    case constants.AcceptedOperator.IS_NULL:
-      return `${column} IS NULL`;
-    case constants.AcceptedOperator.IS_NOT_NULL:
-      return `${column} IS NOT NULL`;
-    case constants.AcceptedOperator.BETWEEN:
-      return `${column} BETWEEN ? AND ?`;
-    case constants.AcceptedOperator.NOT_BETWEEN:
-      return `${column} NOT BETWEEN ? AND ?`;
-    default:
-      throw new Error("Invalid operator");
-  }
-}
 function getTimestamp(table) {
   const isWithTimestamp = !!table.timestamp;
   const timestamp = /* @__PURE__ */ new Date();
@@ -72,13 +27,13 @@ function getTimestamp(table) {
       if (typeof table.timestamp.createdAt === "string") {
         createdAt = table.timestamp.createdAt;
       }
-      isHasCreatedAt = table.timestamp.createdAt === false;
+      isHasCreatedAt = table.timestamp.createdAt !== false;
     }
     if (isCustomTimestamp) {
       if (typeof table.timestamp.updatedAt === "string") {
         updatedAt = table.timestamp.updatedAt;
       }
-      isHasUpdatedAt = table.timestamp.updatedAt === false;
+      isHasUpdatedAt = table.timestamp.updatedAt !== false;
     }
   }
   return {
@@ -105,23 +60,6 @@ function getParanoid(table) {
     deletedAt
   };
 }
-function getWhereConditions(q) {
-  if (q.definition.queryType === constants.QueryType.INSERT) return [];
-  const conditions = [];
-  const base = q.definition.baseAlias ?? q.table.name;
-  const { isWithParanoid, deletedAt } = getParanoid(q.table);
-  const withDeleted = !!q.definition.withDeleted;
-  const isHasConditions = !!q.definition.where?.length;
-  if (!withDeleted && isWithParanoid) {
-    const suffix = isHasConditions ? " AND" : "";
-    const column = `${base}.${utilities.quoteIdentifier(deletedAt)}`;
-    conditions.unshift(`${column} IS NULL${suffix}`);
-  }
-  if (q.definition.where?.length) {
-    conditions.push(...q.definition.where);
-  }
-  return conditions;
-}
 function getGroupByConditions(q) {
   if (q.definition.queryType !== constants.QueryType.SELECT) return [];
   if (q.definition.groupBy?.length) return q.definition.groupBy;
@@ -183,12 +121,29 @@ function parseAliasedRow({
   }
   return result;
 }
+function sanitizeParams(params) {
+  return params.map((param) => {
+    if (param === null || typeof param === "string" || typeof param === "number" || typeof param === "boolean" || typeof param === "bigint") {
+      return param;
+    }
+    if (param === void 0) {
+      return null;
+    }
+    if (param instanceof Date) {
+      return param.toISOString();
+    }
+    try {
+      return JSON.stringify(param);
+    } catch {
+      return null;
+    }
+  });
+}
 
-exports.getCondition = getCondition;
 exports.getGroupByConditions = getGroupByConditions;
 exports.getParanoid = getParanoid;
 exports.getTableColumnNames = getTableColumnNames;
 exports.getTableSelectName = getTableSelectName;
 exports.getTimestamp = getTimestamp;
-exports.getWhereConditions = getWhereConditions;
 exports.parseAliasedRow = parseAliasedRow;
+exports.sanitizeParams = sanitizeParams;

package/dist/cjs/table/index.d.cts

@@ -1,8 +1,8 @@
-export { T as Table } from '../index-CnQVnCEI.cjs';
+export { T as Table } from '../index-K07efKgt.cjs';
 import '../column/index.cjs';
 import './constants.cjs';
-import '../column/constants.cjs';
+import 'bun';
 import '../types.cjs';
 import '../query/constants.cjs';
-import 'bun';
+import '../column/constants.cjs';
 import '../column/types.cjs';

package/dist/cjs/table/types.d.cts

@@ -1,8 +1,8 @@
 import 'bun';
-export { E as ExecOptions, M as MergeTimestampParanoid, x as TableOptions, y as TableOutput, a as TimestampOptions } from '../index-CnQVnCEI.cjs';
+export { K as ExecOptions, M as MergeTimestampParanoid, H as TableOptions, I as TableOutput, h as TimestampOptions } from '../index-K07efKgt.cjs';
 import '../column/index.cjs';
 import './constants.cjs';
-import '../column/constants.cjs';
 import '../types.cjs';
 import '../query/constants.cjs';
+import '../column/constants.cjs';
 import '../column/types.cjs';

package/dist/cjs/table/utilities.d.cts

@@ -1,8 +1,8 @@
 import '../column/constants.cjs';
 import '../column/index.cjs';
 import './constants.cjs';
-export { t as createdAt, w as defineColumns, v as deletedAt, u as updatedAt } from '../index-CnQVnCEI.cjs';
+export { y as createdAt, F as defineColumns, B as deletedAt, z as updatedAt } from '../index-K07efKgt.cjs';
 import '../column/types.cjs';
+import 'bun';
 import '../types.cjs';
 import '../query/constants.cjs';
-import 'bun';

package/dist/cjs/types.d.cts

@@ -1,3 +1,7 @@
 type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+type BuildTuple<N extends number, T extends unknown[] = []> = T['length'] extends N ? T : BuildTuple<N, [...T, unknown]>;
+type Add<A extends number, B extends number, Result extends unknown[] = [...BuildTuple<A>, ...BuildTuple<B>]> = Result['length'] extends number ? Result['length'] : never;
+type Subtract<A extends number, B extends number> = BuildTuple<A> extends [...BuildTuple<B>, ...infer Rest] ? Rest['length'] : never;
+type Multiply<A extends number, B extends number, Result extends unknown[] = []> = B extends 0 ? Result['length'] : Multiply<A, Subtract<B, 1>, [...Result, ...BuildTuple<A>]>;
 
-export type { UnionToIntersection };
+export type { Add, BuildTuple, Multiply, Subtract, UnionToIntersection };

package/dist/cjs/utilities.d.cts

@@ -1,4 +1,5 @@
 declare function deepClone<T>(obj: T): T;
+declare function cloneDefinition<T extends Record<string, unknown>>(def: T): T;
 declare function quoteIdentifier<T extends string, U extends `"${T}"`>(identifier: T): U;
 
-export { deepClone, quoteIdentifier };
+export { cloneDefinition, deepClone, quoteIdentifier };

package/dist/cjs/utilities.js

@@ -13,9 +13,31 @@ function deepClone(obj) {
   }
   return obj;
 }
+function cloneArray(arr) {
+  if (arr.length === 0) return [];
+  if (typeof arr[0] === "object" && arr[0] !== null) {
+    return arr.map((item) => ({ ...item }));
+  }
+  return arr.slice();
+}
+function cloneDefinition(def) {
+  const clone = {};
+  for (const key in def) {
+    const val = def[key];
+    if (val === null || typeof val !== "object") {
+      clone[key] = val;
+    } else if (Array.isArray(val)) {
+      clone[key] = cloneArray(val);
+    } else {
+      clone[key] = { ...val };
+    }
+  }
+  return clone;
+}
 function quoteIdentifier(identifier) {
   return `"${identifier.replace(/"/g, '""')}"`;
 }
 
+exports.cloneDefinition = cloneDefinition;
 exports.deepClone = deepClone;
 exports.quoteIdentifier = quoteIdentifier;

package/dist/esm/column/index.js

@@ -1,5 +1,5 @@
 import { Dialect } from '../table/constants.js';
-import { deepClone } from '../utilities.js';
+import { cloneDefinition } from '../utilities.js';
 import { ColumnTypeMapping, AcceptedColumnTypes } from './constants.js';
 import { columnProperty } from './utils.js';
 
@@ -20,14 +20,7 @@ var Column = class _Column {
     if ("values" in options) {
       this.enums = options.values;
     }
-    this.definition = {
-      autoIncrement: false,
-      primaryKey: false,
-      notNull: false,
-      unique: false,
-      comment: null,
-      default: void 0
-    };
+    this.definition = {};
   }
   static define(options) {
     return new _Column(options);
@@ -66,7 +59,7 @@ var Column = class _Column {
       ...this.length && { length: this.length },
       ...this.enums.length && { values: this.enums }
     });
-    Object.assign(column.definition, deepClone(this.definition));
+    Object.assign(column.definition, cloneDefinition(this.definition));
     return column;
   }
   toQuery() {

package/dist/esm/database/alter.d.ts

@@ -1,7 +1,7 @@
-import { D as Database } from '../index-BXOAxB_h.js';
+import { D as Database } from '../index-B4y4GiNB.js';
 import { Column } from '../column/index.js';
 import { AcceptedColumnTypes } from '../column/constants.js';
-import { T as Table, D as DatabaseDefinition } from '../index-BdpoD4zk.js';
+import { T as Table, D as DatabaseDefinition } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/column.d.ts

@@ -1,6 +1,6 @@
-import { D as Database } from '../index-BXOAxB_h.js';
+import { D as Database } from '../index-B4y4GiNB.js';
 import { Column } from '../column/index.js';
-import { T as Table, D as DatabaseDefinition } from '../index-BdpoD4zk.js';
+import { T as Table, D as DatabaseDefinition } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/contract.d.ts

@@ -1,7 +1,7 @@
-export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-BXOAxB_h.js';
+export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-B4y4GiNB.js';
 import '../column/index.js';
 import '../column/constants.js';
-import '../index-BdpoD4zk.js';
+import '../index-CARBkj9h.js';
 import '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/index.d.ts

@@ -1,9 +1,9 @@
 import 'bun';
 import '../column/index.js';
-import '../index-BdpoD4zk.js';
+import '../index-CARBkj9h.js';
 import '../query/constants.js';
 import '../table/constants.js';
-export { D as Database } from '../index-BXOAxB_h.js';
+export { D as Database } from '../index-B4y4GiNB.js';
 import '../column/constants.js';
 import '../column/types.js';
 import '../types.js';

package/dist/esm/database/index.js

@@ -1,6 +1,6 @@
 import '../table/index.js';
 import { Dialect } from '../table/constants.js';
-import { alterColumnType, setColumnDefault, dropColumnDefault, dropColumnNotNull } from './alter.js';
+import { alterColumnType, setColumnDefault, dropColumnDefault, setColumnNotNull, dropColumnNotNull } from './alter.js';
 import { addColumn, renameColumn, dropColumn } from './column.js';
 import { createTable, renameTable, dropTable } from './table.js';
 import { DatabaseMysql, DatabasePsql, DatabaseSqlite } from './wrapper.js';
@@ -53,7 +53,7 @@ var Database = class _Database {
     this.dropColumnDefault = dropColumnDefault.bind(
       this
     );
-    this.setColumnNotNull = setColumnDefault.bind(
+    this.setColumnNotNull = setColumnNotNull.bind(
       this
     );
     this.dropColumnNotNull = dropColumnNotNull.bind(

package/dist/esm/database/table.d.ts

@@ -1,6 +1,6 @@
-import { D as Database } from '../index-BXOAxB_h.js';
+import { D as Database } from '../index-B4y4GiNB.js';
 import { Column } from '../column/index.js';
-import { T as Table, D as DatabaseDefinition, a as TimestampOptions, M as MergeTimestampParanoid } from '../index-BdpoD4zk.js';
+import { T as Table, D as DatabaseDefinition, c as TimestampOptions, M as MergeTimestampParanoid } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/types.d.ts

@@ -1,6 +1,6 @@
 import 'bun';
 import '../column/index.js';
-export { D as DatabaseDefinition, b as DatabaseDialect, c as DatabaseExecOptions, i as DatabaseOptions, s as MysqlConfig, P as PostgresConfig, r as SqlConfig, S as SqlConfigMapping, d as SqliteConfig } from '../index-BdpoD4zk.js';
+export { D as DatabaseDefinition, d as DatabaseDialect, e as DatabaseExecOptions, o as DatabaseOptions, f as MysqlConfig, P as PostgresConfig, x as SqlConfig, S as SqlConfigMapping, g as SqliteConfig } from '../index-CARBkj9h.js';
 import '../table/constants.js';
 import '../column/constants.js';
 import '../column/types.js';

package/dist/esm/database/wrapper.d.ts

@@ -1,6 +1,6 @@
 import { SQL, TransactionSQL } from 'bun';
 import { Dialect } from '../table/constants.js';
-import { S as SqlConfigMapping, b as DatabaseDialect, c as DatabaseExecOptions, P as PostgresConfig, d as SqliteConfig } from '../index-BdpoD4zk.js';
+import { S as SqlConfigMapping, d as DatabaseDialect, e as DatabaseExecOptions, P as PostgresConfig, f as MysqlConfig, g as SqliteConfig } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import '../column/constants.js';
 import '../column/types.js';
@@ -22,8 +22,8 @@ declare class BaseSql<DbDialect extends Dialect, Options extends SqlConfigMappin
 declare class DatabasePsql extends BaseSql<typeof Dialect.POSTGRES, PostgresConfig> {
     constructor(options: PostgresConfig);
 }
-declare class DatabaseMysql extends BaseSql<typeof Dialect.MYSQL, PostgresConfig> {
-    constructor(options: PostgresConfig);
+declare class DatabaseMysql extends BaseSql<typeof Dialect.MYSQL, MysqlConfig> {
+    constructor(options: MysqlConfig);
 }
 declare class DatabaseSqlite extends BaseSql<typeof Dialect.SQLITE, SqliteConfig> {
     constructor(options: SqliteConfig);

package/dist/esm/database/wrapper.js

@@ -39,23 +39,7 @@ var BaseSql = class {
     if (!options.params) {
       return client.unsafe(options.sql);
     }
-    const params = (options.params ?? []).map((param) => {
-      if (param === null || typeof param === "string" || typeof param === "number" || typeof param === "boolean" || typeof param === "bigint") {
-        return param;
-      }
-      if (param === void 0) {
-        return null;
-      }
-      if (param instanceof Date) {
-        return param.toISOString();
-      }
-      try {
-        return JSON.stringify(param);
-      } catch {
-        return null;
-      }
-    });
-    return client.unsafe(options.sql, params);
+    return client.unsafe(options.sql, options.params);
   }
   async transaction(fn) {
     return this.client.transaction(fn);

package/dist/esm/{index-BXOAxB_h.d.ts → index-B4y4GiNB.d.ts}

@@ -1,6 +1,6 @@
 import { TransactionSQL } from 'bun';
 import { Column } from './column/index.js';
-import { T as Table, D as DatabaseDefinition, a as TimestampOptions, M as MergeTimestampParanoid, h as QuerHooks, b as DatabaseDialect, i as DatabaseOptions, f as QueryBuilder, j as QueryRunHooks } from './index-BdpoD4zk.js';
+import { T as Table, D as DatabaseDefinition, c as TimestampOptions, M as MergeTimestampParanoid, n as QueryHooks, d as DatabaseDialect, o as DatabaseOptions, i as QueryBuilder, p as QueryRunHooks } from './index-CARBkj9h.js';
 import { QueryHooksType } from './query/constants.js';
 import { Dialect } from './table/constants.js';
 import { AcceptedColumnTypes } from './column/constants.js';
@@ -77,7 +77,7 @@ interface ColumnAlterationContract<DbDialect extends Dialect, Tables extends Rec
 }
 
 declare class Database<DbDialect extends Dialect, Tables extends Record<string, Table<string, Record<string, Column>>>, Definition extends Partial<DatabaseDefinition<DbDialect>> = DatabaseDefinition<DbDialect>> {
-    readonly hooks: Partial<QuerHooks>;
+    readonly hooks: Partial<QueryHooks>;
     readonly dialect: DbDialect;
     readonly defintion: Definition;
     readonly tables: Tables;