Revert DirectiveArgument

graphql · May 12, 2021 · 452e3e0 · 452e3e0
1 parent a44b1cf
commit 452e3e0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 42 deletions.
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -146,8 +146,6 @@ export {
   GraphQLSchemaExtensions,
   GraphQLDirectiveConfig,
   GraphQLDirectiveExtensions,
-  GraphQLDirectiveArgument,
-  GraphQLDirectiveArgumentConfig,
   GraphQLArgument,
   GraphQLArgumentConfig,
   GraphQLArgumentExtensions,

diff --git a/src/index.js b/src/index.js
@@ -145,8 +145,6 @@ export type {
   GraphQLDirectiveConfig,
   GraphQLArgument,
   GraphQLArgumentConfig,
-  GraphQLDirectiveArgument,
-  GraphQLDirectiveArgumentConfig,
   GraphQLInputValue,
   GraphQLInputValueConfig,
   GraphQLEnumTypeConfig,

diff --git a/src/type/directives.d.ts b/src/type/directives.d.ts
@@ -7,7 +7,7 @@ import { ObjMap } from '../jsutils/ObjMap';
 import { DirectiveDefinitionNode } from '../language/ast';
 import { DirectiveLocationEnum } from '../language/directiveLocation';
 
-import { GraphQLInputValue, GraphQLInputValueConfig } from './definition';
+import { GraphQLArgument, GraphQLArgumentConfig } from './definition';
 
 /**
  * Test if the given value is a GraphQL directive.
@@ -37,14 +37,14 @@ export class GraphQLDirective {
   description: Maybe<string>;
   locations: Array<DirectiveLocationEnum>;
   isRepeatable: boolean;
-  args: Array<GraphQLDirectiveArgument>;
+  args: Array<GraphQLArgument>;
   extensions: Maybe<Readonly<GraphQLDirectiveExtensions>>;
   astNode: Maybe<DirectiveDefinitionNode>;
 
   constructor(config: Readonly<GraphQLDirectiveConfig>);
 
   toConfig(): GraphQLDirectiveConfig & {
-    args: ObjMap<GraphQLDirectiveArgumentConfig>;
+    args: ObjMap<GraphQLArgumentConfig>;
     isRepeatable: boolean;
     extensions: Maybe<Readonly<GraphQLDirectiveExtensions>>;
   };
@@ -59,29 +59,12 @@ export interface GraphQLDirectiveConfig {
   name: string;
   description?: Maybe<string>;
   locations: Array<DirectiveLocationEnum>;
-  args?: Maybe<ObjMap<GraphQLDirectiveArgumentConfig>>;
+  args?: Maybe<ObjMap<GraphQLArgumentConfig>>;
   isRepeatable?: Maybe<boolean>;
   extensions?: Maybe<Readonly<GraphQLDirectiveExtensions>>;
   astNode?: Maybe<DirectiveDefinitionNode>;
 }
 
-/**
- * Custom extensions
- *
- * @remarks
- * Use a unique identifier name for your extension, for example the name of
- * your library or project. Do not use a shortened identifier as this increases
- * the risk of conflicts. We recommend you add at most one extension field,
- * an object which can contain all the values you need.
- */
-export interface GraphQLDirectiveArgumentExtensions {
-  [attributeName: string]: unknown;
-}
-
-export type GraphQLDirectiveArgument = GraphQLInputValue<GraphQLDirectiveArgumentExtensions>;
-
-export type GraphQLDirectiveArgumentConfig = GraphQLInputValueConfig<GraphQLDirectiveArgumentExtensions>;
-
 /**
  * Used to conditionally include fields or fragments.
  */

diff --git a/src/type/directives.js b/src/type/directives.js
@@ -14,7 +14,7 @@ import type { DirectiveDefinitionNode } from '../language/ast';
 import type { DirectiveLocationEnum } from '../language/directiveLocation';
 import { DirectiveLocation } from '../language/directiveLocation';
 
-import type { GraphQLInputValue, GraphQLInputValueConfig } from './definition';
+import type { GraphQLArgument, GraphQLArgumentConfig } from './definition';
 import { GraphQLString, GraphQLBoolean } from './scalars';
 import {
   defineInputValue,
@@ -50,7 +50,7 @@ export class GraphQLDirective {
   name: string;
   description: ?string;
   locations: Array<DirectiveLocationEnum>;
-  args: $ReadOnlyArray<GraphQLDirectiveArgument>;
+  args: $ReadOnlyArray<GraphQLArgument>;
   isRepeatable: boolean;
   extensions: ?ReadOnlyObjMap<mixed>;
   astNode: ?DirectiveDefinitionNode;
@@ -106,29 +106,23 @@ export class GraphQLDirective {
   }
 }
 
-export type GraphQLDirectiveArgument = GraphQLInputValue;
-
 export type GraphQLDirectiveConfig = {|
   name: string,
   description?: ?string,
   locations: Array<DirectiveLocationEnum>,
-  args?: ?GraphQLDirectiveConfigArgumentMap,
+  args?: ?ObjMap<GraphQLArgumentConfig>,
   isRepeatable?: ?boolean,
   extensions?: ?ReadOnlyObjMapLike<mixed>,
   astNode?: ?DirectiveDefinitionNode,
 |};
 
 type GraphQLDirectiveNormalizedConfig = {|
   ...GraphQLDirectiveConfig,
-  args: GraphQLDirectiveConfigArgumentMap,
+  args: ObjMap<GraphQLArgumentConfig>,
   isRepeatable: boolean,
   extensions: ?ReadOnlyObjMap<mixed>,
 |};
 
-type GraphQLDirectiveConfigArgumentMap = ObjMap<GraphQLDirectiveArgumentConfig>;
-
-export type GraphQLDirectiveArgumentConfig = GraphQLInputValueConfig;
-
 /**
  * Used to conditionally include fields or fragments.
  */

diff --git a/src/type/index.d.ts b/src/type/index.d.ts
@@ -126,7 +126,6 @@ export {
   assertDirective,
   // Directives Definition
   GraphQLDirective,
-  GraphQLDirectiveArgument,
   // Built-in Directives defined by the Spec
   isSpecifiedDirective,
   specifiedDirectives,
@@ -138,7 +137,6 @@ export {
   DEFAULT_DEPRECATION_REASON,
   // type
   GraphQLDirectiveConfig,
-  GraphQLDirectiveArgumentConfig,
   GraphQLDirectiveExtensions,
 } from './directives';
 

diff --git a/src/type/index.js b/src/type/index.js
@@ -72,7 +72,6 @@ export {
   assertDirective,
   // Directives Definition
   GraphQLDirective,
-  GraphQLDirectiveArgument,
   // Built-in Directives defined by the Spec
   isSpecifiedDirective,
   specifiedDirectives,
@@ -84,10 +83,7 @@ export {
   DEFAULT_DEPRECATION_REASON,
 } from './directives';
 
-export type {
-  GraphQLDirectiveConfig,
-  GraphQLDirectiveArgumentConfig,
-} from './directives';
+export type { GraphQLDirectiveConfig } from './directives';
 
 // Common built-in scalar instances.
 export {