@stamhoofd/sql 2.107.3 → 2.109.0

package/dist/tests/filters/SQLTranslatedStringHelper.test.js

@@ -0,0 +1,491 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const structures_1 = require("@stamhoofd/structures");
+const SQLFilter_1 = require("../../src/filters/SQLFilter");
+const SQL_1 = require("../../src/SQL");
+const SQLTranslatedStringHelper_1 = require("../../src/SQLTranslatedStringHelper");
+const utils_1 = require("../utils");
+describe('SQLTranslatedStringHelper', () => {
+    describe('MySQL behaviour', () => {
+        const tableDefinition = {
+            settings: {
+                type: 'json',
+                nullable: true,
+            },
+        };
+        const filters = {
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.Dutch),
+                type: SQLFilter_1.SQLValueType.String,
+                nullable: true,
+            }),
+        };
+        it('Comparing string values is case insensitive', async () => {
+            const rows = [
+                {
+                    settings: {
+                        name: { nl: 'alice', en: 'alice', fr: 'alice' },
+                    },
+                },
+                {
+                    settings: {
+                        name: { nl: 'Alice', en: 'Alice', fr: 'Alice' },
+                    },
+                },
+                {
+                    settings: {
+                        name: { nl: 'ALICE', en: 'ALICE', fr: 'ALICE' },
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'alice',
+                    },
+                    {
+                        'settings:name': 'Alice',
+                    },
+                    {
+                        'settings:name': 'ALICE',
+                    },
+                    {
+                        'settings:name': 'alICe',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'b',
+                    },
+                    {
+                        'settings:name': 'alic',
+                    },
+                ],
+            });
+        });
+        it('Filter matches both string and TranslatedString value', async () => {
+            const rows = [
+                {
+                    settings: {
+                        name: { nl: 'alice', en: 'alice', fr: 'alice' },
+                    },
+                },
+                {
+                    settings: {
+                        name: 'alice',
+                    },
+                },
+                {
+                    settings: {
+                        name: 'ALICE',
+                    },
+                },
+                {
+                    settings: {
+                        name: 'aliCE',
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'alice',
+                    },
+                    {
+                        'settings:name': 'Alice',
+                    },
+                    {
+                        'settings:name': 'ALICE',
+                    },
+                    {
+                        'settings:name': 'alICe',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'b',
+                    },
+                    {
+                        'settings:name': 'alic',
+                    },
+                ],
+            });
+        });
+        it('Filter on gt, gte, lt and lte works', async () => {
+            const filters = {
+                ...SQLFilter_1.baseSQLFilterCompilers,
+                'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                    expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.Dutch),
+                    type: SQLFilter_1.SQLValueType.String,
+                    nullable: true,
+                }),
+            };
+            const rows = [
+                {
+                    settings: {
+                        name: { nl: 'test b', en: 'test c', fr: 'test a' },
+                    },
+                },
+                {
+                    settings: {
+                        name: 'test b',
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': {
+                            $lt: 'test c',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $gt: 'test a',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $gte: 'test b',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $lte: 'test b',
+                        },
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': {
+                            $gt: 'test b',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $gt: 'test c',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $gte: 'test c',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $lt: 'test b',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $lt: 'test b',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $lt: 'test a',
+                        },
+                    },
+                    {
+                        'settings:name': {
+                            $lte: 'test a',
+                        },
+                    },
+                ],
+            });
+        });
+    });
+    describe('Different languages should select the correct value for comparison', () => {
+        const tableDefinition = {
+            settings: {
+                type: 'json',
+                nullable: true,
+            },
+        };
+        it('NL', async () => {
+            const filters = {
+                ...SQLFilter_1.baseSQLFilterCompilers,
+                'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                    expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.Dutch),
+                    type: SQLFilter_1.SQLValueType.String,
+                    nullable: true,
+                }),
+            };
+            const rows = [
+                {
+                    settings: {
+                        name: { nl: 'juist', en: 'fout', fr: 'fout' },
+                    },
+                },
+                {
+                    settings: {
+                        name: 'juist',
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'juist',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'fout',
+                    },
+                ],
+            });
+        });
+        it('EN', async () => {
+            const filters = {
+                ...SQLFilter_1.baseSQLFilterCompilers,
+                'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                    expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.English),
+                    type: SQLFilter_1.SQLValueType.String,
+                    nullable: true,
+                }),
+            };
+            const rows = [
+                {
+                    settings: {
+                        name: { nl: 'fout', en: 'juist', fr: 'fout' },
+                    },
+                },
+                {
+                    settings: {
+                        name: 'juist',
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'juist',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'fout',
+                    },
+                ],
+            });
+        });
+        it('FR', async () => {
+            const filters = {
+                ...SQLFilter_1.baseSQLFilterCompilers,
+                'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                    expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.French),
+                    type: SQLFilter_1.SQLValueType.String,
+                    nullable: true,
+                }),
+            };
+            const rows = [
+                {
+                    settings: {
+                        name: { nl: 'fout', en: 'fout', fr: 'juist' },
+                    },
+                },
+                {
+                    settings: {
+                        name: 'juist',
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'juist',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'fout',
+                    },
+                ],
+            });
+        });
+    });
+    describe('Missing language value should select the next language value in order for comparison', () => {
+        const tableDefinition = {
+            settings: {
+                type: 'json',
+                nullable: true,
+            },
+        };
+        it('NL', async () => {
+            const filters = {
+                ...SQLFilter_1.baseSQLFilterCompilers,
+                'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                    expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.Dutch),
+                    type: SQLFilter_1.SQLValueType.String,
+                    nullable: true,
+                }),
+            };
+            const rows = [
+                // first match english
+                {
+                    settings: {
+                        name: { en: 'juist', fr: 'fout' },
+                    },
+                },
+                // next match french
+                {
+                    settings: {
+                        name: { fr: 'juist' },
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'juist',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'fout',
+                    },
+                ],
+            });
+        });
+        it('EN', async () => {
+            const filters = {
+                ...SQLFilter_1.baseSQLFilterCompilers,
+                'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                    expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.English),
+                    type: SQLFilter_1.SQLValueType.String,
+                    nullable: true,
+                }),
+            };
+            const rows = [
+                // first match dutch
+                {
+                    settings: {
+                        name: { fr: 'fout', nl: 'juist' },
+                    },
+                },
+                // next match french
+                {
+                    settings: {
+                        name: { fr: 'juist' },
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'juist',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'fout',
+                    },
+                ],
+            });
+        });
+        it('FR', async () => {
+            const filters = {
+                ...SQLFilter_1.baseSQLFilterCompilers,
+                'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                    expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.French),
+                    type: SQLFilter_1.SQLValueType.String,
+                    nullable: true,
+                }),
+            };
+            const rows = [
+                // first match english
+                {
+                    settings: {
+                        name: { nl: 'fout', en: 'juist' },
+                    },
+                },
+                // next match dutch
+                {
+                    settings: {
+                        name: { nl: 'juist' },
+                    },
+                },
+            ];
+            await (0, utils_1.testMatch)({
+                tableDefinition,
+                filters,
+                rows,
+                doMatch: [
+                    {
+                        'settings:name': 'juist',
+                    },
+                ],
+                doNotMatch: [
+                    {
+                        'settings:name': 'fout',
+                    },
+                ],
+            });
+        });
+    });
+    it('Empty json value should not match filter', async () => {
+        const tableDefinition = {
+            settings: {
+                type: 'json',
+                nullable: true,
+            },
+        };
+        const filters = {
+            ...SQLFilter_1.baseSQLFilterCompilers,
+            'settings:name': (0, SQLFilter_1.createColumnFilter)({
+                expression: new SQLTranslatedStringHelper_1.SQLTranslatedStringHelper(SQL_1.SQL.column('settings'), '$.name', () => structures_1.Language.Dutch),
+                type: SQLFilter_1.SQLValueType.String,
+                nullable: true,
+            }),
+        };
+        const rows = [
+            // json value
+            {
+                settings: {
+                    name: {},
+                },
+            },
+        ];
+        await (0, utils_1.testMatch)({
+            tableDefinition,
+            filters,
+            rows,
+            doMatch: [],
+            doNotMatch: [
+                {
+                    'settings:name': '',
+                },
+                {
+                    'settings:name': 'test',
+                },
+            ],
+        });
+    });
+});
+//# sourceMappingURL=SQLTranslatedStringHelper.test.js.map

package/dist/tests/filters/SQLTranslatedStringHelper.test.js.map

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

package/dist/tests/filters/dot-syntax.test.js

@@ -10,12 +10,12 @@ describe('Dot syntax', () => {
         age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
         settings: {
             ...SQLFilter_1.baseSQLFilterCompilers,
-            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
-            age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.age'), type: SQLFilter_1.SQLValueType.JSONNumber, nullable: true }),
+            name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonExtract(SQL_1.SQL.column('settings'), '$.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
+            age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonExtract(SQL_1.SQL.column('settings'), '$.age'), type: SQLFilter_1.SQLValueType.JSONNumber, nullable: true }),
             dog: {
                 ...SQLFilter_1.baseSQLFilterCompilers,
-                name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.dog.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
-                age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.dog.age'), type: SQLFilter_1.SQLValueType.JSONNumber, nullable: true }),
+                name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonExtract(SQL_1.SQL.column('settings'), '$.dog.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
+                age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonExtract(SQL_1.SQL.column('settings'), '$.dog.age'), type: SQLFilter_1.SQLValueType.JSONNumber, nullable: true }),
             },
         },
     };

package/dist/tests/filters/dot-syntax.test.js.map

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

package/dist/tests/filters/wildcard.test.js

@@ -10,9 +10,9 @@ describe('Wildcards', () => {
         age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
         settings: {
             ...SQLFilter_1.baseSQLFilterCompilers,
-            records: (0, SQLFilter_1.createWildcardColumnFilter)((key) => ({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.records'), '$.' + key, true), type: SQLFilter_1.SQLValueType.JSONObject, nullable: true }), (key) => ({
+            records: (0, SQLFilter_1.createWildcardColumnFilter)((key) => ({ expression: SQL_1.SQL.jsonExtract(SQL_1.SQL.jsonExtract(SQL_1.SQL.column('settings'), '$.records'), '$.' + key, true), type: SQLFilter_1.SQLValueType.JSONObject, nullable: true }), (key) => ({
                 ...SQLFilter_1.baseSQLFilterCompilers,
-                name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.jsonValue(SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.records'), '$.' + key, true), '$.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
+                name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonExtract(SQL_1.SQL.jsonExtract(SQL_1.SQL.jsonExtract(SQL_1.SQL.column('settings'), '$.records'), '$.' + key, true), '$.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
             })),
         },
     };

package/dist/tests/filters/wildcard.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"wildcard.test.js","sourceRoot":"","sources":["../../../tests/filters/wildcard.test.ts"],"names":[],"mappings":";;AAAA,2DAAyJ;AACzJ,uCAAoC;AACpC,oCAAgC;AAEhC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,MAAM,OAAO,GAAyB;QAClC,GAAG,kCAAsB;QACzB,IAAI,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACvG,GAAG,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACtG,QAAQ,EAAE;YACN,GAAG,kCAAsB;YACzB,OAAO,EAAE,IAAA,sCAA0B,EAC/B,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EACrK,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;gBACd,GAAG,kCAAsB;gBACzB,IAAI,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aACxM,CAAC,CACL;SACJ;KACJ,CAAC;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACvE,MAAM,IAAA,YAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE;oCACF,GAAG,EAAE,KAAK;iCACb;6BACJ;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,+IAA+I;gBACtJ,MAAM,EAAE;oBACJ,KAAK;oBACL,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,IAAA,YAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE,IAAI;6BACb;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,yFAAyF;gBAChG,MAAM,EAAE;oBACJ,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"wildcard.test.js","sourceRoot":"","sources":["../../../tests/filters/wildcard.test.ts"],"names":[],"mappings":";;AAAA,2DAAyJ;AACzJ,uCAAoC;AACpC,oCAAgC;AAEhC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,MAAM,OAAO,GAAyB;QAClC,GAAG,kCAAsB;QACzB,IAAI,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACvG,GAAG,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACtG,QAAQ,EAAE;YACN,GAAG,kCAAsB;YACzB,OAAO,EAAE,IAAA,sCAA0B,EAC/B,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,SAAG,CAAC,WAAW,CAAC,SAAG,CAAC,WAAW,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EACzK,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;gBACd,GAAG,kCAAsB;gBACzB,IAAI,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,WAAW,CAAC,SAAG,CAAC,WAAW,CAAC,SAAG,CAAC,WAAW,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC9M,CAAC,CACL;SACJ;KACJ,CAAC;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACvE,MAAM,IAAA,YAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE;oCACF,GAAG,EAAE,KAAK;iCACb;6BACJ;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,+IAA+I;gBACtJ,MAAM,EAAE;oBACJ,KAAK;oBACL,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,IAAA,YAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE,IAAI;6BACb;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,yFAAyF;gBAChG,MAAM,EAAE;oBACJ,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/queryablemodel.ts","../src/sql.ts","../src/sqldelete.ts","../src/sqlexpression.ts","../src/sqlexpressions.ts","../src/sqlinsert.ts","../src/sqljoin.ts","../src/sqljsonexpressions.ts","../src/sqlorderby.ts","../src/sqlselect.ts","../src/sqlupdate.ts","../src/sqlwhere.ts","../src/filters/sqlfilter.ts","../src/filters/sqlsorter.ts","../src/filters/compilers/contains.ts","../src/filters/compilers/equals.ts","../src/filters/compilers/greater.ts","../src/filters/compilers/in.ts","../src/filters/compilers/index.ts","../src/filters/compilers/less.ts","../src/filters/helpers/isjsoncolumn.ts","../src/filters/helpers/normalizecomparevalue.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../tests/filters/$and.test.ts","../tests/filters/$contains.test.ts","../tests/filters/$eq.test.ts","../tests/filters/$gt.test.ts","../tests/filters/$gte.test.ts","../tests/filters/$in.test.ts","../tests/filters/$lt.test.ts","../tests/filters/$lte.test.ts","../tests/filters/$neq.test.ts","../tests/filters/$not.test.ts","../tests/filters/$or.test.ts","../tests/filters/dot-syntax.test.ts","../tests/filters/exists.test.ts","../tests/filters/joined-relations.test.ts","../tests/filters/special-cases.test.ts","../tests/filters/wildcard.test.ts","../tests/utils/index.ts","../index.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.8.3"}
+{"root":["../src/queryablemodel.ts","../src/sql.ts","../src/sqldelete.ts","../src/sqlexpression.ts","../src/sqlexpressions.ts","../src/sqlinsert.ts","../src/sqljoin.ts","../src/sqljsonexpressions.ts","../src/sqlorderby.ts","../src/sqlselect.ts","../src/sqltranslatedstringhelper.ts","../src/sqlupdate.ts","../src/sqlwhere.ts","../src/filters/sqlfilter.ts","../src/filters/sqlsorter.ts","../src/filters/compilers/contains.ts","../src/filters/compilers/equals.ts","../src/filters/compilers/greater.ts","../src/filters/compilers/in.ts","../src/filters/compilers/index.ts","../src/filters/compilers/less.ts","../src/filters/helpers/isjsoncolumn.ts","../src/filters/helpers/normalizecomparevalue.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../tests/filters/$and.test.ts","../tests/filters/$contains.test.ts","../tests/filters/$eq.test.ts","../tests/filters/$gt.test.ts","../tests/filters/$gte.test.ts","../tests/filters/$in.test.ts","../tests/filters/$lt.test.ts","../tests/filters/$lte.test.ts","../tests/filters/$neq.test.ts","../tests/filters/$not.test.ts","../tests/filters/$or.test.ts","../tests/filters/sqltranslatedstringhelper.test.ts","../tests/filters/dot-syntax.test.ts","../tests/filters/exists.test.ts","../tests/filters/joined-relations.test.ts","../tests/filters/special-cases.test.ts","../tests/filters/wildcard.test.ts","../tests/utils/index.ts","../index.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/sql",
-    "version": "2.107.3",
+    "version": "2.109.0",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "license": "UNLICENCED",
@@ -16,5 +16,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "2827f3e8dbc9046fe6f71b42c608cda407da3a2d"
+    "gitHead": "9a987df4a751f24aabd56e1480dfb9239fb8e019"
 }

package/src/SQL.ts

@@ -1,10 +1,10 @@
 import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { SQLDelete } from './SQLDelete';
-import { isSQLExpression, SQLExpression, SQLNamedExpression } from './SQLExpression';
-import { SQLAssignment, SQLColumnExpression, SQLColumnExpressionParams, SQLIf, SQLJSONTableExpression, SQLParentNamespace, SQLSafeValue, SQLScalar, SQLScalarValue, SQLTableExpression, SQLWildcardSelectExpression } from './SQLExpressions';
+import { isSQLExpression, SQLExpression } from './SQLExpression';
+import { SQLAssignment, SQLCoalesce, SQLColumnExpression, SQLColumnExpressionParams, SQLIf, SQLJSONTableExpression, SQLParentNamespace, SQLSafeValue, SQLScalar, SQLScalarValue, SQLTableExpression, SQLWildcardSelectExpression } from './SQLExpressions';
 import { SQLInsert } from './SQLInsert';
 import { SQLJoin, SQLJoinType } from './SQLJoin';
-import { SQLJsonExtract, SQLJsonKeys, SQLJsonLength, SQLJsonUnquote, SQLLpad } from './SQLJsonExpressions';
+import { SQLJsonExtract, SQLJsonKeys, SQLJsonLength, SQLJsonType, SQLJsonUnquote, SQLJsonValue, SQLJsonValueType, SQLLpad } from './SQLJsonExpressions';
 import { parseTable, SQLSelect } from './SQLSelect';
 import { SQLUpdate } from './SQLUpdate';
 import { ParseWhereArguments, SQLEmptyWhere, SQLWhere } from './SQLWhere';
@@ -22,14 +22,22 @@ class StaticSQL {
         return new SQLColumnExpression(SQLParentNamespace, column);
     }
 
-    jsonValue(column: SQLExpression, path: string, asScalar = false): SQLJsonExtract {
+    jsonExtract(column: SQLExpression, path: string, asScalar = false): SQLJsonExtract {
         return new SQLJsonExtract(column, asScalar ? new SQLScalar(path) : new SQLSafeValue(path));
     }
 
+    jsonValue(column: SQLExpression, path: string, type?: SQLJsonValueType, asScalar = false): SQLJsonExtract {
+        return new SQLJsonValue(column, type, asScalar ? new SQLScalar(path) : new SQLSafeValue(path));
+    }
+
     jsonKeys(column: SQLExpression): SQLJsonKeys {
         return new SQLJsonKeys(column);
     }
 
+    jsonType(column: SQLExpression): SQLJsonType {
+        return new SQLJsonType(column);
+    }
+
     lpad(column: SQLExpression, length: number, value: string): SQLLpad {
         return new SQLLpad(column, new SQLSafeValue(length), new SQLSafeValue(value));
     }
@@ -100,6 +108,10 @@ class StaticSQL {
     if(...args: ConstructorParameters<typeof SQLIf>): SQLIf {
         return new SQLIf(...args);
     }
+
+    coalesce(...args: ConstructorParameters<typeof SQLCoalesce>): SQLCoalesce {
+        return new SQLCoalesce(...args);
+    }
 }
 
 export const SQL = new StaticSQL();