Skip to content

Commit bd4e6e7

Browse files
Copilothotlong
andcommitted
Fix QueryAST compatibility with @objectstack/spec v0.3.3
Update test files to use correct QueryAST property names: - where (instead of filters) - orderBy (instead of sort) - limit (instead of top) - offset (instead of skip) Also update filter syntax to MongoDB-style format: - { age: { $gt: 25 } } instead of { type: 'comparison', ... } - { $and: [...] } instead of { type: 'and', children: [...] } Fixed in: - packages/drivers/excel/test/index.test.ts - packages/drivers/localstorage/test/index.test.ts Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>
1 parent c57bbe3 commit bd4e6e7

File tree

2 files changed

+16
-24
lines changed

2 files changed

+16
-24
lines changed

packages/drivers/excel/test/index.test.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -582,15 +582,12 @@ describe('ExcelDriver', () => {
582582
const result = await driver.executeQuery({
583583
object: TEST_OBJECT,
584584
fields: ['name', 'age'],
585-
filters: {
586-
type: 'comparison',
587-
field: 'age',
588-
operator: '>',
589-
value: 25
585+
where: {
586+
age: { $gt: 25 }
590587
},
591-
sort: [{ field: 'age', order: 'asc' }],
592-
top: 10,
593-
skip: 0
588+
orderBy: [{ field: 'age', order: 'asc' }],
589+
limit: 10,
590+
offset: 0
594591
});
595592

596593
expect(result.value).toHaveLength(2);
@@ -606,11 +603,10 @@ describe('ExcelDriver', () => {
606603

607604
const result = await driver.executeQuery({
608605
object: TEST_OBJECT,
609-
filters: {
610-
type: 'and',
611-
children: [
612-
{ type: 'comparison', field: 'age', operator: '>', value: 25 },
613-
{ type: 'comparison', field: 'city', operator: '=', value: 'NYC' }
606+
where: {
607+
$and: [
608+
{ age: { $gt: 25 } },
609+
{ city: { $eq: 'NYC' } }
614610
]
615611
}
616612
});
@@ -626,9 +622,9 @@ describe('ExcelDriver', () => {
626622

627623
const result = await driver.executeQuery({
628624
object: TEST_OBJECT,
629-
sort: [{ field: 'name', order: 'asc' }],
630-
skip: 1,
631-
top: 1
625+
orderBy: [{ field: 'name', order: 'asc' }],
626+
offset: 1,
627+
limit: 1
632628
});
633629

634630
expect(result.value).toHaveLength(1);

packages/drivers/localstorage/test/index.test.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,7 @@ describe('LocalStorageDriver', () => {
429429
object: 'users',
430430
fields: ['name', 'age'],
431431
where: {
432-
type: 'comparison',
433-
field: 'age',
434-
operator: '>',
435-
value: 25
432+
age: { $gt: 25 }
436433
},
437434
orderBy: [{ field: 'age', order: 'asc' }],
438435
limit: 10,
@@ -453,10 +450,9 @@ describe('LocalStorageDriver', () => {
453450
const result = await driver.executeQuery({
454451
object: 'users',
455452
where: {
456-
type: 'and',
457-
children: [
458-
{ type: 'comparison', field: 'age', operator: '>', value: 25 },
459-
{ type: 'comparison', field: 'city', operator: '=', value: 'NYC' }
453+
$and: [
454+
{ age: { $gt: 25 } },
455+
{ city: { $eq: 'NYC' } }
460456
]
461457
}
462458
});

0 commit comments

Comments
 (0)