@khanacademy/graphql-flow 1.1.2 → 2.0.0

package/.babelrc

@@ -1,6 +1,6 @@
 {
 	"presets": [
-		"@babel/preset-flow",
+		"@babel/preset-typescript",
 		["@babel/preset-env", { "targets": { "node": "12" } }]
 	]
 }

package/.eslintrc.js

@@ -5,6 +5,5 @@ module.exports = {
     plugins: ['flowtype-errors'],
     rules: {
         'prettier/prettier': ['error', {singleQuote: true}],
-        'flowtype-errors/uncovered': 2,
     },
 };

package/.github/workflows/changeset-release.yml

@@ -36,7 +36,7 @@ jobs:
           fetch-depth: 0
       - uses: Khan/actions@shared-node-cache-v0.0.2
         with:
-          node-version: 12.x
+          node-version: 16.x
 
       - name: Create Release Pull Request or Publish to npm
         id: changesets

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @khanacademy/graphql-flow
 
+## 2.0.0
+
+### Major Changes
+
+-   38eb544: Generate TypeScript directly and only TypeScript
+
+### Minor Changes
+
+-   2933c91: Migrate to TypeScript
+
+## 1.2.0
+
+### Minor Changes
+
+-   e1e9fde: Add --omitFileExtensions option
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/cli/config.js

@@ -7,7 +7,7 @@ exports.validateOrThrow = exports.loadConfigFile = exports.getSchemas = exports.
 
 var _schemaFromIntrospectionData = require("../schemaFromIntrospectionData");
 
-var _schema = _interopRequireDefault(require("./schema.json"));
+var _schema = _interopRequireDefault(require("../../schema.json"));
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -33,7 +33,6 @@ const validateOrThrow = (value, jsonSchema) => {
 exports.validateOrThrow = validateOrThrow;
 
 const loadConfigFile = configFile => {
-  // $FlowIgnore
   const data = require(configFile); // eslint-disable-line flowtype-errors/uncovered
 
 
@@ -96,5 +95,4 @@ const findApplicableConfig = (path, configs) => {
   });
 };
 
-exports.findApplicableConfig = findApplicableConfig;
-//# sourceMappingURL=config.js.map
+exports.findApplicableConfig = findApplicableConfig;

package/dist/cli/run.js

@@ -220,5 +220,4 @@ if (config.crawl.dumpOperations) {
     recursive: true
   });
   (0, _fs.writeFileSync)(dumpOperations, JSON.stringify(printedOperations.sort(), null, 2));
-}
-//# sourceMappingURL=run.js.map
+}

package/dist/enums.js

@@ -17,14 +17,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * Both input & output types can have enums & scalars.
  */
 const experimentalEnumTypeToFlow = (ctx, enumConfig, description) => {
-  const enumDeclaration = babelTypes.enumDeclaration( // pass id into generic type annotation
-  babelTypes.identifier(enumConfig.name), babelTypes.enumStringBody(enumConfig.enumValues.map(v => babelTypes.enumDefaultedMember(babelTypes.identifier(v.name)))));
+  const enumDeclaration = babelTypes.tsEnumDeclaration( // pass id into generic type annotation
+  babelTypes.identifier(enumConfig.name), enumConfig.enumValues.map(v => babelTypes.tsEnumMember(babelTypes.identifier(v.name), babelTypes.stringLiteral(v.name))));
 
   if (ctx.experimentalEnumsMap) {
     ctx.experimentalEnumsMap[enumConfig.name] = enumDeclaration;
   }
 
-  return (0, _utils.maybeAddDescriptionComment)(description, babelTypes.genericTypeAnnotation(enumDeclaration.id));
+  return (0, _utils.maybeAddDescriptionComment)(description, babelTypes.tsTypeReference(enumDeclaration.id));
 };
 
 exports.experimentalEnumTypeToFlow = experimentalEnumTypeToFlow;
@@ -37,7 +37,7 @@ const enumTypeToFlow = (ctx, name) => {
     combinedDescription = enumConfig.description + '\n\n' + combinedDescription;
   }
 
-  return ctx.experimentalEnumsMap ? experimentalEnumTypeToFlow(ctx, enumConfig, combinedDescription) : (0, _utils.maybeAddDescriptionComment)(combinedDescription, babelTypes.unionTypeAnnotation(enumConfig.enumValues.map(n => babelTypes.stringLiteralTypeAnnotation(n.name))));
+  return ctx.experimentalEnumsMap ? experimentalEnumTypeToFlow(ctx, enumConfig, combinedDescription) : (0, _utils.maybeAddDescriptionComment)(combinedDescription, babelTypes.tsUnionType(enumConfig.enumValues.map(n => babelTypes.tsLiteralType(babelTypes.stringLiteral(n.name)))));
 };
 
 exports.enumTypeToFlow = enumTypeToFlow;
@@ -54,18 +54,17 @@ exports.builtinScalars = builtinScalars;
 
 const scalarTypeToFlow = (ctx, name) => {
   if (builtinScalars[name]) {
-    return babelTypes.genericTypeAnnotation(babelTypes.identifier(builtinScalars[name]));
+    return babelTypes.tsTypeReference(babelTypes.identifier(builtinScalars[name]));
   }
 
   const underlyingType = ctx.scalars[name];
 
   if (underlyingType != null) {
-    return babelTypes.genericTypeAnnotation(babelTypes.identifier(underlyingType));
+    return babelTypes.tsTypeReference(babelTypes.identifier(underlyingType));
   }
 
   ctx.errors.push(`Unexpected scalar '${name}'! Please add it to the "scalars" argument at the callsite of 'generateFlowTypes()'.`);
-  return babelTypes.genericTypeAnnotation(babelTypes.identifier(`UNKNOWN_SCALAR["${name}"]`));
+  return babelTypes.tsTypeReference(babelTypes.identifier(`UNKNOWN_SCALAR["${name}"]`));
 };
 
-exports.scalarTypeToFlow = scalarTypeToFlow;
-//# sourceMappingURL=enums.js.map
+exports.scalarTypeToFlow = scalarTypeToFlow;

package/dist/generateResponseType.js

@@ -30,29 +30,21 @@ const generateResponseType = (schema, query, ctx) => {
 exports.generateResponseType = generateResponseType;
 
 const sortedObjectTypeAnnotation = (ctx, properties) => {
-  const obj = babelTypes.objectTypeAnnotation(properties.sort((a, b) => {
-    if (a.type === 'ObjectTypeProperty' && b.type === 'ObjectTypeProperty') {
+  const obj = (0, _utils.objectTypeFromProperties)(properties.sort((a, b) => {
+    if (a.type === 'TSPropertySignature' && b.type === 'TSPropertySignature') {
       const aName = a.key.type === 'Identifier' ? a.key.name : '';
       const bName = b.key.type === 'Identifier' ? b.key.name : '';
       return aName < bName ? -1 : 1;
     }
 
     return 0;
-  }), undefined
-  /* indexers */
-  , undefined
-  /* callProperties */
-  , undefined
-  /* internalSlots */
-  , true
-  /* exact */
-  );
+  }));
   const name = ctx.path.join('_');
   const isTopLevelType = ctx.path.length <= 1;
 
   if (ctx.allObjectTypes != null && !isTopLevelType) {
     ctx.allObjectTypes[name] = obj;
-    return babelTypes.genericTypeAnnotation(babelTypes.identifier(name));
+    return babelTypes.tsTypeReference(babelTypes.identifier(name));
   } else {
     return obj;
   }
@@ -84,7 +76,7 @@ const _typeToFlow = (ctx, type, selection) => {
   }
 
   if (type.kind === 'LIST') {
-    return babelTypes.genericTypeAnnotation(ctx.readOnlyArray ? babelTypes.identifier('$ReadOnlyArray') : babelTypes.identifier('Array'), babelTypes.typeParameterInstantiation([typeToFlow(ctx, type.ofType, selection)]));
+    return babelTypes.tsTypeReference(ctx.readOnlyArray ? babelTypes.identifier('ReadonlyArray') : babelTypes.identifier('Array'), babelTypes.tsTypeParameterInstantiation([typeToFlow(ctx, type.ofType, selection)]));
   }
 
   if (type.kind === 'UNION') {
@@ -92,7 +84,7 @@ const _typeToFlow = (ctx, type, selection) => {
 
     if (!selection.selectionSet) {
       console.log('no selection set', selection);
-      return babelTypes.anyTypeAnnotation();
+      return babelTypes.tsAnyKeyword();
     }
 
     return unionOrInterfaceToFlow(ctx, union, selection.selectionSet.selections);
@@ -101,7 +93,7 @@ const _typeToFlow = (ctx, type, selection) => {
   if (type.kind === 'INTERFACE') {
     if (!selection.selectionSet) {
       console.log('no selection set', selection);
-      return babelTypes.anyTypeAnnotation();
+      return babelTypes.tsAnyKeyword();
     }
 
     return unionOrInterfaceToFlow(ctx, ctx.schema.interfacesByName[type.name], selection.selectionSet.selections);
@@ -113,21 +105,21 @@ const _typeToFlow = (ctx, type, selection) => {
 
   if (type.kind !== 'OBJECT') {
     console.log('not object', type);
-    return babelTypes.anyTypeAnnotation();
+    return babelTypes.tsAnyKeyword();
   }
 
   const tname = type.name;
 
   if (!ctx.schema.typesByName[tname]) {
     console.log('unknown referenced type', tname);
-    return babelTypes.anyTypeAnnotation();
+    return babelTypes.tsAnyKeyword();
   }
 
   const childType = ctx.schema.typesByName[tname];
 
   if (!selection.selectionSet) {
     console.log('no selection set', selection);
-    return babelTypes.anyTypeAnnotation();
+    return babelTypes.tsAnyKeyword();
   }
 
   return (0, _utils.maybeAddDescriptionComment)(childType.description, querySelectionToObjectType(ctx, selection.selectionSet.selections, childType, tname));
@@ -146,7 +138,7 @@ const typeToFlow = (ctx, type, selection) => {
 
   const inner = _typeToFlow(ctx, type, selection);
 
-  const result = babelTypes.nullableTypeAnnotation(inner);
+  const result = (0, _utils.nullableType)(inner);
   return (0, _utils.transferLeadingComments)(inner, result);
 };
 
@@ -158,8 +150,10 @@ const ensureOnlyOneTypenameProperty = properties => {
     // The apollo-utilities "addTypeName" utility will add it
     // even if it's already specified :( so we have to filter out
     // the extra one here.
-    if (type.type === 'ObjectTypeProperty' && type.key.name === '__typename') {
-      const name = type.value.type === 'StringLiteralTypeAnnotation' ? type.value.value : 'INVALID';
+    if (type.type === 'TSPropertySignature' && type.key.type === "Identifier" && type.key.name === '__typename') {
+      var _type$typeAnnotation;
+
+      const name = ((_type$typeAnnotation = type.typeAnnotation) === null || _type$typeAnnotation === void 0 ? void 0 : _type$typeAnnotation.typeAnnotation.type) === 'TSLiteralType' && type.typeAnnotation.typeAnnotation.literal.type === 'StringLiteral' ? type.typeAnnotation.typeAnnotation.literal.value : 'INVALID';
 
       if (seenTypeName) {
         if (name !== seenTypeName) {
@@ -181,7 +175,7 @@ const querySelectionToObjectType = (ctx, selections, type, typeName) => {
 };
 
 const objectPropertiesToFlow = (ctx, type, typeName, selections) => {
-  return [].concat(...selections.map(selection => {
+  return selections.flatMap(selection => {
     switch (selection.kind) {
       case 'InlineFragment':
         {
@@ -199,7 +193,7 @@ const objectPropertiesToFlow = (ctx, type, typeName, selections) => {
       case 'FragmentSpread':
         if (!ctx.fragments[selection.name.value]) {
           ctx.errors.push(`No fragment named '${selection.name.value}'. Did you forget to include it in the template literal?`);
-          return [babelTypes.objectTypeProperty(babelTypes.identifier(selection.name.value), babelTypes.genericTypeAnnotation(babelTypes.identifier(`UNKNOWN_FRAGMENT`)))];
+          return [babelTypes.tsPropertySignature(babelTypes.identifier(selection.name.value), babelTypes.tsTypeAnnotation(babelTypes.tsTypeReference(babelTypes.identifier(`UNKNOWN_FRAGMENT`))))];
         }
 
         return objectPropertiesToFlow(ctx, type, typeName, ctx.fragments[selection.name.value].selectionSet.selections);
@@ -209,25 +203,25 @@ const objectPropertiesToFlow = (ctx, type, typeName, selections) => {
         const alias = selection.alias ? selection.alias.value : name;
 
         if (name === '__typename') {
-          return [babelTypes.objectTypeProperty(babelTypes.identifier(alias), babelTypes.stringLiteralTypeAnnotation(typeName))];
+          return [babelTypes.tsPropertySignature(babelTypes.identifier(alias), babelTypes.tsTypeAnnotation(babelTypes.tsLiteralType(babelTypes.stringLiteral(typeName))))];
         }
 
         if (!type.fieldsByName[name]) {
           ctx.errors.push(`Unknown field '${name}' for type '${typeName}'`);
-          return babelTypes.objectTypeProperty(babelTypes.identifier(alias), babelTypes.genericTypeAnnotation(babelTypes.identifier(`UNKNOWN_FIELD["${name}"]`)));
+          return [babelTypes.tsPropertySignature(babelTypes.identifier(alias), babelTypes.tsTypeAnnotation(babelTypes.tsTypeReference(babelTypes.identifier(`UNKNOWN_FIELD["${name}"]`))))];
         }
 
         const typeField = type.fieldsByName[name];
-        return [(0, _utils.maybeAddDescriptionComment)(typeField.description, (0, _utils.liftLeadingPropertyComments)(babelTypes.objectTypeProperty(babelTypes.identifier(alias), typeToFlow({ ...ctx,
+        return [(0, _utils.maybeAddDescriptionComment)(typeField.description, (0, _utils.liftLeadingPropertyComments)(babelTypes.tsPropertySignature(babelTypes.identifier(alias), babelTypes.tsTypeAnnotation(typeToFlow({ ...ctx,
           path: ctx.path.concat([alias])
-        }, typeField.type, selection))))];
+        }, typeField.type, selection)))))];
 
       default:
-        ctx.errors.push( // eslint-disable-next-line flowtype-errors/uncovered
+        ctx.errors.push( // @ts-expect-error: `selection` is `never` here
         `Unsupported selection kind '${selection.kind}'`);
         return [];
     }
-  }));
+  });
 };
 
 exports.objectPropertiesToFlow = objectPropertiesToFlow;
@@ -248,11 +242,10 @@ const unionOrInterfaceToFlow = (ctx, type, selections) => {
 
   if (allFields) {
     const sharedAttributes = selectedAttributes[0].attributes.slice();
-    const typeNameIndex = selectedAttributes[0].attributes.findIndex(x => x.type === 'ObjectTypeProperty' && x.key.type === 'Identifier' && x.key.name === '__typename');
+    const typeNameIndex = selectedAttributes[0].attributes.findIndex(x => x.type === 'TSPropertySignature' && x.key.type === 'Identifier' && x.key.name === '__typename');
 
     if (typeNameIndex !== -1) {
-      sharedAttributes[typeNameIndex] = babelTypes.objectTypeProperty(babelTypes.identifier('__typename'), babelTypes.unionTypeAnnotation(selectedAttributes.map(attrs => // eslint-disable-next-line flowtype-errors/uncovered
-      attrs.attributes[typeNameIndex].value)));
+      sharedAttributes[typeNameIndex] = babelTypes.tsPropertySignature(babelTypes.identifier('__typename'), babelTypes.tsTypeAnnotation(babelTypes.tsUnionType(selectedAttributes.map(attrs => attrs.attributes[typeNameIndex].typeAnnotation.typeAnnotation))));
     }
 
     return sortedObjectTypeAnnotation(ctx, sharedAttributes);
@@ -293,7 +286,7 @@ const unionOrInterfaceToFlow = (ctx, type, selections) => {
    */
 
 
-  const result = babelTypes.unionTypeAnnotation(selectedAttributes.map(({
+  const result = babelTypes.tsUnionType(selectedAttributes.map(({
     typeName,
     attributes
   }) => sortedObjectTypeAnnotation({ ...ctx,
@@ -303,7 +296,7 @@ const unionOrInterfaceToFlow = (ctx, type, selections) => {
 
   if (ctx.allObjectTypes && ctx.path.length > 1) {
     ctx.allObjectTypes[name] = result;
-    return babelTypes.genericTypeAnnotation(babelTypes.identifier(name));
+    return babelTypes.tsTypeReference(babelTypes.identifier(name));
   }
 
   return result;
@@ -314,7 +307,7 @@ exports.unionOrInterfaceToFlow = unionOrInterfaceToFlow;
 const unionOrInterfaceSelection = (config, type, possible, selection) => {
   if (selection.kind === 'Field' && selection.name.value === '__typename') {
     const alias = selection.alias ? selection.alias.value : selection.name.value;
-    return [babelTypes.objectTypeProperty(babelTypes.identifier(alias), babelTypes.stringLiteralTypeAnnotation(possible.name))];
+    return [babelTypes.tsPropertySignature(babelTypes.identifier(alias), babelTypes.tsTypeAnnotation(babelTypes.tsLiteralType(babelTypes.stringLiteral(possible.name))))];
   }
 
   if (selection.kind === 'Field' && type.kind !== 'UNION') {
@@ -324,13 +317,13 @@ const unionOrInterfaceSelection = (config, type, possible, selection) => {
 
     if (!type.fieldsByName[name]) {
       config.errors.push('Unknown field: ' + name + ' on type ' + type.name + ' for possible ' + possible.name);
-      return [babelTypes.objectTypeProperty(babelTypes.identifier(alias), babelTypes.genericTypeAnnotation(babelTypes.identifier(`UNKNOWN_FIELD`)))];
+      return [babelTypes.tsPropertySignature(babelTypes.identifier(alias), babelTypes.tsTypeAnnotation(babelTypes.tsTypeReference(babelTypes.identifier(`UNKNOWN_FIELD`))))];
     }
 
     const typeField = type.fieldsByName[name];
-    return [(0, _utils.liftLeadingPropertyComments)(babelTypes.objectTypeProperty(babelTypes.identifier(alias), typeToFlow({ ...config,
+    return [(0, _utils.liftLeadingPropertyComments)(babelTypes.tsPropertySignature(babelTypes.identifier(alias), babelTypes.tsTypeAnnotation(typeToFlow({ ...config,
       path: config.path.concat([name])
-    }, typeField.type, selection)))];
+    }, typeField.type, selection))))];
   }
 
   if (selection.kind === 'FragmentSpread') {
@@ -343,7 +336,7 @@ const unionOrInterfaceSelection = (config, type, possible, selection) => {
     const typeName = fragment.typeCondition.name.value;
 
     if (config.schema.interfacesByName[typeName] && config.schema.interfacesByName[typeName].possibleTypesByName[possible.name] || typeName === possible.name) {
-      return [].concat(...fragment.selectionSet.selections.map(selection => unionOrInterfaceSelection(config, config.schema.typesByName[possible.name], possible, selection)));
+      return fragment.selectionSet.selections.flatMap(selection => unionOrInterfaceSelection(config, config.schema.typesByName[possible.name], possible, selection));
     } else {
       return [];
     }
@@ -373,5 +366,4 @@ Try using an inline fragment "... on SomeType {}".`);
   }
 
   return objectPropertiesToFlow(config, config.schema.typesByName[possible.name], possible.name, selection.selectionSet.selections);
-};
-//# sourceMappingURL=generateResponseType.js.map
+};

package/dist/generateTypeFiles.js

@@ -11,14 +11,9 @@ var _path = _interopRequireDefault(require("path"));
 
 var _ = require(".");
 
-var _convert = require("@khanacademy/flow-to-ts/dist/convert.bundle");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// eslint-disable-next-line flowtype-errors/uncovered
-const indexPrelude = regenerateCommand => `// @flow
-//
-// AUTOGENERATED
+const indexPrelude = regenerateCommand => `// AUTOGENERATED
 // NOTE: New response types are added to this file automatically.
 //       Outdated response types can be removed manually as they are deprecated.
 //${regenerateCommand ? '      To regenerate, run ' + regenerateCommand : ''}
@@ -29,27 +24,19 @@ const indexPrelude = regenerateCommand => `// @flow
 exports.indexPrelude = indexPrelude;
 
 const generateTypeFileContents = (fileName, schema, document, options, generatedDir, indexContents) => {
-  const files = {}; /// Write export for __generated__/index.js if it doesn't exist
+  const files = {}; /// Write export for __generated__/index.ts if it doesn't exist
 
   const addToIndex = (filePath, typeName) => {
-    if (options.typeScript) {
+    if (options.typeScript || options.omitFileExtensions) {
       // Typescript doesn't like file extensions
-      filePath = filePath.replace(/\.js$/, '');
+      filePath = filePath.replace(/\.ts$/, '');
     }
 
-    const newLine = `export type {${typeName}} from './${_path.default.basename(filePath)}';`;
+    const newLine = `export type {${typeName}} from './${_path.default.basename(filePath)}';`; // We match the entire new line to avoid issues that can arise from
+    // prefix matches.
 
-    if (indexContents.indexOf('./' + _path.default.basename(filePath)) === -1) {
+    if (indexContents.indexOf(newLine) === -1) {
       indexContents += newLine + '\n';
-    } else {
-      const lines = indexContents.split('\n').map(line => {
-        if (line.includes('./' + _path.default.basename(filePath))) {
-          return newLine;
-        }
-
-        return line;
-      });
-      indexContents = lines.join('\n');
     }
   };
 
@@ -64,11 +51,11 @@ const generateTypeFileContents = (fileName, schema, document, options, generated
   }) => {
     // We write all generated files to a `__generated__` subdir to keep
     // things tidy.
-    const targetFileName = options.typeFileName ? options.typeFileName.replace('[operationName]', name) : `${name}.js`;
+    const targetFileName = options.typeFileName ? options.typeFileName.replace('[operationName]', name) : `${name}.ts`;
 
     const targetPath = _path.default.join(generatedDir, targetFileName);
 
-    let fileContents = '// @' + `flow\n// AUTOGENERATED -- DO NOT EDIT\n` + `// Generated for operation '${name}' in file '../${_path.default.basename(fileName)}'\n` + (options.regenerateCommand ? `// To regenerate, run '${options.regenerateCommand}'.\n` : '') + code;
+    let fileContents = `// AUTOGENERATED -- DO NOT EDIT\n` + `// Generated for operation '${name}' in file '../${_path.default.basename(fileName)}'\n` + (options.regenerateCommand ? `// To regenerate, run '${options.regenerateCommand}'.\n` : '') + code;
 
     if (options.splitTypes && !isFragment) {
       fileContents += `\nexport type ${name} = ${typeName}['response'];\n` + `export type ${name}Variables = ${typeName}['variables'];\n`;
@@ -116,7 +103,7 @@ const getGeneratedDir = (fileName, options) => {
 const generateTypeFiles = (fileName, schema, document, options) => {
   const generatedDir = getGeneratedDir(fileName, options);
 
-  const indexFile = _path.default.join(generatedDir, 'index' + (options.typeScript ? '.ts' : '.js'));
+  const indexFile = _path.default.join(generatedDir, 'index.ts');
 
   if (!_fs.default.existsSync(generatedDir)) {
     _fs.default.mkdirSync(generatedDir, {
@@ -135,16 +122,8 @@ const generateTypeFiles = (fileName, schema, document, options) => {
 
   _fs.default.writeFileSync(indexFile, indexContents);
 
-  Object.keys(files).forEach(key => {
-    let fname = key;
-
-    if (options.typeScript) {
-      // eslint-disable-next-line flowtype-errors/uncovered
-      files[key] = (0, _convert.convert)(files[key]).replace(`variables: {}`, `variables: Record<never, never>`);
-      fname = key.replace(/\.js$/, '.ts');
-    }
-
-    _fs.default.writeFileSync(fname, files[key]);
+  Object.keys(files).forEach(fname => {
+    _fs.default.writeFileSync(fname, files[fname]);
   });
 
   _fs.default.writeFileSync(indexFile, indexContents);
@@ -175,5 +154,4 @@ const processPragmas = (generateConfig, crawlConfig, rawSource) => {
   }
 };
 
-exports.processPragmas = processPragmas;
-//# sourceMappingURL=generateTypeFiles.js.map
+exports.processPragmas = processPragmas;

package/dist/generateVariablesType.js

@@ -19,31 +19,24 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// eslint-disable-line flowtype-errors/uncovered
 const inputObjectToFlow = (ctx, name) => {
   const inputObject = ctx.schema.inputObjectsByName[name];
 
   if (!inputObject) {
     ctx.errors.push(`Unknown input object ${name}`);
-    return babelTypes.stringLiteralTypeAnnotation(`Unknown input object ${name}`);
+    return babelTypes.tsLiteralType(babelTypes.stringLiteral(`Unknown input object ${name}`));
   }
 
-  return (0, _utils.maybeAddDescriptionComment)(inputObject.description, babelTypes.objectTypeAnnotation(inputObject.inputFields.map(vbl => (0, _utils.maybeAddDescriptionComment)(vbl.description, maybeOptionalObjectTypeProperty(vbl.name, inputRefToFlow(ctx, vbl.type)))), undefined
-  /* indexers */
-  , undefined
-  /* callProperties */
-  , undefined
-  /* internalSlots */
-  , true
-  /* exact */
-  ));
+  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))))));
 };
 
 exports.inputObjectToFlow = inputObjectToFlow;
 
 const maybeOptionalObjectTypeProperty = (name, type) => {
-  const prop = (0, _utils.liftLeadingPropertyComments)(babelTypes.objectTypeProperty(babelTypes.identifier(name), type));
+  const prop = (0, _utils.liftLeadingPropertyComments)(babelTypes.tsPropertySignature(babelTypes.identifier(name), babelTypes.tsTypeAnnotation(type)));
 
-  if (type.type === 'NullableTypeAnnotation') {
+  if ((0, _utils.isnNullableType)(type)) {
     prop.optional = true;
   }
 
@@ -59,7 +52,7 @@ const inputRefToFlow = (ctx, inputRef) => {
 
   const result = _inputRefToFlow(ctx, inputRef);
 
-  return (0, _utils.transferLeadingComments)(result, babelTypes.nullableTypeAnnotation(result));
+  return (0, _utils.transferLeadingComments)(result, (0, _utils.nullableType)(result));
 };
 
 exports.inputRefToFlow = inputRefToFlow;
@@ -78,10 +71,10 @@ const _inputRefToFlow = (ctx, inputRef) => {
   }
 
   if (inputRef.kind === 'LIST') {
-    return babelTypes.genericTypeAnnotation(babelTypes.identifier('$ReadOnlyArray'), babelTypes.typeParameterInstantiation([inputRefToFlow(ctx, inputRef.ofType)]));
+    return babelTypes.tsTypeReference(babelTypes.identifier('ReadonlyArray'), babelTypes.tsTypeParameterInstantiation([inputRefToFlow(ctx, inputRef.ofType)]));
   }
 
-  return babelTypes.stringLiteralTypeAnnotation(JSON.stringify(inputRef));
+  return babelTypes.tsLiteralType(babelTypes.stringLiteral(JSON.stringify(inputRef)));
 };
 
 const variableToFlow = (ctx, type) => {
@@ -91,7 +84,7 @@ const variableToFlow = (ctx, type) => {
 
   const result = _variableToFlow(ctx, type);
 
-  return (0, _utils.transferLeadingComments)(result, babelTypes.nullableTypeAnnotation(result));
+  return (0, _utils.transferLeadingComments)(result, (0, _utils.nullableType)(result));
 };
 
 const _variableToFlow = (ctx, type) => {
@@ -107,33 +100,24 @@ const _variableToFlow = (ctx, type) => {
     const customScalarType = ctx.scalars[type.name.value];
 
     if (customScalarType) {
-      return babelTypes.genericTypeAnnotation(babelTypes.identifier(customScalarType));
+      return babelTypes.tsTypeReference(babelTypes.identifier(customScalarType));
     }
 
     return inputObjectToFlow(ctx, type.name.value);
   }
 
   if (type.kind === 'ListType') {
-    return babelTypes.genericTypeAnnotation(babelTypes.identifier('$ReadOnlyArray'), babelTypes.typeParameterInstantiation([variableToFlow(ctx, type.type)]));
+    return babelTypes.tsTypeReference(babelTypes.identifier('ReadonlyArray'), babelTypes.tsTypeParameterInstantiation([variableToFlow(ctx, type.type)]));
   }
 
-  return babelTypes.stringLiteralTypeAnnotation('UNKNOWN' + JSON.stringify(type));
+  return babelTypes.tsLiteralType(babelTypes.stringLiteral('UNKNOWN' + JSON.stringify(type)));
 };
 
 const generateVariablesType = (schema, item, ctx) => {
-  const variableObject = babelTypes.objectTypeAnnotation((item.variableDefinitions || []).map(vbl => {
+  const variableObject = (0, _utils.objectTypeFromProperties)((item.variableDefinitions || []).map(vbl => {
     return maybeOptionalObjectTypeProperty(vbl.variable.name.value, variableToFlow(ctx, vbl.type));
-  }), undefined
-  /* indexers */
-  , undefined
-  /* callProperties */
-  , undefined
-  /* internalSlots */
-  , true
-  /* exact */
-  );
+  }));
   return (0, _generator.default)(variableObject).code; // eslint-disable-line flowtype-errors/uncovered
 };
 
-exports.generateVariablesType = generateVariablesType;
-//# sourceMappingURL=generateVariablesType.js.map
+exports.generateVariablesType = generateVariablesType;

package/dist/index.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.documentToFlowTypes = exports.FlowGenerationError = void 0;
 
+var _wonderStuffCore = require("@khanacademy/wonder-stuff-core");
+
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
 var _generateResponseType = require("./generateResponseType");
@@ -13,25 +15,16 @@ var _generateVariablesType = require("./generateVariablesType");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/* eslint-disable no-console */
-
-/* flow-uncovered-file */
-
-/**
- * This tool generates flowtype definitions from graphql queries.
- *
- * It relies on `introspection-query.json` existing in this directory,
- * which is produced by running `./tools/graphql-flow/sendIntrospection.js`.
- */
 // eslint-disable-line flowtype-errors/uncovered
 const optionsToConfig = (schema, definitions, options, errors = []) => {
-  var _options$strictNullab, _options$readOnlyArra, _options$scalars, _options$typeScript;
+  var _options$strictNullab, _options$readOnlyArra, _options$scalars, _options$typeScript, _options$omitFileExte;
 
   const internalOptions = {
     strictNullability: (_options$strictNullab = options === null || options === void 0 ? void 0 : options.strictNullability) !== null && _options$strictNullab !== void 0 ? _options$strictNullab : true,
     readOnlyArray: (_options$readOnlyArra = options === null || options === void 0 ? void 0 : options.readOnlyArray) !== null && _options$readOnlyArra !== void 0 ? _options$readOnlyArra : true,
     scalars: (_options$scalars = options === null || options === void 0 ? void 0 : options.scalars) !== null && _options$scalars !== void 0 ? _options$scalars : {},
-    typeScript: (_options$typeScript = options === null || options === void 0 ? void 0 : options.typeScript) !== null && _options$typeScript !== void 0 ? _options$typeScript : false
+    typeScript: (_options$typeScript = options === null || options === void 0 ? void 0 : options.typeScript) !== null && _options$typeScript !== void 0 ? _options$typeScript : false,
+    omitFileExtensions: (_options$omitFileExte = options === null || options === void 0 ? void 0 : options.omitFileExtensions) !== null && _options$omitFileExte !== void 0 ? _options$omitFileExte : false
   };
   const fragments = {};
   definitions.forEach(def => {
@@ -47,7 +40,9 @@ const optionsToConfig = (schema, definitions, options, errors = []) => {
     path: [],
     experimentalEnumsMap: options !== null && options !== void 0 && options.experimentalEnums ? {} : undefined,
     ...internalOptions
-  };
+  }; // @ts-expect-error: TS2322 - The type 'readonly []' is 'readonly' and cannot be
+  // assigned to the mutable type 'string[]'.
+
   return config;
 };
 
@@ -97,7 +92,7 @@ const documentToFlowTypes = (document, schema, options) => {
       const typeName = `${name}Type`; // TODO(jared): Maybe make this template configurable?
       // We'll see what's required to get webapp on board.
 
-      const code = `export type ${typeName} = {|\n    variables: ${variables},\n    response: ${response}\n|};`;
+      const code = `export type ${typeName} = {\n    variables: ${variables},\n    response: ${response}\n};`;
       const extraTypes = codegenExtraTypes(types);
       const experimentalEnums = codegenExtraTypes(config.experimentalEnumsMap || {});
       return {
@@ -108,7 +103,7 @@ const documentToFlowTypes = (document, schema, options) => {
         experimentalEnums
       };
     }
-  }).filter(Boolean);
+  }).filter(_wonderStuffCore.isTruthy);
 
   if (errors.length) {
     throw new FlowGenerationError(errors);
@@ -126,5 +121,4 @@ function codegenExtraTypes(types) {
     extraTypes[k] = (0, _generator.default)(types[k]).code;
   });
   return extraTypes;
-}
-//# sourceMappingURL=index.js.map
+}