@stamhoofd/sql 2.118.1 → 2.120.0

package/{src/filters/SQLFilter.ts → dist/filters/SQLFilter.js}

@@ -1,76 +1,40 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { compileFilter, FilterCompiler, FilterDefinitions, filterDefinitionsToCompiler, RequiredFilterCompiler, StamhoofdFilter } from '@stamhoofd/structures';
-import { SQLExpression, SQLExpressionOptions, SQLQuery } from '../SQLExpression.js';
-import { SQLJoin } from '../SQLJoin.js';
+import { compileFilter, filterDefinitionsToCompiler } from '@stamhoofd/structures';
+import { SQLSafeValue } from '../SQLExpressions.js';
 import { SQLJsonValue } from '../SQLJsonExpressions.js';
-import { SQLSelect } from '../SQLSelect.js';
-import { SQLWhere, SQLWhereAnd, SQLWhereExists, SQLWhereJoin, SQLWhereNot, SQLWhereOr } from '../SQLWhere.js';
-import { $equalsSQLFilterCompiler, $greaterThanSQLFilterCompiler, $inSQLFilterCompiler, $lessThanSQLFilterCompiler } from './compilers/index.js';
+import { SQLWhereAnd, SQLWhereExists, SQLWhereJoin, SQLWhereNot, SQLWhereOr } from '../SQLWhere.js';
 import { $containsSQLFilterCompiler } from './compilers/contains.js';
-import { SQLSafeValue } from '../SQLExpressions.js';
-
-export type SQLSyncFilterRunner = (column: SQLCurrentColumn) => SQLWhere;
-export type SQLFilterRunner = (column: SQLCurrentColumn) => Promise<SQLWhere> | SQLWhere;
-export type SQLFilterCompiler = FilterCompiler<SQLFilterRunner>;
-export type SQLRequiredFilterCompiler = RequiredFilterCompiler<SQLFilterRunner>;
-export type SQLFilterDefinitions = FilterDefinitions<SQLFilterRunner>;
-
-export enum SQLValueType {
+import { $equalsSQLFilterCompiler, $greaterThanSQLFilterCompiler, $inSQLFilterCompiler, $lessThanSQLFilterCompiler } from './compilers/index.js';
+export var SQLValueType;
+(function (SQLValueType) {
     /** At the root of a select */
-    Table = 'Table',
-
+    SQLValueType["Table"] = "Table";
     /** Column with type string */
-    String = 'String',
-
+    SQLValueType["String"] = "String";
     /** MySQL Datetime */
-    Datetime = 'Datetime',
-
+    SQLValueType["Datetime"] = "Datetime";
     /** Column with type number */
-    Number = 'Number',
-
+    SQLValueType["Number"] = "Number";
     /** Column with type boolean, meaning 1 or 0 */
-    Boolean = 'Boolean',
-
+    SQLValueType["Boolean"] = "Boolean";
     /** True or false in JSON */
-    JSONBoolean = 'JSONBoolean',
-    JSONString = 'JSONString',
-
-    JSONNumber = 'JSONNumber',
-
-    /** [...] */
-    JSONArray = 'JSONArray',
-
-    /** {...} */
-    JSONObject = 'JSONObject',
-}
-
-export type SQLCurrentColumn = {
-    expression: SQLExpression;
-
-    /**
-     * MySQL nullable. Please fill this in correctly! If a value can be null, can not exist (=mysql null), or can be JSONNull, set this to true.
-     *
-     * Mainly > and < operators will make sure the behaviour is consistent with MySQL sorting (normally comparing with null will always return false in MySQL)
-     */
-    nullable?: boolean;
-
+    SQLValueType["JSONBoolean"] = "JSONBoolean";
+    SQLValueType["JSONString"] = "JSONString";
+    SQLValueType["JSONNumber"] = "JSONNumber";
     /**
-     * JSON nullable
+     * Either boolean, string, number or null (if nullable). Only use this if you cannot determine the type at compile time.
      */
-
-    /**
-     * Type of this column, use to normalize values received from filters
-     */
-    type: SQLValueType;
-    checkPermission?: (filter: StamhoofdFilter) => Promise<void>;
-};
-
-export function createColumnFilter(column: SQLCurrentColumn, childDefinitions?: SQLFilterDefinitions): SQLFilterCompiler {
-    return (filter: StamhoofdFilter) => {
+    SQLValueType["JSONScalar"] = "JSONScalar";
+    /** [...] */
+    SQLValueType["JSONArray"] = "JSONArray";
+    /** {...} */
+    SQLValueType["JSONObject"] = "JSONObject";
+})(SQLValueType || (SQLValueType = {}));
+export function createColumnFilter(column, childDefinitions) {
+    return (filter) => {
         const compiler = childDefinitions ? filterDefinitionsToCompiler(childDefinitions) : filterDefinitionsToCompiler(baseSQLFilterCompilers);
         const runner = $andSQLFilterCompiler(filter, compiler);
-
-        return async (_: SQLCurrentColumn) => {
+        return async (_) => {
             if (column.checkPermission) {
                 await column.checkPermission(filter);
             }
@@ -81,13 +45,11 @@ export function createColumnFilter(column: SQLCurrentColumn, childDefinitions?:
         };
     };
 }
-
-export function createWildcardColumnFilter(getColumn: (key: string) => SQLCurrentColumn, childDefinitions?: (key: string) => SQLFilterDefinitions, options?: { checkPermission?: (key: string) => Promise<void> }): SQLFilterCompiler {
-    const wildcardCompiler = (filter: StamhoofdFilter, _, key: string) => {
+export function createWildcardColumnFilter(getColumn, childDefinitions, options) {
+    const wildcardCompiler = (filter, _, key) => {
         const compiler = childDefinitions ? filterDefinitionsToCompiler(childDefinitions(key)) : filterDefinitionsToCompiler(baseSQLFilterCompilers);
         const runner = $andSQLFilterCompiler(filter, compiler);
-
-        return async (_: SQLCurrentColumn) => {
+        return async (_) => {
             if (options?.checkPermission) {
                 await options.checkPermission(key);
             }
@@ -101,24 +63,20 @@ export function createWildcardColumnFilter(getColumn: (key: string) => SQLCurren
             });
         };
     };
-
-    return (filter: StamhoofdFilter) => {
+    return (filter) => {
         return $andSQLFilterCompiler(filter, wildcardCompiler);
     };
 }
-
 /**
  * Filter with a subquery that should return at least one result.
  */
-export function createExistsFilter(baseSelect: InstanceType<typeof SQLSelect> & SQLExpression, definitions: SQLFilterDefinitions): SQLFilterCompiler {
-    return (filter: StamhoofdFilter, _: SQLFilterCompiler) => {
+export function createExistsFilter(baseSelect, definitions) {
+    return (filter, _) => {
         if (filter !== null && typeof filter === 'object' && '$elemMatch' in filter) {
-            filter = filter['$elemMatch'] as StamhoofdFilter;
+            filter = filter['$elemMatch'];
         }
-
         const runner = compileToSQLRunner(filter, definitions);
-
-        return async (_: SQLCurrentColumn) => {
+        return async (_) => {
             const w = await runner({
                 expression: SQLRootExpression,
                 type: SQLValueType.Table,
@@ -131,19 +89,17 @@ export function createExistsFilter(baseSelect: InstanceType<typeof SQLSelect> &
         };
     };
 }
-
 /**
  * WARNING: only use this on one-to-one relations. Using it on one-to-many relations will result in duplicate results.
  *
  * By default doesRelationAlwaysExist is set to true, this means we expect the relation to always exist. This helps optimize the query (dropping the join if the where clause in the join is always true)
  */
-export function createJoinedRelationFilter(join: SQLJoin, definitions: SQLFilterDefinitions, options: { doesRelationAlwaysExist: boolean } = { doesRelationAlwaysExist: true }): SQLFilterCompiler {
-    return (filter: StamhoofdFilter, _: SQLFilterCompiler) => {
+export function createJoinedRelationFilter(join, definitions, options = { doesRelationAlwaysExist: true }) {
+    return (filter, _) => {
         if (filter !== null && typeof filter === 'object' && '$elemMatch' in filter) {
-            filter = filter['$elemMatch'] as StamhoofdFilter;
+            filter = filter['$elemMatch'];
         }
-
-        return async (_: SQLCurrentColumn) => {
+        return async (_) => {
             const w = await compileToSQLFilter(filter, definitions);
             return new SQLWhereJoin(join, w, {
                 doesRelationAlwaysExist: options.doesRelationAlwaysExist,
@@ -151,77 +107,61 @@ export function createJoinedRelationFilter(join: SQLJoin, definitions: SQLFilter
         };
     };
 }
-
-export function $andSQLFilterCompiler(filter: StamhoofdFilter, filters: SQLFilterCompiler): SQLFilterRunner {
+export function $andSQLFilterCompiler(filter, filters) {
     const runners = compileSQLFilter(filter, filters);
-
-    return async (column: SQLCurrentColumn) => {
+    return async (column) => {
         const wheres = (await Promise.all(
-            runners.map(runner => (runner(column))),
-        ));
-
+        // eslint-disable-next-line @typescript-eslint/await-thenable
+        runners.map(runner => (runner(column)))));
         return new SQLWhereAnd(wheres);
     };
 }
-
-export function $orSQLFilterCompiler(filter: StamhoofdFilter, filters: SQLFilterCompiler): SQLFilterRunner {
+export function $orSQLFilterCompiler(filter, filters) {
     const runners = compileSQLFilter(filter, filters);
-
-    return async (column: SQLCurrentColumn) => {
+    return async (column) => {
         const wheres = (await Promise.all(
-            runners.map(runner => (runner(column))),
-        ));
-
+        // eslint-disable-next-line @typescript-eslint/await-thenable
+        runners.map(runner => (runner(column)))));
         return new SQLWhereOr(wheres);
     };
 }
-
-export function $notSQLFilterCompiler(filter: StamhoofdFilter, filters: SQLFilterCompiler): SQLFilterRunner {
+export function $notSQLFilterCompiler(filter, filters) {
     const andRunner = $andSQLFilterCompiler(filter, filters);
-
-    return async (column: SQLCurrentColumn) => {
+    return async (column) => {
         return new SQLWhereNot(await andRunner(column));
     };
 }
-
-function invertFilterCompiler(compiler: SQLRequiredFilterCompiler): SQLRequiredFilterCompiler {
-    return (filter: StamhoofdFilter, parentCompiler: SQLFilterCompiler) => {
+function invertFilterCompiler(compiler) {
+    return (filter, parentCompiler) => {
         const runner = compiler(filter, parentCompiler);
         return async (column) => {
             return new SQLWhereNot(await runner(column));
         };
     };
 }
-
-export const baseSQLFilterCompilers: SQLFilterDefinitions = {
+export const baseSQLFilterCompilers = {
     $and: $andSQLFilterCompiler,
     $or: $orSQLFilterCompiler,
     $not: $notSQLFilterCompiler,
     $eq: $equalsSQLFilterCompiler,
     $neq: invertFilterCompiler($equalsSQLFilterCompiler),
-
     $lt: $lessThanSQLFilterCompiler,
     $gt: $greaterThanSQLFilterCompiler,
     $lte: invertFilterCompiler($greaterThanSQLFilterCompiler),
     $gte: invertFilterCompiler($lessThanSQLFilterCompiler),
-
     $in: $inSQLFilterCompiler,
-
     $contains: $containsSQLFilterCompiler,
 };
-
-const compileSQLFilter = compileFilter<SQLFilterRunner>;
-
-export const SQLRootExpression: SQLExpression = {
-    getSQL(options?: SQLExpressionOptions): SQLQuery {
+const compileSQLFilter = (compileFilter);
+export const SQLRootExpression = {
+    getSQL(options) {
         throw new SimpleError({
             code: 'invalid_filter',
             message: 'Root level filters are not allowed to use $eq or $neq',
         });
     },
 };
-
-export function compileToSQLRunner(filter: StamhoofdFilter, definitions: SQLFilterDefinitions): SQLFilterRunner {
+export function compileToSQLRunner(filter, definitions) {
     if (filter === null) {
         return () => {
             return new SQLWhereAnd([]); // No filter, return empty where
@@ -230,43 +170,42 @@ export function compileToSQLRunner(filter: StamhoofdFilter, definitions: SQLFilt
     const compiler = filterDefinitionsToCompiler(definitions); // this compiler searches in the definition for the right compiler for the given key
     const runner = $andSQLFilterCompiler(filter, compiler);
     return runner;
-};
-
-export async function compileToSQLFilter(filter: StamhoofdFilter, filters: SQLFilterDefinitions): Promise<SQLWhere> {
+}
+;
+export async function compileToSQLFilter(filter, filters) {
     const runner = compileToSQLRunner(filter, filters);
     return await runner({
         expression: SQLRootExpression,
         type: SQLValueType.Table,
         nullable: false,
     });
-};
-
+}
+;
 /**
  * Casts json strings, numbers and booleans to native MySQL types. This includes json null to mysql null.
  */
-export function normalizeColumn(column: SQLCurrentColumn): SQLCurrentColumn {
-    if (column.type === SQLValueType.JSONString) {
+export function normalizeColumn(column, hint) {
+    if (column.type === SQLValueType.JSONString || (column.type === SQLValueType.JSONScalar && typeof hint === 'string')) {
         return {
             expression: new SQLJsonValue(column.expression, 'CHAR'),
             type: SQLValueType.String,
             nullable: column.nullable,
         };
     }
-
-    if (column.type === SQLValueType.JSONBoolean) {
+    if (column.type === SQLValueType.JSONNumber || (column.type === SQLValueType.JSONScalar && typeof hint === 'number')) {
         return {
-            expression: new SQLJsonValue(column.expression, 'UNSIGNED'),
-            type: SQLValueType.Boolean,
+            expression: new SQLJsonValue(column.expression, 'SIGNED'),
+            type: SQLValueType.Number,
             nullable: column.nullable,
         };
     }
-
-    if (column.type === SQLValueType.JSONNumber) {
+    if (column.type === SQLValueType.JSONBoolean || (column.type === SQLValueType.JSONScalar && typeof hint === 'boolean')) {
         return {
             expression: new SQLJsonValue(column.expression, 'UNSIGNED'),
-            type: SQLValueType.Number,
+            type: SQLValueType.Boolean,
             nullable: column.nullable,
         };
     }
     return column;
 }
+//# sourceMappingURL=SQLFilter.js.map

package/dist/filters/SQLFilter.js.map

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

package/dist/{src/filters → filters}/SQLSorter.d.ts

@@ -1,9 +1,9 @@
-import { PlainObject } from '@simonbackx/simple-encoding';
-import { SortDefinition, SortList } from '@stamhoofd/structures';
-import { SQLExpression } from '../SQLExpression.js';
-import { SQLJoin } from '../SQLJoin.js';
-import { SQLOrderBy, SQLOrderByDirection } from '../SQLOrderBy.js';
-import { SQLSelect } from '../SQLSelect.js';
+import type { PlainObject } from '@simonbackx/simple-encoding';
+import type { SortDefinition, SortList } from '@stamhoofd/structures';
+import type { SQLExpression } from '../SQLExpression.js';
+import type { SQLJoin } from '../SQLJoin.js';
+import type { SQLOrderBy, SQLOrderByDirection } from '../SQLOrderBy.js';
+import type { SQLSelect } from '../SQLSelect.js';
 export type SQLSortDefinition<T, B extends PlainObject | Date = PlainObject | Date> = SortDefinition<T, B> & {
     toSQL(direction: SQLOrderByDirection): SQLOrderBy;
     join?: SQLJoin;

package/dist/filters/SQLSorter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLSorter.d.ts","sourceRoot":"","sources":["../../src/filters/SQLSorter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,MAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,WAAW,GAAG,IAAI,IAAI,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;IACzG,KAAK,CAAC,SAAS,EAAE,mBAAmB,GAAG,UAAU,CAAC;IAClD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/E,wBAAgB,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,QA0C5G"}

package/dist/{src/filters → filters}/SQLSorter.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.applySQLSorter = applySQLSorter;
-const simple_errors_1 = require("@simonbackx/simple-errors");
-function applySQLSorter(selectQuery, sortBy, definitions) {
+import { SimpleError } from '@simonbackx/simple-errors';
+export function applySQLSorter(selectQuery, sortBy, definitions) {
     if (sortBy.length === 0) {
-        throw new simple_errors_1.SimpleError({
+        throw new SimpleError({
             code: 'empty_sort',
             message: 'No sort passed',
         });
@@ -24,10 +21,10 @@ function applySQLSorter(selectQuery, sortBy, definitions) {
                 const name = d.join.table.getSQL({ defaultNamespace: 'default' });
                 for (const j of selectQuery._joins) {
                     if (j.table.getSQL({ defaultNamespace: 'default' }) === name) {
-                        throw new simple_errors_1.SimpleError({
+                        throw new SimpleError({
                             code: 'sorter_join_overlap',
                             message: 'This combination of sorters is not possible',
-                            human: $t('e328a7c2-318c-4425-b61a-61e6f4211707'),
+                            human: $t('%GU'),
                         });
                     }
                 }

package/dist/filters/SQLSorter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLSorter.js","sourceRoot":"","sources":["../../src/filters/SQLSorter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAexD,MAAM,UAAU,cAAc,CAAC,WAA2B,EAAE,MAAgB,EAAE,WAA+B;IACzG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,WAAW,CAAC;YAClB,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,gBAAgB;SAC5B,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACrB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACjD,CAAC;QAED,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAEtC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YACT,kEAAkE;YAClE,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7C,gBAAgB;YACpB,CAAC;iBACI,CAAC;gBACF,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAC;gBAElE,KAAK,MAAM,CAAC,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;oBACjC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;wBAC3D,MAAM,IAAI,WAAW,CAAC;4BAClB,IAAI,EAAE,qBAAqB;4BAC3B,OAAO,EAAE,6CAA6C;4BACtD,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;yBACnB,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;gBAED,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;QACL,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YACX,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;AACL,CAAC"}

package/dist/filters/compilers/contains.d.ts

@@ -0,0 +1,4 @@
+import type { StamhoofdFilter } from '@stamhoofd/structures';
+import type { SQLSyncFilterRunner } from '../SQLFilter.js';
+export declare function $containsSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner;
+//# sourceMappingURL=contains.d.ts.map

package/dist/filters/compilers/contains.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contains.d.ts","sourceRoot":"","sources":["../../../src/filters/compilers/contains.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,OAAO,KAAK,EAAoB,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAI5E,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAmCvF"}

package/dist/filters/compilers/contains.js

@@ -0,0 +1,26 @@
+import { SimpleError } from '@simonbackx/simple-errors';
+import { assertFilterCompareValue } from '@stamhoofd/structures';
+import { scalarToSQLExpression, SQLLower, SQLNull } from '../../SQLExpressions.js';
+import { SQLJsonSearch } from '../../SQLJsonExpressions.js';
+import { SQLWhereEqual, SQLWhereLike, SQLWhereSign } from '../../SQLWhere.js';
+import { normalizeColumn, SQLValueType } from '../SQLFilter.js';
+import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
+export function $containsSQLFilterCompiler(filter) {
+    return (originalColumn) => {
+        const v = assertFilterCompareValue(filter);
+        const column = normalizeColumn(originalColumn, v);
+        const value = normalizeCompareValue(v, column.type);
+        if (typeof value !== 'string') {
+            throw new SimpleError({
+                code: 'invalid_filter',
+                message: 'Expected string at $contains filter',
+            });
+        }
+        if (column.type === SQLValueType.JSONArray || column.type === SQLValueType.JSONObject) {
+            // For JSON arrays and objects, we use JSON_CONTAINS
+            return new SQLWhereEqual(new SQLJsonSearch(new SQLLower(column.expression), 'one', scalarToSQLExpression('%' + SQLWhereLike.escape(value) + '%')), SQLWhereSign.NotEqual, new SQLNull());
+        }
+        return new SQLWhereLike(column.expression, scalarToSQLExpression('%' + SQLWhereLike.escape(value) + '%'));
+    };
+}
+//# sourceMappingURL=contains.js.map

package/dist/filters/compilers/contains.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contains.js","sourceRoot":"","sources":["../../../src/filters/compilers/contains.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,MAAM,UAAU,0BAA0B,CAAC,MAAuB;IAC9D,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,MAAM,CAAC,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,qBAAqB,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,IAAI,WAAW,CAAC;gBAClB,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,qCAAqC;aACjD,CAAC,CAAC;QACP,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,UAAU,EAAE,CAAC;YACpF,oDAAoD;YACpD,OAAO,IAAI,aAAa,CACpB,IAAI,aAAa,CACb,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAC/B,KAAK,EACL,qBAAqB,CACjB,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CACzC,CACJ,EACD,YAAY,CAAC,QAAQ,EACrB,IAAI,OAAO,EAAE,CAChB,CAAC;QACN,CAAC;QAED,OAAO,IAAI,YAAY,CACnB,MAAM,CAAC,UAAU,EACjB,qBAAqB,CACjB,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CACzC,CACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC"}

package/dist/filters/compilers/equals.d.ts

@@ -0,0 +1,4 @@
+import type { StamhoofdFilter } from '@stamhoofd/structures';
+import type { SQLSyncFilterRunner } from '../SQLFilter.js';
+export declare function $equalsSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner;
+//# sourceMappingURL=equals.d.ts.map

package/dist/filters/compilers/equals.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"equals.d.ts","sourceRoot":"","sources":["../../../src/filters/compilers/equals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM7D,OAAO,KAAK,EAAoB,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAK5E,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAgErF"}

package/dist/filters/compilers/equals.js

@@ -0,0 +1,44 @@
+import { assertFilterCompareValue } from '@stamhoofd/structures';
+import { scalarToSQLExpression, SQLLower, SQLNull } from '../../SQLExpressions.js';
+import { SQLJsonContains, SQLJsonSearch, SQLJsonValue } from '../../SQLJsonExpressions.js';
+import { SQLWhereEqual, SQLWhereLike, SQLWhereOr, SQLWhereSign } from '../../SQLWhere.js';
+import { normalizeColumn, SQLValueType } from '../SQLFilter.js';
+import { isJSONColumn } from '../helpers/isJSONColumn.js';
+import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
+export function $equalsSQLFilterCompiler(filter) {
+    return (originalColumn) => {
+        const v = assertFilterCompareValue(filter);
+        const column = normalizeColumn(originalColumn, v);
+        const value = normalizeCompareValue(v, column.type);
+        /**
+         * Special case, checking for equality with a JSON array.
+         * This should return true if the JSON array contains the value exactly.
+         *
+         * This differs from $contains, which will check for 'LIKE' inside the JSON array.
+         */
+        if (column.type === SQLValueType.JSONArray) {
+            let where;
+            if (typeof value === 'string') {
+                where = new SQLWhereEqual(new SQLJsonSearch(new SQLLower(column.expression), 'one', scalarToSQLExpression(SQLWhereLike.escape(value))), SQLWhereSign.NotEqual, new SQLNull());
+            }
+            else {
+                where = new SQLJsonContains(column.expression, scalarToSQLExpression(JSON.stringify(value)));
+            }
+            // If comparing against null, also check for native MySQL null (the column does not exist)
+            if (value === null) {
+                where = new SQLWhereOr([
+                    where,
+                    new SQLWhereEqual(column.expression, SQLWhereSign.Equal, new SQLNull()),
+                ]);
+            }
+            return where;
+        }
+        if (value === null && isJSONColumn(column)) {
+            // JSON values can either resolve to null or "null" in MySQL.
+            return new SQLWhereEqual(new SQLJsonValue(column.expression), // casts json null to null, including invalid paths
+            SQLWhereSign.Equal, new SQLNull());
+        }
+        return new SQLWhereEqual(column.expression, SQLWhereSign.Equal, scalarToSQLExpression(value)).setNullable(column.nullable);
+    };
+}
+//# sourceMappingURL=equals.js.map

package/dist/filters/compilers/equals.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"equals.js","sourceRoot":"","sources":["../../../src/filters/compilers/equals.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE1F,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,MAAM,UAAU,wBAAwB,CAAC,MAAuB;IAC5D,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,MAAM,CAAC,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,qBAAqB,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACpD;;;;;WAKG;QACH,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,SAAS,EAAE,CAAC;YACzC,IAAI,KAAe,CAAC;YAEpB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5B,KAAK,GAAG,IAAI,aAAa,CACrB,IAAI,aAAa,CACb,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAC/B,KAAK,EACL,qBAAqB,CACjB,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAC7B,CACJ,EACD,YAAY,CAAC,QAAQ,EACrB,IAAI,OAAO,EAAE,CAChB,CAAC;YACN,CAAC;iBACI,CAAC;gBACF,KAAK,GAAG,IAAI,eAAe,CACvB,MAAM,CAAC,UAAU,EACjB,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAC/C,CAAC;YACN,CAAC;YAED,0FAA0F;YAC1F,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACjB,KAAK,GAAG,IAAI,UAAU,CAAC;oBACnB,KAAK;oBACL,IAAI,aAAa,CACb,MAAM,CAAC,UAAU,EACjB,YAAY,CAAC,KAAK,EAClB,IAAI,OAAO,EAAE,CAChB;iBACJ,CAAC,CAAC;YACP,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,KAAK,KAAK,IAAI,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YACzC,6DAA6D;YAC7D,OAAO,IAAI,aAAa,CACpB,IAAI,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,mDAAmD;YACxF,YAAY,CAAC,KAAK,EAClB,IAAI,OAAO,EAAE,CAChB,CAAC;QACN,CAAC;QAED,OAAO,IAAI,aAAa,CACpB,MAAM,CAAC,UAAU,EACjB,YAAY,CAAC,KAAK,EAClB,qBAAqB,CAAC,KAAK,CAAC,CAC/B,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC;AACN,CAAC"}

package/dist/filters/compilers/greater.d.ts

@@ -0,0 +1,4 @@
+import type { StamhoofdFilter } from '@stamhoofd/structures';
+import type { SQLSyncFilterRunner } from '../SQLFilter.js';
+export declare function $greaterThanSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner;
+//# sourceMappingURL=greater.d.ts.map

package/dist/filters/compilers/greater.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"greater.d.ts","sourceRoot":"","sources":["../../../src/filters/compilers/greater.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,OAAO,KAAK,EAAoB,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAI7E,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAc1F"}

package/dist/filters/compilers/greater.js

@@ -0,0 +1,15 @@
+import { assertFilterCompareValue } from '@stamhoofd/structures';
+import { scalarToSQLExpression } from '../../SQLExpressions.js';
+import { SQLWhereEqual, SQLWhereSign } from '../../SQLWhere.js';
+import { normalizeColumn } from '../SQLFilter.js';
+import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
+export function $greaterThanSQLFilterCompiler(filter) {
+    return (originalColumn) => {
+        const v = assertFilterCompareValue(filter);
+        const column = normalizeColumn(originalColumn, v);
+        const value = normalizeCompareValue(v, column.type);
+        const base = new SQLWhereEqual(column.expression, SQLWhereSign.Greater, scalarToSQLExpression(value)).setNullable(column.nullable);
+        return base;
+    };
+}
+//# sourceMappingURL=greater.js.map

package/dist/filters/compilers/greater.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"greater.js","sourceRoot":"","sources":["../../../src/filters/compilers/greater.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,MAAM,UAAU,6BAA6B,CAAC,MAAuB;IACjE,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,MAAM,CAAC,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,qBAAqB,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpD,MAAM,IAAI,GAAG,IAAI,aAAa,CAC1B,MAAM,CAAC,UAAU,EACjB,YAAY,CAAC,OAAO,EACpB,qBAAqB,CAAC,KAAK,CAAC,CAC/B,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;AACN,CAAC"}

package/dist/filters/compilers/in.d.ts

@@ -0,0 +1,4 @@
+import type { StamhoofdFilter } from '@stamhoofd/structures';
+import type { SQLSyncFilterRunner } from '../SQLFilter.js';
+export declare function $inSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner;
+//# sourceMappingURL=in.d.ts.map

package/dist/filters/compilers/in.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"in.d.ts","sourceRoot":"","sources":["../../../src/filters/compilers/in.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,OAAO,KAAK,EAAoB,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAK5E,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAoDjF"}

package/{src/filters/compilers/in.ts → dist/filters/compilers/in.js}

@@ -1,40 +1,34 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { assertFilterCompareValue, StamhoofdFilter } from '@stamhoofd/structures';
+import { assertFilterCompareValue } from '@stamhoofd/structures';
 import { scalarToSQLExpression, SQLArray } from '../../SQLExpressions.js';
 import { SQLJsonOverlaps } from '../../SQLJsonExpressions.js';
 import { SQLWhereEqual, SQLWhereOr, SQLWhereSign } from '../../SQLWhere.js';
-import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner, SQLValueType } from '../SQLFilter.js';
+import { normalizeColumn, SQLValueType } from '../SQLFilter.js';
 import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
 import { $equalsSQLFilterCompiler } from './equals.js';
-
-export function $inSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner {
-    return (originalColumn: SQLCurrentColumn) => {
+export function $inSQLFilterCompiler(filter) {
+    return (originalColumn) => {
         if (!Array.isArray(filter)) {
             throw new SimpleError({
                 code: 'invalid_filter',
                 message: 'Expected array at $in filter',
             });
         }
-
         if (filter.length > 1000) {
             throw new SimpleError({
                 code: 'invalid_filter',
                 message: 'Too many values in $in filter, maximum is 1000',
-                human: $t('2f4b0c22-044e-486b-8a75-80a5b51beaf3', { count: filter.length }),
+                human: $t('%1HH', { count: filter.length }),
             });
         }
-
-        const column = normalizeColumn(originalColumn);
-        const values = filter.map(val => normalizeCompareValue(assertFilterCompareValue(val), column.type));
-
-        if (values.length === 0) {
+        if (filter.length === 0) {
             // Return always false
             return new SQLWhereOr([]);
         }
-
+        const column = normalizeColumn(originalColumn, assertFilterCompareValue(filter.find(f => f !== null) ?? null));
+        const values = filter.map(val => normalizeCompareValue(assertFilterCompareValue(val), column.type));
         const valuesWithoutNulls = values.filter(val => val !== null);
         const hasNull = values.length !== valuesWithoutNulls.length;
-
         if (hasNull) {
             // We cannot 'in' check with null. On top of that, null has some special behaviour when used in JSON values (e.g. JSON null vs MySQL null).
             return new SQLWhereOr([
@@ -42,22 +36,13 @@ export function $inSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunn
                 $inSQLFilterCompiler(valuesWithoutNulls)(column),
             ]);
         }
-
         if (column.type === SQLValueType.JSONArray) {
             const jsonValues = JSON.stringify(valuesWithoutNulls);
             const valuesExpression = scalarToSQLExpression(jsonValues);
-
-            return new SQLJsonOverlaps(
-                column.expression,
-                valuesExpression,
-            );
+            return new SQLJsonOverlaps(column.expression, valuesExpression);
         }
         const valuesExpression = valuesWithoutNulls.length === 1 ? scalarToSQLExpression(valuesWithoutNulls[0]) : new SQLArray(valuesWithoutNulls);
-
-        return new SQLWhereEqual(
-            column.expression,
-            SQLWhereSign.Equal,
-            valuesExpression,
-        ).setNullable(column.nullable);
+        return new SQLWhereEqual(column.expression, SQLWhereSign.Equal, valuesExpression).setNullable(column.nullable);
     };
 }
+//# sourceMappingURL=in.js.map

package/dist/filters/compilers/in.js.map

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

package/dist/filters/compilers/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/filters/compilers/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC"}

package/{src/filters/compilers/index.ts → dist/filters/compilers/index.js}

@@ -2,3 +2,4 @@ export * from './less.js';
 export * from './greater.js';
 export * from './equals.js';
 export * from './in.js';
+//# sourceMappingURL=index.js.map