Skip to content

Commit ccbbaf7

Browse files
KenCorbettTruepicKenCorbettTruepic
committed
Fix type errors in test files
1 parent 04c5566 commit ccbbaf7

File tree

19 files changed

+142
-101
lines changed

19 files changed

+142
-101
lines changed

‎dist/adapters/base.test.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
44
};
55
Object.defineProperty(exports, "__esModule", { value: true });
66
const base_1 = __importDefault(require("./base"));
7+
const vitest_1 = require("vitest");
78
const not_implemented_1 = __importDefault(require("../errors/not_implemented"));
89
describe('constructor', () => {
910
test('creates an instance of the validator, calls `defineValidation`', () => {
10-
const defineValidation = jest.spyOn(base_1.default.prototype, 'defineValidation');
11+
const defineValidation = vitest_1.vi.spyOn(base_1.default.prototype, 'defineValidation');
1112
expect(new base_1.default().validator.constructor.name).toBe('AdapterValidator');
1213
expect(defineValidation).toHaveBeenCalled();
1314
defineValidation.mockRestore();
@@ -48,10 +49,10 @@ describe('filter', () => {
4849
const adapter = new base_1.default();
4950
const builder = 'builder';
5051
const filter = { operator: '=' };
51-
const FILTER_OPERATORS = jest
52+
const FILTER_OPERATORS = vitest_1.vi
5253
.spyOn(base_1.default, 'FILTER_OPERATORS', 'get')
5354
.mockReturnValue(['=']);
54-
adapter['filter:='] = jest.fn(() => 'test');
55+
adapter['filter:='] = vitest_1.vi.fn(() => 'test');
5556
adapter.filter(builder, filter);
5657
expect(adapter['filter:=']).toHaveBeenCalledWith(builder, filter);
5758
expect(adapter['filter:=']).toHaveReturnedWith('test');
@@ -61,17 +62,17 @@ describe('filter', () => {
6162
const adapter = new base_1.default();
6263
const builder = 'builder';
6364
const filter = { operator: '=' };
64-
const FILTER_OPERATORS = jest
65+
const FILTER_OPERATORS = vitest_1.vi
6566
.spyOn(base_1.default, 'FILTER_OPERATORS', 'get')
6667
.mockReturnValue(['=']);
67-
adapter['filter:*'] = jest.fn(() => 'test');
68+
adapter['filter:*'] = vitest_1.vi.fn(() => 'test');
6869
adapter.filter(builder, filter);
6970
expect(adapter['filter:*']).toHaveBeenCalledWith(builder, filter);
7071
expect(adapter['filter:*']).toHaveReturnedWith('test');
7172
FILTER_OPERATORS.mockRestore();
7273
});
7374
test('throws `NotImplementedError` if operator is not supported', () => {
74-
const FILTER_OPERATORS = jest
75+
const FILTER_OPERATORS = vitest_1.vi
7576
.spyOn(base_1.default, 'FILTER_OPERATORS', 'get')
7677
.mockReturnValue(['=']);
7778
expect(() => new base_1.default().filter('builder', { operator: 'invalid' })).toThrow(not_implemented_1.default);

‎dist/adapters/knex.test.js‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const knexInstance = (0, knex_1.default)({ client: 'pg' });
1010
describe('filter', () => {
1111
test('uses `field` for the column, not `name`', () => {
1212
const query = new knex_2.default()
13-
.filter((0, knex_1.default)('test'), {
13+
.filter(knexInstance('test'), {
1414
name: 'test',
1515
field: 'testing',
1616
operator: '=',
@@ -21,7 +21,7 @@ describe('filter', () => {
2121
});
2222
test('supports the `=` operator', () => {
2323
const query = new knex_2.default()
24-
.filter((0, knex_1.default)('test'), {
24+
.filter(knexInstance('test'), {
2525
name: 'test',
2626
field: 'test',
2727
operator: '=',
@@ -32,7 +32,7 @@ describe('filter', () => {
3232
});
3333
test('supports the `!=` operator', () => {
3434
const query = new knex_2.default()
35-
.filter((0, knex_1.default)('test'), {
35+
.filter(knexInstance('test'), {
3636
name: 'test',
3737
field: 'test',
3838
operator: '!=',
@@ -43,7 +43,7 @@ describe('filter', () => {
4343
});
4444
test('supports the `<>` operator', () => {
4545
const query = new knex_2.default()
46-
.filter((0, knex_1.default)('test'), {
46+
.filter(knexInstance('test'), {
4747
name: 'test',
4848
field: 'test',
4949
operator: '<>',
@@ -54,7 +54,7 @@ describe('filter', () => {
5454
});
5555
test('supports the `>` operator', () => {
5656
const query = new knex_2.default()
57-
.filter((0, knex_1.default)('test'), {
57+
.filter(knexInstance('test'), {
5858
name: 'test',
5959
field: 'test',
6060
operator: '>',
@@ -65,7 +65,7 @@ describe('filter', () => {
6565
});
6666
test('supports the `>=` operator', () => {
6767
const query = new knex_2.default()
68-
.filter((0, knex_1.default)('test'), {
68+
.filter(knexInstance('test'), {
6969
name: 'test',
7070
field: 'test',
7171
operator: '>=',
@@ -76,7 +76,7 @@ describe('filter', () => {
7676
});
7777
test('supports the `<` operator', () => {
7878
const query = new knex_2.default()
79-
.filter((0, knex_1.default)('test'), {
79+
.filter(knexInstance('test'), {
8080
name: 'test',
8181
field: 'test',
8282
operator: '<',
@@ -87,7 +87,7 @@ describe('filter', () => {
8787
});
8888
test('supports the `<=` operator', () => {
8989
const query = new knex_2.default()
90-
.filter((0, knex_1.default)('test'), {
90+
.filter(knexInstance('test'), {
9191
name: 'test',
9292
field: 'test',
9393
operator: '<=',
@@ -98,7 +98,7 @@ describe('filter', () => {
9898
});
9999
test('supports the `is` operator', () => {
100100
const query = new knex_2.default()
101-
.filter((0, knex_1.default)('test'), {
101+
.filter(knexInstance('test'), {
102102
name: 'test',
103103
field: 'test',
104104
operator: 'is',
@@ -109,7 +109,7 @@ describe('filter', () => {
109109
});
110110
test('supports the `is not` operator', () => {
111111
const query = new knex_2.default()
112-
.filter((0, knex_1.default)('test'), {
112+
.filter(knexInstance('test'), {
113113
name: 'test',
114114
field: 'test',
115115
operator: 'is not',
@@ -120,7 +120,7 @@ describe('filter', () => {
120120
});
121121
test('supports the `in` operator', () => {
122122
const query = new knex_2.default()
123-
.filter((0, knex_1.default)('test'), {
123+
.filter(knexInstance('test'), {
124124
name: 'test',
125125
field: 'test',
126126
operator: 'in',
@@ -131,7 +131,7 @@ describe('filter', () => {
131131
});
132132
test('supports the `not in` operator', () => {
133133
const query = new knex_2.default()
134-
.filter((0, knex_1.default)('test'), {
134+
.filter(knexInstance('test'), {
135135
name: 'test',
136136
field: 'test',
137137
operator: 'not in',
@@ -142,7 +142,7 @@ describe('filter', () => {
142142
});
143143
test('supports the `like` operator', () => {
144144
const query = new knex_2.default()
145-
.filter((0, knex_1.default)('test'), {
145+
.filter(knexInstance('test'), {
146146
name: 'test',
147147
field: 'test',
148148
operator: 'like',
@@ -153,7 +153,7 @@ describe('filter', () => {
153153
});
154154
test('supports the `not like` operator', () => {
155155
const query = new knex_2.default()
156-
.filter((0, knex_1.default)('test'), {
156+
.filter(knexInstance('test'), {
157157
name: 'test',
158158
field: 'test',
159159
operator: 'not like',
@@ -164,7 +164,7 @@ describe('filter', () => {
164164
});
165165
test('supports the `ilike` operator', () => {
166166
const query = new knex_2.default()
167-
.filter((0, knex_1.default)('test'), {
167+
.filter(knexInstance('test'), {
168168
name: 'test',
169169
field: 'test',
170170
operator: 'ilike',
@@ -175,7 +175,7 @@ describe('filter', () => {
175175
});
176176
test('supports the `not ilike` operator', () => {
177177
const query = new knex_2.default()
178-
.filter((0, knex_1.default)('test'), {
178+
.filter(knexInstance('test'), {
179179
name: 'test',
180180
field: 'test',
181181
operator: 'not ilike',
@@ -186,7 +186,7 @@ describe('filter', () => {
186186
});
187187
test('supports the `between` operator', () => {
188188
const query = new knex_2.default()
189-
.filter((0, knex_1.default)('test'), {
189+
.filter(knexInstance('test'), {
190190
name: 'test',
191191
field: 'test',
192192
operator: 'between',
@@ -197,7 +197,7 @@ describe('filter', () => {
197197
});
198198
test('supports the `not between` operator', () => {
199199
const query = new knex_2.default()
200-
.filter((0, knex_1.default)('test'), {
200+
.filter(knexInstance('test'), {
201201
name: 'test',
202202
field: 'test',
203203
operator: 'not between',
@@ -210,21 +210,29 @@ describe('filter', () => {
210210
describe('sort', () => {
211211
test('adds an `order by` clause', () => {
212212
const query = new knex_2.default()
213-
.sort((0, knex_1.default)('test'), { name: 'test', field: 'test', order: 'desc' })
213+
.sort(knexInstance('test'), {
214+
name: 'test',
215+
field: 'test',
216+
order: 'desc',
217+
})
214218
.toString();
215219
expect(query).toBe('select * from "test" order by "test" desc');
216220
});
217221
test('uses `field` for the column, not `name`', () => {
218222
const query = new knex_2.default()
219-
.sort((0, knex_1.default)('test'), { name: 'test', field: 'testing', order: 'desc' })
223+
.sort(knexInstance('test'), {
224+
name: 'test',
225+
field: 'testing',
226+
order: 'desc',
227+
})
220228
.toString();
221229
expect(query).toBe('select * from "test" order by "testing" desc');
222230
});
223231
});
224232
describe('page', () => {
225233
test('adds a `limit` clause', () => {
226234
const query = new knex_2.default()
227-
.page((0, knex_1.default)('test'), { size: 10, offset: 20 })
235+
.page(knexInstance('test'), { size: 10, offset: 20 })
228236
.toString();
229237
expect(query).toBe('select * from "test" limit 10 offset 20');
230238
});

‎dist/index.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,20 @@ class QueryQL {
5555
this.query = query;
5656
this.builder = builder;
5757
this.config = new config_1.default(config);
58-
this.adapter = new (this.config.get('adapter'))();
58+
const AdapterCtor = this.config.get('adapter');
59+
this.adapter = new AdapterCtor();
5960
this.schema = new schema_1.default();
6061
this.defineSchema(this.schema);
6162
this.filterer = new filterer_1.default(this);
6263
this.sorter = new sorter_1.default(this);
6364
this.pager = new pager_1.default(this);
64-
this.validator = new (this.config.get('validator'))(this.defineValidation.bind(this));
65+
const ValidatorCtor = this.config.get('validator');
66+
this.validator = new ValidatorCtor(this.defineValidation.bind(this));
6567
}
66-
defineSchema( /* schema */) {
68+
defineSchema(schema) {
6769
throw new not_implemented_1.default();
6870
}
69-
defineValidation( /* ...args */) {
71+
defineValidation(...args) {
7072
return undefined;
7173
}
7274
get defaultFilter() {
@@ -100,4 +102,11 @@ class QueryQL {
100102
return this.builder;
101103
}
102104
}
105+
// Attach helpers as static properties to match existing runtime API/tests
106+
(function (QueryQL) {
107+
})(QueryQL || (QueryQL = {}));
108+
QueryQL.adapters = adapters;
109+
QueryQL.Config = config_1.default;
110+
QueryQL.errors = errors;
111+
QueryQL.validators = validators;
103112
exports.default = QueryQL;

‎dist/index.test.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
66
const knex_1 = __importDefault(require("knex"));
77
const knex = (0, knex_1.default)({ client: 'pg' });
88
const config_1 = __importDefault(require("./config"));
9-
const empty_1 = __importDefault(require("../test/queriers/empty"));
9+
const empty_1 = __importDefault(require("./test/queriers/empty"));
1010
const not_implemented_1 = __importDefault(require("./errors/not_implemented"));
1111
const _1 = __importDefault(require("."));
12-
const test_1 = __importDefault(require("../test/queriers/test"));
12+
const test_1 = __importDefault(require("./test/queriers/test"));
13+
const vitest_1 = require("vitest");
1314
const validation_1 = __importDefault(require("./errors/validation"));
1415
describe('constructor', () => {
1516
test('accepts a query to set', () => {
@@ -28,18 +29,18 @@ describe('constructor', () => {
2829
expect(querier.config.get()).toMatchObject(config);
2930
});
3031
test('calls `defineSchema` with a schema instance', () => {
31-
const defineSchema = jest.spyOn(test_1.default.prototype, 'defineSchema');
32+
const defineSchema = vitest_1.vi.spyOn(test_1.default.prototype, 'defineSchema');
3233
const querier = new test_1.default({}, knex('test'));
3334
expect(defineSchema).toHaveBeenCalledWith(querier.schema);
3435
defineSchema.mockRestore();
3536
});
3637
test('creates an instance of the configured adapter', () => {
37-
const adapter = jest.fn();
38+
const adapter = vitest_1.vi.fn();
3839
new test_1.default({}, knex('test'), { adapter });
3940
expect(adapter.mock.instances).toHaveLength(1);
4041
});
4142
test('creates an instance of the configured validator', () => {
42-
const validator = jest.fn();
43+
const validator = vitest_1.vi.fn();
4344
new test_1.default({}, knex('test'), { validator });
4445
expect(validator.mock.instances).toHaveLength(1);
4546
});

0 commit comments

Comments
 (0)