@devries-cameron20 / composio Mirror · read-only / commits / 7276d1e9f
Fork 0

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

Mirrored from https://github.com/Camo67/composio.git

Synced Nov 22, 23:15 UTC

fix: prevent marking nested object as required in json schema (#1715)

Musthaq Ahamad committed Jul 1, 2025 at 18:24 UTC 7276d1e9fd814fe9f5dae18c64d83e573fc31788
26 files changed +224 -40
.changeset/cold-badgers-drop.md new
+14
@@ -0,0 +1,14 @@
1 +---
2 +'@composio/core': patch
3 +'@composio/json-schema-to-zod': patch
4 +'@composio/anthropic': patch
5 +'@composio/cloudflare': patch
6 +'@composio/google': patch
7 +'@composio/langchain': patch
8 +'@composio/mastra': patch
9 +'@composio/openai': patch
10 +'@composio/openai-agents': patch
11 +'@composio/vercel': patch
12 +---
13 +
14 +Fix issues with json schema to zod parsing causing nested objects to be marked as required
.changeset/eighty-actors-smile.md new
+14
@@ -0,0 +1,14 @@
1 +---
2 +'@composio/core': patch
3 +'@composio/json-schema-to-zod': patch
4 +'@composio/anthropic': patch
5 +'@composio/cloudflare': patch
6 +'@composio/google': patch
7 +'@composio/langchain': patch
8 +'@composio/mastra': patch
9 +'@composio/openai': patch
10 +'@composio/openai-agents': patch
11 +'@composio/vercel': patch
12 +---
13 +
14 +Fix issues with objects with default values being marked as required
.changeset/pre.json
+3 -1
@@ -15,6 +15,8 @@
15 "@composio/vercel": "0.1.35"
16 },
17 "changesets": [
18 - "cuddly-dragons-knock"
18 + "cold-badgers-drop",
19 + "cuddly-dragons-knock",
20 + "eighty-actors-smile"
21 ]
22 }
pnpm-lock.yaml
+6 -6
@@ -585,8 +585,8 @@ importers:
585 specifier: 0.1.0-alpha.25
586 version: 0.1.0-alpha.25
587 '@composio/json-schema-to-zod':
588 - specifier: 0.1.9
589 - version: 0.1.9
588 + specifier: 0.1.10-next.1
589 + version: 0.1.10-next.1
590 '@types/json-schema':
591 specifier: ^7.0.15
592 version: 7.0.15
@@ -1135,8 +1135,8 @@ packages:
1135 '@composio/client@0.1.0-alpha.25':
1136 resolution: {integrity: sha512-5zbqn3zxSoIs4MtfuEKZ3p+xE6Is/PPh77ldoIT9iBYvZrw9RsqA7Xlyw5PgbIiG3QPoeRSpEAnjwBoVwU8ehQ==}
1137
1138 - '@composio/json-schema-to-zod@0.1.9':
1139 - resolution: {integrity: sha512-uDOAPPkaMWM2DJLCFCW6/rxTgair6EmQ4Ojo6RDayzIl2BRUro0wGkpof4Za8sJPrmdTfSqteRMDy46xPnOYhw==}
1138 + '@composio/json-schema-to-zod@0.1.10-next.1':
1139 + resolution: {integrity: sha512-z43S9sHq0A86bDh/zjpRiBQ4blIFOWX6HS1d4awEok2bGkoEVTnnByyH+DmpkmH52GNhvcZrEXkoAszBdW2XxA==}
1140
1141 '@composio/mcp@1.0.3-0':
1142 resolution: {integrity: sha512-IpbfST0SSs/CEv+PIf6+EL0feNuJhQyUrOHJLPge8NhyLLrCyVqvujRIPyRUUjy0NDsked/Mm5VpJmYM6OACbg==}
@@ -6891,7 +6891,7 @@ snapshots:
6891
6892 '@composio/client@0.1.0-alpha.25': {}
6893
6894 - '@composio/json-schema-to-zod@0.1.9':
6894 + '@composio/json-schema-to-zod@0.1.10-next.1':
6895 dependencies:
6896 '@types/json-schema': 7.0.15
6897 zod: 3.25.67
@@ -6981,7 +6981,7 @@ snapshots:
6981 dependencies:
6982 '@effect/cluster': 0.39.4(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/sql@0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/workflow@0.2.4(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(effect@3.16.8))(effect@3.16.8)
6983 '@effect/platform': 0.85.2(effect@3.16.8)
6984 - '@effect/platform-node-shared': 0.40.4(@effect/cluster@0.39.4(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/sql@0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/workflow@0.2.4(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/sql@0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(effect@3.16.8)
6984 + '@effect/platform-node-shared': 0.40.5(@effect/cluster@0.39.4(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/sql@0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/workflow@0.2.4(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/sql@0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(effect@3.16.8)
6985 '@effect/rpc': 0.62.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8)
6986 '@effect/sql': 0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8)
6987 effect: 3.16.8
ts/packages/core/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/core
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/json-schema-to-zod@0.1.10-next.1
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/json-schema-to-zod@0.1.10-next.0
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/core/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/core",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "",
5 "main": "src/index.ts",
6 "type": "module",
@@ -44,7 +44,7 @@
44 },
45 "dependencies": {
46 "@composio/client": "0.1.0-alpha.25",
47 - "@composio/json-schema-to-zod": "0.1.9",
47 + "@composio/json-schema-to-zod": "0.1.10-next.1",
48 "@types/json-schema": "^7.0.15",
49 "chalk": "^5.4.1",
50 "openai": "^4.94.0",
ts/packages/json-schema-to-zod/CHANGELOG.md
+12
@@ -1,5 +1,17 @@
1 # @composio/json-schema-to-zod
2
3 +## 0.1.10-next.1
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +
9 +## 0.1.10-next.0
10 +
11 +### Patch Changes
12 +
13 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
14 +
15 ## 0.1.9
16
17 ### Patch Changes
ts/packages/json-schema-to-zod/package.json
+1 -1
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/json-schema-to-zod",
3 - "version": "0.1.9",
3 + "version": "0.1.10-next.1",
4 "description": "",
5 "main": "src/index.ts",
6 "type": "module",
ts/packages/json-schema-to-zod/src/parsers/parse-object.ts
+11 -13
@@ -27,23 +27,21 @@ function parseObjectProperties(objectSchema: JsonSchemaObject & { type: 'object'
27 path: [...refs.path, 'properties', key],
28 });
29
30 - const hasDefault = typeof propJsonSchema === 'object' && propJsonSchema.default !== undefined;
30 const required = Array.isArray(objectSchema.required)
31 ? objectSchema.required.includes(key)
33 - : typeof propJsonSchema === 'object' && propJsonSchema.required === true;
32 + : false;
33
35 - // If property has a default value or is an object with nested defaults,
36 - // we should include it in the schema even if it's not required
37 - const isOptional =
38 - !hasDefault &&
34 + // Handle default values for optional properties
35 + if (
36 !required &&
40 - !(
41 - typeof propJsonSchema === 'object' &&
42 - propJsonSchema.type === 'object' &&
43 - propJsonSchema.properties
44 - );
45 -
46 - properties[key] = isOptional ? propZodSchema.optional() : propZodSchema;
37 + propJsonSchema &&
38 + typeof propJsonSchema === 'object' &&
39 + 'default' in propJsonSchema
40 + ) {
41 + properties[key] = propZodSchema.optional().default(propJsonSchema.default);
42 + } else {
43 + properties[key] = required ? propZodSchema : propZodSchema.optional();
44 + }
45 }
46
47 return z.object(properties);
ts/packages/json-schema-to-zod/test/json-to-zod.test.ts
+1 -1
@@ -401,7 +401,7 @@ describe('jsonSchemaToZod', () => {
401 // Test property with type
402 expect(zodSchema.parse({ withType: 'test' })).toEqual({
403 withType: 'test',
404 - withoutType: 'default value', // Default value is included
404 + withoutType: 'default value',
405 });
406 expect(() => zodSchema.parse({ withType: 123 })).toThrow();
407
ts/packages/providers/anthropic/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/anthropic
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/anthropic/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/anthropic",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "Non-Agentic Provider for Anthropic in Composio SDK",
5 "main": "src/index.ts",
6 "type": "module",
@@ -35,7 +35,7 @@
35 "packageManager": "pnpm@10.8.0",
36 "peerDependencies": {
37 "@anthropic-ai/sdk": "^0.52.0",
38 - "@composio/core": "0.1.36-next.0"
38 + "@composio/core": "0.1.36-next.2"
39 },
40 "devDependencies": {
41 "@composio/core": "workspace:*",
ts/packages/providers/cloudflare/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/cloudflare
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/cloudflare/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/cloudflare",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "",
5 "main": "src/index.ts",
6 "type": "module",
@@ -31,7 +31,7 @@
31 "packageManager": "pnpm@10.8.0",
32 "peerDependencies": {
33 "@cloudflare/workers-types": "^4.20250416.0",
34 - "@composio/core": "0.1.36-next.0"
34 + "@composio/core": "0.1.36-next.2"
35 },
36 "devDependencies": {
37 "@composio/core": "workspace:*",
ts/packages/providers/google/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/google
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/google/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/google",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "Google GenAI Provider for Composio SDK",
5 "main": "src/index.ts",
6 "type": "module",
@@ -36,7 +36,7 @@
36 "license": "ISC",
37 "packageManager": "pnpm@10.8.0",
38 "peerDependencies": {
39 - "@composio/core": "0.1.36-next.0",
39 + "@composio/core": "0.1.36-next.2",
40 "@google/genai": "^1.1.0"
41 },
42 "devDependencies": {
ts/packages/providers/langchain/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/langchain
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/langchain/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/langchain",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "",
5 "main": "dist/index.js",
6 "type": "module",
@@ -30,7 +30,7 @@
30 "license": "ISC",
31 "packageManager": "pnpm@10.8.0",
32 "peerDependencies": {
33 - "@composio/core": "0.1.36-next.0",
33 + "@composio/core": "0.1.36-next.2",
34 "@langchain/core": "^0.3.44"
35 },
36 "devDependencies": {
ts/packages/providers/mastra/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/mastra
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/mastra/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/mastra",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "Agentic Provider for mastra in Composio SDK",
5 "main": "src/index.ts",
6 "type": "module",
@@ -34,7 +34,7 @@
34 "license": "ISC",
35 "packageManager": "pnpm@10.8.0",
36 "peerDependencies": {
37 - "@composio/core": "0.1.36-next.0",
37 + "@composio/core": "0.1.36-next.2",
38 "@mastra/core": "^0.10.0"
39 },
40 "devDependencies": {
ts/packages/providers/openai-agents/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/vercel
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/openai-agents/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/openai-agents",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "",
5 "main": "src/index.ts",
6 "type": "module",
@@ -30,7 +30,7 @@
30 "license": "ISC",
31 "packageManager": "pnpm@10.8.0",
32 "peerDependencies": {
33 - "@composio/core": "0.1.36-next.0",
33 + "@composio/core": "0.1.36-next.2",
34 "@openai/agents": "^0.0.7"
35 },
36 "devDependencies": {
ts/packages/providers/openai/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/openai
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/openai/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/openai",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "",
5 "main": "src/index.ts",
6 "type": "module",
@@ -30,7 +30,7 @@
30 "license": "ISC",
31 "packageManager": "pnpm@10.8.0",
32 "peerDependencies": {
33 - "@composio/core": "0.1.36-next.0",
33 + "@composio/core": "0.1.36-next.2",
34 "openai": "^4.3.8"
35 },
36 "devDependencies": {
ts/packages/providers/vercel/CHANGELOG.md
+16
@@ -1,5 +1,21 @@
1 # @composio/vercel
2
3 +## 0.1.36-next.2
4 +
5 +### Patch Changes
6 +
7 +- Fix issues with objects with default values being marked as required
8 +- Updated dependencies
9 + - @composio/core@0.1.36-next.2
10 +
11 +## 0.1.36-next.1
12 +
13 +### Patch Changes
14 +
15 +- Fix issues with json schema to zod parsing causing nested objects to be marked as required
16 +- Updated dependencies
17 + - @composio/core@0.1.36-next.1
18 +
19 ## 0.1.36-next.0
20
21 ### Patch Changes
ts/packages/providers/vercel/package.json
+2 -2
@@ -1,6 +1,6 @@
1 {
2 "name": "@composio/vercel",
3 - "version": "0.1.36-next.0",
3 + "version": "0.1.36-next.2",
4 "description": "",
5 "main": "src/index.ts",
6 "type": "module",
@@ -30,7 +30,7 @@
30 "license": "ISC",
31 "packageManager": "pnpm@10.8.0",
32 "peerDependencies": {
33 - "@composio/core": "0.1.36-next.0",
33 + "@composio/core": "0.1.36-next.2",
34 "ai": "^4.3.8"
35 },
36 "devDependencies": {