Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
13237dc
Merge pull request #3133 from apollographql/main
sachindshinde Aug 30, 2024
bb07a37
Skip type resolution for null (#3138)
tninesling Sep 3, 2024
217b8ec
Connectors (#3046)
dylan-apollo Sep 9, 2024
fccf785
Merge branch 'main' into lb/merge-main
lennyburdette Sep 23, 2024
feb0086
Merge pull request #3151 from apollographql/lb/merge-main
lennyburdette Sep 23, 2024
98285e5
bump version to 2.10.0-alpha.2 (#3152)
lennyburdette Sep 23, 2024
f0e5b54
Merge branch 'main' into next
lennyburdette Nov 7, 2024
a0359b0
add changeset after merging main
lennyburdette Nov 7, 2024
138e132
Merge pull request #3179 from apollographql/prep-2.10.0-preview.1
lennyburdette Nov 7, 2024
b117986
release: on branch next (alpha) (#3181)
github-actions[bot] Nov 7, 2024
02de6d4
merge main into next, bringing in 2.9.3 changes (#3199)
lennyburdette Jan 10, 2025
397a0a6
release: on branch next (alpha) (#3200)
github-actions[bot] Jan 14, 2025
52038a9
update uplink schema and merge main (#3212)
lennyburdette Feb 12, 2025
28d6c29
release Federation 2.10.0 (#3213)
lennyburdette Feb 13, 2025
b632655
remove unnecessary alpha changelog entries (#3216)
lennyburdette Feb 13, 2025
a520a0c
merge main into next --strategy-option theirs (#3227)
lennyburdette Mar 12, 2025
e7e6757
add connect/v0.2 and allow @connect on OBJECT (#3228)
lennyburdette Mar 12, 2025
41bdeb7
release: on branch next (preview) (#3217)
github-actions[bot] Mar 12, 2025
414740d
Merge branch 'main' into lb/merge-main
lennyburdette Apr 7, 2025
0c74313
Merge pull request #3241 from apollographql/lb/merge-main
lennyburdette Apr 7, 2025
1e01dc4
allow `@connect` as default import (#3240)
lennyburdette Apr 8, 2025
845ef94
Add @connect.batch.maxSize to connect spec (#3249)
andrewmcgivery Apr 16, 2025
1c3854e
links related to join__directive always use latest version (#3234)
lennyburdette Apr 18, 2025
105c430
connect url properties (#3245)
lennyburdette Apr 18, 2025
32afdd7
release: on branch next (preview) (#3242)
github-actions[bot] Apr 23, 2025
e279895
Add errors property to @connect and @source (#3250)
andrewmcgivery Apr 29, 2025
d4b8424
Don't auto-upgrade 0.2 connect subgraphs to fed 2.11 (#3253)
dylan-apollo May 7, 2025
3e2b0a8
prep 2.11.0-preview.2 release (#3255)
lennyburdette May 14, 2025
fc4bc0a
release: on branch next (preview) (#3256)
github-actions[bot] May 14, 2025
0dbc7cc
Merge default array arguments for external types (#3096)
tninesling May 21, 2025
7c64ed0
exit preview changeset mode (#3261)
lennyburdette Jun 2, 2025
b6b3bb0
merge main (#3263)
lennyburdette Jun 2, 2025
6290285
restore files from main (#3264)
lennyburdette Jun 2, 2025
e45d50c
reset all docs files from main (#3265)
lennyburdette Jun 2, 2025
3739dfa
add 2.11 to version docs (#3267)
lennyburdette Jun 2, 2025
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
11 changes: 11 additions & 0 deletions .changeset/afraid-queens-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"apollo-federation-integration-testsuite": patch
"@apollo/query-planner": patch
"@apollo/query-graphs": patch
"@apollo/composition": patch
"@apollo/federation-internals": patch
"@apollo/subgraph": patch
"@apollo/gateway": patch
---

Preparing preview.2 release
11 changes: 11 additions & 0 deletions .changeset/lucky-pillows-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@apollo/composition": minor
"@apollo/federation-internals": minor
"apollo-federation-integration-testsuite": minor
"@apollo/gateway": minor
"@apollo/query-graphs": minor
"@apollo/query-planner": minor
"@apollo/subgraph": minor
---

Add connect spec v0.2
18 changes: 18 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"mode": "exit",
"tag": "preview",
"initialVersions": {
"@apollo/composition": "2.10.0",
"apollo-federation-integration-testsuite": "2.10.0",
"@apollo/gateway": "2.10.0",
"@apollo/federation-internals": "2.10.0",
"@apollo/query-graphs": "2.10.0",
"@apollo/query-planner": "2.10.0",
"@apollo/subgraph": "2.10.0"
},
"changesets": [
"afraid-queens-drive",
"five-suits-drum",
"lucky-pillows-rhyme"
]
}
5 changes: 5 additions & 0 deletions .changeset/sixty-plums-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@apollo/composition": patch
---

Allow merging external types when using arrays as default arguments.
30 changes: 30 additions & 0 deletions composition-js/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
# CHANGELOG for `@apollo/composition`

## 2.11.0-preview.2

### Patch Changes

- Preparing preview.2 release ([#3255](https://github.com/apollographql/federation/pull/3255))

- Updated dependencies [[`3e2b0a8569a9fe46726182887ed0b4bfc0b52468`](https://github.com/apollographql/federation/commit/3e2b0a8569a9fe46726182887ed0b4bfc0b52468)]:
- @apollo/query-graphs@2.11.0-preview.2
- @apollo/federation-internals@2.11.0-preview.2

## 2.11.0-preview.1

### Patch Changes

- Updated dependencies [[`1462c91879d41884c0a7e60551d8dd0d67c832d3`](https://github.com/apollographql/federation/commit/1462c91879d41884c0a7e60551d8dd0d67c832d3)]:
- @apollo/query-graphs@2.11.0-preview.1
- @apollo/federation-internals@2.11.0-preview.1

## 2.11.0-preview.0

### Minor Changes

- Add connect spec v0.2 ([#3228](https://github.com/apollographql/federation/pull/3228))

### Patch Changes

- Updated dependencies [[`e7e67579908d5cd2fa6fe558228dffe4808cd98d`](https://github.com/apollographql/federation/commit/e7e67579908d5cd2fa6fe558228dffe4808cd98d)]:
- @apollo/federation-internals@2.11.0-preview.0
- @apollo/query-graphs@2.11.0-preview.0

## 2.10.0

### Minor Changes
Expand Down
6 changes: 3 additions & 3 deletions composition-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@apollo/composition",
"version": "2.10.0",
"version": "2.11.0-preview.2",
"description": "Apollo Federation composition utilities",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -27,8 +27,8 @@
"access": "public"
},
"dependencies": {
"@apollo/federation-internals": "2.10.0",
"@apollo/query-graphs": "2.10.0"
"@apollo/federation-internals": "2.11.0-preview.2",
"@apollo/query-graphs": "2.11.0-preview.2"
},
"peerDependencies": {
"graphql": "^16.5.0"
Expand Down
41 changes: 41 additions & 0 deletions composition-js/src/__tests__/compose.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,47 @@ describe('composition', () => {
`);
});

it('merges default arguments when they are arrays', () => {
const subgraphA = {
name: 'subgraph-a',
typeDefs: gql`
type Query {
a: A @shareable
}

type A @key(fields: "id") {
id: ID
get(ids: [ID] = []): [B] @external
req: Int @requires(fields: "get { __typename }")
}

type B @key(fields: "id", resolvable: false) {
id: ID
}
`
};
const subgraphB = {
name: 'subgraph-b',
typeDefs: gql`
type Query {
a: A @shareable
}

type A @key(fields: "id") {
id: ID
get(ids: [ID] = []): [B]
}

type B @key(fields: "id") {
id: ID
}
`
};

const result = composeAsFed2Subgraphs([subgraphA, subgraphB]);
assertCompositionSuccess(result);
});

describe('merging of type references', () => {
describe('for field types', () => {
it('errors on incompatible types', () => {
Expand Down
Loading