@khanacademy/graphql-flow 3.1.1 → 3.1.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @khanacademy/graphql-flow
 
+## 3.1.2
+
+### Patch Changes
+
+-   09f72b5: Fix handling of input objects with required attributes that have a default value
+
 ## 3.1.1
 
 ### Patch Changes

package/dist/generateVariablesType.js

@@ -27,7 +27,7 @@ const inputObjectToFlow = (ctx, name) => {
     return babelTypes.tsLiteralType(babelTypes.stringLiteral(`Unknown input object ${name}`));
   }
 
-  return (0, _utils.maybeAddDescriptionComment)(inputObject.description, (0, _utils.objectTypeFromProperties)(inputObject.inputFields.map(vbl => (0, _utils.maybeAddDescriptionComment)(vbl.description, maybeOptionalObjectTypeProperty(vbl.name, inputRefToFlow(ctx, vbl.type))))));
+  return (0, _utils.maybeAddDescriptionComment)(inputObject.description, (0, _utils.objectTypeFromProperties)(inputObject.inputFields.map(vbl => (0, _utils.maybeAddDescriptionComment)(vbl.description, maybeOptionalObjectTypeProperty(vbl.name, inputRefToFlow(ctx, vbl.type, vbl.defaultValue != null))))));
 };
 
 exports.inputObjectToFlow = inputObjectToFlow;
@@ -44,9 +44,11 @@ const maybeOptionalObjectTypeProperty = (name, type) => {
 
 exports.maybeOptionalObjectTypeProperty = maybeOptionalObjectTypeProperty;
 
-const inputRefToFlow = (ctx, inputRef) => {
+const inputRefToFlow = (ctx, inputRef, hasDefaultValue = false) => {
   if (inputRef.kind === "NON_NULL") {
-    return _inputRefToFlow(ctx, inputRef.ofType);
+    const result = _inputRefToFlow(ctx, inputRef.ofType);
+
+    return hasDefaultValue ? (0, _utils.nullableType)(result) : result;
   }
 
   const result = _inputRefToFlow(ctx, inputRef);

package/package.json

@@ -1,9 +1,14 @@
 {
     "name": "@khanacademy/graphql-flow",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "bin": {
         "graphql-flow": "./dist/cli/run.js"
     },
+    "jest": {
+        "testPathIgnorePatterns": [
+            "dist"
+        ]
+    },
     "scripts": {
         "test": "jest",
         "publish:ci": "yarn run build && changeset publish",

package/src/__test__/example-schema.graphql

@@ -60,6 +60,7 @@ input CharacterInput {
   friends: [ID!]
   appearsIn: [Episode!]
   candies: PositiveNumber!
+  friendly: Boolean! = true
 }
 
 type Mutation {

package/src/__test__/graphql-flow.test.ts

@@ -621,6 +621,7 @@ describe("graphql-flow generation", () => {
                     - JEDI*/
                     "NEW_HOPE" | "EMPIRE" | "JEDI"> | null | undefined;
                     candies: number;
+                    friendly?: boolean | null | undefined;
                   };
                 },
                     response: {

package/src/generateVariablesType.ts

@@ -31,7 +31,7 @@ export const inputObjectToFlow = (
                     vbl.description,
                     maybeOptionalObjectTypeProperty(
                         vbl.name,
-                        inputRefToFlow(ctx, vbl.type),
+                        inputRefToFlow(ctx, vbl.type, vbl.defaultValue != null),
                     ),
                 ),
             ),
@@ -58,9 +58,11 @@ export const maybeOptionalObjectTypeProperty = (
 export const inputRefToFlow = (
     ctx: Context,
     inputRef: IntrospectionInputTypeRef,
+    hasDefaultValue = false,
 ): babelTypes.TSType => {
     if (inputRef.kind === "NON_NULL") {
-        return _inputRefToFlow(ctx, inputRef.ofType);
+        const result = _inputRefToFlow(ctx, inputRef.ofType);
+        return hasDefaultValue ? nullableType(result) : result;
     }
     const result = _inputRefToFlow(ctx, inputRef);
     return transferLeadingComments(result, nullableType(result));