Merge branch 'milinda/requestScoped-directive' into milinda/queryCache-directive

Author: SkArchon

cli/CHANGELOG.md

@@ -4,6 +4,10 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.125.4](https://github.com/wundergraph/cosmo/compare/wgc@0.125.3...wgc@0.125.4) (2026-06-22)
+
+**Note:** Version bump only for package wgc
+
 ## [0.125.3](https://github.com/wundergraph/cosmo/compare/wgc@0.125.2...wgc@0.125.3) (2026-06-19)
 
 **Note:** Version bump only for package wgc

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgc",
-  "version": "0.125.3",
+  "version": "0.125.4",
   "description": "The official CLI tool to manage the GraphQL Federation Platform Cosmo",
   "type": "module",
   "main": "dist/src/index.js",

composition/CHANGELOG.md

@@ -4,6 +4,13 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.60.0](https://github.com/wundergraph/cosmo/compare/@wundergraph/composition@0.59.2...@wundergraph/composition@0.60.0) (2026-06-22)
+
+### Features
+
+* **composition:** [@openfed](https://github.com/openfed)__cacheInvalidate directive (2/5) ([#2983](https://github.com/wundergraph/cosmo/issues/2983)) ([19bbbe5](https://github.com/wundergraph/cosmo/commit/19bbbe5659011ef4536fe43edbb1ae313bda91e3)) (@SkArchon)
+* **composition:** [@openfed](https://github.com/openfed)__entityCache directive (1/5) ([#2980](https://github.com/wundergraph/cosmo/issues/2980)) ([2075164](https://github.com/wundergraph/cosmo/commit/2075164f18ee0cf953effdef2a031c59b3e8d112)) (@SkArchon)
+
 ## [0.59.2](https://github.com/wundergraph/cosmo/compare/@wundergraph/composition@0.59.1...@wundergraph/composition@0.59.2) (2026-06-19)
 
 ### Bug Fixes

composition/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wundergraph/composition",
-  "version": "0.59.2",
+  "version": "0.60.0",
   "author": {
     "name": "WunderGraph Maintainers",
     "email": "info@wundergraph.com"

composition/src/errors/errors.ts

@@ -6,7 +6,7 @@ import {
   type ObjectDefinitionData,
 } from '../schema-building/types/types';
 import {
-  type CacheInvalidateOnNonEntityReturnTypeErrorParams,
+  type InvalidEntityReturnTypeErrorParams,
   type IncompatibleMergedTypesErrorParams,
   type IncompatibleParentTypeMergeErrorParams,
   type IncompatibleTypeWithProvidesErrorMessageParams,
@@ -2082,29 +2082,21 @@ export function queryCacheOnNonEntityReturnTypeErrorMessage(fieldCoords: string,
   );
 }
 
-export function cacheInvalidateOnNonMutationSubscriptionFieldErrorMessage(fieldCoords: string): string {
-  return `Coordinates "${fieldCoords}" are not a Mutation or Subscription root field.`;
+export function invalidMutationOrSubscriptionFieldCoordsErrorMessage(fieldCoords: string): string {
+  return `Field coordinates "${fieldCoords}" are not a Mutation or Subscription root field.`;
 }
 
-export function cacheInvalidateOnNonEntityReturnTypeErrorMessage({
+export function invalidEntityReturnTypeErrorMessage({
   fieldCoords,
-  returnType,
-}: CacheInvalidateOnNonEntityReturnTypeErrorParams): string {
-  return `Coordinates "${fieldCoords}" return non-entity type "${returnType}".`;
+  returnTypeName,
+}: InvalidEntityReturnTypeErrorParams): string {
+  return `Field coordinates "${fieldCoords}" return non-entity type "${returnTypeName}".`;
 }
 
-export function cachePopulateOnNonMutationSubscriptionFieldErrorMessage(fieldCoords: string): string {
-  return `@openfed__cachePopulate is only valid on Mutation or Subscription fields, found on "${fieldCoords}".`;
-}
-
-export function cachePopulateOnNonEntityReturnTypeErrorMessage(returnType: string): string {
-  return `@openfed__cachePopulate returns non-entity type "${returnType}".`;
-}
-
-export function cacheInvalidateAndPopulateMutualExclusionErrorMessage(fieldCoords: string): string {
-  return (
-    `Field "${fieldCoords}" has both @openfed__cacheInvalidate and @openfed__cachePopulate.` +
-    ` A field must use one or the other, not both.`
+export function invalidMutuallyExclusiveCacheDirectivesError(fieldCoords: string): Error {
+  return new Error(
+    `Field coordinates "${fieldCoords}" define both mutually exclusive directives "@openfed__cacheInvalidate"` +
+      ` and "@openfed__cachePopulate".`,
   );
 }
 

composition/src/errors/types/params.ts

@@ -95,12 +95,12 @@ export type InvalidArgumentValueErrorParams = {
   expectedTypeString: string;
 };
 
-export type CacheInvalidateOnNonEntityReturnTypeErrorParams = {
+export type InvalidEntityReturnTypeErrorParams = {
   fieldCoords: string;
-  returnType: string;
+  returnTypeName: string;
 };
 
 export type MaxAgeNotPositiveIntegerErrorParams = {
   directiveName: DirectiveName;
-  value: number;
+  value: number | string | null;
 };

composition/src/router-configuration/types.ts

@@ -172,20 +172,21 @@ export type CacheInvalidateConfiguration = {
 // Extracted from @openfed__cachePopulate on Mutation/Subscription fields.
 // Tells the router to populate the entity cache with the operation's return value.
 // maxAgeSeconds overrides the entity's default TTL when provided.
-export type CachePopulateConfig = {
+export type CachePopulateConfiguration = {
   entityTypeName: TypeName;
   fieldName: FieldName;
-  maxAgeSeconds?: number;
-  operationType: string;
+  maxAgeSeconds: number;
+  operationType: OperationTypeNode;
 };
 
 export type EntityCachingConfiguration = {
   // Attached to the Mutation/Subscription type's ConfigurationData from @openfed__cacheInvalidate.
   cacheInvalidateConfigurations: Array<CacheInvalidateConfiguration>;
+  // Attached to the Mutation/Subscription type's ConfigurationData from @openfed__cachePopulate.
+  cachePopulateConfigurations: Array<CachePopulateConfiguration>;
   // Attached to an entity type's ConfigurationData (e.g. "Product") from @openfed__entityCache.
   entityCacheConfigurations: Array<EntityCacheConfiguration>;
-  // Attached to the Mutation/Subscription type's ConfigurationData from @openfed__cachePopulate.
-  cachePopulateConfigurations: Array<CachePopulateConfig>;
+  // Attached to a field's ConfigurationData from @openfed__requestScoped.
   requestScopedConfigurations: Array<RequestScopedConfiguration>;
   // Attached to the Query type's ConfigurationData from @openfed__queryCache.
   queryCacheConfigurations?: Array<QueryCacheConfig>;

composition/src/router-configuration/utils.ts

@@ -20,11 +20,12 @@ export function getOrInitializeEntityCaching(configurationData: ConfigurationDat
   if (!configurationData.entityCaching) {
     configurationData.entityCaching = {
       cacheInvalidateConfigurations: [],
-      entityCacheConfigurations: [],
       cachePopulateConfigurations: [],
+      entityCacheConfigurations: [],
       requestScopedConfigurations: [],
     };
   }
+
   return configurationData.entityCaching;
 }