@stamhoofd/sql 2.118.1 → 2.120.0

package/dist/{src/ModelCache.d.ts → ModelCache.d.ts}

@@ -1,4 +1,4 @@
-import { QueryableModel } from './QueryableModel.js';
+import type { QueryableModel } from './QueryableModel.js';
 import { LRUCache } from 'lru-cache';
 /**
  * There simply is no reason not to cache data in memory for the most used models.

package/dist/ModelCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelCache.d.ts","sourceRoot":"","sources":["../src/ModelCache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC;;GAEG;AACH,qBAAa,UAAU,CAAC,CAAC,SAAS,cAAc;IAC5C,KAAK,wCAEF;IAEH,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQ3B,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC;IA2BtB,KAAK,CAAC,KAAK,EAAE,CAAC;IAUd,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;CAG9B"}

package/{src/ModelCache.ts → dist/ModelCache.js}

@@ -1,27 +1,22 @@
 import { AutoEncoder } from '@simonbackx/simple-encoding';
-import { QueryableModel } from './QueryableModel.js';
 import { LRUCache } from 'lru-cache';
-
 /**
  * There simply is no reason not to cache data in memory for the most used models.
  */
-export class ModelCache<M extends QueryableModel> {
-    cache = new LRUCache<string | number, M>({
+export class ModelCache {
+    cache = new LRUCache({
         max: 1000,
     });
-
-    getById(id: string | number) {
+    getById(id) {
         const base = this.cache.get(id);
         if (!base) {
             return base;
         }
         return this.deepClone(base);
     }
-
-    deepClone(model: M): M {
+    deepClone(model) {
         const copy = new model.static();
         copy.copyFrom(model);
-
         for (const column of copy.static.columns.values()) {
             try {
                 this[column.name] = structuredClone(model[column.name]);
@@ -37,15 +32,12 @@ export class ModelCache<M extends QueryableModel> {
                 }
             }
         }
-
         if (!copy.existsInDatabase) {
             throw new Error('Unexpected not exists');
         }
-
-        return copy as M;
+        return copy;
     }
-
-    store(model: M) {
+    store(model) {
         const clone = this.deepClone(model);
         const id = clone.getPrimaryKey();
         if (!id) {
@@ -54,8 +46,8 @@ export class ModelCache<M extends QueryableModel> {
         }
         this.cache.set(id, model);
     }
-
-    clearId(id: string | number) {
+    clearId(id) {
         this.cache.delete(id);
     }
 }
+//# sourceMappingURL=ModelCache.js.map

package/dist/ModelCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelCache.js","sourceRoot":"","sources":["../src/ModelCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC;;GAEG;AACH,MAAM,OAAO,UAAU;IACnB,KAAK,GAAG,IAAI,QAAQ,CAAqB;QACrC,GAAG,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,OAAO,CAAC,EAAmB;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,KAAQ;QACd,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAErB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,IAAI,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,CAAC,EAAE,CAAC;gBACP,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChE,yBAAyB;gBACzB,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,WAAW,EAAE,CAAC;oBAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;gBACnD,CAAC;qBACI,CAAC;oBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC3C,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC7C,CAAC;QAED,OAAO,IAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,KAAQ;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;QACjC,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;YAC7D,OAAO;QACX,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,EAAmB;QACvB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;CACJ"}

package/dist/{src/QueryableModel.d.ts → QueryableModel.d.ts}

@@ -1,10 +1,11 @@
-import { Model, SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import { Model } from '@simonbackx/simple-database';
 import { SQLSelect } from './SQLSelect.js';
-import { SQLDelete } from './SQLDelete.js';
-import { SQLUpdate } from './SQLUpdate.js';
-import { SQLInsert } from './SQLInsert.js';
-import { SQLExpression } from './SQLExpression.js';
-import { ModelCache } from './ModelCache.js';
+import type { SQLDelete } from './SQLDelete.js';
+import type { SQLUpdate } from './SQLUpdate.js';
+import type { SQLInsert } from './SQLInsert.js';
+import type { SQLExpression } from './SQLExpression.js';
+import type { ModelCache } from './ModelCache.js';
 export declare class QueryableModel extends Model {
     rawSelectedRow: SQLResultNamespacedRow | null;
     static cache: ModelCache<QueryableModel> | null;

package/dist/QueryableModel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryableModel.d.ts","sourceRoot":"","sources":["../src/QueryableModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,qBAAa,cAAe,SAAQ,KAAK;IACrC,cAAc,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IACrD,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,IAAI,CAAQ;IAEvD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,OAAO,KAAK,GAAG,OAAO,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAyB1I,MAAM,CAAC,MAAM,IAAI,SAAS;IAI1B,MAAM,CAAC,MAAM,IAAI,SAAS;IAI1B,MAAM,CAAC,MAAM,IAAI,SAAS;IAIpB,OAAO;WAWA,UAAU,CAAC,CAAC,SAAS,OAAO,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE;IAuBzF;;;OAGG;WACmB,OAAO,CAAC,CAAC,SAAS,OAAO,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;WAC/H,OAAO,CAAC,CAAC,SAAS,OAAO,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,cAAc,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAYjJ;;;OAGG;WACmB,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,cAAc,EAAE,GAAG,GAAG,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;CA4BnJ"}

package/dist/{src/QueryableModel.js → QueryableModel.js}

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryableModel = void 0;
-const simple_database_1 = require("@simonbackx/simple-database");
-const SQLSelect_js_1 = require("./SQLSelect.js");
-const SQL_js_1 = require("./SQL.js");
-class QueryableModel extends simple_database_1.Model {
+import { Model } from '@simonbackx/simple-database';
+import { SQLSelect } from './SQLSelect.js';
+import { SQL } from './SQL.js';
+export class QueryableModel extends Model {
     rawSelectedRow = null;
     static cache = null;
     static select(...columns) {
@@ -23,17 +20,17 @@ class QueryableModel extends simple_database_1.Model {
             }
             return d;
         };
-        const select = new SQLSelect_js_1.SQLSelect(transformer, ...(columns.length === 0 ? [SQL_js_1.SQL.wildcard()] : columns));
-        return select.from(SQL_js_1.SQL.table(this.table));
+        const select = new SQLSelect(transformer, ...(columns.length === 0 ? [SQL.wildcard()] : columns));
+        return select.from(SQL.table(this.table));
     }
     static delete() {
-        return SQL_js_1.SQL.delete().from(SQL_js_1.SQL.table(this.table));
+        return SQL.delete().from(SQL.table(this.table));
     }
     static update() {
-        return SQL_js_1.SQL.update(SQL_js_1.SQL.table(this.table));
+        return SQL.update(SQL.table(this.table));
     }
     static insert() {
-        return SQL_js_1.SQL.insert(SQL_js_1.SQL.table(this.table));
+        return SQL.insert(SQL.table(this.table));
     }
     async refresh() {
         const { fields, skipUpdate } = this.getChangedDatabaseProperties();
@@ -104,5 +101,4 @@ class QueryableModel extends simple_database_1.Model {
         return this.select().where(this.primary.name, ids).limit(ids.length).fetch();
     }
 }
-exports.QueryableModel = QueryableModel;
 //# sourceMappingURL=QueryableModel.js.map

package/dist/QueryableModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryableModel.js","sourceRoot":"","sources":["../src/QueryableModel.ts"],"names":[],"mappings":"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"}

package/dist/{src/SQL.d.ts → SQL.d.ts}

@@ -1,13 +1,15 @@
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { SQLDelete } from './SQLDelete.js';
-import { SQLExpression } from './SQLExpression.js';
-import { SQLAssignment, SQLCoalesce, SQLColumnExpression, SQLColumnExpressionParams, SQLDistinct, SQLIf, SQLIsNull, SQLJSONTableExpression, SQLScalarValue, SQLTableExpression, SQLWildcardSelectExpression } from './SQLExpressions.js';
+import type { SQLExpression } from './SQLExpression.js';
+import type { SQLColumnExpressionParams, SQLScalarValue } from './SQLExpressions.js';
+import { SQLAssignment, SQLCoalesce, SQLColumnExpression, SQLDistinct, SQLIf, SQLIsNull, SQLJSONTableExpression, SQLTableExpression, SQLWildcardSelectExpression } from './SQLExpressions.js';
 import { SQLInsert } from './SQLInsert.js';
 import { SQLJoin } from './SQLJoin.js';
-import { SQLJsonExtract, SQLJsonKeys, SQLJsonLength, SQLJsonType, SQLJsonUnquote, SQLJsonValue, SQLJsonValueType, SQLLpad } from './SQLJsonExpressions.js';
+import type { SQLJsonValueType } from './SQLJsonExpressions.js';
+import { SQLJsonExtract, SQLJsonKeys, SQLJsonLength, SQLJsonType, SQLJsonUnquote, SQLJsonValue, SQLLpad } from './SQLJsonExpressions.js';
 import { parseTable, SQLSelect } from './SQLSelect.js';
 import { SQLUpdate } from './SQLUpdate.js';
-import { ParseWhereArguments, SQLWhere } from './SQLWhere.js';
+import type { ParseWhereArguments, SQLWhere } from './SQLWhere.js';
 declare class StaticSQL {
     wildcard(namespace?: string): SQLWildcardSelectExpression;
     column(...args: SQLColumnExpressionParams): SQLColumnExpression;

package/dist/SQL.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../src/SQL.ts"],"names":[],"mappings":"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"}

package/dist/SQL.js

@@ -0,0 +1,100 @@
+import { SQLDelete } from './SQLDelete.js';
+import { isSQLExpression } from './SQLExpression.js';
+import { SQLAssignment, SQLCoalesce, SQLColumnExpression, SQLDistinct, SQLIf, SQLIsNull, SQLJSONTableExpression, SQLParentNamespace, SQLSafeValue, SQLScalar, SQLTableExpression, SQLWildcardSelectExpression } from './SQLExpressions.js';
+import { SQLInsert } from './SQLInsert.js';
+import { SQLJoin, SQLJoinType } from './SQLJoin.js';
+import { SQLJsonExtract, SQLJsonKeys, SQLJsonLength, SQLJsonType, SQLJsonUnquote, SQLJsonValue, SQLLpad } from './SQLJsonExpressions.js';
+import { parseTable, SQLSelect } from './SQLSelect.js';
+import { SQLUpdate } from './SQLUpdate.js';
+import { SQLEmptyWhere } from './SQLWhere.js';
+class StaticSQL {
+    wildcard(namespace) {
+        return new SQLWildcardSelectExpression(namespace);
+    }
+    column(...args) {
+        return new SQLColumnExpression(...args);
+    }
+    parentColumn(column) {
+        return new SQLColumnExpression(SQLParentNamespace, column);
+    }
+    jsonExtract(column, path, asScalar = false) {
+        return new SQLJsonExtract(column, asScalar ? new SQLScalar(path) : new SQLSafeValue(path));
+    }
+    jsonValue(column, path, type, asScalar = false) {
+        return new SQLJsonValue(column, type, asScalar ? new SQLScalar(path) : new SQLSafeValue(path));
+    }
+    jsonKeys(column) {
+        return new SQLJsonKeys(column);
+    }
+    jsonType(column) {
+        return new SQLJsonType(column);
+    }
+    lpad(column, length, value) {
+        return new SQLLpad(column, new SQLSafeValue(length), new SQLSafeValue(value));
+    }
+    jsonUnquotedValue(column, path) {
+        return new SQLJsonUnquote(new SQLJsonExtract(column, new SQLSafeValue(path)));
+    }
+    jsonLength(column, path) {
+        return new SQLJsonLength(column, path ? new SQLSafeValue(path) : undefined);
+    }
+    table(table, asNamespace) {
+        return new SQLTableExpression(table, asNamespace);
+    }
+    jsonTable(expression, asNamespace) {
+        return new SQLJSONTableExpression(expression, asNamespace);
+    }
+    select(...columns) {
+        if (columns.length === 0) {
+            return new SQLSelect(this.wildcard());
+        }
+        return new SQLSelect(...columns);
+    }
+    insert(tableName) {
+        return new SQLInsert(tableName);
+    }
+    update(tableName) {
+        return new SQLUpdate(tableName);
+    }
+    assignment(key, value) {
+        return new SQLAssignment(typeof key === 'string' ? new SQLColumnExpression(key) : key, isSQLExpression(value) ? value : new SQLScalar(value));
+    }
+    where(...args) {
+        return new SQLEmptyWhere().and(...args);
+    }
+    whereNot(...args) {
+        return new SQLEmptyWhere().andNot(...args);
+    }
+    delete() {
+        return new SQLDelete();
+    }
+    leftJoin(...args) {
+        return new SQLJoin(SQLJoinType.Left, parseTable(...args));
+    }
+    rightJoin(...args) {
+        return new SQLJoin(SQLJoinType.Right, parseTable(...args));
+    }
+    innerJoin(...args) {
+        return new SQLJoin(SQLJoinType.Inner, parseTable(...args));
+    }
+    join(...args) {
+        return new SQLJoin(SQLJoinType.Inner, parseTable(...args));
+    }
+    if(...args) {
+        return new SQLIf(...args);
+    }
+    coalesce(...args) {
+        return new SQLCoalesce(...args);
+    }
+    distinct(column) {
+        if (!column) {
+            return new SQLDistinct(this.wildcard());
+        }
+        return new SQLDistinct(column);
+    }
+    isNull(column) {
+        return new SQLIsNull(column);
+    }
+}
+export const SQL = new StaticSQL();
+//# sourceMappingURL=SQL.js.map

package/dist/SQL.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../src/SQL.ts"],"names":[],"mappings":"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"}

package/dist/{src/SQLDelete.d.ts → SQLDelete.d.ts}

@@ -1,5 +1,5 @@
-import { SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression.js';
-import { SQLJoin } from './SQLJoin.js';
+import type { SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression.js';
+import type { SQLJoin } from './SQLJoin.js';
 declare class EmptyClass {
 }
 declare const SQLDelete_base: {

package/dist/SQLDelete.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLDelete.d.ts","sourceRoot":"","sources":["../src/SQLDelete.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAEvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAI5C,cAAM,UAAU;CAAG;;;;;;;;;;;;;AACnB,qBAAa,SAAU,SAAQ,cAAsB,YAAW,aAAa;IACzE,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,OAAO,CAAC,CAAC,EAAE,CAAM;IAE9C,KAAK,IAAI,IAAI;IAMb,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAKhC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,OAAO,CAAC,GAAG,IAAI;IAK9C,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,QAAQ;IA+B1C,MAAM,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAW3C,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;CAGpH"}

package/dist/{src/SQLDelete.js → SQLDelete.js}

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLDelete = void 0;
-const simple_database_1 = require("@simonbackx/simple-database");
-const SQLExpression_js_1 = require("./SQLExpression.js");
-const SQLLogger_js_1 = require("./SQLLogger.js");
-const SQLWhere_js_1 = require("./SQLWhere.js");
+import { Database } from '@simonbackx/simple-database';
+import { joinSQLQuery, normalizeSQLQuery } from './SQLExpression.js';
+import { SQLLogger } from './SQLLogger.js';
+import { Whereable } from './SQLWhere.js';
 class EmptyClass {
 }
-class SQLDelete extends (0, SQLWhere_js_1.Whereable)(EmptyClass) {
+export class SQLDelete extends Whereable(EmptyClass) {
     _from;
     _joins = [];
     clone() {
@@ -43,19 +40,18 @@ class SQLDelete extends (0, SQLWhere_js_1.Whereable)(EmptyClass) {
                 query.push(this._where.getSQL(options));
             }
         }
-        return (0, SQLExpression_js_1.joinSQLQuery)(query, ' ');
+        return joinSQLQuery(query, ' ');
     }
     async delete() {
         if (this._where && this._where.isAlways === false) {
             return { affectedRows: 0 };
         }
-        const { query, params } = (0, SQLExpression_js_1.normalizeSQLQuery)(this.getSQL());
-        const [rows] = await SQLLogger_js_1.SQLLogger.log(simple_database_1.Database.delete(query, params), query, params);
+        const { query, params } = normalizeSQLQuery(this.getSQL());
+        const [rows] = await SQLLogger.log(Database.delete(query, params), query, params);
         return rows;
     }
     async then(onFulfilled, onRejected) {
         return this.delete().then(onFulfilled, onRejected);
     }
 }
-exports.SQLDelete = SQLDelete;
 //# sourceMappingURL=SQLDelete.js.map

package/dist/SQLDelete.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLDelete.js","sourceRoot":"","sources":["../src/SQLDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU;CAAG;AACnB,MAAM,OAAO,SAAU,SAAQ,SAAS,CAAC,UAAU,CAAC;IAChD,KAAK,CAAgB;IACrB,MAAM,GAAqC,EAAE,CAAC;IAE9C,KAAK;QACD,MAAM,CAAC,GAAG,IAAI,SAAS,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvB,OAAO,CAAQ,CAAC;IACpB,CAAC;IAED,IAAI,CAAC,KAAoB;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAkC;QACnC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,OAA8B;QACjC,MAAM,KAAK,GAAe;YACtB,QAAQ;SACX,CAAC;QAEF,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,gBAAgB,GAAI,IAAI,CAAC,KAAa,CAAC,SAAS,IAAK,IAAI,CAAC,KAAa,CAAC,KAAK,IAAI,SAAS,CAAC;QAEnG,KAAK,CAAC,IAAI,CACN,MAAM,CACT,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAEvC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAEvD,QAAQ;QACR,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YACpC,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;YACjF,CAAC;iBACI,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACvB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACpB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC;QAED,OAAO,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,MAAM;QACR,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;YAChD,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;QAC/B,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAE3D,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,WAAqD,EAAE,UAAgC;QAC9F,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;CACJ"}

package/dist/SQLExpression.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLExpression.d.ts","sourceRoot":"","sources":["../src/SQLExpression.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,QAAQ,GAAG,kBAAkB,GAAG,MAAM,CAAC;AAEnD,wBAAgB,YAAY,CAAC,OAAO,EAAE,CAAC,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAM7G;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,GAAG,kBAAkB,CAKjE;AAED,MAAM,WAAW,aAAa;IAC1B,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,QAAQ,CAAC;CACpD;AAED,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACrD,OAAO,IAAI,MAAM,CAAC;CACrB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,aAAa,CAElE"}

package/dist/{src/SQLExpression.js → SQLExpression.js}

@@ -1,22 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinSQLQuery = joinSQLQuery;
-exports.normalizeSQLQuery = normalizeSQLQuery;
-exports.isSQLExpression = isSQLExpression;
-function joinSQLQuery(queries, seperator) {
+export function joinSQLQuery(queries, seperator) {
     queries = queries.filter(q => q !== undefined && q !== null);
     return {
         query: queries.map(q => typeof q === 'string' ? q : q.query).join(seperator ?? ''),
         params: queries.flatMap(q => typeof q === 'string' ? [] : q.params),
     };
 }
-function normalizeSQLQuery(q) {
+export function normalizeSQLQuery(q) {
     return {
         query: typeof q === 'string' ? q : q.query,
         params: typeof q === 'string' ? [] : q.params,
     };
 }
-function isSQLExpression(obj) {
+export function isSQLExpression(obj) {
     return typeof obj === 'object' && obj !== null && !!obj.getSQL && typeof obj.getSQL === 'function';
 }
 //# sourceMappingURL=SQLExpression.js.map

package/dist/SQLExpression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLExpression.js","sourceRoot":"","sources":["../src/SQLExpression.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,YAAY,CAAC,OAAwC,EAAE,SAAkB;IACrF,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IAC7D,OAAO;QACH,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;QACnF,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;KACvE,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,CAAW;IACzC,OAAO;QACH,KAAK,EAAE,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;QAC1C,MAAM,EAAE,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM;KAChD,CAAC;AACN,CAAC;AAUD,MAAM,UAAU,eAAe,CAAC,GAAY;IACxC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,CAAE,GAAW,CAAC,MAAM,IAAI,OAAQ,GAAW,CAAC,MAAM,KAAK,UAAU,CAAC;AACzH,CAAC"}

package/dist/{src/SQLExpressions.d.ts → SQLExpressions.d.ts}

@@ -1,5 +1,5 @@
-import { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery } from './SQLExpression.js';
-import { ParseWhereArguments } from './SQLWhere.js';
+import type { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery } from './SQLExpression.js';
+import type { ParseWhereArguments } from './SQLWhere.js';
 export type SQLScalarValue = string | number | boolean | Date;
 export type SQLDynamicExpression = SQLScalarValue | SQLScalarValue[] | null | SQLExpression;
 export declare function scalarToSQLExpression(s: SQLScalarValue | null): SQLExpression;

package/dist/SQLExpressions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLExpressions.d.ts","sourceRoot":"","sources":["../src/SQLExpressions.ts"],"names":[],"mappings":"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"}