-
Notifications
You must be signed in to change notification settings - Fork 2
Upgrade @objectstack/spec to v0.3.3 #192
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
d54c0ec
Initial plan
Copilot 380b315
Update @objectstack/spec to 0.3.3 in all package.json files
Copilot bf4ab3f
Fix breaking changes from @objectstack/spec upgrade to 0.3.3
Copilot 2542193
Fix MongoDB driver and tests for FilterCondition format
Copilot 847ccb6
Fix SQL driver to use skip instead of offset in legacy query format
Copilot 00401ce
Initial plan
Copilot dafc7cb
Fix QueryAST property name changes in memory, fs, and excel drivers
Copilot e36db69
Fix QueryAST property names in redis and localstorage drivers
Copilot b6530b4
Update fs driver tests to use new QueryAST property names
Copilot 31d366d
Update documentation in redis driver to reflect FilterCondition format
Copilot f473aec
Merge pull request #193 from objectstack-ai/copilot/fix-action-step-i…
hotlong 3b17e6e
Initial plan
Copilot 17fe1b2
Add zod as devDependency to fix test failures
Copilot 3b03434
Merge pull request #194 from objectstack-ai/copilot/fix-api-integrati…
hotlong 6d58103
Initial plan
Copilot c57bbe3
test: update driver tests to use new QueryAST format from @objectstac…
Copilot bd4e6e7
Fix QueryAST compatibility with @objectstack/spec v0.3.3
Copilot 332243e
Merge pull request #195 from objectstack-ai/copilot/check-action-stat…
hotlong 578608e
Initial plan
Copilot adacc16
Fix Redis driver filter conversion for @objectstack/spec v0.3.3
Copilot 682118c
Add safety check for NOT filter child property
Copilot 1759209
Merge pull request #196 from objectstack-ai/copilot/fix-action-run-error
xuyushun441-sys 0708f0c
Initial plan
Copilot 514c38f
Fix pagination in mock drivers to use offset instead of skip
Copilot 2a5c3d9
Remove redundant skip deletion in count query (code review fix)
Copilot 0a56ba9
Merge pull request #197 from objectstack-ai/copilot/fix-action-job-issue
xuyushun441-sys File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| import { Data, System } from '@objectstack/spec'; | ||
| import { Data, Driver as DriverSpec } from '@objectstack/spec'; | ||
| type QueryAST = Data.QueryAST; | ||
| type FilterNode = Data.FilterNode; | ||
| type SortNode = Data.SortNode; | ||
| type DriverInterface = System.DriverInterface; | ||
| type DriverInterface = DriverSpec.DriverInterface; | ||
| /** | ||
| * ObjectQL | ||
| * Copyright (c) 2026-present ObjectStack Inc. | ||
|
|
@@ -620,12 +619,13 @@ export class FileSystemDriver implements Driver { | |
| const objectName = ast.object || ''; | ||
|
|
||
| // Convert QueryAST to legacy query format | ||
| // Note: Convert FilterCondition (MongoDB-like) to array format for fs driver | ||
| const legacyQuery: any = { | ||
| fields: ast.fields, | ||
| filters: this.convertFilterNodeToLegacy(ast.filters), | ||
| sort: ast.sort?.map((s: SortNode) => [s.field, s.order]), | ||
| limit: ast.top, | ||
| skip: ast.skip, | ||
| filters: this.convertFilterConditionToArray(ast.where), | ||
| sort: ast.orderBy?.map((s: SortNode) => [s.field, s.order]), | ||
| limit: ast.limit, | ||
| skip: ast.offset, | ||
| }; | ||
|
|
||
| // Use existing find method | ||
|
|
@@ -754,60 +754,80 @@ export class FileSystemDriver implements Driver { | |
| // ========== Helper Methods ========== | ||
|
|
||
| /** | ||
| * Convert FilterNode from QueryAST to legacy filter format. | ||
| * Convert FilterCondition (MongoDB-like format) to legacy array format. | ||
| * This allows the fs driver to use its existing filter evaluation logic. | ||
| * | ||
| * @param node - The FilterNode to convert | ||
| * @param condition - FilterCondition object or legacy array | ||
| * @returns Legacy filter array format | ||
| */ | ||
| private convertFilterNodeToLegacy(node?: FilterNode): any { | ||
| if (!node) return undefined; | ||
| private convertFilterConditionToArray(condition?: any): any[] | undefined { | ||
| if (!condition) return undefined; | ||
|
|
||
| switch (node.type) { | ||
| case 'comparison': | ||
| // Convert comparison node to [field, operator, value] format | ||
| const operator = node.operator || '='; | ||
| return [[node.field, operator, node.value]]; | ||
|
|
||
| case 'and': | ||
| // Convert AND node to array with 'and' separator | ||
| if (!node.children || node.children.length === 0) return undefined; | ||
| const andResults: any[] = []; | ||
| for (const child of node.children) { | ||
| const converted = this.convertFilterNodeToLegacy(child); | ||
| if (converted) { | ||
| if (andResults.length > 0) { | ||
| andResults.push('and'); | ||
| // If already an array, return as-is | ||
| if (Array.isArray(condition)) { | ||
| return condition; | ||
| } | ||
|
|
||
| // If it's an object (FilterCondition), convert to array format | ||
| // This is a simplified conversion - a full implementation would need to handle all operators | ||
| const result: any[] = []; | ||
|
|
||
| for (const [key, value] of Object.entries(condition)) { | ||
| if (key === '$and' && Array.isArray(value)) { | ||
| // Handle $and: [cond1, cond2, ...] | ||
| for (let i = 0; i < value.length; i++) { | ||
| const converted = this.convertFilterConditionToArray(value[i]); | ||
| if (converted && converted.length > 0) { | ||
| if (result.length > 0) { | ||
| result.push('and'); | ||
| } | ||
| andResults.push(...(Array.isArray(converted) ? converted : [converted])); | ||
| result.push(...converted); | ||
| } | ||
| } | ||
| return andResults.length > 0 ? andResults : undefined; | ||
|
|
||
| case 'or': | ||
| // Convert OR node to array with 'or' separator | ||
| if (!node.children || node.children.length === 0) return undefined; | ||
| const orResults: any[] = []; | ||
| for (const child of node.children) { | ||
| const converted = this.convertFilterNodeToLegacy(child); | ||
| if (converted) { | ||
| if (orResults.length > 0) { | ||
| orResults.push('or'); | ||
| } else if (key === '$or' && Array.isArray(value)) { | ||
| // Handle $or: [cond1, cond2, ...] | ||
| for (let i = 0; i < value.length; i++) { | ||
| const converted = this.convertFilterConditionToArray(value[i]); | ||
| if (converted && converted.length > 0) { | ||
| if (result.length > 0) { | ||
| result.push('or'); | ||
| } | ||
| orResults.push(...(Array.isArray(converted) ? converted : [converted])); | ||
| result.push(...converted); | ||
| } | ||
| } | ||
| return orResults.length > 0 ? orResults : undefined; | ||
|
|
||
| case 'not': | ||
| // NOT is complex - we'll just process the first child for now | ||
| if (node.children && node.children.length > 0) { | ||
| return this.convertFilterNodeToLegacy(node.children[0]); | ||
| } else if (key === '$not' && typeof value === 'object') { | ||
| // Handle $not: { condition } | ||
| // Note: NOT is complex to represent in array format, so we skip it for now | ||
| const converted = this.convertFilterConditionToArray(value); | ||
| if (converted) { | ||
| result.push(...converted); | ||
| } | ||
| return undefined; | ||
|
|
||
| default: | ||
| return undefined; | ||
| } else if (typeof value === 'object' && value !== null) { | ||
| // Handle field-level conditions like { field: { $eq: value } } | ||
| const field = key; | ||
| for (const [operator, operandValue] of Object.entries(value)) { | ||
| let op: string; | ||
| switch (operator) { | ||
| case '$eq': op = '='; break; | ||
| case '$ne': op = '!='; break; | ||
| case '$gt': op = '>'; break; | ||
| case '$gte': op = '>='; break; | ||
| case '$lt': op = '<'; break; | ||
| case '$lte': op = '<='; break; | ||
| case '$in': op = 'in'; break; | ||
| case '$nin': op = 'nin'; break; | ||
| case '$regex': op = 'like'; break; | ||
| default: op = '='; | ||
| } | ||
| result.push([field, op, operandValue]); | ||
| } | ||
| } else { | ||
| // Handle simple equality: { field: value } | ||
| result.push([key, '=', value]); | ||
|
Comment on lines
+822
to
+826
|
||
| } | ||
| } | ||
|
|
||
| return result.length > 0 ? result : undefined; | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
convertFilterConditionToArrayappends multiple[field, op, value]entries without inserting'and'separators (for multiple fields or multiple operators on the same field). SincematchesFilterscombines conditions only via explicit operator tokens, the additional conditions may be skipped. Please interleave'and'between generated conditions by default.