@stamhoofd/sql 2.89.2 → 2.90.1

package/dist/src/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,EAA4B,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIlF,OAAO,EAAqC,mBAAmB,EAAgB,MAAM,cAAc,CAAC;AAGpG,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAkCvF"}

package/dist/src/filters/{modern/compilers → compilers}/contains.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.$containsSQLFilterCompiler = $containsSQLFilterCompiler;
 const simple_errors_1 = require("@simonbackx/simple-errors");
 const structures_1 = require("@stamhoofd/structures");
-const SQLExpressions_1 = require("../../../SQLExpressions");
-const SQLJsonExpressions_1 = require("../../../SQLJsonExpressions");
-const SQLWhere_1 = require("../../../SQLWhere");
-const SQLModernFilter_1 = require("../SQLModernFilter");
+const SQLExpressions_1 = require("../../SQLExpressions");
+const SQLJsonExpressions_1 = require("../../SQLJsonExpressions");
+const SQLWhere_1 = require("../../SQLWhere");
+const SQLFilter_1 = require("../SQLFilter");
 const normalizeCompareValue_1 = require("../helpers/normalizeCompareValue");
 function $containsSQLFilterCompiler(filter) {
     return (originalColumn) => {
-        const column = (0, SQLModernFilter_1.normalizeColumn)(originalColumn);
+        const column = (0, SQLFilter_1.normalizeColumn)(originalColumn);
         const value = (0, normalizeCompareValue_1.normalizeCompareValue)((0, structures_1.assertFilterCompareValue)(filter), column.type);
         if (typeof value !== 'string') {
             throw new simple_errors_1.SimpleError({
@@ -18,7 +18,7 @@ function $containsSQLFilterCompiler(filter) {
                 message: 'Expected string at $contains filter',
             });
         }
-        if (column.type === SQLModernFilter_1.SQLModernValueType.JSONArray || column.type === SQLModernFilter_1.SQLModernValueType.JSONObject) {
+        if (column.type === SQLFilter_1.SQLValueType.JSONArray || column.type === SQLFilter_1.SQLValueType.JSONObject) {
             // For JSON arrays and objects, we use JSON_CONTAINS
             return new SQLWhere_1.SQLWhereEqual(new SQLJsonExpressions_1.SQLJsonSearch(new SQLExpressions_1.SQLLower(column.expression), 'one', (0, SQLExpressions_1.scalarToSQLExpression)('%' + SQLWhere_1.SQLWhereLike.escape(value) + '%')), SQLWhere_1.SQLWhereSign.NotEqual, new SQLExpressions_1.SQLNull());
         }

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

@@ -0,0 +1 @@
+{"version":3,"file":"contains.js","sourceRoot":"","sources":["../../../../src/filters/compilers/contains.ts"],"names":[],"mappings":";;AAQA,gEAkCC;AA1CD,6DAAwD;AACxD,sDAAkF;AAClF,yDAAgF;AAChF,iEAAyD;AACzD,6CAA2E;AAC3E,4CAAoG;AACpG,4EAAyE;AAEzE,SAAgB,0BAA0B,CAAC,MAAuB;IAC9D,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAA,6CAAqB,EAAC,IAAA,qCAAwB,EAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAEnF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,qCAAqC;aACjD,CAAC,CAAC;QACP,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,wBAAY,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,wBAAY,CAAC,UAAU,EAAE,CAAC;YACpF,oDAAoD;YACpD,OAAO,IAAI,wBAAa,CACpB,IAAI,kCAAa,CACb,IAAI,yBAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAC/B,KAAK,EACL,IAAA,sCAAqB,EACjB,GAAG,GAAG,uBAAY,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CACzC,CACJ,EACD,uBAAY,CAAC,QAAQ,EACrB,IAAI,wBAAO,EAAE,CAChB,CAAC;QACN,CAAC;QAED,OAAO,IAAI,uBAAY,CACnB,MAAM,CAAC,UAAU,EACjB,IAAA,sCAAqB,EACjB,GAAG,GAAG,uBAAY,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CACzC,CACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC"}

package/dist/src/filters/{modern/compilers → compilers}/equals.d.ts

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

package/dist/src/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,EAA4B,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIlF,OAAO,EAAqC,mBAAmB,EAAgB,MAAM,cAAc,CAAC;AAIpG,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CA+DrF"}

package/dist/src/filters/{modern/compilers → compilers}/equals.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.$equalsSQLFilterCompiler = $equalsSQLFilterCompiler;
 const structures_1 = require("@stamhoofd/structures");
-const SQLExpressions_1 = require("../../../SQLExpressions");
-const SQLJsonExpressions_1 = require("../../../SQLJsonExpressions");
-const SQLWhere_1 = require("../../../SQLWhere");
-const SQLModernFilter_1 = require("../SQLModernFilter");
+const SQLExpressions_1 = require("../../SQLExpressions");
+const SQLJsonExpressions_1 = require("../../SQLJsonExpressions");
+const SQLWhere_1 = require("../../SQLWhere");
+const SQLFilter_1 = require("../SQLFilter");
 const isJSONColumn_1 = require("../helpers/isJSONColumn");
 const normalizeCompareValue_1 = require("../helpers/normalizeCompareValue");
 function $equalsSQLFilterCompiler(filter) {
     return (originalColumn) => {
-        const column = (0, SQLModernFilter_1.normalizeColumn)(originalColumn);
+        const column = (0, SQLFilter_1.normalizeColumn)(originalColumn);
         const value = (0, normalizeCompareValue_1.normalizeCompareValue)((0, structures_1.assertFilterCompareValue)(filter), column.type);
         /**
          * Special case, checking for equality with a JSON array.
@@ -18,7 +18,7 @@ function $equalsSQLFilterCompiler(filter) {
          *
          * This differs from $contains, which will check for 'LIKE' inside the JSON array.
          */
-        if (column.type === SQLModernFilter_1.SQLModernValueType.JSONArray) {
+        if (column.type === SQLFilter_1.SQLValueType.JSONArray) {
             let where;
             if (typeof value === 'string') {
                 where = new SQLWhere_1.SQLWhereEqual(new SQLJsonExpressions_1.SQLJsonSearch(new SQLExpressions_1.SQLLower(column.expression), 'one', (0, SQLExpressions_1.scalarToSQLExpression)(SQLWhere_1.SQLWhereLike.escape(value))), SQLWhere_1.SQLWhereSign.NotEqual, new SQLExpressions_1.SQLNull());
@@ -40,7 +40,7 @@ function $equalsSQLFilterCompiler(filter) {
             return new SQLWhere_1.SQLWhereEqual(new SQLJsonExpressions_1.SQLJsonValue(column.expression), // casts json null to null, including invalid paths
             SQLWhere_1.SQLWhereSign.Equal, new SQLExpressions_1.SQLNull());
         }
-        return new SQLWhere_1.SQLWhereEqual(column.expression, SQLWhere_1.SQLWhereSign.Equal, (0, SQLExpressions_1.scalarToSQLExpression)(value));
+        return new SQLWhere_1.SQLWhereEqual(column.expression, SQLWhere_1.SQLWhereSign.Equal, (0, SQLExpressions_1.scalarToSQLExpression)(value)).setNullable(column.nullable);
     };
 }
 //# sourceMappingURL=equals.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"equals.js","sourceRoot":"","sources":["../../../../src/filters/compilers/equals.ts"],"names":[],"mappings":";;AAQA,4DA+DC;AAvED,sDAAkF;AAClF,yDAAgF;AAChF,iEAAwF;AACxF,6CAAiG;AACjG,4CAAoG;AACpG,0DAAuD;AACvD,4EAAyE;AAEzE,SAAgB,wBAAwB,CAAC,MAAuB;IAC5D,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAA,6CAAqB,EAAC,IAAA,qCAAwB,EAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACnF;;;;;WAKG;QACH,IAAI,MAAM,CAAC,IAAI,KAAK,wBAAY,CAAC,SAAS,EAAE,CAAC;YACzC,IAAI,KAAe,CAAC;YAEpB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5B,KAAK,GAAG,IAAI,wBAAa,CACrB,IAAI,kCAAa,CACb,IAAI,yBAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAC/B,KAAK,EACL,IAAA,sCAAqB,EACjB,uBAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAC7B,CACJ,EACD,uBAAY,CAAC,QAAQ,EACrB,IAAI,wBAAO,EAAE,CAChB,CAAC;YACN,CAAC;iBACI,CAAC;gBACF,KAAK,GAAG,IAAI,oCAAe,CACvB,MAAM,CAAC,UAAU,EACjB,IAAA,sCAAqB,EAAC,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,qBAAU,CAAC;oBACnB,KAAK;oBACL,IAAI,wBAAa,CACb,MAAM,CAAC,UAAU,EACjB,uBAAY,CAAC,KAAK,EAClB,IAAI,wBAAO,EAAE,CAChB;iBACJ,CAAC,CAAC;YACP,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,KAAK,KAAK,IAAI,IAAI,IAAA,2BAAY,EAAC,MAAM,CAAC,EAAE,CAAC;YACzC,6DAA6D;YAC7D,OAAO,IAAI,wBAAa,CACpB,IAAI,iCAAY,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,mDAAmD;YACxF,uBAAY,CAAC,KAAK,EAClB,IAAI,wBAAO,EAAE,CAChB,CAAC;QACN,CAAC;QAED,OAAO,IAAI,wBAAa,CACpB,MAAM,CAAC,UAAU,EACjB,uBAAY,CAAC,KAAK,EAClB,IAAA,sCAAqB,EAAC,KAAK,CAAC,CAC/B,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC;AACN,CAAC"}

package/dist/src/filters/{modern/compilers → compilers}/greater.d.ts

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

package/dist/src/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,EAA4B,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGlF,OAAO,EAAqC,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGtF,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAa1F"}

package/dist/src/filters/{modern/compilers → compilers}/greater.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.$greaterThanSQLFilterCompiler = $greaterThanSQLFilterCompiler;
 const structures_1 = require("@stamhoofd/structures");
-const SQLExpressions_1 = require("../../../SQLExpressions");
-const SQLWhere_1 = require("../../../SQLWhere");
-const SQLModernFilter_1 = require("../SQLModernFilter");
+const SQLExpressions_1 = require("../../SQLExpressions");
+const SQLWhere_1 = require("../../SQLWhere");
+const SQLFilter_1 = require("../SQLFilter");
 const normalizeCompareValue_1 = require("../helpers/normalizeCompareValue");
 function $greaterThanSQLFilterCompiler(filter) {
     return (originalColumn) => {
-        const column = (0, SQLModernFilter_1.normalizeColumn)(originalColumn);
+        const column = (0, SQLFilter_1.normalizeColumn)(originalColumn);
         const value = (0, normalizeCompareValue_1.normalizeCompareValue)((0, structures_1.assertFilterCompareValue)(filter), column.type);
         const base = new SQLWhere_1.SQLWhereEqual(column.expression, SQLWhere_1.SQLWhereSign.Greater, (0, SQLExpressions_1.scalarToSQLExpression)(value)).setNullable(column.nullable);
         return base;

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

@@ -0,0 +1 @@
+{"version":3,"file":"greater.js","sourceRoot":"","sources":["../../../../src/filters/compilers/greater.ts"],"names":[],"mappings":";;AAMA,sEAaC;AAnBD,sDAAkF;AAClF,yDAA6D;AAC7D,6CAA6D;AAC7D,4CAAsF;AACtF,4EAAyE;AAEzE,SAAgB,6BAA6B,CAAC,MAAuB;IACjE,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAA,6CAAqB,EAAC,IAAA,qCAAwB,EAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAEnF,MAAM,IAAI,GAAG,IAAI,wBAAa,CAC1B,MAAM,CAAC,UAAU,EACjB,uBAAY,CAAC,OAAO,EACpB,IAAA,sCAAqB,EAAC,KAAK,CAAC,CAC/B,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;AACN,CAAC"}

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

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

package/dist/src/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,EAA4B,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIlF,OAAO,EAAqC,mBAAmB,EAAgB,MAAM,cAAc,CAAC;AAIpG,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAoDjF"}

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

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.$inSQLFilterCompiler = $inSQLFilterCompiler;
 const simple_errors_1 = require("@simonbackx/simple-errors");
 const structures_1 = require("@stamhoofd/structures");
-const SQLExpressions_1 = require("../../../SQLExpressions");
-const SQLJsonExpressions_1 = require("../../../SQLJsonExpressions");
-const SQLWhere_1 = require("../../../SQLWhere");
-const SQLModernFilter_1 = require("../SQLModernFilter");
+const SQLExpressions_1 = require("../../SQLExpressions");
+const SQLJsonExpressions_1 = require("../../SQLJsonExpressions");
+const SQLWhere_1 = require("../../SQLWhere");
+const SQLFilter_1 = require("../SQLFilter");
 const normalizeCompareValue_1 = require("../helpers/normalizeCompareValue");
 const equals_1 = require("./equals");
 function $inSQLFilterCompiler(filter) {
@@ -23,7 +23,7 @@ function $inSQLFilterCompiler(filter) {
                 message: 'Too many values in $in filter, maximum is 100',
             });
         }
-        const column = (0, SQLModernFilter_1.normalizeColumn)(originalColumn);
+        const column = (0, SQLFilter_1.normalizeColumn)(originalColumn);
         const values = filter.map(val => (0, normalizeCompareValue_1.normalizeCompareValue)((0, structures_1.assertFilterCompareValue)(val), column.type));
         if (values.length === 0) {
             // Return always false
@@ -38,13 +38,13 @@ function $inSQLFilterCompiler(filter) {
                 $inSQLFilterCompiler(valuesWithoutNulls)(column),
             ]);
         }
-        if (column.type === SQLModernFilter_1.SQLModernValueType.JSONArray) {
+        if (column.type === SQLFilter_1.SQLValueType.JSONArray) {
             const jsonValues = JSON.stringify(valuesWithoutNulls);
             const valuesExpression = (0, SQLExpressions_1.scalarToSQLExpression)(jsonValues);
             return new SQLJsonExpressions_1.SQLJsonOverlaps(column.expression, valuesExpression);
         }
         const valuesExpression = valuesWithoutNulls.length === 1 ? (0, SQLExpressions_1.scalarToSQLExpression)(valuesWithoutNulls[0]) : new SQLExpressions_1.SQLArray(valuesWithoutNulls);
-        return new SQLWhere_1.SQLWhereEqual(column.expression, SQLWhere_1.SQLWhereSign.Equal, valuesExpression);
+        return new SQLWhere_1.SQLWhereEqual(column.expression, SQLWhere_1.SQLWhereSign.Equal, valuesExpression).setNullable(column.nullable);
     };
 }
 //# sourceMappingURL=in.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"in.js","sourceRoot":"","sources":["../../../../src/filters/compilers/in.ts"],"names":[],"mappings":";;AASA,oDAoDC;AA7DD,6DAAwD;AACxD,sDAAkF;AAClF,yDAAuE;AACvE,iEAA2D;AAC3D,6CAAyE;AACzE,4CAAoG;AACpG,4EAAyE;AACzE,qCAAoD;AAEpD,SAAgB,oBAAoB,CAAC,MAAuB;IACxD,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,8BAA8B;aAC1C,CAAC,CAAC;QACP,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YACtB,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,+CAA+C;aAC3D,CAAC,CAAC;QACP,CAAC;QAED,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAA,6CAAqB,EAAC,IAAA,qCAAwB,EAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,sBAAsB;YACtB,OAAO,IAAI,qBAAU,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,MAAM,CAAC;QAE5D,IAAI,OAAO,EAAE,CAAC;YACV,2IAA2I;YAC3I,OAAO,IAAI,qBAAU,CAAC;gBAClB,IAAA,iCAAwB,EAAC,IAAI,CAAC,CAAC,MAAM,CAAC;gBACtC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC;aACnD,CAAC,CAAC;QACP,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,wBAAY,CAAC,SAAS,EAAE,CAAC;YACzC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;YACtD,MAAM,gBAAgB,GAAG,IAAA,sCAAqB,EAAC,UAAU,CAAC,CAAC;YAE3D,OAAO,IAAI,oCAAe,CACtB,MAAM,CAAC,UAAU,EACjB,gBAAgB,CACnB,CAAC;QACN,CAAC;QACD,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,sCAAqB,EAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,yBAAQ,CAAC,kBAAkB,CAAC,CAAC;QAE3I,OAAO,IAAI,wBAAa,CACpB,MAAM,CAAC,UAAU,EACjB,uBAAY,CAAC,KAAK,EAClB,gBAAgB,CACnB,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC;AACN,CAAC"}

package/dist/src/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,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,MAAM,CAAC"}

package/dist/src/filters/compilers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/filters/compilers/index.ts"],"names":[],"mappings":";;;AAAA,iDAAuB;AACvB,oDAA0B;AAC1B,mDAAyB;AACzB,+CAAqB"}

package/dist/src/filters/{modern/compilers → compilers}/less.d.ts

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

package/dist/src/filters/compilers/less.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"less.d.ts","sourceRoot":"","sources":["../../../../src/filters/compilers/less.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGlF,OAAO,EAAqC,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGtF,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAYvF"}

package/dist/src/filters/{modern/compilers → compilers}/less.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.$lessThanSQLFilterCompiler = $lessThanSQLFilterCompiler;
 const structures_1 = require("@stamhoofd/structures");
-const SQLExpressions_1 = require("../../../SQLExpressions");
-const SQLWhere_1 = require("../../../SQLWhere");
-const SQLModernFilter_1 = require("../SQLModernFilter");
+const SQLExpressions_1 = require("../../SQLExpressions");
+const SQLWhere_1 = require("../../SQLWhere");
+const SQLFilter_1 = require("../SQLFilter");
 const normalizeCompareValue_1 = require("../helpers/normalizeCompareValue");
 function $lessThanSQLFilterCompiler(filter) {
     return (originalColumn) => {
-        const column = (0, SQLModernFilter_1.normalizeColumn)(originalColumn);
+        const column = (0, SQLFilter_1.normalizeColumn)(originalColumn);
         const value = (0, normalizeCompareValue_1.normalizeCompareValue)((0, structures_1.assertFilterCompareValue)(filter), column.type);
         const base = new SQLWhere_1.SQLWhereEqual(column.expression, SQLWhere_1.SQLWhereSign.Less, (0, SQLExpressions_1.scalarToSQLExpression)(value)).setNullable(column.nullable);
         return base;

package/dist/src/filters/compilers/less.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"less.js","sourceRoot":"","sources":["../../../../src/filters/compilers/less.ts"],"names":[],"mappings":";;AAMA,gEAYC;AAlBD,sDAAkF;AAClF,yDAA6D;AAC7D,6CAA6D;AAC7D,4CAAsF;AACtF,4EAAyE;AAEzE,SAAgB,0BAA0B,CAAC,MAAuB;IAC9D,OAAO,CAAC,cAAgC,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAA,6CAAqB,EAAC,IAAA,qCAAwB,EAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAEnF,MAAM,IAAI,GAAG,IAAI,wBAAa,CAC1B,MAAM,CAAC,UAAU,EACjB,uBAAY,CAAC,IAAI,EACjB,IAAA,sCAAqB,EAAC,KAAK,CAAC,CAC/B,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;AACN,CAAC"}

package/dist/src/filters/helpers/isJSONColumn.d.ts

@@ -0,0 +1,4 @@
+import { SQLCurrentColumn, SQLValueType } from '../SQLFilter';
+export declare function isJSONColumn({ type }: SQLCurrentColumn): boolean;
+export declare function isJSONType(type: SQLValueType): boolean;
+//# sourceMappingURL=isJSONColumn.d.ts.map

package/dist/src/filters/helpers/isJSONColumn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isJSONColumn.d.ts","sourceRoot":"","sources":["../../../../src/filters/helpers/isJSONColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9D,wBAAgB,YAAY,CAAC,EAAE,IAAI,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAEhE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAMtD"}

package/dist/src/filters/helpers/isJSONColumn.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isJSONColumn = isJSONColumn;
+exports.isJSONType = isJSONType;
+const SQLFilter_1 = require("../SQLFilter");
+function isJSONColumn({ type }) {
+    return isJSONType(type);
+}
+function isJSONType(type) {
+    return type === SQLFilter_1.SQLValueType.JSONString
+        || type === SQLFilter_1.SQLValueType.JSONBoolean
+        || type === SQLFilter_1.SQLValueType.JSONNumber
+        || type === SQLFilter_1.SQLValueType.JSONArray
+        || type === SQLFilter_1.SQLValueType.JSONObject;
+}
+//# sourceMappingURL=isJSONColumn.js.map

package/dist/src/filters/helpers/isJSONColumn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isJSONColumn.js","sourceRoot":"","sources":["../../../../src/filters/helpers/isJSONColumn.ts"],"names":[],"mappings":";;AAEA,oCAEC;AAED,gCAMC;AAZD,4CAA8D;AAE9D,SAAgB,YAAY,CAAC,EAAE,IAAI,EAAoB;IACnD,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,UAAU,CAAC,IAAkB;IACzC,OAAO,IAAI,KAAK,wBAAY,CAAC,UAAU;WAChC,IAAI,KAAK,wBAAY,CAAC,WAAW;WACjC,IAAI,KAAK,wBAAY,CAAC,UAAU;WAChC,IAAI,KAAK,wBAAY,CAAC,SAAS;WAC/B,IAAI,KAAK,wBAAY,CAAC,UAAU,CAAC;AAC5C,CAAC"}

package/dist/src/filters/{modern/helpers → helpers}/normalizeCompareValue.d.ts

@@ -1,9 +1,9 @@
 import { StamhoofdCompareValue } from '@stamhoofd/structures';
-import { SQLModernValueType } from '../SQLModernFilter';
+import { SQLValueType } from '../SQLFilter';
 /**
  * Prepares a compare value so we can compare it, given a certain column type.
  *
  * E.g. if you pass in true - and we are comparing against a mysql boolean column, convert it to 1.
  */
-export declare function normalizeCompareValue(val: StamhoofdCompareValue, againstType: SQLModernValueType): string | number | Date | null | boolean;
+export declare function normalizeCompareValue(val: StamhoofdCompareValue, againstType: SQLValueType): string | number | Date | null | boolean;
 //# sourceMappingURL=normalizeCompareValue.d.ts.map

package/dist/src/filters/helpers/normalizeCompareValue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeCompareValue.d.ts","sourceRoot":"","sources":["../../../../src/filters/helpers/normalizeCompareValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,qBAAqB,EAAE,WAAW,EAAE,YAAY,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,OAAO,CA4FpI"}

package/dist/src/filters/{modern/helpers → helpers}/normalizeCompareValue.js

@@ -1,65 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCompareValue = normalizeCompareValue;
-const SQLModernFilter_1 = require("../SQLModernFilter");
+const SQLFilter_1 = require("../SQLFilter");
 /**
  * Prepares a compare value so we can compare it, given a certain column type.
  *
  * E.g. if you pass in true - and we are comparing against a mysql boolean column, convert it to 1.
  */
 function normalizeCompareValue(val, againstType) {
-    if (againstType === SQLModernFilter_1.SQLModernValueType.Table) {
+    if (againstType === SQLFilter_1.SQLValueType.Table) {
         throw new Error('Cannot compare at root level');
     }
-    if (againstType === SQLModernFilter_1.SQLModernValueType.JSONObject) {
+    if (againstType === SQLFilter_1.SQLValueType.JSONObject) {
         if (val === null) {
             return null;
         }
         throw new Error('Cannot compare with a JSON object');
     }
     if (val instanceof Date) {
-        if (againstType === SQLModernFilter_1.SQLModernValueType.Datetime) {
+        if (againstType === SQLFilter_1.SQLValueType.Datetime) {
             return val;
         }
         throw new Error('Cannot compare a date with a non-datetime column');
     }
     if (typeof val === 'string') {
-        if (againstType === SQLModernFilter_1.SQLModernValueType.String || againstType === SQLModernFilter_1.SQLModernValueType.JSONString) {
+        if (againstType === SQLFilter_1.SQLValueType.String || againstType === SQLFilter_1.SQLValueType.JSONString) {
             return val.toLocaleLowerCase();
         }
-        if (againstType === SQLModernFilter_1.SQLModernValueType.JSONArray) {
+        if (againstType === SQLFilter_1.SQLValueType.JSONArray) {
             // We'll search inside the array
             return val.toLocaleLowerCase();
         }
+        // Allowed to compare strings with dates
+        if (againstType === SQLFilter_1.SQLValueType.Datetime) {
+            // Note, taht if you ever filter dates by string values, you need to work with UTC timezones
+            return val;
+        }
         throw new Error('Cannot compare a string with a non-string column');
     }
     if (typeof val === 'boolean') {
-        if (againstType === SQLModernFilter_1.SQLModernValueType.JSONBoolean) {
+        if (againstType === SQLFilter_1.SQLValueType.JSONBoolean) {
             return val;
         }
-        if (againstType === SQLModernFilter_1.SQLModernValueType.Boolean || againstType === SQLModernFilter_1.SQLModernValueType.Number) {
+        if (againstType === SQLFilter_1.SQLValueType.Boolean || againstType === SQLFilter_1.SQLValueType.Number) {
             return val === true ? 1 : 0;
         }
-        if (againstType === SQLModernFilter_1.SQLModernValueType.JSONArray) {
+        if (againstType === SQLFilter_1.SQLValueType.JSONArray) {
             // We'll search inside the array
             return val;
         }
         throw new Error('Cannot compare a boolean with a non-boolean column');
     }
     if (typeof val === 'number') {
-        if (againstType === SQLModernFilter_1.SQLModernValueType.JSONBoolean) {
+        if (againstType === SQLFilter_1.SQLValueType.JSONBoolean) {
             return val === 1 ? true : false;
         }
-        if (againstType === SQLModernFilter_1.SQLModernValueType.Boolean) {
+        if (againstType === SQLFilter_1.SQLValueType.Boolean) {
             if (val !== 1 && val !== 0) {
                 throw new Error('Cannot compare a number with a boolean column');
             }
             return val;
         }
-        if (againstType === SQLModernFilter_1.SQLModernValueType.Number || againstType === SQLModernFilter_1.SQLModernValueType.JSONNumber) {
+        if (againstType === SQLFilter_1.SQLValueType.Number || againstType === SQLFilter_1.SQLValueType.JSONNumber) {
             return val;
         }
-        if (againstType === SQLModernFilter_1.SQLModernValueType.JSONArray) {
+        if (againstType === SQLFilter_1.SQLValueType.JSONArray) {
             // We'll search inside the array
             return val;
         }

package/dist/src/filters/helpers/normalizeCompareValue.js.map

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

package/dist/tests/filters/$and.test.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const SQLModernFilter_1 = require("../../src/filters/modern/SQLModernFilter");
+const SQLFilter_1 = require("../../src/filters/SQLFilter");
 const SQL_1 = require("../../src/SQL");
 const utils_1 = require("../utils");
 describe('$and', () => {
@@ -12,8 +12,8 @@ describe('$and', () => {
     });
     it('If one child is always false, the whole $and is always false', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: true }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
         };
         await (0, utils_1.test)({
             filter: {
@@ -31,10 +31,41 @@ describe('$and', () => {
             },
         });
     });
+    /**
+     * Regression:
+     * when using $lte on a nullable field, it sometimes didn't group the OR
+     * and caused:
+     * (birthday >= x) AND birthday <= x OR birthday is null
+     * instead of
+     * birthday >= x AND (birthday <= x OR birthday is null)
+     *
+     * This was caused by incorrect WhereNot.isSingle logic ($lte and $gte uses not $gt and not $lt under the hood)
+     */
+    it('Grouping nullable $lte and $gte correctly inside $and', async () => {
+        const filters = {
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            birthDay: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('birthDay'), type: SQLFilter_1.SQLValueType.Datetime, nullable: true }),
+        };
+        await (0, utils_1.test)({
+            filter: {
+                birthDay: {
+                    $and: {
+                        $gte: new Date(200),
+                        $lte: new Date(500),
+                    },
+                },
+            },
+            filters,
+            query: {
+                query: '`default`.`birthDay` >= ? AND (`default`.`birthDay` <= ? OR `default`.`birthDay` IS NULL)',
+                params: [new Date(200), new Date(500)],
+            },
+        });
+    });
     it('An empty $and is always true', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: true }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
         };
         await (0, utils_1.test)({
             filter: {
@@ -49,8 +80,8 @@ describe('$and', () => {
     });
     it('If all children are always true, the whole $and is always true', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: true }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
         };
         await (0, utils_1.test)({
             filter: {
@@ -74,8 +105,8 @@ describe('$and', () => {
     });
     it('Children that are always true are removed from the $and', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: true }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
         };
         await (0, utils_1.test)({
             filter: {
@@ -98,8 +129,8 @@ describe('$and', () => {
     });
     it('Can be used with direct object child', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: false }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
         };
         await (0, utils_1.test)({
             filter: {
@@ -119,9 +150,9 @@ describe('$and', () => {
     });
     it('NOT (A AND B) is simplified to (NOT A or not B)', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: false }),
-            createdAt: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('createdAt'), type: SQLModernFilter_1.SQLModernValueType.Datetime, nullable: false }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
+            createdAt: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('createdAt'), type: SQLFilter_1.SQLValueType.Datetime, nullable: false }),
         };
         await (0, utils_1.test)({
             filter: {
@@ -139,8 +170,8 @@ describe('$and', () => {
     });
     it('empty $and branches are removed', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: false }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
         };
         await (0, utils_1.test)({
             filter: {
@@ -158,8 +189,8 @@ describe('$and', () => {
     });
     it('deep $and branches are cleaned up', async () => {
         const filters = {
-            ...SQLModernFilter_1.baseModernSQLFilterCompilers,
-            name: (0, SQLModernFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLModernFilter_1.SQLModernValueType.String, nullable: false }),
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
         };
         await (0, utils_1.test)({
             filter: {

package/dist/tests/filters/$and.test.js.map

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