@stamhoofd/sql 2.116.0 → 2.117.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (106) hide show
  1. package/dist/src/QueryableModel.d.ts +1 -0
  2. package/dist/src/QueryableModel.d.ts.map +1 -1
  3. package/dist/src/QueryableModel.js +2 -6
  4. package/dist/src/QueryableModel.js.map +1 -1
  5. package/dist/src/SQLJoin.d.ts +9 -9
  6. package/dist/src/SQLJoin.d.ts.map +1 -1
  7. package/dist/src/SQLJoin.js +7 -7
  8. package/dist/src/SQLJoin.js.map +1 -1
  9. package/dist/src/SQLJsonExpressions.d.ts +3 -3
  10. package/dist/src/SQLJsonExpressions.d.ts.map +1 -1
  11. package/dist/src/SQLJsonExpressions.js +21 -21
  12. package/dist/src/SQLJsonExpressions.js.map +1 -1
  13. package/dist/src/SQLOrderBy.d.ts +3 -3
  14. package/dist/src/SQLOrderBy.d.ts.map +1 -1
  15. package/dist/src/SQLOrderBy.js +6 -6
  16. package/dist/src/SQLOrderBy.js.map +1 -1
  17. package/dist/src/SQLSelect.d.ts +1 -0
  18. package/dist/src/SQLSelect.d.ts.map +1 -1
  19. package/dist/src/SQLSelect.js.map +1 -1
  20. package/dist/src/SQLWhere.d.ts +4 -4
  21. package/dist/src/SQLWhere.d.ts.map +1 -1
  22. package/dist/src/SQLWhere.js +26 -26
  23. package/dist/src/SQLWhere.js.map +1 -1
  24. package/dist/src/filters/compilers/contains.d.ts +1 -1
  25. package/dist/src/filters/compilers/contains.d.ts.map +1 -1
  26. package/dist/src/filters/compilers/contains.js +10 -10
  27. package/dist/src/filters/compilers/contains.js.map +1 -1
  28. package/dist/src/filters/compilers/equals.d.ts +1 -1
  29. package/dist/src/filters/compilers/equals.d.ts.map +1 -1
  30. package/dist/src/filters/compilers/equals.js +17 -17
  31. package/dist/src/filters/compilers/equals.js.map +1 -1
  32. package/dist/src/filters/compilers/greater.d.ts +1 -1
  33. package/dist/src/filters/compilers/greater.d.ts.map +1 -1
  34. package/dist/src/filters/compilers/greater.js +7 -7
  35. package/dist/src/filters/compilers/greater.js.map +1 -1
  36. package/dist/src/filters/compilers/in.d.ts +1 -1
  37. package/dist/src/filters/compilers/in.d.ts.map +1 -1
  38. package/dist/src/filters/compilers/in.js +16 -16
  39. package/dist/src/filters/compilers/in.js.map +1 -1
  40. package/dist/src/filters/compilers/index.d.ts +4 -4
  41. package/dist/src/filters/compilers/index.d.ts.map +1 -1
  42. package/dist/src/filters/compilers/index.js +4 -4
  43. package/dist/src/filters/compilers/index.js.map +1 -1
  44. package/dist/src/filters/compilers/less.d.ts +1 -1
  45. package/dist/src/filters/compilers/less.d.ts.map +1 -1
  46. package/dist/src/filters/compilers/less.js +7 -7
  47. package/dist/src/filters/compilers/less.js.map +1 -1
  48. package/dist/src/filters/helpers/isJSONColumn.d.ts +1 -1
  49. package/dist/src/filters/helpers/isJSONColumn.d.ts.map +1 -1
  50. package/dist/src/filters/helpers/isJSONColumn.js +6 -6
  51. package/dist/src/filters/helpers/isJSONColumn.js.map +1 -1
  52. package/dist/src/filters/helpers/normalizeCompareValue.d.ts +1 -1
  53. package/dist/src/filters/helpers/normalizeCompareValue.d.ts.map +1 -1
  54. package/dist/src/filters/helpers/normalizeCompareValue.js +14 -14
  55. package/dist/src/filters/helpers/normalizeCompareValue.js.map +1 -1
  56. package/dist/tests/filters/$and.test.js +31 -31
  57. package/dist/tests/filters/$and.test.js.map +1 -1
  58. package/dist/tests/filters/$contains.test.js +45 -45
  59. package/dist/tests/filters/$contains.test.js.map +1 -1
  60. package/dist/tests/filters/$eq.test.js +88 -88
  61. package/dist/tests/filters/$eq.test.js.map +1 -1
  62. package/dist/tests/filters/$gt.test.js +32 -32
  63. package/dist/tests/filters/$gt.test.js.map +1 -1
  64. package/dist/tests/filters/$gte.test.js +26 -26
  65. package/dist/tests/filters/$gte.test.js.map +1 -1
  66. package/dist/tests/filters/$in.test.js +45 -45
  67. package/dist/tests/filters/$in.test.js.map +1 -1
  68. package/dist/tests/filters/$lt.test.js +26 -26
  69. package/dist/tests/filters/$lt.test.js.map +1 -1
  70. package/dist/tests/filters/$lte.test.js +26 -26
  71. package/dist/tests/filters/$lte.test.js.map +1 -1
  72. package/dist/tests/filters/$neq.test.js +6 -6
  73. package/dist/tests/filters/$neq.test.js.map +1 -1
  74. package/dist/tests/filters/$not.test.js +9 -9
  75. package/dist/tests/filters/$not.test.js.map +1 -1
  76. package/dist/tests/filters/$or.test.js +25 -25
  77. package/dist/tests/filters/$or.test.js.map +1 -1
  78. package/dist/tests/filters/SQLTranslatedStringHelper.test.js +50 -50
  79. package/dist/tests/filters/SQLTranslatedStringHelper.test.js.map +1 -1
  80. package/dist/tests/filters/dot-syntax.test.js +20 -20
  81. package/dist/tests/filters/dot-syntax.test.js.map +1 -1
  82. package/dist/tests/filters/joined-relations.test.js +43 -43
  83. package/dist/tests/filters/joined-relations.test.js.map +1 -1
  84. package/dist/tests/filters/special-cases.test.js +19 -19
  85. package/dist/tests/filters/special-cases.test.js.map +1 -1
  86. package/dist/tests/filters/wildcard.test.js +12 -12
  87. package/dist/tests/filters/wildcard.test.js.map +1 -1
  88. package/dist/tests/utils/index.d.ts +3 -3
  89. package/dist/tests/utils/index.d.ts.map +1 -1
  90. package/dist/tests/utils/index.js +12 -12
  91. package/dist/tests/utils/index.js.map +1 -1
  92. package/package.json +4 -3
  93. package/src/QueryableModel.ts +5 -3
  94. package/src/SQLJoin.ts +3 -3
  95. package/src/SQLJsonExpressions.ts +3 -3
  96. package/src/SQLOrderBy.ts +4 -4
  97. package/src/SQLSelect.ts +1 -0
  98. package/src/SQLWhere.ts +5 -5
  99. package/src/filters/compilers/contains.ts +5 -5
  100. package/src/filters/compilers/equals.ts +6 -6
  101. package/src/filters/compilers/greater.ts +4 -4
  102. package/src/filters/compilers/in.ts +6 -6
  103. package/src/filters/compilers/index.ts +4 -4
  104. package/src/filters/compilers/less.ts +4 -4
  105. package/src/filters/helpers/isJSONColumn.ts +1 -1
  106. package/src/filters/helpers/normalizeCompareValue.ts +1 -1
@@ -1,16 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const SQLFilter_1 = require("../../src/filters/SQLFilter");
4
- const SQL_1 = require("../../src/SQL");
5
- const utils_1 = require("../utils");
3
+ const SQLFilter_js_1 = require("../../src/filters/SQLFilter.js");
4
+ const SQL_js_1 = require("../../src/SQL.js");
5
+ const index_js_1 = require("../utils/index.js");
6
6
  describe('Special filter cases', () => {
7
7
  it('Can combine $and with $or', async () => {
8
8
  const filters = {
9
- ...SQLFilter_1.baseSQLFilterCompilers,
10
- name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
11
- age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
9
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
10
+ name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('name'), type: SQLFilter_js_1.SQLValueType.String, nullable: false }),
11
+ age: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('age'), type: SQLFilter_js_1.SQLValueType.Number, nullable: false }),
12
12
  };
13
- await (0, utils_1.test)({
13
+ await (0, index_js_1.test)({
14
14
  filter: [
15
15
  {
16
16
  $or: {
@@ -43,9 +43,9 @@ describe('Special filter cases', () => {
43
43
  });
44
44
  it('Cannot filter on unknown columns', async () => {
45
45
  const filters = {
46
- ...SQLFilter_1.baseSQLFilterCompilers,
46
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
47
47
  };
48
- await (0, utils_1.testError)({
48
+ await (0, index_js_1.testError)({
49
49
  filter: {
50
50
  name: 'John Doe',
51
51
  },
@@ -55,11 +55,11 @@ describe('Special filter cases', () => {
55
55
  });
56
56
  it('Cannot stack column filters', async () => {
57
57
  const filters = {
58
- ...SQLFilter_1.baseSQLFilterCompilers,
59
- name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
60
- age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
58
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
59
+ name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('name'), type: SQLFilter_js_1.SQLValueType.String, nullable: false }),
60
+ age: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('age'), type: SQLFilter_js_1.SQLValueType.Number, nullable: false }),
61
61
  };
62
- await (0, utils_1.testError)({
62
+ await (0, index_js_1.testError)({
63
63
  filter: {
64
64
  name: {
65
65
  age: 12,
@@ -72,9 +72,9 @@ describe('Special filter cases', () => {
72
72
  describe('Empty filters', () => {
73
73
  it('an empty object filter is always true', async () => {
74
74
  const filters = {
75
- ...SQLFilter_1.baseSQLFilterCompilers,
75
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
76
76
  };
77
- await (0, utils_1.test)({
77
+ await (0, index_js_1.test)({
78
78
  filter: {},
79
79
  filters,
80
80
  query: {
@@ -85,9 +85,9 @@ describe('Special filter cases', () => {
85
85
  });
86
86
  it('an empty array filter is always true', async () => {
87
87
  const filters = {
88
- ...SQLFilter_1.baseSQLFilterCompilers,
88
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
89
89
  };
90
- await (0, utils_1.test)({
90
+ await (0, index_js_1.test)({
91
91
  filter: [],
92
92
  filters,
93
93
  query: {
@@ -98,9 +98,9 @@ describe('Special filter cases', () => {
98
98
  });
99
99
  it('a null filter is always true', async () => {
100
100
  const filters = {
101
- ...SQLFilter_1.baseSQLFilterCompilers,
101
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
102
102
  };
103
- await (0, utils_1.test)({
103
+ await (0, index_js_1.test)({
104
104
  filter: null,
105
105
  filters,
106
106
  query: {
@@ -1 +1 @@
1
- {"version":3,"file":"special-cases.test.js","sourceRoot":"","sources":["../../../tests/filters/special-cases.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"special-cases.test.js","sourceRoot":"","sources":["../../../tests/filters/special-cases.test.ts"],"names":[],"mappings":"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"}
@@ -1,23 +1,23 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const SQLFilter_1 = require("../../src/filters/SQLFilter");
4
- const SQL_1 = require("../../src/SQL");
5
- const utils_1 = require("../utils");
3
+ const SQLFilter_js_1 = require("../../src/filters/SQLFilter.js");
4
+ const SQL_js_1 = require("../../src/SQL.js");
5
+ const index_js_1 = require("../utils/index.js");
6
6
  describe('Wildcards', () => {
7
7
  const filters = {
8
- ...SQLFilter_1.baseSQLFilterCompilers,
9
- name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
10
- age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
8
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
9
+ name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('name'), type: SQLFilter_js_1.SQLValueType.String, nullable: true }),
10
+ age: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('age'), type: SQLFilter_js_1.SQLValueType.Number, nullable: false }),
11
11
  settings: {
12
- ...SQLFilter_1.baseSQLFilterCompilers,
13
- 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) => ({
14
- ...SQLFilter_1.baseSQLFilterCompilers,
15
- 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 }),
12
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
13
+ records: (0, SQLFilter_js_1.createWildcardColumnFilter)((key) => ({ expression: SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.column('settings'), '$.records'), '$.' + key, true), type: SQLFilter_js_1.SQLValueType.JSONObject, nullable: true }), (key) => ({
14
+ ...SQLFilter_js_1.baseSQLFilterCompilers,
15
+ name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.column('settings'), '$.records'), '$.' + key, true), '$.name'), type: SQLFilter_js_1.SQLValueType.JSONString, nullable: true }),
16
16
  })),
17
17
  },
18
18
  };
19
19
  it('Correctly finds the right filter when using object syntax', async () => {
20
- await (0, utils_1.test)({
20
+ await (0, index_js_1.test)({
21
21
  filter: [
22
22
  {
23
23
  settings: {
@@ -42,7 +42,7 @@ describe('Wildcards', () => {
42
42
  });
43
43
  });
44
44
  it('Can support this', async () => {
45
- await (0, utils_1.test)({
45
+ await (0, index_js_1.test)({
46
46
  filter: [
47
47
  {
48
48
  settings: {
@@ -1 +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,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"}
1
+ {"version":3,"file":"wildcard.test.js","sourceRoot":"","sources":["../../../tests/filters/wildcard.test.ts"],"names":[],"mappings":";;AAAA,iEAA4J;AAC5J,6CAAuC;AACvC,gDAAyC;AAEzC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,MAAM,OAAO,GAAyB;QAClC,GAAG,qCAAsB;QACzB,IAAI,EAAE,IAAA,iCAAkB,EAAC,EAAE,UAAU,EAAE,YAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,2BAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACvG,GAAG,EAAE,IAAA,iCAAkB,EAAC,EAAE,UAAU,EAAE,YAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,2BAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACtG,QAAQ,EAAE;YACN,GAAG,qCAAsB;YACzB,OAAO,EAAE,IAAA,yCAA0B,EAC/B,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,2BAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EACzK,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;gBACd,GAAG,qCAAsB;gBACzB,IAAI,EAAE,IAAA,iCAAkB,EAAC,EAAE,UAAU,EAAE,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,2BAAY,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,eAAI,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,eAAI,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"}
@@ -1,8 +1,8 @@
1
1
  import { PlainObject } from '@simonbackx/simple-encoding';
2
2
  import { StamhoofdFilter } from '@stamhoofd/structures';
3
- import { SQLFilterDefinitions } from '../../src/filters/SQLFilter';
4
- import { SQLQuery } from '../../src/SQLExpression';
5
- import { SQLScalarValue } from '../../src/SQLExpressions';
3
+ import { SQLFilterDefinitions } from '../../src/filters/SQLFilter.js';
4
+ import { SQLQuery } from '../../src/SQLExpression.js';
5
+ import { SQLScalarValue } from '../../src/SQLExpressions.js';
6
6
  export declare function testError({ filter, filters, error }: {
7
7
  filter: StamhoofdFilter;
8
8
  filters: SQLFilterDefinitions;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEvF,OAAO,EAAsB,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,wBAAsB,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAIpI;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAiBjI;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAqBvI;AAED,wBAAsB,YAAY,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAQrJ;AAED,wBAAsB,kBAAkB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAQzJ;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,QASlE;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,KAAK,GAAG,cAAc,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE9I,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,GAAG,MAAM,CAM5F;AAmBD;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,iBAoGrR"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAE1F,OAAO,EAAsB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,wBAAsB,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAIpI;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAiBjI;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAqBvI;AAED,wBAAsB,YAAY,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAQrJ;AAED,wBAAsB,kBAAkB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAQzJ;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,QASlE;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,KAAK,GAAG,cAAc,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE9I,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,GAAG,MAAM,CAM5F;AAmBD;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,iBAoGrR"}
@@ -10,17 +10,17 @@ exports.createTableDefinition = createTableDefinition;
10
10
  exports.testMatch = testMatch;
11
11
  const simple_database_1 = require("@simonbackx/simple-database");
12
12
  const test_utils_1 = require("@stamhoofd/test-utils");
13
- const SQLFilter_1 = require("../../src/filters/SQLFilter");
14
- const SQL_1 = require("../../src/SQL");
15
- const SQLWhere_1 = require("../../src/SQLWhere");
13
+ const SQLFilter_js_1 = require("../../src/filters/SQLFilter.js");
14
+ const SQL_js_1 = require("../../src/SQL.js");
15
+ const SQLWhere_js_1 = require("../../src/SQLWhere.js");
16
16
  async function testError({ filter, filters, error }) {
17
- await expect((0, SQLFilter_1.compileToSQLFilter)(filter, filters)).rejects.toThrow(error);
17
+ await expect((0, SQLFilter_js_1.compileToSQLFilter)(filter, filters)).rejects.toThrow(error);
18
18
  }
19
19
  /**
20
20
  * Only compares the WHERE clause of the query.
21
21
  */
22
22
  async function test({ filter, filters, query }) {
23
- const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
23
+ const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
24
24
  if (where.isAlways === false) {
25
25
  doesQueryMatch('', query);
26
26
  return;
@@ -39,19 +39,19 @@ async function test({ filter, filters, query }) {
39
39
  * Use to also test joins. This will use `test_table` as the table name in your query.
40
40
  */
41
41
  async function testSelect({ filter, filters, query }) {
42
- const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
42
+ const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
43
43
  if (where.isAlways === false) {
44
44
  doesQueryMatch('', query);
45
45
  return;
46
46
  }
47
- const select = SQL_1.SQL.select().from('test_table').where(where);
47
+ const select = SQL_js_1.SQL.select().from('test_table').where(where);
48
48
  let sql;
49
49
  try {
50
50
  sql = select.getSQL();
51
51
  }
52
52
  catch (e) {
53
53
  console.error('Error in testSelect:', e);
54
- console.error('testSelect', select, where, (where instanceof SQLWhere_1.SQLWhereAnd ? where.children : where));
54
+ console.error('testSelect', select, where, (where instanceof SQLWhere_js_1.SQLWhereAnd ? where.children : where));
55
55
  throw e;
56
56
  }
57
57
  doesQueryMatch(sql, query);
@@ -147,8 +147,8 @@ async function testMatch({ tableDefinition, rows, doMatch, doNotMatch, filters }
147
147
  // Run queries
148
148
  try {
149
149
  for (const filter of doMatch ?? []) {
150
- const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
151
- const select = SQL_1.SQL.select().from(tableName).where(where);
150
+ const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
151
+ const select = SQL_js_1.SQL.select().from(tableName).where(where);
152
152
  let results;
153
153
  try {
154
154
  results = await select.fetch();
@@ -168,8 +168,8 @@ async function testMatch({ tableDefinition, rows, doMatch, doNotMatch, filters }
168
168
  }).toMatchSnapshot('SQL Query for filter: ' + JSON.stringify(filter));
169
169
  }
170
170
  for (const filter of doNotMatch ?? []) {
171
- const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
172
- const select = SQL_1.SQL.select().from(tableName).where(where);
171
+ const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
172
+ const select = SQL_js_1.SQL.select().from(tableName).where(where);
173
173
  let results;
174
174
  try {
175
175
  results = await select.fetch();
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":";;AAUA,8BAIC;AAKD,oBAiBC;AAKD,gCAqBC;AAED,oCAQC;AAED,gDAQC;AAED,wCASC;AAID,sDAMC;AA0BD,8BAoGC;AArOD,iEAA+E;AAG/E,sDAAkD;AAClD,2DAAuF;AACvF,uCAAoC;AAGpC,iDAAiD;AAE1C,KAAK,UAAU,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAA6E;IACjI,MAAM,MAAM,CACR,IAAA,8BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CACtC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAA+E;IAC9H,MAAM,KAAK,GAAG,MAAM,IAAA,8BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC3B,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC1B,OAAO;IACX,CAAC;IAED,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC1B,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9B,OAAO;IACX,CAAC;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC;QACrB,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,QAAQ;KAC5B,CAAC,CAAC;IACH,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAA+E;IACpI,MAAM,KAAK,GAAG,MAAM,IAAA,8BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC3B,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC1B,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,SAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAE5D,IAAI,GAAa,CAAC;IAClB,IAAI,CAAC;QACD,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,CAAC,EAAE,CAAC;QACP,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,YAAY,sBAAW,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAEpG,MAAM,CAAC,CAAC;IACZ,CAAC;IACD,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAsF;IAClJ,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC;YACP,MAAM;YACN,OAAO;YACP,KAAK;SACR,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAoF;IACtJ,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,SAAS,CAAC;YACZ,MAAM;YACN,OAAO;YACP,KAAK;SACR,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,SAAgB,cAAc,CAAC,KAAe,EAAE,SAAmB;IAC/D,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IAC7D,MAAM,IAAI,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC;IAEzE,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAC9D,MAAM,OAAO,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;IAEtE,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAID,SAAgB,qBAAqB,CAAC,SAAiB,EAAE,UAA2B;IAChF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;QAC1E,MAAM,UAAU,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,+DAA+D,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/G,OAAO,KAAK,IAAI,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACf,OAAO,kBAAkB,SAAS,SAAS,OAAO,uEAAuE,CAAC;AAC9H,CAAC;AAED,IAAI,MAAM,GAAG,KAAK,CAAC;AACnB,SAAS,uBAAuB;IAC5B,IAAI,MAAM,EAAE,CAAC;QACT,OAAO;IACX,CAAC;IACD,MAAM,GAAG,IAAI,CAAC;IAEd,sBAAS,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;QAC7B,IAAI,CAAC;YACD,MAAM,0BAAQ,CAAC,GAAG,EAAE,CAAC;QACzB,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,kDAAkD,EAAE,KAAK,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAiM;IAClR,MAAM,SAAS,GAAG,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9E,MAAM,cAAc,GAAG,qBAAqB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAEzE,uBAAuB,EAAE,CAAC;IAE1B,IAAI,CAAC;QACD,MAAM,0BAAQ,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACrD,MAAM,KAAK,CAAC;IAChB,CAAC;IAED,mBAAmB;IACnB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACjB,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YAC7B,CAAC;iBACI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC7D,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC9C,CAAC;iBACI,CAAC;gBACF,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC9B,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YACD,MAAM,0BAAQ,CAAC,MAAM,CAAC,eAAe,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;YACzD,MAAM,WAAW,CAAC;QACtB,CAAC;IACL,CAAC;IAED,cAAc;IACd,IAAI,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,OAAO,IAAI,EAAE,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,MAAM,IAAA,8BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,SAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAEzD,IAAI,OAAiC,CAAC;YACtC,IAAI,CAAC;gBACD,OAAO,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACnC,CAAC;YACD,OAAO,CAAC,EAAE,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC1G,MAAM,CAAC,CAAC;YACZ,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjC,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7H,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAwB,CAAC;YACpD,MAAM,CAAC;gBACH,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,EAAE,cAAc,CAAC;gBACpE,MAAM,EAAE,KAAK,CAAC,MAAM;aACvB,CAAC,CAAC,eAAe,CAAC,wBAAwB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,IAAA,8BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,SAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAEzD,IAAI,OAAiC,CAAC;YACtC,IAAI,CAAC;gBACD,OAAO,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACnC,CAAC;YACD,OAAO,CAAC,EAAE,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC1G,MAAM,CAAC,CAAC;YACZ,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7H,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAEhC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;gBACjD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAwB,CAAC;gBACpD,MAAM,CAAC;oBACH,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,EAAE,cAAc,CAAC;oBACpE,MAAM,EAAE,KAAK,CAAC,MAAM;iBACvB,CAAC,CAAC,eAAe,CAAC,kCAAkC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YACpF,CAAC;iBACI,CAAC;gBACF,MAAM,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,kCAAkC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YACxG,CAAC;QACL,CAAC;IACL,CAAC;YACO,CAAC;QACL,IAAI,CAAC;YACD,MAAM,0BAAQ,CAAC,SAAS,CAAC,0BAA0B,SAAS,IAAI,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,SAAS,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,SAAS,CAAC,CAAC;QAClE,CAAC;IACL,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@stamhoofd/sql",
3
- "version": "2.116.0",
3
+ "version": "2.117.0",
4
4
  "main": "./dist/index.js",
5
5
  "types": "./dist/index.d.ts",
6
6
  "license": "UNLICENCED",
@@ -11,10 +11,11 @@
11
11
  ],
12
12
  "scripts": {
13
13
  "build": "tsc -b --clean && tsc -b",
14
- "test": "jest"
14
+ "test": "jest",
15
+ "lint": "eslint"
15
16
  },
16
17
  "publishConfig": {
17
18
  "access": "public"
18
19
  },
19
- "gitHead": "842040d2dcbde452fb25178f3586c8d5293b974f"
20
+ "gitHead": "ad4b006dca3aa5a7c14b2afc83b6df3c2a72424c"
20
21
  }
@@ -13,7 +13,7 @@ export class QueryableModel extends Model {
13
13
 
14
14
  static select<T extends typeof Model & typeof QueryableModel>(this: T, ...columns: (SQLExpression | string)[]): SQLSelect<InstanceType<T>> {
15
15
  const transformer = (row: SQLResultNamespacedRow): InstanceType<T> => {
16
- const d = (this as T).fromRow(row[this.table] as any) as InstanceType<T> | undefined;
16
+ const d = (this as T).fromRow(row[this.table]) as InstanceType<T> | undefined;
17
17
 
18
18
  if (this.cache && d) {
19
19
  this.cache.store(d);
@@ -86,7 +86,9 @@ export class QueryableModel extends Model {
86
86
  * Get a model by its primary key
87
87
  * @param id primary key
88
88
  */
89
- static override async getByID<T extends typeof Model>(this: T & typeof QueryableModel, id: number | string): Promise<InstanceType<T> | undefined> {
89
+ static override async getByID<T extends typeof Model>(this: T & typeof QueryableModel, id: number | string, required: true): Promise<InstanceType<T>>;
90
+ static override async getByID<T extends typeof Model>(this: T & typeof QueryableModel, id: number | string): Promise<InstanceType<T> | undefined>;
91
+ static override async getByID<T extends typeof Model>(this: T & typeof QueryableModel, id: number | string, required?: boolean): Promise<InstanceType<T> | undefined> {
90
92
  if (this.cache) {
91
93
  const hit = this.cache.getById(id);
92
94
  if (hit) {
@@ -94,7 +96,7 @@ export class QueryableModel extends Model {
94
96
  return hit as InstanceType<T>;
95
97
  }
96
98
  }
97
- return ((await (this as any as typeof QueryableModel).select().where(this.primary.name, id).first(false)) ?? undefined) as any as InstanceType<T> | undefined;
99
+ return ((await (this as any as typeof QueryableModel).select().where(this.primary.name, id).first(required ?? false)) ?? undefined) as any as InstanceType<T> | undefined;
98
100
  }
99
101
 
100
102
  /**
package/src/SQLJoin.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery, joinSQLQuery } from './SQLExpression';
2
- import { SQLSelect } from './SQLSelect';
3
- import { Whereable } from './SQLWhere';
1
+ import { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery, joinSQLQuery } from './SQLExpression.js';
2
+ import { SQLSelect } from './SQLSelect.js';
3
+ import { Whereable } from './SQLWhere.js';
4
4
 
5
5
  export enum SQLJoinType {
6
6
  Left = 'Left',
@@ -1,6 +1,6 @@
1
- import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from './SQLExpression';
2
- import { SQLJSONFalse, SQLJSONNull, SQLJSONTrue, SQLSafeValue, SQLScalar, SQLScalarValue } from './SQLExpressions';
3
- import { SQLWhere } from './SQLWhere';
1
+ import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from './SQLExpression.js';
2
+ import { SQLJSONFalse, SQLJSONNull, SQLJSONTrue, SQLSafeValue, SQLScalar, SQLScalarValue } from './SQLExpressions.js';
3
+ import { SQLWhere } from './SQLWhere.js';
4
4
 
5
5
  export function scalarToSQLJSONExpression(s: SQLScalarValue | null): SQLExpression {
6
6
  if (s === null) {
package/src/SQLOrderBy.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from './SQLExpression';
2
- import { SQLColumnExpression } from './SQLExpressions';
1
+ import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from './SQLExpression.js';
2
+ import { SQLColumnExpression } from './SQLExpressions.js';
3
3
 
4
- type Constructor<T = {}> = new (...args: any[]) => T;
4
+ type Constructor<T = object> = new (...args: any[]) => T;
5
5
 
6
- export function Orderable<Sup extends Constructor<{}>>(Base: Sup) {
6
+ export function Orderable<Sup extends Constructor<object>>(Base: Sup) {
7
7
  return class extends Base {
8
8
  _orderBy: SQLOrderBy | null = null;
9
9
 
package/src/SQLSelect.ts CHANGED
@@ -233,6 +233,7 @@ export class SQLSelect<T extends object = SQLResultNamespacedRow> extends Wherea
233
233
 
234
234
  first(required: false): Promise<T | null>;
235
235
  first(required: true): Promise<T>;
236
+ first(required: boolean): Promise<T | null>;
236
237
  async first(required = true): Promise<T | null> {
237
238
  const rows = await this.limit(1).fetch();
238
239
  if (rows.length === 0) {
package/src/SQLWhere.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery, normalizeSQLQuery } from './SQLExpression';
2
- import { SQLArray, SQLColumnExpression, SQLDynamicExpression, SQLNull, readDynamicSQLExpression } from './SQLExpressions';
3
- import { SQLJoin, SQLJoinType } from './SQLJoin';
4
- import { SQLSelect } from './SQLSelect';
1
+ import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery, normalizeSQLQuery } from './SQLExpression.js';
2
+ import { SQLArray, SQLColumnExpression, SQLDynamicExpression, SQLNull, readDynamicSQLExpression } from './SQLExpressions.js';
3
+ import { SQLJoin, SQLJoinType } from './SQLJoin.js';
4
+ import { SQLSelect } from './SQLSelect.js';
5
5
 
6
- type Constructor<T = {}> = new (...args: any[]) => T;
6
+ type Constructor<T = object> = new (...args: any[]) => T;
7
7
 
8
8
  export enum SQLWhereSign {
9
9
  Equal = '=',
@@ -1,10 +1,10 @@
1
1
  import { SimpleError } from '@simonbackx/simple-errors';
2
2
  import { assertFilterCompareValue, StamhoofdFilter } from '@stamhoofd/structures';
3
- import { scalarToSQLExpression, SQLLower, SQLNull } from '../../SQLExpressions';
4
- import { SQLJsonSearch } from '../../SQLJsonExpressions';
5
- import { SQLWhereEqual, SQLWhereLike, SQLWhereSign } from '../../SQLWhere';
6
- import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner, SQLValueType } from '../SQLFilter';
7
- import { normalizeCompareValue } from '../helpers/normalizeCompareValue';
3
+ import { scalarToSQLExpression, SQLLower, SQLNull } from '../../SQLExpressions.js';
4
+ import { SQLJsonSearch } from '../../SQLJsonExpressions.js';
5
+ import { SQLWhereEqual, SQLWhereLike, SQLWhereSign } from '../../SQLWhere.js';
6
+ import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner, SQLValueType } from '../SQLFilter.js';
7
+ import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
8
8
 
9
9
  export function $containsSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner {
10
10
  return (originalColumn: SQLCurrentColumn) => {
@@ -1,10 +1,10 @@
1
1
  import { assertFilterCompareValue, StamhoofdFilter } from '@stamhoofd/structures';
2
- import { scalarToSQLExpression, SQLLower, SQLNull } from '../../SQLExpressions';
3
- import { SQLJsonContains, SQLJsonSearch, SQLJsonValue } from '../../SQLJsonExpressions';
4
- import { SQLWhere, SQLWhereEqual, SQLWhereLike, SQLWhereOr, SQLWhereSign } from '../../SQLWhere';
5
- import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner, SQLValueType } from '../SQLFilter';
6
- import { isJSONColumn } from '../helpers/isJSONColumn';
7
- import { normalizeCompareValue } from '../helpers/normalizeCompareValue';
2
+ import { scalarToSQLExpression, SQLLower, SQLNull } from '../../SQLExpressions.js';
3
+ import { SQLJsonContains, SQLJsonSearch, SQLJsonValue } from '../../SQLJsonExpressions.js';
4
+ import { SQLWhere, SQLWhereEqual, SQLWhereLike, SQLWhereOr, SQLWhereSign } from '../../SQLWhere.js';
5
+ import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner, SQLValueType } from '../SQLFilter.js';
6
+ import { isJSONColumn } from '../helpers/isJSONColumn.js';
7
+ import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
8
8
 
9
9
  export function $equalsSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner {
10
10
  return (originalColumn: SQLCurrentColumn) => {
@@ -1,8 +1,8 @@
1
1
  import { assertFilterCompareValue, StamhoofdFilter } from '@stamhoofd/structures';
2
- import { scalarToSQLExpression } from '../../SQLExpressions';
3
- import { SQLWhereEqual, SQLWhereSign } from '../../SQLWhere';
4
- import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner } from '../SQLFilter';
5
- import { normalizeCompareValue } from '../helpers/normalizeCompareValue';
2
+ import { scalarToSQLExpression } from '../../SQLExpressions.js';
3
+ import { SQLWhereEqual, SQLWhereSign } from '../../SQLWhere.js';
4
+ import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner } from '../SQLFilter.js';
5
+ import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
6
6
 
7
7
  export function $greaterThanSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner {
8
8
  return (originalColumn: SQLCurrentColumn) => {
@@ -1,11 +1,11 @@
1
1
  import { SimpleError } from '@simonbackx/simple-errors';
2
2
  import { assertFilterCompareValue, StamhoofdFilter } from '@stamhoofd/structures';
3
- import { scalarToSQLExpression, SQLArray } from '../../SQLExpressions';
4
- import { SQLJsonOverlaps } from '../../SQLJsonExpressions';
5
- import { SQLWhereEqual, SQLWhereOr, SQLWhereSign } from '../../SQLWhere';
6
- import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner, SQLValueType } from '../SQLFilter';
7
- import { normalizeCompareValue } from '../helpers/normalizeCompareValue';
8
- import { $equalsSQLFilterCompiler } from './equals';
3
+ import { scalarToSQLExpression, SQLArray } from '../../SQLExpressions.js';
4
+ import { SQLJsonOverlaps } from '../../SQLJsonExpressions.js';
5
+ import { SQLWhereEqual, SQLWhereOr, SQLWhereSign } from '../../SQLWhere.js';
6
+ import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner, SQLValueType } from '../SQLFilter.js';
7
+ import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
8
+ import { $equalsSQLFilterCompiler } from './equals.js';
9
9
 
10
10
  export function $inSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner {
11
11
  return (originalColumn: SQLCurrentColumn) => {
@@ -1,4 +1,4 @@
1
- export * from './less';
2
- export * from './greater';
3
- export * from './equals';
4
- export * from './in';
1
+ export * from './less.js';
2
+ export * from './greater.js';
3
+ export * from './equals.js';
4
+ export * from './in.js';
@@ -1,8 +1,8 @@
1
1
  import { assertFilterCompareValue, StamhoofdFilter } from '@stamhoofd/structures';
2
- import { scalarToSQLExpression } from '../../SQLExpressions';
3
- import { SQLWhereEqual, SQLWhereSign } from '../../SQLWhere';
4
- import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner } from '../SQLFilter';
5
- import { normalizeCompareValue } from '../helpers/normalizeCompareValue';
2
+ import { scalarToSQLExpression } from '../../SQLExpressions.js';
3
+ import { SQLWhereEqual, SQLWhereSign } from '../../SQLWhere.js';
4
+ import { normalizeColumn, SQLCurrentColumn, SQLSyncFilterRunner } from '../SQLFilter.js';
5
+ import { normalizeCompareValue } from '../helpers/normalizeCompareValue.js';
6
6
 
7
7
  export function $lessThanSQLFilterCompiler(filter: StamhoofdFilter): SQLSyncFilterRunner {
8
8
  return (originalColumn: SQLCurrentColumn) => {
@@ -1,4 +1,4 @@
1
- import { SQLCurrentColumn, SQLValueType } from '../SQLFilter';
1
+ import { SQLCurrentColumn, SQLValueType } from '../SQLFilter.js';
2
2
 
3
3
  export function isJSONColumn({ type }: SQLCurrentColumn): boolean {
4
4
  return isJSONType(type);
@@ -1,5 +1,5 @@
1
1
  import { StamhoofdCompareValue } from '@stamhoofd/structures';
2
- import { SQLValueType } from '../SQLFilter';
2
+ import { SQLValueType } from '../SQLFilter.js';
3
3
 
4
4
  /**
5
5
  * Prepares a compare value so we can compare it, given a certain column type.