@theguild/federation-composition 0.6.2 → 0.7.0-rc-20231220151602-cc7df93

package/cjs/subgraph/validation/rules/known-directives-rule.js

@@ -11,7 +11,9 @@ function KnownDirectivesRule(context) {
         }
     }
     for (const specifiedDirective of graphql_1.specifiedDirectives) {
-        locationsMap.set(specifiedDirective.name, new Set(specifiedDirective.locations.map(loc => String(loc))));
+        if (!locationsMap.has(specifiedDirective.name)) {
+            locationsMap.set(specifiedDirective.name, new Set(specifiedDirective.locations.map(loc => String(loc))));
+        }
     }
     return {
         Directive(node, _key, _parent, _path, ancestors) {

package/cjs/subgraph/validation/validate-state.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUnionType = exports.isInterfaceType = exports.isObjectType = exports.isEnumType = exports.isScalarType = exports.isInputObjectType = exports.typeExists = exports.isInputType = exports.isTypeSubTypeOf = exports.validateSubgraphState = void 0;
+exports.isDirective = exports.isUnionType = exports.isInterfaceType = exports.isObjectType = exports.isEnumType = exports.isScalarType = exports.isInputObjectType = exports.typeExists = exports.isInputType = exports.isTypeSubTypeOf = exports.validateSubgraphState = void 0;
 const graphql_1 = require("graphql");
 const format_js_1 = require("../../utils/format.js");
 const state_js_1 = require("../../utils/state.js");
@@ -16,6 +16,7 @@ function validateSubgraphState(state) {
         }));
     }
     validateRootTypes(state, reportError);
+    validateDirectives(state, reportError);
     validateTypes(state, reportError);
     return errors;
 }
@@ -57,6 +58,24 @@ function validateRootTypes(state, reportError) {
 function capitalize(str) {
     return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
 }
+function validateDirectives(state, reportError) {
+    for (const directive of state.types.values()) {
+        if (isDirective(directive)) {
+            validateName(reportError, directive.name);
+            for (const [argName, arg] of directive.args) {
+                validateName(reportError, argName);
+                const argInputTypeName = (0, state_js_1.stripTypeModifiers)(arg.type);
+                if (!isInputType(state, argInputTypeName)) {
+                    reportError(`The type of @${directive.name}(${arg.name}:) must be Input Type ` +
+                        `but got: ${arg.type}.`);
+                }
+                if (isRequiredArgument(arg) && arg.deprecated?.deprecated === true) {
+                    reportError(`Required argument @${directive.name}(${arg.name}:) cannot be deprecated.`);
+                }
+            }
+        }
+    }
+}
 function validateTypes(state, reportError) {
     const validateInputObjectCircularRefs = createInputObjectCircularRefsValidator(state, reportError);
     const implementationsMap = new Map();
@@ -474,3 +493,7 @@ function isUnionType(type) {
     return type.kind === state_js_2.TypeKind.UNION;
 }
 exports.isUnionType = isUnionType;
+function isDirective(type) {
+    return type.kind === state_js_2.TypeKind.DIRECTIVE;
+}
+exports.isDirective = isDirective;

package/esm/subgraph/validation/rules/known-directives-rule.js

@@ -8,7 +8,9 @@ export function KnownDirectivesRule(context) {
         }
     }
     for (const specifiedDirective of specifiedDirectives) {
-        locationsMap.set(specifiedDirective.name, new Set(specifiedDirective.locations.map(loc => String(loc))));
+        if (!locationsMap.has(specifiedDirective.name)) {
+            locationsMap.set(specifiedDirective.name, new Set(specifiedDirective.locations.map(loc => String(loc))));
+        }
     }
     return {
         Directive(node, _key, _parent, _path, ancestors) {

package/esm/subgraph/validation/validate-state.js

@@ -13,6 +13,7 @@ export function validateSubgraphState(state) {
         }));
     }
     validateRootTypes(state, reportError);
+    validateDirectives(state, reportError);
     validateTypes(state, reportError);
     return errors;
 }
@@ -53,6 +54,24 @@ function validateRootTypes(state, reportError) {
 function capitalize(str) {
     return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
 }
+function validateDirectives(state, reportError) {
+    for (const directive of state.types.values()) {
+        if (isDirective(directive)) {
+            validateName(reportError, directive.name);
+            for (const [argName, arg] of directive.args) {
+                validateName(reportError, argName);
+                const argInputTypeName = stripTypeModifiers(arg.type);
+                if (!isInputType(state, argInputTypeName)) {
+                    reportError(`The type of @${directive.name}(${arg.name}:) must be Input Type ` +
+                        `but got: ${arg.type}.`);
+                }
+                if (isRequiredArgument(arg) && arg.deprecated?.deprecated === true) {
+                    reportError(`Required argument @${directive.name}(${arg.name}:) cannot be deprecated.`);
+                }
+            }
+        }
+    }
+}
 function validateTypes(state, reportError) {
     const validateInputObjectCircularRefs = createInputObjectCircularRefsValidator(state, reportError);
     const implementationsMap = new Map();
@@ -461,3 +480,6 @@ export function isInterfaceType(type) {
 export function isUnionType(type) {
     return type.kind === TypeKind.UNION;
 }
+export function isDirective(type) {
+    return type.kind === TypeKind.DIRECTIVE;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theguild/federation-composition",
-  "version": "0.6.2",
+  "version": "0.7.0-rc-20231220151602-cc7df93",
   "description": "Open Source Composition library for Apollo Federation",
   "peerDependencies": {
     "graphql": "^16.0.0"

package/typings/subgraph/validation/validate-state.d.cts

@@ -1,5 +1,5 @@
 import { GraphQLError } from 'graphql';
-import { EnumType, InputObjectType, InterfaceType, ObjectType, ScalarType, SubgraphState, SubgraphType, UnionType } from '../state.cjs';
+import { Directive, EnumType, InputObjectType, InterfaceType, ObjectType, ScalarType, SubgraphState, SubgraphType, UnionType } from '../state.cjs';
 export declare function validateSubgraphState(state: SubgraphState): GraphQLError[];
 export declare function isTypeSubTypeOf(state: SubgraphState, implementationsMap: Map<string, Set<string>>, maybeSubTypeName: string, superTypeName: string): boolean;
 export declare function isInputType(state: SubgraphState, typeName: string): boolean;
@@ -10,4 +10,5 @@ export declare function isEnumType(type: SubgraphType): type is EnumType;
 export declare function isObjectType(type: SubgraphType): type is ObjectType;
 export declare function isInterfaceType(type: SubgraphType): type is InterfaceType;
 export declare function isUnionType(type: SubgraphType): type is UnionType;
+export declare function isDirective(type: SubgraphType): type is Directive;
 //# sourceMappingURL=validate-state.d.ts.map

package/typings/subgraph/validation/validate-state.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLError } from 'graphql';
-import { EnumType, InputObjectType, InterfaceType, ObjectType, ScalarType, SubgraphState, SubgraphType, UnionType } from '../state.js';
+import { Directive, EnumType, InputObjectType, InterfaceType, ObjectType, ScalarType, SubgraphState, SubgraphType, UnionType } from '../state.js';
 export declare function validateSubgraphState(state: SubgraphState): GraphQLError[];
 export declare function isTypeSubTypeOf(state: SubgraphState, implementationsMap: Map<string, Set<string>>, maybeSubTypeName: string, superTypeName: string): boolean;
 export declare function isInputType(state: SubgraphState, typeName: string): boolean;
@@ -10,4 +10,5 @@ export declare function isEnumType(type: SubgraphType): type is EnumType;
 export declare function isObjectType(type: SubgraphType): type is ObjectType;
 export declare function isInterfaceType(type: SubgraphType): type is InterfaceType;
 export declare function isUnionType(type: SubgraphType): type is UnionType;
+export declare function isDirective(type: SubgraphType): type is Directive;
 //# sourceMappingURL=validate-state.d.ts.map