@stamhoofd/sql 2.119.0 → 2.120.1

package/dist/SQLInsert.js.map

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

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

@@ -1,4 +1,4 @@
-import { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery } from './SQLExpression.js';
+import type { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery } from './SQLExpression.js';
 export declare enum SQLJoinType {
     Left = "Left",
     Right = "Right",

package/dist/SQLJoin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLJoin.d.ts","sourceRoot":"","sources":["../src/SQLJoin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAK3G,oBAAY,WAAW;IACnB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;CAClB;AAED,cAAM,UAAU;CAAG;;;;;;;;;;;;;AACnB,qBAAa,OAAQ,SAAQ,YAAsB,YAAW,aAAa;IACvE,IAAI,cAAoB;IACxB,KAAK,EAAE,kBAAkB,CAAC;gBAEd,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB;IAMxD,OAAO,CAAC,aAAa;IASrB,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,QAAQ;CA4BnD"}

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

@@ -1,26 +1,24 @@
-import { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery, joinSQLQuery } from './SQLExpression.js';
+import { joinSQLQuery } from './SQLExpression.js';
 import { SQLSelect } from './SQLSelect.js';
 import { Whereable } from './SQLWhere.js';
-
-export enum SQLJoinType {
-    Left = 'Left',
-    Right = 'Right',
-    Inner = 'Inner',
-    Outer = 'Outer',
+export var SQLJoinType;
+(function (SQLJoinType) {
+    SQLJoinType["Left"] = "Left";
+    SQLJoinType["Right"] = "Right";
+    SQLJoinType["Inner"] = "Inner";
+    SQLJoinType["Outer"] = "Outer";
+})(SQLJoinType || (SQLJoinType = {}));
+class EmptyClass {
 }
-
-class EmptyClass {}
-export class SQLJoin extends Whereable(EmptyClass) implements SQLExpression {
+export class SQLJoin extends Whereable(EmptyClass) {
     type = SQLJoinType.Left;
-    table: SQLNamedExpression;
-
-    constructor(type: SQLJoinType, table: SQLNamedExpression) {
+    table;
+    constructor(type, table) {
         super();
         this.type = type;
         this.table = table;
     }
-
-    private getJoinPrefix(): string {
+    getJoinPrefix() {
         switch (this.type) {
             case SQLJoinType.Left: return 'LEFT JOIN';
             case SQLJoinType.Right: return 'RIGHT JOIN';
@@ -28,8 +26,7 @@ export class SQLJoin extends Whereable(EmptyClass) implements SQLExpression {
             case SQLJoinType.Outer: return 'OUTER JOIN';
         }
     }
-
-    getSQL(options?: SQLExpressionOptions): SQLQuery {
+    getSQL(options) {
         // add parenthesis if the table is a select
         if (this.table instanceof SQLSelect) {
             return joinSQLQuery([
@@ -45,7 +42,6 @@ export class SQLJoin extends Whereable(EmptyClass) implements SQLExpression {
                 }),
             ], ' ');
         }
-
         return joinSQLQuery([
             this.getJoinPrefix(),
             this.table?.getSQL(options),
@@ -58,3 +54,4 @@ export class SQLJoin extends Whereable(EmptyClass) implements SQLExpression {
         ], ' ');
     }
 }
+//# sourceMappingURL=SQLJoin.js.map

package/dist/SQLJoin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLJoin.js","sourceRoot":"","sources":["../src/SQLJoin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACnB,4BAAa,CAAA;IACb,8BAAe,CAAA;IACf,8BAAe,CAAA;IACf,8BAAe,CAAA;AACnB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAED,MAAM,UAAU;CAAG;AACnB,MAAM,OAAO,OAAQ,SAAQ,SAAS,CAAC,UAAU,CAAC;IAC9C,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IACxB,KAAK,CAAqB;IAE1B,YAAY,IAAiB,EAAE,KAAyB;QACpD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEO,aAAa;QACjB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAChB,KAAK,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,WAAW,CAAC;YAC1C,KAAK,WAAW,CAAC,KAAK,CAAC,CAAC,OAAO,YAAY,CAAC;YAC5C,KAAK,WAAW,CAAC,KAAK,CAAC,CAAC,OAAO,MAAM,CAAC;YACtC,KAAK,WAAW,CAAC,KAAK,CAAC,CAAC,OAAO,YAAY,CAAC;QAChD,CAAC;IACL,CAAC;IAED,MAAM,CAAC,OAA8B;QACjC,2CAA2C;QAC3C,IAAI,IAAI,CAAC,KAAK,YAAY,SAAS,EAAE,CAAC;YAClC,OAAO,YAAY,CAAC;gBAChB,IAAI,CAAC,aAAa,EAAE;gBACpB,GAAG;gBACH,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;gBAC3B,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE;gBAC9B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;gBAC9B,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;oBAChB,GAAG,OAAO;oBACV,eAAe,EAAE,OAAO,EAAE,gBAAgB;oBAC1C,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;iBACzC,CAAC;aACL,EAAE,GAAG,CAAC,CAAC;QACZ,CAAC;QAED,OAAO,YAAY,CAAC;YAChB,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YAC9B,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;gBAChB,GAAG,OAAO;gBACV,eAAe,EAAE,OAAO,EAAE,gBAAgB;gBAC1C,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;aACzC,CAAC;SACL,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC;CACJ"}

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

@@ -1,5 +1,5 @@
-import { SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression.js';
-import { SQLScalarValue } from './SQLExpressions.js';
+import type { SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression.js';
+import type { SQLScalarValue } from './SQLExpressions.js';
 import { SQLWhere } from './SQLWhere.js';
 export declare function scalarToSQLJSONExpression(s: SQLScalarValue | null): SQLExpression;
 export declare class SQLJsonUnquote implements SQLExpression {

package/dist/SQLJsonExpressions.d.ts.map

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

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

@@ -1,37 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLLpad = exports.SQLJsonOverlaps = exports.SQLJsonContains = exports.SQLJsonSearch = exports.SQLJsonLength = exports.SQLJsonKeys = exports.SQLJsonType = exports.SQLJsonExtract = exports.SQLJsonValue = exports.SQLJsonUnquote = void 0;
-exports.scalarToSQLJSONExpression = scalarToSQLJSONExpression;
-const SQLExpression_js_1 = require("./SQLExpression.js");
-const SQLExpressions_js_1 = require("./SQLExpressions.js");
-const SQLWhere_js_1 = require("./SQLWhere.js");
-function scalarToSQLJSONExpression(s) {
+import { joinSQLQuery } from './SQLExpression.js';
+import { SQLJSONFalse, SQLJSONNull, SQLJSONTrue, SQLSafeValue, SQLScalar } from './SQLExpressions.js';
+import { SQLWhere } from './SQLWhere.js';
+export function scalarToSQLJSONExpression(s) {
     if (s === null) {
-        return SQLExpressions_js_1.SQLJSONNull;
+        return SQLJSONNull;
     }
     if (s === true) {
-        return SQLExpressions_js_1.SQLJSONTrue;
+        return SQLJSONTrue;
     }
     if (s === false) {
-        return SQLExpressions_js_1.SQLJSONFalse;
+        return SQLJSONFalse;
     }
-    return new SQLExpressions_js_1.SQLScalar(s);
+    return new SQLScalar(s);
 }
-class SQLJsonUnquote {
+export class SQLJsonUnquote {
     target;
     constructor(target) {
         this.target = target;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_UNQUOTE(',
             this.target.getSQL(options),
             ')',
         ]);
     }
 }
-exports.SQLJsonUnquote = SQLJsonUnquote;
-class SQLJsonValue {
+export class SQLJsonValue {
     target;
     path;
     type;
@@ -44,24 +39,24 @@ class SQLJsonValue {
             this.path = target.path;
             return;
         }
-        this.path = path ?? new SQLExpressions_js_1.SQLSafeValue('$');
+        this.path = path ?? new SQLSafeValue('$');
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_VALUE(',
             this.target.getSQL(options),
             ',',
             this.path.getSQL(options),
             (this.type ? ' RETURNING ' + this.type + (this.type === 'CHAR' ? ' CHARACTER SET utf8mb4' : '') : ''),
             ' NULL ON ERROR)',
+            ...(this.type === 'CHAR' ? [' COLLATE utf8mb4_0900_ai_ci'] : []),
         ]);
     }
 }
-exports.SQLJsonValue = SQLJsonValue;
 /**
  * Same as target->path, JSON_EXTRACT(target, path)
  */
-class SQLJsonExtract {
+export class SQLJsonExtract {
     target;
     path;
     constructor(target, path) {
@@ -69,7 +64,7 @@ class SQLJsonExtract {
         this.path = path;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_EXTRACT(',
             this.target.getSQL(options),
             ',',
@@ -86,39 +81,36 @@ class SQLJsonExtract {
         return '"' + str.replace(/(["\\])/g, '\\$1') + '"';
     }
 }
-exports.SQLJsonExtract = SQLJsonExtract;
-class SQLJsonType {
+export class SQLJsonType {
     target;
     constructor(target) {
         this.target = target;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_TYPE(',
             this.target.getSQL(options),
             ')',
         ]);
     }
 }
-exports.SQLJsonType = SQLJsonType;
 /**
  * Same as target->path, JSON_EXTRACT(target, path)
  */
-class SQLJsonKeys {
+export class SQLJsonKeys {
     target;
     constructor(target) {
         this.target = target;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_KEYS(',
             this.target.getSQL(options),
             ')',
         ]);
     }
 }
-exports.SQLJsonKeys = SQLJsonKeys;
-class SQLJsonLength {
+export class SQLJsonLength {
     target;
     path;
     constructor(target, path) {
@@ -126,7 +118,7 @@ class SQLJsonLength {
         this.path = path;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_LENGTH(',
             this.target.getSQL(options),
             ...(this.path
@@ -139,11 +131,10 @@ class SQLJsonLength {
         ]);
     }
 }
-exports.SQLJsonLength = SQLJsonLength;
 /**
  * JSON_SEARCH(json_doc, one_or_all, search_str[, escape_char[, path] ...])
  */
-class SQLJsonSearch {
+export class SQLJsonSearch {
     target;
     oneOrAll;
     searchStr;
@@ -155,11 +146,11 @@ class SQLJsonSearch {
         this.path = path;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_SEARCH(',
             this.target.getSQL(options),
             ',',
-            new SQLExpressions_js_1.SQLSafeValue(this.oneOrAll).getSQL(options),
+            new SQLSafeValue(this.oneOrAll).getSQL(options),
             ',',
             this.searchStr.getSQL(options),
             ...(this.path
@@ -172,11 +163,10 @@ class SQLJsonSearch {
         ]);
     }
 }
-exports.SQLJsonSearch = SQLJsonSearch;
 /**
  * JSON_CONTAINS(target, candidate[, path])
  */
-class SQLJsonContains extends SQLWhere_js_1.SQLWhere {
+export class SQLJsonContains extends SQLWhere {
     target;
     candidate;
     path;
@@ -187,7 +177,7 @@ class SQLJsonContains extends SQLWhere_js_1.SQLWhere {
         this.path = path;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_CONTAINS(',
             this.target.getSQL(options),
             ',',
@@ -206,11 +196,10 @@ class SQLJsonContains extends SQLWhere_js_1.SQLWhere {
         return c;
     }
 }
-exports.SQLJsonContains = SQLJsonContains;
 /**
  * JSON_CONTAINS(json_doc1, json_doc2)
  */
-class SQLJsonOverlaps extends SQLWhere_js_1.SQLWhere {
+export class SQLJsonOverlaps extends SQLWhere {
     jsonDoc1;
     jsonDoc2;
     constructor(jsonDoc1, jsonDoc2) {
@@ -219,7 +208,7 @@ class SQLJsonOverlaps extends SQLWhere_js_1.SQLWhere {
         this.jsonDoc2 = jsonDoc2;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'JSON_OVERLAPS(',
             this.jsonDoc1.getSQL(options),
             ',',
@@ -232,8 +221,7 @@ class SQLJsonOverlaps extends SQLWhere_js_1.SQLWhere {
         return c;
     }
 }
-exports.SQLJsonOverlaps = SQLJsonOverlaps;
-class SQLLpad {
+export class SQLLpad {
     target;
     length;
     value;
@@ -243,7 +231,7 @@ class SQLLpad {
         this.value = value;
     }
     getSQL(options) {
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'LPAD(',
             this.target.getSQL(options),
             ',',
@@ -254,5 +242,4 @@ class SQLLpad {
         ]);
     }
 }
-exports.SQLLpad = SQLLpad;
 //# sourceMappingURL=SQLJsonExpressions.js.map

package/dist/SQLJsonExpressions.js.map

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

package/dist/SQLLogger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLLogger.d.ts","sourceRoot":"","sources":["../src/SQLLogger.ts"],"names":[],"mappings":"AAGA,cAAM,eAAe;IACjB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3C,2BAA2B,UAAS;IACpC,aAAa,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAM;IAEhF,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;IAapC,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM;IAqBpG,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;CAqCnF;AAED,eAAO,MAAM,SAAS,iBAAwB,CAAC"}

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLLogger = void 0;
-const simple_database_1 = require("@simonbackx/simple-database");
-const simple_logging_1 = require("@simonbackx/simple-logging");
+import { Database } from '@simonbackx/simple-database';
+import { StyledText } from '@simonbackx/simple-logging';
 class StaticSQLLogger {
     slowQueryThresholdMs = null;
     explainAllAndLogInefficient = false;
@@ -11,7 +8,7 @@ class StaticSQLLogger {
         // Run an EXPLAIN on the query to see what is going on
         try {
             const explainQuery = 'EXPLAIN ' + query;
-            const [explainRows] = await simple_database_1.Database.select(explainQuery, params, { nestTables: true });
+            const [explainRows] = await Database.select(explainQuery, params, { nestTables: true });
             return explainRows[0]?.[''] ?? null;
         }
         catch (e) {
@@ -28,7 +25,7 @@ class StaticSQLLogger {
             return;
         }
         if (explainResult['type'] === 'ALL') {
-            console.warn(new simple_logging_1.StyledText('[FULL TABLE SCAN] ').addClass('error').addTag('query'), `Inefficient query detected${elapsedTimeMs !== undefined ? ' (' + elapsedTimeMs.toFixed(0) + 'ms)' : ''}:`, query, params, 'EXPLAIN result:', explainResult);
+            console.warn(new StyledText('[FULL TABLE SCAN] ').addClass('error').addTag('query'), `Inefficient query detected${elapsedTimeMs !== undefined ? ' (' + elapsedTimeMs.toFixed(0) + 'ms)' : ''}:`, query, params, 'EXPLAIN result:', explainResult);
         }
     }
     async log(queryPromise, query, params) {
@@ -63,5 +60,5 @@ class StaticSQLLogger {
         return result;
     }
 }
-exports.SQLLogger = new StaticSQLLogger();
+export const SQLLogger = new StaticSQLLogger();
 //# sourceMappingURL=SQLLogger.js.map

package/dist/SQLLogger.js.map

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

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

@@ -1,4 +1,4 @@
-import { SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression.js';
+import type { SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression.js';
 type Constructor<T = object> = new (...args: any[]) => T;
 export declare function Orderable<Sup extends Constructor<object>>(Base: Sup): {
     new (...args: any[]): {

package/dist/SQLOrderBy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLOrderBy.d.ts","sourceRoot":"","sources":["../src/SQLOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAIvF,KAAK,WAAW,CAAC,CAAC,GAAG,MAAM,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAEzD,wBAAgB,SAAS,CAAC,GAAG,SAAS,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG;kBAFvB,GAAG,EAAE;kBAIhC,UAAU,GAAG,IAAI;gBAEnB,CAAC,QAAQ,CAAC,WAAW,UAAU,GAAG,CAAC;gBACnC,CAAC,QAAQ,CAAC,UAAU,aAAa,GAAG,MAAM,cAAc,mBAAmB,GAAG,CAAC;;QAsB9F;AAED,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,MAAM,CAAC;AACjD,qBAAa,UAAW,YAAW,aAAa;IAC5C,OAAO,EAAE;QAAE,MAAM,EAAE,aAAa,CAAC;QAAC,SAAS,EAAE,mBAAmB,CAAA;KAAE,EAAE,CAAM;gBAE9D,GAAG,OAAO,EAAE;QAAE,MAAM,EAAE,aAAa,CAAC;QAAC,SAAS,EAAE,mBAAmB,CAAA;KAAE,EAAE;IAInF,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE;IAIpC,GAAG,CAAC,OAAO,EAAE,UAAU;IAIvB,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,QAAQ;CAkBnD"}

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

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLOrderBy = void 0;
-exports.Orderable = Orderable;
-const SQLExpression_js_1 = require("./SQLExpression.js");
-const SQLExpressions_js_1 = require("./SQLExpressions.js");
-function Orderable(Base) {
+import { joinSQLQuery } from './SQLExpression.js';
+import { SQLColumnExpression } from './SQLExpressions.js';
+export function Orderable(Base) {
     return class extends Base {
         _orderBy = null;
         orderBy(columnOrOrderBy, direction) {
             let o = columnOrOrderBy;
             if (!(columnOrOrderBy instanceof SQLOrderBy)) {
                 o = new SQLOrderBy({
-                    column: typeof columnOrOrderBy === 'string' ? new SQLExpressions_js_1.SQLColumnExpression(columnOrOrderBy) : columnOrOrderBy,
+                    column: typeof columnOrOrderBy === 'string' ? new SQLColumnExpression(columnOrOrderBy) : columnOrOrderBy,
                     direction: direction ?? 'ASC',
                 });
             }
@@ -26,7 +22,7 @@ function Orderable(Base) {
         }
     };
 }
-class SQLOrderBy {
+export class SQLOrderBy {
     orderBy = [];
     constructor(...orderBy) {
         this.orderBy = orderBy;
@@ -41,10 +37,10 @@ class SQLOrderBy {
         if (this.orderBy.length === 0) {
             return '';
         }
-        return (0, SQLExpression_js_1.joinSQLQuery)([
+        return joinSQLQuery([
             'ORDER BY ',
-            (0, SQLExpression_js_1.joinSQLQuery)(this.orderBy.map((o) => {
-                return (0, SQLExpression_js_1.joinSQLQuery)([
+            joinSQLQuery(this.orderBy.map((o) => {
+                return joinSQLQuery([
                     o.column.getSQL(options),
                     o.direction,
                 ], ' ');
@@ -52,5 +48,4 @@ class SQLOrderBy {
         ]);
     }
 }
-exports.SQLOrderBy = SQLOrderBy;
 //# sourceMappingURL=SQLOrderBy.js.map

package/dist/SQLOrderBy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLOrderBy.js","sourceRoot":"","sources":["../src/SQLOrderBy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,MAAM,UAAU,SAAS,CAAkC,IAAS;IAChE,OAAO,KAAM,SAAQ,IAAI;QACrB,QAAQ,GAAsB,IAAI,CAAC;QAInC,OAAO,CAAa,eAAuC,EAAE,SAA+B;YACxF,IAAI,CAAC,GAAG,eAA6B,CAAC;YACtC,IAAI,CAAC,CAAC,eAAe,YAAY,UAAU,CAAC,EAAE,CAAC;gBAC3C,CAAC,GAAG,IAAI,UAAU,CAAC;oBACf,MAAM,EAAE,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe;oBACxG,SAAS,EAAE,SAAS,IAAI,KAAK;iBAChC,CAAC,CAAC;YACP,CAAC;YAED,MAAM,EAAE,GAAG,IAAW,CAAC,CAAC,6EAA6E;YAErG,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACd,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;iBACI,CAAC;gBACF,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC;YACpB,CAAC;YAED,OAAO,EAAE,CAAC;QACd,CAAC;KACJ,CAAC;AACN,CAAC;AAGD,MAAM,OAAO,UAAU;IACnB,OAAO,GAAgE,EAAE,CAAC;IAE1E,YAAY,GAAG,OAAoE;QAC/E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAAqB;QAChC,OAAO,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,GAAG,CAAC,OAAmB;QACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,OAA8B;QACjC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACd,CAAC;QAED,OAAO,YAAY,CAAC;YAChB,WAAW;YACX,YAAY,CACR,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnB,OAAO,YAAY,CAAC;oBAChB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;oBACxB,CAAC,CAAC,SAAS;iBACd,EAAE,GAAG,CAAC,CAAC;YACZ,CAAC,CAAC,EACF,IAAI,CACP;SACJ,CAAC,CAAC;IACP,CAAC;CACJ"}

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

@@ -1,6 +1,6 @@
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
-import { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery } from './SQLExpression.js';
-import { SQLJoin } from './SQLJoin.js';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery } from './SQLExpression.js';
+import type { SQLJoin } from './SQLJoin.js';
 declare class EmptyClass {
 }
 export declare function parseTable(tableOrExpression: SQLNamedExpression | string, asNamespace?: string): SQLNamedExpression;

package/dist/SQLSelect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLSelect.d.ts","sourceRoot":"","sources":["../src/SQLSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAG1E,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAG3G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,cAAM,UAAU;CAAG;AAEnB,wBAAgB,UAAU,CAAC,iBAAiB,EAAE,kBAAkB,GAAG,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAOnH;AAED,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,sBAAsB,IAAI,qBAAqB,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG;IAC7G,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,wBAAwB,CAAC;IAClC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;CACxD,CAAC;AACF,MAAM,MAAM,wBAAwB,GAAG;IACnC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,MAAM,GAAG,sBAAsB,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG;IAAE,OAAO,IAAI,MAAM,CAAA;CAAE,CAAC;;;;;;;;;;;;;;;;;;;AAE7G,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,sBAAsB,CAAE,SAAQ,cAAiC,YAAW,aAAa;IAC/H,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,KAAK,EAAE,kBAAkB,CAAC;IAE1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC9B,QAAQ,EAAE,aAAa,EAAE,CAAM;IAC/B,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,OAAO,CAAC,CAAC,EAAE,CAAM;IAC9C,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC1C,OAAO,CAAC,KAAK,CAAuB;IACpC,MAAM,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAElD,YAAY,EAAE,CAAC,CAAC,GAAG,EAAE,sBAAsB,KAAK,CAAC,CAAC,GAAG,IAAI,CAAQ;gBAErD,GAAG,OAAO,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC,EAAE;gBACtC,WAAW,EAAE,CAAC,CAAC,GAAG,EAAE,sBAAsB,KAAK,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC,EAAE;IAUrG,KAAK,IAAI,IAAI;IAOb,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAC5C,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IACzB,IAAI,CAAC,UAAU,EAAE,kBAAkB,GAAG,IAAI;IAO1C,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC,EAAE,GAAG,IAAI;IAKpD,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,OAAO,CAAC,GAAG,IAAI;IAS9C,OAAO,CAAC,GAAG,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI;IAK1C,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAKrC,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,QAAQ;IA4EhD;;;;OAIG;IACH,IAAI,QAAQ,mBAEX;IAED,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,GAAE,MAAM,GAAG,IAAW,GAAG,IAAI;IAMzD,KAAK,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IA2C3B,KAAK,CAAC,QAAQ,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IACzC,KAAK,CAAC,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC;IACjC,KAAK,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAarC,KAAK,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAkClD,GAAG,CAAC,UAAU,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAmCrD,GAAG,CAAC,OAAO,GAAE,wBAA6B,GAAG,CAAC,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,KAAK;IAqGpG,UAAU,CAAC,OAAO,GAAE,wBAA6B,GAAG,CAAC,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,iBAAiB,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK;IAuF7G,OAAO,IAAI,MAAM,GAAG,IAAI;IAIxB;;;;OAIG;IACH,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc;CAKnC"}

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

@@ -1,25 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLSelect = void 0;
-exports.parseTable = parseTable;
-const simple_database_1 = require("@simonbackx/simple-database");
-const utility_1 = require("@stamhoofd/utility");
-const SQLExpression_js_1 = require("./SQLExpression.js");
-const SQLExpressions_js_1 = require("./SQLExpressions.js");
-const SQLOrderBy_js_1 = require("./SQLOrderBy.js");
-const SQLWhere_js_1 = require("./SQLWhere.js");
-const SQLLogger_js_1 = require("./SQLLogger.js");
+import { Database } from '@simonbackx/simple-database';
+import { Formatter } from '@stamhoofd/utility';
+import { joinSQLQuery, normalizeSQLQuery } from './SQLExpression.js';
+import { SQLAlias, SQLColumnExpression, SQLCount, SQLSelectAs, SQLSum, SQLTableExpression } from './SQLExpressions.js';
+import { Orderable } from './SQLOrderBy.js';
+import { Whereable } from './SQLWhere.js';
+import { SQLLogger } from './SQLLogger.js';
 class EmptyClass {
 }
-function parseTable(tableOrExpression, asNamespace) {
+export function parseTable(tableOrExpression, asNamespace) {
     if (typeof tableOrExpression === 'string') {
-        return new SQLExpressions_js_1.SQLTableExpression(tableOrExpression, asNamespace);
+        return new SQLTableExpression(tableOrExpression, asNamespace);
     }
     else {
         return tableOrExpression;
     }
 }
-class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderable)(EmptyClass)) {
+export class SQLSelect extends Whereable(Orderable(EmptyClass)) {
     _columns;
     _from;
     _limit = null;
@@ -35,7 +31,7 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
         if (typeof columns[0] === 'function') {
             this._transformer = columns.shift();
         }
-        this._columns = columns.map(c => typeof c === 'string' ? new SQLExpressions_js_1.SQLColumnExpression(c) : c);
+        this._columns = columns.map(c => typeof c === 'string' ? new SQLColumnExpression(c) : c);
     }
     clone() {
         const c = new SQLSelect(...this._columns);
@@ -48,7 +44,7 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
         return this;
     }
     select(...columns) {
-        this._columns.push(...columns.map(c => typeof c === 'string' ? new SQLExpressions_js_1.SQLColumnExpression(c) : c));
+        this._columns.push(...columns.map(c => typeof c === 'string' ? new SQLColumnExpression(c) : c));
         return this;
     }
     join(join) {
@@ -84,13 +80,13 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
             options.parentNamespace = parentOptions.defaultNamespace;
         }
         const columns = this._columns.map(c => c.getSQL(options));
-        query.push((0, SQLExpression_js_1.joinSQLQuery)(columns, ', '));
+        query.push(joinSQLQuery(columns, ', '));
         query.push('FROM');
         query.push(this._from.getSQL(options));
         // Joins
         query.push(...this._joins.map(j => j.getSQL(options)));
         if (this._where) {
-            const whereJoins = utility_1.Formatter.uniqueArray(this._where.getJoins()).filter(j => !this._joins.includes(j));
+            const whereJoins = Formatter.uniqueArray(this._where.getJoins()).filter(j => !this._joins.includes(j));
             query.push(...whereJoins.map(j => j.getSQL(options)));
         }
         // Where
@@ -106,7 +102,7 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
         }
         if (this._groupBy.length > 0) {
             query.push('GROUP BY');
-            query.push((0, SQLExpression_js_1.joinSQLQuery)(this._groupBy.map(c => c.getSQL(options)), ', '));
+            query.push(joinSQLQuery(this._groupBy.map(c => c.getSQL(options)), ', '));
         }
         if (this._orderBy) {
             query.push(this._orderBy.getSQL(options));
@@ -117,7 +113,7 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
                 query.push('OFFSET ' + this._offset);
             }
         }
-        return (0, SQLExpression_js_1.joinSQLQuery)(query, ' ');
+        return joinSQLQuery(query, ' ');
     }
     /**
      * Returns true when it know all results will be included without filtering.
@@ -136,12 +132,12 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
         if (this._where && this._where.isAlways === false) {
             return [];
         }
-        const { query, params } = (0, SQLExpression_js_1.normalizeSQLQuery)(this.getSQL());
+        const { query, params } = normalizeSQLQuery(this.getSQL());
         // when debugging: log all queries
         // console.log(query, params);
         let rows;
         try {
-            const [_rows] = await SQLLogger_js_1.SQLLogger.log(simple_database_1.Database.select(query, params, { nestTables: true }), query, params);
+            const [_rows] = await SQLLogger.log(Database.select(query, params, { nestTables: true }), query, params);
             rows = _rows;
         }
         catch (e) {
@@ -185,13 +181,13 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
             return 0;
         }
         this._columns = [
-            new SQLExpressions_js_1.SQLSelectAs(new SQLExpressions_js_1.SQLCount(expression ?? null), new SQLExpressions_js_1.SQLAlias('c')),
+            new SQLSelectAs(new SQLCount(expression ?? null), new SQLAlias('c')),
         ];
         this._offset = null;
         this._limit = null;
         this._orderBy = null;
-        const { query, params } = (0, SQLExpression_js_1.normalizeSQLQuery)(this.getSQL());
-        const [rows] = await SQLLogger_js_1.SQLLogger.log(simple_database_1.Database.select(query, params, { nestTables: true }), query, params);
+        const { query, params } = normalizeSQLQuery(this.getSQL());
+        const [rows] = await SQLLogger.log(Database.select(query, params, { nestTables: true }), query, params);
         if (rows.length === 1) {
             const row = rows[0];
             if ('' in row) {
@@ -212,14 +208,14 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
             return 0;
         }
         this._columns = [
-            new SQLExpressions_js_1.SQLSelectAs(new SQLExpressions_js_1.SQLSum(expression), new SQLExpressions_js_1.SQLAlias('c')),
+            new SQLSelectAs(new SQLSum(expression), new SQLAlias('c')),
         ];
         this._offset = null;
         this._limit = null;
         this._orderBy = null;
-        const { query, params } = (0, SQLExpression_js_1.normalizeSQLQuery)(this.getSQL());
+        const { query, params } = normalizeSQLQuery(this.getSQL());
         // console.log(query, params);
-        const [rows] = await SQLLogger_js_1.SQLLogger.log(simple_database_1.Database.select(query, params, { nestTables: true }), query, params);
+        const [rows] = await SQLLogger.log(Database.select(query, params, { nestTables: true }), query, params);
         if (rows.length === 1) {
             const row = rows[0];
             if ('' in row) {
@@ -405,5 +401,4 @@ class SQLSelect extends (0, SQLWhere_js_1.Whereable)((0, SQLOrderBy_js_1.Orderab
         return this;
     }
 }
-exports.SQLSelect = SQLSelect;
 //# sourceMappingURL=SQLSelect.js.map