Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"@objectql/protocol-graphql": "workspace:*",
"@objectql/protocol-json-rpc": "workspace:*",
"@objectql/protocol-odata-v4": "workspace:*",
"@objectstack/cli": "1.1.0",
"@objectstack/core": "1.1.0",
"@objectstack/plugin-hono-server": "^1.1.0",
"@objectstack/cli": "2.0.0",
"@objectstack/core": "2.0.0",
"@objectstack/plugin-hono-server": "^2.0.0",
"@types/js-yaml": "^4.0.9",
"@types/node": "^20.10.0",
"@types/supertest": "^6.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/excel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@objectql/driver-memory": "workspace:*",
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"exceljs": "^4.4.0",
"zod": "^3.24.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/fs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@objectql/driver-memory": "workspace:*",
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.24.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/memory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"mingo": "^7.1.1",
"zod": "^3.24.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/mongo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"mongodb": "^5.9.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/pg-wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@electric-sql/pglite": "^0.1.5",
"@objectql/driver-sql": "workspace:*",
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"knex": "^3.1.0",
"nanoid": "^3.3.11",
"zod": "^3.24.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/redis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"redis": "^4.6.0",
"zod": "^3.24.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.24.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/sql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"knex": "^3.1.0",
"nanoid": "^3.3.11",
"zod": "^3.24.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/sqlite-wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@objectql/driver-sql": "workspace:*",
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"knex": "^3.1.0",
"nanoid": "^3.3.11",
"wa-sqlite": "^1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/foundation/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"@objectql/plugin-formula": "workspace:*",
"@objectql/plugin-validator": "workspace:*",
"@objectql/types": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/objectql": "^1.1.0",
"@objectstack/runtime": "^1.1.0",
"@objectstack/spec": "^1.1.0",
"@objectstack/core": "^2.0.0",
"@objectstack/objectql": "^2.0.0",
"@objectstack/runtime": "^2.0.0",
"@objectstack/spec": "^2.0.0",
"js-yaml": "^4.1.0",
"zod": "^3.23.8"
},
Expand Down
6 changes: 4 additions & 2 deletions packages/foundation/core/src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ export function convertIntrospectedSchemaToObjects(
reference_to: foreignKey.referencedTable,
label: toTitleCase(column.name),
required: !column.nullable,
searchable: false
searchable: false,
sortable: false
Comment on lines 118 to +122
Copy link

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sortable was added here for introspection, but upgrading @objectstack/spec to v2 makes FieldConfig.sortable required everywhere a FieldConfig literal is constructed. There are multiple existing const fieldConfig: FieldConfig = { ... } usages (e.g. in packages/foundation/plugin-validator/test/*.ts) that currently omit sortable, which will break TypeScript compilation and/or spec validation. Please update those FieldConfig literals (or, if the intention is to rely on defaults, adjust the FieldConfig typing/parsing layer so sortable can be omitted safely).

Copilot uses AI. Check for mistakes.
};
} else {
// Regular field
Expand All @@ -131,7 +132,8 @@ export function convertIntrospectedSchemaToObjects(
type: fieldType,
label: toTitleCase(column.name),
required: !column.nullable,
searchable: false
searchable: false,
sortable: false
};

// Add unique constraint
Expand Down
2 changes: 1 addition & 1 deletion packages/foundation/platform-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@objectql/core": "workspace:*",
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"fast-glob": "^3.3.2",
"js-yaml": "^4.1.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/foundation/plugin-formula/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/spec": "^1.1.0",
"@objectstack/core": "^2.0.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/foundation/plugin-multitenancy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/spec": "^1.1.0",
"@objectstack/core": "^2.0.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/foundation/plugin-security/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/spec": "^1.1.0",
"@objectstack/core": "^2.0.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/foundation/plugin-validator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/spec": "^1.1.0",
"@objectstack/core": "^2.0.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/foundation/plugin-workflow/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/spec": "^1.1.0",
"@objectstack/core": "^2.0.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/foundation/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {},
"devDependencies": {
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"ts-json-schema-generator": "^2.4.0",
"zod": "^3.23.8"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/protocols/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@as-integrations/express4": "^1.1.2",
"@graphql-tools/schema": "^10.0.2",
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"cors": "^2.8.5",
"dataloader": "^2.2.2",
"express": "^4.18.2",
Expand All @@ -36,7 +36,7 @@
"devDependencies": {
"@objectql/driver-memory": "workspace:*",
"@objectql/protocol-tck": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/core": "^2.0.0",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/ws": "^8.5.10",
Expand Down
4 changes: 2 additions & 2 deletions packages/protocols/json-rpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@objectql/driver-memory": "workspace:*",
"@objectql/protocol-tck": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/core": "^2.0.0",
"typescript": "^5.3.3",
"vitest": "^1.0.4"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/protocols/odata-v4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
},
"dependencies": {
"@objectql/types": "workspace:*",
"@objectstack/spec": "^1.1.0",
"@objectstack/spec": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@objectql/driver-memory": "workspace:*",
"@objectql/protocol-tck": "workspace:*",
"@objectstack/core": "^1.1.0",
"@objectstack/core": "^2.0.0",
"typescript": "^5.3.3",
"vitest": "^1.0.4"
},
Expand Down
Loading
Loading