Revert and deprecate and introduce

Author: leebyron

src/index.d.ts

@@ -409,11 +409,14 @@ export {
   // Create a JavaScript value from a GraphQL language AST without a Type.
   valueFromASTUntyped,
   // Create a GraphQL language AST from a JavaScript value.
+  // DEPRECATED: use valueToLiteral
   astFromValue,
   // A helper to use within recursive-descent visitors which need to be aware of
   // the GraphQL type system.
   TypeInfo,
   visitWithTypeInfo,
+  // Create a GraphQL Literal AST from a JavaScript input value.
+  valueToLiteral,
   // Coerces a GraphQL Literal with a GraphQL type.
   coerceInputLiteral,
   // Coerces a JavaScript value with a GraphQL type, or produces errors.

src/index.js

@@ -398,11 +398,14 @@ export {
   // Create a JavaScript value from a GraphQL language AST without a Type.
   valueFromASTUntyped,
   // Create a GraphQL language AST from a JavaScript value.
+  // DEPRECATED: use valueToLiteral
   astFromValue,
   // A helper to use within recursive-descent visitors which need to be aware of
   // the GraphQL type system.
   TypeInfo,
   visitWithTypeInfo,
+  // Create a GraphQL Literal AST from a JavaScript input value.
+  valueToLiteral,
   // Coerces a GraphQL Literal with a GraphQL type.
   coerceInputLiteral,
   // Coerces a JavaScript value with a GraphQL type, or produces errors.

src/type/definition.d.ts

@@ -249,19 +249,27 @@ export function getNullableType<T extends GraphQLNullableType>(
 /**
  * These named types do not include modifiers like List or NonNull.
  */
-export type GraphQLNamedType =
+export type GraphQLNamedType = GraphQLNamedInputType | GraphQLNamedOutputType;
+
+export type GraphQLNamedInputType =
+  | GraphQLScalarType
+  | GraphQLEnumType
+  | GraphQLInputObjectType;
+
+export type GraphQLNamedOutputType =
   | GraphQLScalarType
   | GraphQLObjectType
   | GraphQLInterfaceType
   | GraphQLUnionType
-  | GraphQLEnumType
-  | GraphQLInputObjectType;
+  | GraphQLEnumType;
 
 export function isNamedType(type: unknown): type is GraphQLNamedType;
 
 export function assertNamedType(type: unknown): GraphQLNamedType;
 
 export function getNamedType(type: undefined): undefined;
+export function getNamedType(type: GraphQLInputType): GraphQLNamedInputType;
+export function getNamedType(type: GraphQLOutputType): GraphQLNamedOutputType;
 export function getNamedType(type: GraphQLType): GraphQLNamedType;
 
 /**

src/type/definition.js

@@ -468,13 +468,19 @@ export function getNullableType(type) {
 /**
  * These named types do not include modifiers like List or NonNull.
  */
-export type GraphQLNamedType =
+export type GraphQLNamedType = GraphQLNamedInputType | GraphQLNamedOutputType;
+
+export type GraphQLNamedInputType =
+  | GraphQLScalarType
+  | GraphQLEnumType
+  | GraphQLInputObjectType;
+
+export type GraphQLNamedOutputType =
   | GraphQLScalarType
   | GraphQLObjectType
   | GraphQLInterfaceType
   | GraphQLUnionType
-  | GraphQLEnumType
-  | GraphQLInputObjectType;
+  | GraphQLEnumType;
 
 export function isNamedType(type: mixed): boolean %checks {
   return (
@@ -496,6 +502,8 @@ export function assertNamedType(type: mixed): GraphQLNamedType {
 
 /* eslint-disable no-redeclare */
 declare function getNamedType(type: void | null): void;
+declare function getNamedType(type: GraphQLInputType): GraphQLNamedInputType;
+declare function getNamedType(type: GraphQLOutputType): GraphQLNamedOutputType;
 declare function getNamedType(type: GraphQLType): GraphQLNamedType;
 export function getNamedType(type) {
   /* eslint-enable no-redeclare */
@@ -554,6 +562,7 @@ export class GraphQLScalarType {
   serialize: GraphQLScalarSerializer<mixed>;
   parseValue: GraphQLScalarValueParser<mixed>;
   parseLiteral: GraphQLScalarLiteralParser<mixed>;
+  valueToLiteral: ?GraphQLScalarValueToLiteral;
   extensions: ?ReadOnlyObjMap<mixed>;
   astNode: ?ScalarTypeDefinitionNode;
   extensionASTNodes: $ReadOnlyArray<ScalarTypeExtensionNode>;
@@ -568,6 +577,7 @@ export class GraphQLScalarType {
     this.parseLiteral =
       config.parseLiteral ??
       ((node, variables) => parseValue(valueFromASTUntyped(node, variables)));
+    this.valueToLiteral = config.valueToLiteral;
     this.extensions = config.extensions && toObjMap(config.extensions);
     this.astNode = config.astNode;
     this.extensionASTNodes = config.extensionASTNodes ?? [];
@@ -603,6 +613,7 @@ export class GraphQLScalarType {
       serialize: this.serialize,
       parseValue: this.parseValue,
       parseLiteral: this.parseLiteral,
+      valueToLiteral: this.valueToLiteral,
       extensions: this.extensions,
       astNode: this.astNode,
       extensionASTNodes: this.extensionASTNodes,
@@ -636,6 +647,8 @@ export type GraphQLScalarLiteralParser<TInternal> = (
   variables: ?ObjMap<mixed>,
 ) => ?TInternal;
 
+export type GraphQLScalarValueToLiteral = (inputValue: mixed) => ?ValueNode;
+
 export type GraphQLScalarTypeConfig<TInternal, TExternal> = {|
   name: string,
   description?: ?string,
@@ -646,6 +659,8 @@ export type GraphQLScalarTypeConfig<TInternal, TExternal> = {|
   parseValue?: GraphQLScalarValueParser<TInternal>,
   // Parses an externally provided literal value to use as an input.
   parseLiteral?: GraphQLScalarLiteralParser<TInternal>,
+  // Translates an external input value to an external literal (AST).
+  valueToLiteral?: ?GraphQLScalarValueToLiteral,
   extensions?: ?ReadOnlyObjMapLike<mixed>,
   astNode?: ?ScalarTypeDefinitionNode,
   extensionASTNodes?: ?$ReadOnlyArray<ScalarTypeExtensionNode>,
@@ -1339,6 +1354,16 @@ export class GraphQLEnumType /* <T> */ {
     return enumValue.value;
   }
 
+  valueToLiteral(value: mixed): ?ValueNode {
+    if (typeof value === 'string') {
+      // https://spec.graphql.org/draft/#Name
+      if (/^[_a-zA-Z][_a-zA-Z0-9]*$/.test(value)) {
+        return { kind: Kind.ENUM, value };
+      }
+      return { kind: Kind.STRING, value };
+    }
+  }
+
   toConfig(): GraphQLEnumTypeNormalizedConfig {
     const values = keyValMap(
       this.getValues(),

src/type/introspection.js

@@ -3,7 +3,7 @@ import { invariant } from '../jsutils/invariant';
 
 import { print } from '../language/printer';
 import { DirectiveLocation } from '../language/directiveLocation';
-import { astFromValue } from '../utilities/astFromValue';
+import { valueToLiteral } from '../utilities/valueToLiteral';
 
 import type { GraphQLSchema } from './schema';
 import type { GraphQLDirective } from './directives';
@@ -386,7 +386,7 @@ export const __InputValue: GraphQLObjectType = new GraphQLObjectType({
           const { type, defaultValue } = inputValue;
           const valueAST =
             defaultValue !== undefined
-              ? astFromValue(defaultValue, type)
+              ? valueToLiteral(defaultValue, type)
               : undefined;
           return valueAST ? print(valueAST) : null;
         },

src/type/scalars.js

@@ -1,6 +1,7 @@
 import { inspect } from '../jsutils/inspect';
 import { isObjectLike } from '../jsutils/isObjectLike';
 
+import type { ValueNode } from '../language/ast';
 import { Kind } from '../language/kinds';
 import { print } from '../language/printer';
 
@@ -268,6 +269,15 @@ export const GraphQLID: GraphQLScalarType = new GraphQLScalarType({
     }
     return valueNode.value;
   },
+  valueToLiteral(value: mixed): ?ValueNode {
+    // ID types can use Int literals.
+    if (typeof value === 'string') {
+      if (/^-?(?:0|[1-9][0-9]*)$/.test(value)) {
+        return { kind: Kind.INT, value };
+      }
+      return { kind: Kind.STRING, value };
+    }
+  },
 });
 
 export const specifiedScalarTypes: $ReadOnlyArray<GraphQLScalarType> = Object.freeze(