@khanacademy/graphql-flow 2.0.0 → 3.0.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @khanacademy/graphql-flow
 
+## 3.0.1
+
+### Patch Changes
+
+-   c6be76f: Search through untracked files for graphql-tag. Don't error out on files that can't be found.
+
+## 3.0.0
+
+### Major Changes
+
+-   ad68019: Update 'graphql' to 16.3.x (requires consumers to change their version of 'graphql')
+
 ## 2.0.0
 
 ### Major Changes

package/dist/cli/config.js

@@ -52,9 +52,12 @@ const getSchemas = schemaFilePath => {
 
   if (schemaFilePath.endsWith('.graphql')) {
     const schemaForValidation = (0, _graphql.buildSchema)(raw);
-    const queryResponse = (0, _graphql.graphqlSync)(schemaForValidation, (0, _graphql.getIntrospectionQuery)({
-      descriptions: true
-    }));
+    const queryResponse = (0, _graphql.graphqlSync)({
+      schema: schemaForValidation,
+      source: (0, _graphql.getIntrospectionQuery)({
+        descriptions: true
+      })
+    });
     const schemaForTypeGeneration = (0, _schemaFromIntrospectionData.schemaFromIntrospectionData)( // eslint-disable-next-line flowtype-errors/uncovered
     queryResponse.data);
     return [schemaForValidation, schemaForTypeGeneration];

package/dist/cli/run.js

@@ -42,7 +42,10 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 /** Step (1) */
 const findGraphqlTagReferences = root => {
-  const response = (0, _child_process.execSync)("git grep -I --word-regexp --name-only --fixed-strings 'graphql-tag' -- '*.js' '*.jsx' '*.ts' '*.tsx'", {
+  // NOTE(john): We want to include untracked files here so that we can
+  // generate types for them. This is useful for when we have a new file
+  // that we want to generate types for, but we haven't committed it yet.
+  const response = (0, _child_process.execSync)("git grep -I --word-regexp --name-only --fixed-strings --untracked 'graphql-tag' -- '*.js' '*.jsx' '*.ts' '*.tsx'", {
     encoding: 'utf8',
     cwd: root
   });

package/dist/parser/parse.js

@@ -35,7 +35,10 @@ const listExternalReferences = file => {
     if (v.type === 'import') {
       if (followImports) {
         const absPath = (0, _utils.getPathWithExtension)(v.path);
-        paths[absPath] = true;
+
+        if (absPath) {
+          paths[absPath] = true;
+        }
       }
     } else {
       v.source.expressions.forEach(expr => add(expr, true));

package/dist/parser/utils.js

@@ -28,9 +28,13 @@ const getPathWithExtension = pathWithoutExtension => {
 
   if (_fs.default.existsSync(pathWithoutExtension + '.ts')) {
     return pathWithoutExtension + '.ts';
-  }
+  } // NOTE(john): This is a bit of a hack, but it's necessary for when we
+  // have a file that doesn't exist. This will happen when we delete all of
+  // the type files before re-running graphql-flow again. We want to ensure
+  // that we don't error out in this case.
+
 
-  throw new Error("Can't find file at " + pathWithoutExtension);
+  return "";
 };
 
 exports.getPathWithExtension = getPathWithExtension;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@khanacademy/graphql-flow",
-    "version": "2.0.0",
+    "version": "3.0.1",
     "bin": {
         "graphql-flow": "./dist/cli/run.js"
     },
@@ -40,7 +40,7 @@
         "@babel/types": "^7.17.0",
         "@khanacademy/wonder-stuff-core": "^1.5.1",
         "apollo-utilities": "^1.3.4",
-        "graphql": "14.5.8",
+        "graphql": "^16.3.0",
         "jsonschema": "^1.4.1",
         "prettier": "^2.5.1",
         "prettier-eslint": "^13.0.0"

package/src/cli/config.ts

@@ -39,13 +39,13 @@ export const getSchemas = (schemaFilePath: string): [GraphQLSchema, Schema] => {
     const raw = fs.readFileSync(schemaFilePath, 'utf8');
     if (schemaFilePath.endsWith('.graphql')) {
         const schemaForValidation = buildSchema(raw);
-        const queryResponse = graphqlSync(
-            schemaForValidation,
-            getIntrospectionQuery({descriptions: true}),
-        );
+        const queryResponse = graphqlSync({
+            schema: schemaForValidation,
+            source: getIntrospectionQuery({descriptions: true}),
+        });
         const schemaForTypeGeneration = schemaFromIntrospectionData(
             // eslint-disable-next-line flowtype-errors/uncovered
-            (queryResponse.data as IntrospectionQuery),
+            ((queryResponse.data as any) as IntrospectionQuery),
         );
         return [schemaForValidation, schemaForTypeGeneration];
     } else {

package/src/cli/run.ts

@@ -32,8 +32,11 @@ import {dirname} from 'path';
 /** Step (1) */
 
 const findGraphqlTagReferences = (root: string): Array<string> => {
+    // NOTE(john): We want to include untracked files here so that we can
+    // generate types for them. This is useful for when we have a new file
+    // that we want to generate types for, but we haven't committed it yet.
     const response = execSync(
-        "git grep -I --word-regexp --name-only --fixed-strings 'graphql-tag' -- '*.js' '*.jsx' '*.ts' '*.tsx'",
+        "git grep -I --word-regexp --name-only --fixed-strings --untracked 'graphql-tag' -- '*.js' '*.jsx' '*.ts' '*.tsx'",
         {
             encoding: 'utf8',
             cwd: root,

package/src/parser/parse.ts

@@ -105,7 +105,9 @@ const listExternalReferences = (file: FileResult): Array<string> => {
         if (v.type === 'import') {
             if (followImports) {
                 const absPath = getPathWithExtension(v.path);
-                paths[absPath] = true;
+                if (absPath) {
+                    paths[absPath] = true;
+                }
             }
         } else {
             v.source.expressions.forEach((expr) => add(expr, true));

package/src/parser/utils.ts

@@ -20,5 +20,9 @@ export const getPathWithExtension = (pathWithoutExtension: string): string => {
     if (fs.existsSync(pathWithoutExtension + '.ts')) {
         return pathWithoutExtension + '.ts';
     }
-    throw new Error("Can't find file at " + pathWithoutExtension);
+    // NOTE(john): This is a bit of a hack, but it's necessary for when we
+    // have a file that doesn't exist. This will happen when we delete all of
+    // the type files before re-running graphql-flow again. We want to ensure
+    // that we don't error out in this case.
+    return "";
 };