@khanacademy/graphql-flow 0.2.2 → 0.2.5

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

@@ -55,8 +55,8 @@ jobs:
         if: steps.changesets.outputs.published == 'true'
         uses: rtCamp/action-slack-notify@v2
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_FEIWEB_WEBHOOK }}
-          SLACK_CHANNEL: frontend-infra-web
+          SLACK_WEBHOOK: ${{ secrets.SLACK_FEI_FIREHOSE }}
+          SLACK_CHANNEL: fei-firehose
           SLACK_MSG_AUTHOR: ${{ github.event.pull_request.user.login }}
           SLACK_USERNAME: GithubGoose
           SLACK_ICON_EMOJI: ":goose:"
@@ -64,17 +64,3 @@ jobs:
           SLACK_TITLE: "New Graphql-Flow release!"
           SLACK_FOOTER: Graphql-Flow Slack Notification
           MSG_MINIMAL: true
-
-      - name: Send a Slack notification for mobile if a publish happens
-        if: steps.changesets.outputs.published == 'true'
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_FEIMOBILE_WEBHOOK }}
-          SLACK_CHANNEL: frontend-infra-mobile
-          SLACK_MSG_AUTHOR: ${{ github.event.pull_request.user.login }}
-          SLACK_USERNAME: GithubGoose
-          SLACK_ICON_EMOJI: ":goose:"
-          SLACK_MESSAGE: "A new version of ${{ github.event.repository.name }} was published! 🎉 \nRelease notes → https://github.com/Khan/${{ github.event.repository.name }}/releases/"
-          SLACK_TITLE: "New Graphql-Flow release!"
-          SLACK_FOOTER: Graphql-Flow Slack Notification
-          MSG_MINIMAL: true

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @khanacademy/graphql-flow
 
+## 0.2.5
+
+### Patch Changes
+
+-   0df32ac: Allow generatedDir to be an absolute path
+
+## 0.2.4
+
+### Patch Changes
+
+-   843839c: Add 'dumpOperations' config option, to enable safelisting
+
+## 0.2.3
+
+### Patch Changes
+
+-   f5ea353: Add 'typeFileName' config option to fit the mobile repo's expectations
+
 ## 0.2.2
 
 ### Patch Changes

package/Readme.md

@@ -42,7 +42,17 @@ type Options = {
     readOnlyArray: boolean = true,
     scalars: {[key: string]: 'string' | 'boolean' | 'number'}
 
-    // Specify the name of the generated types directory
+    // Specify the name of the generated types directory.  If this
+    // is a relative path, then this is used to suffix the output
+    // directory; if it's an absolute path it's used to prefix the
+    // output directory.  For instance, if a gql directive is
+    // found in /foo/bar/baz/query.js and you run the cli (or
+    // jest) from directory /foo, then:
+    // * if `generatedDirectory` is "__generated__", the output will
+    //   be in /foo/bar/baz/__generated__/index.js and sibling files
+    // * if `generatedDirectory` is "/tmp/__generated__", the output
+    //   will be in /tmp/__generated__/bar/baz/index.js and sibling
+    //   files.
     generatedDirectory: string = '__generated__',
 
     // The default generated type contains both the types of the response
@@ -70,6 +80,10 @@ type Options = {
     // Names are generated by concatenating the attribute names
     // of the path to the object type, separated by underscores.
     exportAllObjectTypes?: boolean,
+
+    // A template for the name of generated files
+    // default: [operationName].js
+    typeFileName?: string,
 }
 ```
 

package/dist/cli/config.js

@@ -20,7 +20,7 @@ const loadConfigFile = configFile => {
 
   // eslint-disable-next-line flowtype-errors/uncovered
   const data = JSON.parse(_fs.default.readFileSync(configFile, 'utf8'));
-  const toplevelKeys = ['excludes', 'schemaFilePath', 'options'];
+  const toplevelKeys = ['excludes', 'schemaFilePath', 'options', 'dumpOperations'];
   Object.keys(data).forEach(k => {
     if (!toplevelKeys.includes(k)) {
       throw new Error(`Invalid attribute in config file ${configFile}: ${k}. Allowed attributes: ${toplevelKeys.join(', ')}`);
@@ -28,7 +28,7 @@ const loadConfigFile = configFile => {
   });
 
   if (data.options) {
-    const externalOptionsKeys = ['pragma', 'loosePragma', 'ignorePragma', 'scalars', 'strictNullability', 'regenerateCommand', 'readOnlyArray', 'splitTypes', 'generatedDirectory', 'exportAllObjectTypes'];
+    const externalOptionsKeys = ['pragma', 'loosePragma', 'ignorePragma', 'scalars', 'strictNullability', 'regenerateCommand', 'readOnlyArray', 'splitTypes', 'generatedDirectory', 'exportAllObjectTypes', 'typeFileName'];
     Object.keys(data.options).forEach(k => {
       if (!externalOptionsKeys.includes(k)) {
         throw new Error(`Invalid option in config file ${configFile}: ${k}. Allowed options: ${externalOptionsKeys.join(', ')}`);
@@ -39,7 +39,8 @@ const loadConfigFile = configFile => {
   return {
     options: (_data$options = data.options) !== null && _data$options !== void 0 ? _data$options : {},
     excludes: (_data$excludes$map = (_data$excludes = data.excludes) === null || _data$excludes === void 0 ? void 0 : _data$excludes.map(string => new RegExp(string))) !== null && _data$excludes$map !== void 0 ? _data$excludes$map : [],
-    schemaFilePath: _path.default.join(_path.default.dirname(configFile), data.schemaFilePath)
+    schemaFilePath: _path.default.isAbsolute(data.schemaFilePath) ? data.schemaFilePath : _path.default.join(_path.default.dirname(configFile), data.schemaFilePath),
+    dumpOperations: data.dumpOperations
   };
 };
 /**

package/dist/cli/config.js.flow

@@ -18,6 +18,7 @@ import path from 'path';
 export type CliConfig = {
     excludes: Array<RegExp>,
     schemaFilePath: string,
+    dumpOperations?: string,
     options: ExternalOptions,
 };
 
@@ -29,12 +30,18 @@ type JSONConfig = {
     excludes?: Array<string>,
     schemaFilePath: string,
     options?: ExternalOptions,
+    dumpOperations?: string,
 };
 
 export const loadConfigFile = (configFile: string): CliConfig => {
     // eslint-disable-next-line flowtype-errors/uncovered
     const data: JSONConfig = JSON.parse(fs.readFileSync(configFile, 'utf8'));
-    const toplevelKeys = ['excludes', 'schemaFilePath', 'options'];
+    const toplevelKeys = [
+        'excludes',
+        'schemaFilePath',
+        'options',
+        'dumpOperations',
+    ];
     Object.keys(data).forEach((k) => {
         if (!toplevelKeys.includes(k)) {
             throw new Error(
@@ -56,6 +63,7 @@ export const loadConfigFile = (configFile: string): CliConfig => {
             'splitTypes',
             'generatedDirectory',
             'exportAllObjectTypes',
+            'typeFileName',
         ];
         Object.keys(data.options).forEach((k) => {
             if (!externalOptionsKeys.includes(k)) {
@@ -70,10 +78,10 @@ export const loadConfigFile = (configFile: string): CliConfig => {
     return {
         options: data.options ?? {},
         excludes: data.excludes?.map((string) => new RegExp(string)) ?? [],
-        schemaFilePath: path.join(
-            path.dirname(configFile),
-            data.schemaFilePath,
-        ),
+        schemaFilePath: path.isAbsolute(data.schemaFilePath)
+            ? data.schemaFilePath
+            : path.join(path.dirname(configFile), data.schemaFilePath),
+        dumpOperations: data.dumpOperations,
     };
 };
 

package/dist/cli/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/cli/config.js"],"names":["loadConfigFile","configFile","data","JSON","parse","fs","readFileSync","toplevelKeys","Object","keys","forEach","k","includes","Error","join","options","externalOptionsKeys","excludes","map","string","RegExp","schemaFilePath","path","dirname","getSchemas","raw","endsWith","schemaForValidation","queryResponse","descriptions","schemaForTypeGeneration","introspectionData"],"mappings":";;;;;;;AAKA;;AAEA;;AACA;;AAOA;;;;AAkBO,MAAMA,cAAc,GAAIC,UAAD,IAAmC;AAAA;;AAC7D;AACA,QAAMC,IAAgB,GAAGC,IAAI,CAACC,KAAL,CAAWC,YAAGC,YAAH,CAAgBL,UAAhB,EAA4B,MAA5B,CAAX,CAAzB;AACA,QAAMM,YAAY,GAAG,CAAC,UAAD,EAAa,gBAAb,EAA+B,SAA/B,CAArB;AACAC,EAAAA,MAAM,CAACC,IAAP,CAAYP,IAAZ,EAAkBQ,OAAlB,CAA2BC,CAAD,IAAO;AAC7B,QAAI,CAACJ,YAAY,CAACK,QAAb,CAAsBD,CAAtB,CAAL,EAA+B;AAC3B,YAAM,IAAIE,KAAJ,CACD,oCAAmCZ,UAAW,KAAIU,CAAE,yBAAwBJ,YAAY,CAACO,IAAb,CACzE,IADyE,CAE3E,EAHA,CAAN;AAKH;AACJ,GARD;;AASA,MAAIZ,IAAI,CAACa,OAAT,EAAkB;AACd,UAAMC,mBAAmB,GAAG,CACxB,QADwB,EAExB,aAFwB,EAGxB,cAHwB,EAIxB,SAJwB,EAKxB,mBALwB,EAMxB,mBANwB,EAOxB,eAPwB,EAQxB,YARwB,EASxB,oBATwB,EAUxB,sBAVwB,CAA5B;AAYAR,IAAAA,MAAM,CAACC,IAAP,CAAYP,IAAI,CAACa,OAAjB,EAA0BL,OAA1B,CAAmCC,CAAD,IAAO;AACrC,UAAI,CAACK,mBAAmB,CAACJ,QAApB,CAA6BD,CAA7B,CAAL,EAAsC;AAClC,cAAM,IAAIE,KAAJ,CACD,iCAAgCZ,UAAW,KAAIU,CAAE,sBAAqBK,mBAAmB,CAACF,IAApB,CACnE,IADmE,CAErE,EAHA,CAAN;AAKH;AACJ,KARD;AASH;;AACD,SAAO;AACHC,IAAAA,OAAO,mBAAEb,IAAI,CAACa,OAAP,yDAAkB,EADtB;AAEHE,IAAAA,QAAQ,0CAAEf,IAAI,CAACe,QAAP,mDAAE,eAAeC,GAAf,CAAoBC,MAAD,IAAY,IAAIC,MAAJ,CAAWD,MAAX,CAA/B,CAAF,mEAAwD,EAF7D;AAGHE,IAAAA,cAAc,EAAEC,cAAKR,IAAL,CACZQ,cAAKC,OAAL,CAAatB,UAAb,CADY,EAEZC,IAAI,CAACmB,cAFO;AAHb,GAAP;AAQH,CA5CM;AA8CP;AACA;AACA;;;;;AACO,MAAMG,UAAU,GAAIH,cAAD,IAAqD;AAC3E,QAAMI,GAAG,GAAGpB,YAAGC,YAAH,CAAgBe,cAAhB,EAAgC,MAAhC,CAAZ;;AACA,MAAIA,cAAc,CAACK,QAAf,CAAwB,UAAxB,CAAJ,EAAyC;AACrC,UAAMC,mBAAmB,GAAG,0BAAYF,GAAZ,CAA5B;AACA,UAAMG,aAAa,GAAG,0BAClBD,mBADkB,EAElB,oCAAsB;AAACE,MAAAA,YAAY,EAAE;AAAf,KAAtB,CAFkB,CAAtB;AAIA,UAAMC,uBAAuB,GAAG,+DAC5B;AACEF,IAAAA,aAAa,CAAC1B,IAFY,CAAhC;AAIA,WAAO,CAACyB,mBAAD,EAAsBG,uBAAtB,CAAP;AACH,GAXD,MAWO;AACH;AACA,UAAMC,iBAAqC,GAAG5B,IAAI,CAACC,KAAL,CAAWqB,GAAX,CAA9C;AACA,UAAME,mBAAmB,GAAG,gCAAkBI,iBAAlB,CAA5B;AACA,UAAMD,uBAAuB,GACzB,8DAA4BC,iBAA5B,CADJ;AAEA,WAAO,CAACJ,mBAAD,EAAsBG,uBAAtB,CAAP;AACH;AACJ,CArBM","sourcesContent":["// @flow\nimport type {ExternalOptions} from '../generateTypeFiles';\nimport type {Schema} from '../types';\nimport type {GraphQLSchema} from 'graphql/type/schema';\n\nimport {schemaFromIntrospectionData} from '../schemaFromIntrospectionData';\n\nimport fs from 'fs';\nimport {\n    buildClientSchema,\n    buildSchema,\n    getIntrospectionQuery,\n    graphqlSync,\n    type IntrospectionQuery,\n} from 'graphql';\nimport path from 'path';\n\nexport type CliConfig = {\n    excludes: Array<RegExp>,\n    schemaFilePath: string,\n    options: ExternalOptions,\n};\n\n/**\n * This is the json-compatible form of the config\n * object.\n */\ntype JSONConfig = {\n    excludes?: Array<string>,\n    schemaFilePath: string,\n    options?: ExternalOptions,\n};\n\nexport const loadConfigFile = (configFile: string): CliConfig => {\n    // eslint-disable-next-line flowtype-errors/uncovered\n    const data: JSONConfig = JSON.parse(fs.readFileSync(configFile, 'utf8'));\n    const toplevelKeys = ['excludes', 'schemaFilePath', 'options'];\n    Object.keys(data).forEach((k) => {\n        if (!toplevelKeys.includes(k)) {\n            throw new Error(\n                `Invalid attribute in config file ${configFile}: ${k}. Allowed attributes: ${toplevelKeys.join(\n                    ', ',\n                )}`,\n            );\n        }\n    });\n    if (data.options) {\n        const externalOptionsKeys = [\n            'pragma',\n            'loosePragma',\n            'ignorePragma',\n            'scalars',\n            'strictNullability',\n            'regenerateCommand',\n            'readOnlyArray',\n            'splitTypes',\n            'generatedDirectory',\n            'exportAllObjectTypes',\n        ];\n        Object.keys(data.options).forEach((k) => {\n            if (!externalOptionsKeys.includes(k)) {\n                throw new Error(\n                    `Invalid option in config file ${configFile}: ${k}. Allowed options: ${externalOptionsKeys.join(\n                        ', ',\n                    )}`,\n                );\n            }\n        });\n    }\n    return {\n        options: data.options ?? {},\n        excludes: data.excludes?.map((string) => new RegExp(string)) ?? [],\n        schemaFilePath: path.join(\n            path.dirname(configFile),\n            data.schemaFilePath,\n        ),\n    };\n};\n\n/**\n * Loads a .json 'introspection query response', or a .graphql schema definition.\n */\nexport const getSchemas = (schemaFilePath: string): [GraphQLSchema, Schema] => {\n    const raw = fs.readFileSync(schemaFilePath, 'utf8');\n    if (schemaFilePath.endsWith('.graphql')) {\n        const schemaForValidation = buildSchema(raw);\n        const queryResponse = graphqlSync(\n            schemaForValidation,\n            getIntrospectionQuery({descriptions: true}),\n        );\n        const schemaForTypeGeneration = schemaFromIntrospectionData(\n            // eslint-disable-next-line flowtype-errors/uncovered\n            ((queryResponse.data: any): IntrospectionQuery),\n        );\n        return [schemaForValidation, schemaForTypeGeneration];\n    } else {\n        // eslint-disable-next-line flowtype-errors/uncovered\n        const introspectionData: IntrospectionQuery = JSON.parse(raw);\n        const schemaForValidation = buildClientSchema(introspectionData);\n        const schemaForTypeGeneration =\n            schemaFromIntrospectionData(introspectionData);\n        return [schemaForValidation, schemaForTypeGeneration];\n    }\n};\n"],"file":"config.js"}
+{"version":3,"sources":["../../src/cli/config.js"],"names":["loadConfigFile","configFile","data","JSON","parse","fs","readFileSync","toplevelKeys","Object","keys","forEach","k","includes","Error","join","options","externalOptionsKeys","excludes","map","string","RegExp","schemaFilePath","path","isAbsolute","dirname","dumpOperations","getSchemas","raw","endsWith","schemaForValidation","queryResponse","descriptions","schemaForTypeGeneration","introspectionData"],"mappings":"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","sourcesContent":["// @flow\nimport type {ExternalOptions} from '../generateTypeFiles';\nimport type {Schema} from '../types';\nimport type {GraphQLSchema} from 'graphql/type/schema';\n\nimport {schemaFromIntrospectionData} from '../schemaFromIntrospectionData';\n\nimport fs from 'fs';\nimport {\n    buildClientSchema,\n    buildSchema,\n    getIntrospectionQuery,\n    graphqlSync,\n    type IntrospectionQuery,\n} from 'graphql';\nimport path from 'path';\n\nexport type CliConfig = {\n    excludes: Array<RegExp>,\n    schemaFilePath: string,\n    dumpOperations?: string,\n    options: ExternalOptions,\n};\n\n/**\n * This is the json-compatible form of the config\n * object.\n */\ntype JSONConfig = {\n    excludes?: Array<string>,\n    schemaFilePath: string,\n    options?: ExternalOptions,\n    dumpOperations?: string,\n};\n\nexport const loadConfigFile = (configFile: string): CliConfig => {\n    // eslint-disable-next-line flowtype-errors/uncovered\n    const data: JSONConfig = JSON.parse(fs.readFileSync(configFile, 'utf8'));\n    const toplevelKeys = [\n        'excludes',\n        'schemaFilePath',\n        'options',\n        'dumpOperations',\n    ];\n    Object.keys(data).forEach((k) => {\n        if (!toplevelKeys.includes(k)) {\n            throw new Error(\n                `Invalid attribute in config file ${configFile}: ${k}. Allowed attributes: ${toplevelKeys.join(\n                    ', ',\n                )}`,\n            );\n        }\n    });\n    if (data.options) {\n        const externalOptionsKeys = [\n            'pragma',\n            'loosePragma',\n            'ignorePragma',\n            'scalars',\n            'strictNullability',\n            'regenerateCommand',\n            'readOnlyArray',\n            'splitTypes',\n            'generatedDirectory',\n            'exportAllObjectTypes',\n            'typeFileName',\n        ];\n        Object.keys(data.options).forEach((k) => {\n            if (!externalOptionsKeys.includes(k)) {\n                throw new Error(\n                    `Invalid option in config file ${configFile}: ${k}. Allowed options: ${externalOptionsKeys.join(\n                        ', ',\n                    )}`,\n                );\n            }\n        });\n    }\n    return {\n        options: data.options ?? {},\n        excludes: data.excludes?.map((string) => new RegExp(string)) ?? [],\n        schemaFilePath: path.isAbsolute(data.schemaFilePath)\n            ? data.schemaFilePath\n            : path.join(path.dirname(configFile), data.schemaFilePath),\n        dumpOperations: data.dumpOperations,\n    };\n};\n\n/**\n * Loads a .json 'introspection query response', or a .graphql schema definition.\n */\nexport const getSchemas = (schemaFilePath: string): [GraphQLSchema, Schema] => {\n    const raw = fs.readFileSync(schemaFilePath, 'utf8');\n    if (schemaFilePath.endsWith('.graphql')) {\n        const schemaForValidation = buildSchema(raw);\n        const queryResponse = graphqlSync(\n            schemaForValidation,\n            getIntrospectionQuery({descriptions: true}),\n        );\n        const schemaForTypeGeneration = schemaFromIntrospectionData(\n            // eslint-disable-next-line flowtype-errors/uncovered\n            ((queryResponse.data: any): IntrospectionQuery),\n        );\n        return [schemaForValidation, schemaForTypeGeneration];\n    } else {\n        // eslint-disable-next-line flowtype-errors/uncovered\n        const introspectionData: IntrospectionQuery = JSON.parse(raw);\n        const schemaForValidation = buildClientSchema(introspectionData);\n        const schemaForTypeGeneration =\n            schemaFromIntrospectionData(introspectionData);\n        return [schemaForValidation, schemaForTypeGeneration];\n    }\n};\n"],"file":"config.js"}

package/dist/cli/run.js

@@ -21,9 +21,11 @@ var _printer = require("graphql/language/printer");
 
 var _validation = require("graphql/validation");
 
-var _path = _interopRequireDefault(require("path"));
+var _path = _interopRequireWildcard(require("path"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 // eslint-disable-line flowtype-errors/uncovered
 
@@ -61,7 +63,17 @@ const [schemaForValidation, schemaForTypeGeneration] = (0, _config.getSchemas)(c
 const inputFiles = cliFiles.length ? cliFiles : findGraphqlTagReferences(process.cwd());
 /** Step (2) */
 
-const files = (0, _parse.processFiles)(inputFiles, f => (0, _fs.readFileSync)(f, 'utf8'));
+const files = (0, _parse.processFiles)(inputFiles, f => {
+  if ((0, _fs.existsSync)(f)) {
+    return (0, _fs.readFileSync)(f, 'utf8');
+  }
+
+  if ((0, _fs.existsSync)(f + '.js')) {
+    return (0, _fs.readFileSync)(f + '.js', 'utf8');
+  }
+
+  throw new Error(`Unable to find ${f}`);
+});
 let filesHadErrors = false;
 Object.keys(files).forEach(key => {
   const file = files[key];
@@ -99,6 +111,7 @@ console.log(Object.keys(resolved).length, 'resolved queries');
 /** Step (4) */
 
 let validationFailures = 0;
+const printedOperations = [];
 Object.keys(resolved).forEach(k => {
   const {
     document,
@@ -112,16 +125,20 @@ Object.keys(resolved).forEach(k => {
   const hasNonFragments = document.definitions.some(({
     kind
   }) => kind !== 'FragmentDefinition');
-  const rawSource = raw.literals[0];
+  const rawSource = raw.literals[0]; // eslint-disable-next-line flowtype-errors/uncovered
+
+  const withTypeNames = (0, _apolloUtilities.addTypenameToDocument)(document);
+  const printed = (0, _printer.print)(withTypeNames);
+
+  if (hasNonFragments && !printedOperations.includes(printed)) {
+    printedOperations.push(printed);
+  }
+
   const processedOptions = (0, _generateTypeFiles.processPragmas)(config.options, rawSource);
 
   if (!processedOptions) {
     return;
-  } // eslint-disable-next-line flowtype-errors/uncovered
-
-
-  const withTypeNames = (0, _apolloUtilities.addTypenameToDocument)(document);
-  const printed = (0, _printer.print)(withTypeNames);
+  }
 
   if (hasNonFragments) {
     /* eslint-disable flowtype-errors/uncovered */
@@ -156,4 +173,13 @@ if (validationFailures) {
 
   process.exit(1);
 }
+
+if (config.dumpOperations) {
+  const dumpOperations = config.dumpOperations;
+  const parent = (0, _path.dirname)(dumpOperations);
+  (0, _fs.mkdirSync)(parent, {
+    recursive: true
+  });
+  (0, _fs.writeFileSync)(dumpOperations, JSON.stringify(printedOperations.sort(), null, 2));
+}
 //# sourceMappingURL=run.js.map

package/dist/cli/run.js.flow

@@ -9,11 +9,12 @@ import {getSchemas, loadConfigFile} from './config';
 import {addTypenameToDocument} from 'apollo-utilities'; // eslint-disable-line flowtype-errors/uncovered
 
 import {execSync} from 'child_process';
-import {readFileSync} from 'fs';
+import {existsSync, mkdirSync, readFileSync, writeFileSync} from 'fs';
 import {type DocumentNode} from 'graphql';
 import {print} from 'graphql/language/printer';
 import {validate} from 'graphql/validation';
 import path from 'path';
+import {dirname} from 'path';
 
 /**
  * This CLI tool executes the following steps:
@@ -68,7 +69,15 @@ const inputFiles = cliFiles.length
 
 /** Step (2) */
 
-const files = processFiles(inputFiles, (f) => readFileSync(f, 'utf8'));
+const files = processFiles(inputFiles, (f) => {
+    if (existsSync(f)) {
+        return readFileSync(f, 'utf8');
+    }
+    if (existsSync(f + '.js')) {
+        return readFileSync(f + '.js', 'utf8');
+    }
+    throw new Error(`Unable to find ${f}`);
+});
 
 let filesHadErrors = false;
 Object.keys(files).forEach((key) => {
@@ -103,6 +112,7 @@ console.log(Object.keys(resolved).length, 'resolved queries');
 /** Step (4) */
 
 let validationFailures: number = 0;
+const printedOperations: Array<string> = [];
 
 Object.keys(resolved).forEach((k) => {
     const {document, raw} = resolved[k];
@@ -113,14 +123,18 @@ Object.keys(resolved).forEach((k) => {
         ({kind}) => kind !== 'FragmentDefinition',
     );
     const rawSource: string = raw.literals[0];
-    const processedOptions = processPragmas(config.options, rawSource);
-    if (!processedOptions) {
-        return;
-    }
 
     // eslint-disable-next-line flowtype-errors/uncovered
     const withTypeNames: DocumentNode = addTypenameToDocument(document);
     const printed = print(withTypeNames);
+    if (hasNonFragments && !printedOperations.includes(printed)) {
+        printedOperations.push(printed);
+    }
+
+    const processedOptions = processPragmas(config.options, rawSource);
+    if (!processedOptions) {
+        return;
+    }
 
     if (hasNonFragments) {
         /* eslint-disable flowtype-errors/uncovered */
@@ -163,3 +177,13 @@ if (validationFailures) {
     // eslint-disable-next-line flowtype-errors/uncovered
     process.exit(1);
 }
+
+if (config.dumpOperations) {
+    const dumpOperations = config.dumpOperations;
+    const parent = dirname(dumpOperations);
+    mkdirSync(parent, {recursive: true});
+    writeFileSync(
+        dumpOperations,
+        JSON.stringify(printedOperations.sort(), null, 2),
+    );
+}

package/dist/cli/run.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/cli/run.js"],"names":["findGraphqlTagReferences","root","response","encoding","cwd","trim","split","map","relative","path","join","_","__","configFile","cliFiles","process","argv","console","log","exit","config","schemaForValidation","schemaForTypeGeneration","schemaFilePath","inputFiles","length","files","f","filesHadErrors","Object","keys","forEach","key","file","errors","error","message","resolved","loc","validationFailures","k","document","raw","excludes","some","rx","test","hasNonFragments","definitions","kind","rawSource","literals","processedOptions","options","withTypeNames","printed","err"],"mappings":"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","sourcesContent":["#!/usr/bin/env node\n// @flow\n/* eslint-disable no-console */\nimport {generateTypeFiles, processPragmas} from '../generateTypeFiles';\nimport {processFiles} from '../parser/parse';\nimport {resolveDocuments} from '../parser/resolve';\nimport {getSchemas, loadConfigFile} from './config';\n\nimport {addTypenameToDocument} from 'apollo-utilities'; // eslint-disable-line flowtype-errors/uncovered\n\nimport {execSync} from 'child_process';\nimport {readFileSync} from 'fs';\nimport {type DocumentNode} from 'graphql';\nimport {print} from 'graphql/language/printer';\nimport {validate} from 'graphql/validation';\nimport path from 'path';\n\n/**\n * This CLI tool executes the following steps:\n * 1) process options\n * 2) crawl files to find all operations and fragments, with\n *   tagged template literals and expressions.\n * 3) resolve the found operations, passing the literals and\n *   fragments into the `graphql-tag` function to produce\n *   the DocumentNodes.\n * 4) generate types for all resolved Queries & Mutations\n */\n\n/** Step (1) */\n\nconst findGraphqlTagReferences = (root: string): Array<string> => {\n    const response = execSync(\n        \"git grep -I --word-regexp --name-only --fixed-strings 'graphql-tag' -- '*.js' '*.jsx'\",\n        {\n            encoding: 'utf8',\n            cwd: root,\n        },\n    );\n    return response\n        .trim()\n        .split('\\n')\n        .map((relative) => path.join(root, relative));\n};\n\nconst [_, __, configFile, ...cliFiles] = process.argv;\n\nif (\n    configFile === '-h' ||\n    configFile === '--help' ||\n    configFile === 'help' ||\n    !configFile\n) {\n    console.log(`graphql-flow\n\nUsage: graphql-flow [configFile.json] [filesToCrawl...]`);\n    process.exit(1); // eslint-disable-line flowtype-errors/uncovered\n}\n\nconst config = loadConfigFile(configFile);\n\nconst [schemaForValidation, schemaForTypeGeneration] = getSchemas(\n    config.schemaFilePath,\n);\n\nconst inputFiles = cliFiles.length\n    ? cliFiles\n    : findGraphqlTagReferences(process.cwd());\n\n/** Step (2) */\n\nconst files = processFiles(inputFiles, (f) => readFileSync(f, 'utf8'));\n\nlet filesHadErrors = false;\nObject.keys(files).forEach((key) => {\n    const file = files[key];\n    if (file.errors.length) {\n        filesHadErrors = true;\n        console.error(`Errors in ${file.path}`);\n        file.errors.forEach((error) => {\n            console.error(` - ${error.message}`);\n        });\n    }\n});\n\nif (filesHadErrors) {\n    console.error('Aborting');\n    process.exit(1); // eslint-disable-line flowtype-errors/uncovered\n}\n\n/** Step (3) */\n\nconst {resolved, errors} = resolveDocuments(files);\nif (errors.length) {\n    errors.forEach((error) => {\n        console.error(`Resolution error ${error.message} in ${error.loc.path}`);\n    });\n    console.error('Aborting');\n    process.exit(1); // eslint-disable-line flowtype-errors/uncovered\n}\n\nconsole.log(Object.keys(resolved).length, 'resolved queries');\n\n/** Step (4) */\n\nlet validationFailures: number = 0;\n\nObject.keys(resolved).forEach((k) => {\n    const {document, raw} = resolved[k];\n    if (config.excludes.some((rx) => rx.test(raw.loc.path))) {\n        return; // skip\n    }\n    const hasNonFragments = document.definitions.some(\n        ({kind}) => kind !== 'FragmentDefinition',\n    );\n    const rawSource: string = raw.literals[0];\n    const processedOptions = processPragmas(config.options, rawSource);\n    if (!processedOptions) {\n        return;\n    }\n\n    // eslint-disable-next-line flowtype-errors/uncovered\n    const withTypeNames: DocumentNode = addTypenameToDocument(document);\n    const printed = print(withTypeNames);\n\n    if (hasNonFragments) {\n        /* eslint-disable flowtype-errors/uncovered */\n        const errors = validate(schemaForValidation, withTypeNames);\n        /* eslint-disable flowtype-errors/uncovered */\n        if (errors.length) {\n            errors.forEach((error) => {\n                console.error(\n                    `Schema validation found errors for ${raw.loc.path}!`,\n                );\n                console.error(printed);\n                console.error(error);\n                validationFailures++;\n            });\n        }\n        /* eslint-enable flowtype-errors/uncovered */\n    }\n\n    try {\n        generateTypeFiles(\n            raw.loc.path,\n            schemaForTypeGeneration,\n            withTypeNames,\n            processedOptions,\n        );\n        // eslint-disable-next-line flowtype-errors/uncovered\n    } catch (err) {\n        console.error(`Error while generating operation from ${raw.loc.path}`);\n        console.error(printed);\n        // eslint-disable-next-line flowtype-errors/uncovered\n        console.error(err);\n        validationFailures++;\n    }\n});\n\nif (validationFailures) {\n    console.error(\n        `Encountered ${validationFailures} validation failures while printing types.`,\n    );\n    // eslint-disable-next-line flowtype-errors/uncovered\n    process.exit(1);\n}\n"],"file":"run.js"}
+{"version":3,"sources":["../../src/cli/run.js"],"names":["findGraphqlTagReferences","root","response","encoding","cwd","trim","split","map","relative","path","join","_","__","configFile","cliFiles","process","argv","console","log","exit","config","schemaForValidation","schemaForTypeGeneration","schemaFilePath","inputFiles","length","files","f","Error","filesHadErrors","Object","keys","forEach","key","file","errors","error","message","resolved","loc","validationFailures","printedOperations","k","document","raw","excludes","some","rx","test","hasNonFragments","definitions","kind","rawSource","literals","withTypeNames","printed","includes","push","processedOptions","options","err","dumpOperations","parent","recursive","JSON","stringify","sort"],"mappings":"AAAA;;AAEA;;;AACA;;AACA;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AAEA;;AACA;;AACA;;;;;;AAPwD;;AAUxD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AAEA,MAAMA,wBAAwB,GAAIC,IAAD,IAAiC;AAC9D,QAAMC,QAAQ,GAAG,6BACb,uFADa,EAEb;AACIC,IAAAA,QAAQ,EAAE,MADd;AAEIC,IAAAA,GAAG,EAAEH;AAFT,GAFa,CAAjB;AAOA,SAAOC,QAAQ,CACVG,IADE,GAEFC,KAFE,CAEI,IAFJ,EAGFC,GAHE,CAGGC,QAAD,IAAcC,cAAKC,IAAL,CAAUT,IAAV,EAAgBO,QAAhB,CAHhB,CAAP;AAIH,CAZD;;AAcA,MAAM,CAACG,CAAD,EAAIC,EAAJ,EAAQC,UAAR,EAAoB,GAAGC,QAAvB,IAAmCC,OAAO,CAACC,IAAjD;;AAEA,IACIH,UAAU,KAAK,IAAf,IACAA,UAAU,KAAK,QADf,IAEAA,UAAU,KAAK,MAFf,IAGA,CAACA,UAJL,EAKE;AACEI,EAAAA,OAAO,CAACC,GAAR,CAAa;AACjB;AACA,wDAFI;AAGAH,EAAAA,OAAO,CAACI,IAAR,CAAa,CAAb,EAJF,CAImB;AACpB;;AAED,MAAMC,MAAM,GAAG,4BAAeP,UAAf,CAAf;AAEA,MAAM,CAACQ,mBAAD,EAAsBC,uBAAtB,IAAiD,wBACnDF,MAAM,CAACG,cAD4C,CAAvD;AAIA,MAAMC,UAAU,GAAGV,QAAQ,CAACW,MAAT,GACbX,QADa,GAEbd,wBAAwB,CAACe,OAAO,CAACX,GAAR,EAAD,CAF9B;AAIA;;AAEA,MAAMsB,KAAK,GAAG,yBAAaF,UAAb,EAA0BG,CAAD,IAAO;AAC1C,MAAI,oBAAWA,CAAX,CAAJ,EAAmB;AACf,WAAO,sBAAaA,CAAb,EAAgB,MAAhB,CAAP;AACH;;AACD,MAAI,oBAAWA,CAAC,GAAG,KAAf,CAAJ,EAA2B;AACvB,WAAO,sBAAaA,CAAC,GAAG,KAAjB,EAAwB,MAAxB,CAAP;AACH;;AACD,QAAM,IAAIC,KAAJ,CAAW,kBAAiBD,CAAE,EAA9B,CAAN;AACH,CARa,CAAd;AAUA,IAAIE,cAAc,GAAG,KAArB;AACAC,MAAM,CAACC,IAAP,CAAYL,KAAZ,EAAmBM,OAAnB,CAA4BC,GAAD,IAAS;AAChC,QAAMC,IAAI,GAAGR,KAAK,CAACO,GAAD,CAAlB;;AACA,MAAIC,IAAI,CAACC,MAAL,CAAYV,MAAhB,EAAwB;AACpBI,IAAAA,cAAc,GAAG,IAAjB;AACAZ,IAAAA,OAAO,CAACmB,KAAR,CAAe,aAAYF,IAAI,CAACzB,IAAK,EAArC;AACAyB,IAAAA,IAAI,CAACC,MAAL,CAAYH,OAAZ,CAAqBI,KAAD,IAAW;AAC3BnB,MAAAA,OAAO,CAACmB,KAAR,CAAe,MAAKA,KAAK,CAACC,OAAQ,EAAlC;AACH,KAFD;AAGH;AACJ,CATD;;AAWA,IAAIR,cAAJ,EAAoB;AAChBZ,EAAAA,OAAO,CAACmB,KAAR,CAAc,UAAd;AACArB,EAAAA,OAAO,CAACI,IAAR,CAAa,CAAb,EAFgB,CAEC;AACpB;AAED;;;AAEA,MAAM;AAACmB,EAAAA,QAAD;AAAWH,EAAAA;AAAX,IAAqB,+BAAiBT,KAAjB,CAA3B;;AACA,IAAIS,MAAM,CAACV,MAAX,EAAmB;AACfU,EAAAA,MAAM,CAACH,OAAP,CAAgBI,KAAD,IAAW;AACtBnB,IAAAA,OAAO,CAACmB,KAAR,CAAe,oBAAmBA,KAAK,CAACC,OAAQ,OAAMD,KAAK,CAACG,GAAN,CAAU9B,IAAK,EAArE;AACH,GAFD;AAGAQ,EAAAA,OAAO,CAACmB,KAAR,CAAc,UAAd;AACArB,EAAAA,OAAO,CAACI,IAAR,CAAa,CAAb,EALe,CAKE;AACpB;;AAEDF,OAAO,CAACC,GAAR,CAAYY,MAAM,CAACC,IAAP,CAAYO,QAAZ,EAAsBb,MAAlC,EAA0C,kBAA1C;AAEA;;AAEA,IAAIe,kBAA0B,GAAG,CAAjC;AACA,MAAMC,iBAAgC,GAAG,EAAzC;AAEAX,MAAM,CAACC,IAAP,CAAYO,QAAZ,EAAsBN,OAAtB,CAA+BU,CAAD,IAAO;AACjC,QAAM;AAACC,IAAAA,QAAD;AAAWC,IAAAA;AAAX,MAAkBN,QAAQ,CAACI,CAAD,CAAhC;;AACA,MAAItB,MAAM,CAACyB,QAAP,CAAgBC,IAAhB,CAAsBC,EAAD,IAAQA,EAAE,CAACC,IAAH,CAAQJ,GAAG,CAACL,GAAJ,CAAQ9B,IAAhB,CAA7B,CAAJ,EAAyD;AACrD,WADqD,CAC7C;AACX;;AACD,QAAMwC,eAAe,GAAGN,QAAQ,CAACO,WAAT,CAAqBJ,IAArB,CACpB,CAAC;AAACK,IAAAA;AAAD,GAAD,KAAYA,IAAI,KAAK,oBADD,CAAxB;AAGA,QAAMC,SAAiB,GAAGR,GAAG,CAACS,QAAJ,CAAa,CAAb,CAA1B,CARiC,CAUjC;;AACA,QAAMC,aAA2B,GAAG,4CAAsBX,QAAtB,CAApC;AACA,QAAMY,OAAO,GAAG,oBAAMD,aAAN,CAAhB;;AACA,MAAIL,eAAe,IAAI,CAACR,iBAAiB,CAACe,QAAlB,CAA2BD,OAA3B,CAAxB,EAA6D;AACzDd,IAAAA,iBAAiB,CAACgB,IAAlB,CAAuBF,OAAvB;AACH;;AAED,QAAMG,gBAAgB,GAAG,uCAAetC,MAAM,CAACuC,OAAtB,EAA+BP,SAA/B,CAAzB;;AACA,MAAI,CAACM,gBAAL,EAAuB;AACnB;AACH;;AAED,MAAIT,eAAJ,EAAqB;AACjB;AACA,UAAMd,MAAM,GAAG,0BAASd,mBAAT,EAA8BiC,aAA9B,CAAf;AACA;;AACA,QAAInB,MAAM,CAACV,MAAX,EAAmB;AACfU,MAAAA,MAAM,CAACH,OAAP,CAAgBI,KAAD,IAAW;AACtBnB,QAAAA,OAAO,CAACmB,KAAR,CACK,sCAAqCQ,GAAG,CAACL,GAAJ,CAAQ9B,IAAK,GADvD;AAGAQ,QAAAA,OAAO,CAACmB,KAAR,CAAcmB,OAAd;AACAtC,QAAAA,OAAO,CAACmB,KAAR,CAAcA,KAAd;AACAI,QAAAA,kBAAkB;AACrB,OAPD;AAQH;AACD;;AACH;;AAED,MAAI;AACA,8CACII,GAAG,CAACL,GAAJ,CAAQ9B,IADZ,EAEIa,uBAFJ,EAGIgC,aAHJ,EAIII,gBAJJ,EADA,CAOA;AACH,GARD,CAQE,OAAOE,GAAP,EAAY;AACV3C,IAAAA,OAAO,CAACmB,KAAR,CAAe,yCAAwCQ,GAAG,CAACL,GAAJ,CAAQ9B,IAAK,EAApE;AACAQ,IAAAA,OAAO,CAACmB,KAAR,CAAcmB,OAAd,EAFU,CAGV;;AACAtC,IAAAA,OAAO,CAACmB,KAAR,CAAcwB,GAAd;AACApB,IAAAA,kBAAkB;AACrB;AACJ,CAtDD;;AAwDA,IAAIA,kBAAJ,EAAwB;AACpBvB,EAAAA,OAAO,CAACmB,KAAR,CACK,eAAcI,kBAAmB,4CADtC,EADoB,CAIpB;;AACAzB,EAAAA,OAAO,CAACI,IAAR,CAAa,CAAb;AACH;;AAED,IAAIC,MAAM,CAACyC,cAAX,EAA2B;AACvB,QAAMA,cAAc,GAAGzC,MAAM,CAACyC,cAA9B;AACA,QAAMC,MAAM,GAAG,mBAAQD,cAAR,CAAf;AACA,qBAAUC,MAAV,EAAkB;AAACC,IAAAA,SAAS,EAAE;AAAZ,GAAlB;AACA,yBACIF,cADJ,EAEIG,IAAI,CAACC,SAAL,CAAexB,iBAAiB,CAACyB,IAAlB,EAAf,EAAyC,IAAzC,EAA+C,CAA/C,CAFJ;AAIH","sourcesContent":["#!/usr/bin/env node\n// @flow\n/* eslint-disable no-console */\nimport {generateTypeFiles, processPragmas} from '../generateTypeFiles';\nimport {processFiles} from '../parser/parse';\nimport {resolveDocuments} from '../parser/resolve';\nimport {getSchemas, loadConfigFile} from './config';\n\nimport {addTypenameToDocument} from 'apollo-utilities'; // eslint-disable-line flowtype-errors/uncovered\n\nimport {execSync} from 'child_process';\nimport {existsSync, mkdirSync, readFileSync, writeFileSync} from 'fs';\nimport {type DocumentNode} from 'graphql';\nimport {print} from 'graphql/language/printer';\nimport {validate} from 'graphql/validation';\nimport path from 'path';\nimport {dirname} from 'path';\n\n/**\n * This CLI tool executes the following steps:\n * 1) process options\n * 2) crawl files to find all operations and fragments, with\n *   tagged template literals and expressions.\n * 3) resolve the found operations, passing the literals and\n *   fragments into the `graphql-tag` function to produce\n *   the DocumentNodes.\n * 4) generate types for all resolved Queries & Mutations\n */\n\n/** Step (1) */\n\nconst findGraphqlTagReferences = (root: string): Array<string> => {\n    const response = execSync(\n        \"git grep -I --word-regexp --name-only --fixed-strings 'graphql-tag' -- '*.js' '*.jsx'\",\n        {\n            encoding: 'utf8',\n            cwd: root,\n        },\n    );\n    return response\n        .trim()\n        .split('\\n')\n        .map((relative) => path.join(root, relative));\n};\n\nconst [_, __, configFile, ...cliFiles] = process.argv;\n\nif (\n    configFile === '-h' ||\n    configFile === '--help' ||\n    configFile === 'help' ||\n    !configFile\n) {\n    console.log(`graphql-flow\n\nUsage: graphql-flow [configFile.json] [filesToCrawl...]`);\n    process.exit(1); // eslint-disable-line flowtype-errors/uncovered\n}\n\nconst config = loadConfigFile(configFile);\n\nconst [schemaForValidation, schemaForTypeGeneration] = getSchemas(\n    config.schemaFilePath,\n);\n\nconst inputFiles = cliFiles.length\n    ? cliFiles\n    : findGraphqlTagReferences(process.cwd());\n\n/** Step (2) */\n\nconst files = processFiles(inputFiles, (f) => {\n    if (existsSync(f)) {\n        return readFileSync(f, 'utf8');\n    }\n    if (existsSync(f + '.js')) {\n        return readFileSync(f + '.js', 'utf8');\n    }\n    throw new Error(`Unable to find ${f}`);\n});\n\nlet filesHadErrors = false;\nObject.keys(files).forEach((key) => {\n    const file = files[key];\n    if (file.errors.length) {\n        filesHadErrors = true;\n        console.error(`Errors in ${file.path}`);\n        file.errors.forEach((error) => {\n            console.error(` - ${error.message}`);\n        });\n    }\n});\n\nif (filesHadErrors) {\n    console.error('Aborting');\n    process.exit(1); // eslint-disable-line flowtype-errors/uncovered\n}\n\n/** Step (3) */\n\nconst {resolved, errors} = resolveDocuments(files);\nif (errors.length) {\n    errors.forEach((error) => {\n        console.error(`Resolution error ${error.message} in ${error.loc.path}`);\n    });\n    console.error('Aborting');\n    process.exit(1); // eslint-disable-line flowtype-errors/uncovered\n}\n\nconsole.log(Object.keys(resolved).length, 'resolved queries');\n\n/** Step (4) */\n\nlet validationFailures: number = 0;\nconst printedOperations: Array<string> = [];\n\nObject.keys(resolved).forEach((k) => {\n    const {document, raw} = resolved[k];\n    if (config.excludes.some((rx) => rx.test(raw.loc.path))) {\n        return; // skip\n    }\n    const hasNonFragments = document.definitions.some(\n        ({kind}) => kind !== 'FragmentDefinition',\n    );\n    const rawSource: string = raw.literals[0];\n\n    // eslint-disable-next-line flowtype-errors/uncovered\n    const withTypeNames: DocumentNode = addTypenameToDocument(document);\n    const printed = print(withTypeNames);\n    if (hasNonFragments && !printedOperations.includes(printed)) {\n        printedOperations.push(printed);\n    }\n\n    const processedOptions = processPragmas(config.options, rawSource);\n    if (!processedOptions) {\n        return;\n    }\n\n    if (hasNonFragments) {\n        /* eslint-disable flowtype-errors/uncovered */\n        const errors = validate(schemaForValidation, withTypeNames);\n        /* eslint-disable flowtype-errors/uncovered */\n        if (errors.length) {\n            errors.forEach((error) => {\n                console.error(\n                    `Schema validation found errors for ${raw.loc.path}!`,\n                );\n                console.error(printed);\n                console.error(error);\n                validationFailures++;\n            });\n        }\n        /* eslint-enable flowtype-errors/uncovered */\n    }\n\n    try {\n        generateTypeFiles(\n            raw.loc.path,\n            schemaForTypeGeneration,\n            withTypeNames,\n            processedOptions,\n        );\n        // eslint-disable-next-line flowtype-errors/uncovered\n    } catch (err) {\n        console.error(`Error while generating operation from ${raw.loc.path}`);\n        console.error(printed);\n        // eslint-disable-next-line flowtype-errors/uncovered\n        console.error(err);\n        validationFailures++;\n    }\n});\n\nif (validationFailures) {\n    console.error(\n        `Encountered ${validationFailures} validation failures while printing types.`,\n    );\n    // eslint-disable-next-line flowtype-errors/uncovered\n    process.exit(1);\n}\n\nif (config.dumpOperations) {\n    const dumpOperations = config.dumpOperations;\n    const parent = dirname(dumpOperations);\n    mkdirSync(parent, {recursive: true});\n    writeFileSync(\n        dumpOperations,\n        JSON.stringify(printedOperations.sort(), null, 2),\n    );\n}\n"],"file":"run.js"}

package/dist/generateTypeFiles.js

@@ -56,7 +56,7 @@ const generateTypeFileContents = (fileName, schema, document, options, generated
   }) => {
     // We write all generated files to a `__generated__` subdir to keep
     // things tidy.
-    const targetFileName = `${name}.js`;
+    const targetFileName = options.typeFileName ? options.typeFileName.replace('[operationName]', name) : `${name}.js`;
 
     const targetPath = _path.default.join(generatedDir, targetFileName);
 
@@ -82,10 +82,23 @@ const generateTypeFileContents = (fileName, schema, document, options, generated
 
 exports.generateTypeFileContents = generateTypeFileContents;
 
-const generateTypeFiles = (fileName, schema, document, options) => {
+const getGeneratedDir = (fileName, options) => {
   var _options$generatedDir;
 
-  const generatedDir = _path.default.join(_path.default.dirname(fileName), (_options$generatedDir = options.generatedDirectory) !== null && _options$generatedDir !== void 0 ? _options$generatedDir : '__generated__');
+  const generatedDirectory = (_options$generatedDir = options.generatedDirectory) !== null && _options$generatedDir !== void 0 ? _options$generatedDir : '__generated__';
+
+  if (_path.default.isAbsolute(generatedDirectory)) {
+    // fileName is absolute here, so we make it relative to cwd
+    // for more reasonable filenames.  We convert leading ..'s
+    // to `__` so this doesn't escape the output directory.
+    return _path.default.join(generatedDirectory, _path.default.relative(process.cwd(), _path.default.dirname(fileName)).replace(/\.\.\//g, '__/'));
+  } else {
+    return _path.default.join(_path.default.dirname(fileName), generatedDirectory);
+  }
+};
+
+const generateTypeFiles = (fileName, schema, document, options) => {
+  const generatedDir = getGeneratedDir(fileName, options);
 
   const indexFile = _path.default.join(generatedDir, 'index.js');
 
@@ -132,7 +145,8 @@ const processPragmas = (options, rawSource) => {
       scalars: options.scalars,
       splitTypes: options.splitTypes,
       generatedDirectory: options.generatedDirectory,
-      exportAllObjectTypes: options.exportAllObjectTypes
+      exportAllObjectTypes: options.exportAllObjectTypes,
+      typeFileName: options.typeFileName
     };
   } else {
     return null;

package/dist/generateTypeFiles.js.flow

@@ -20,6 +20,7 @@ export type ExternalOptions = {
     splitTypes?: boolean,
     generatedDirectory?: string,
     exportAllObjectTypes?: boolean,
+    typeFileName?: string,
 };
 
 export const indexPrelude = (regenerateCommand?: string): string => `// @flow
@@ -64,7 +65,9 @@ export const generateTypeFileContents = (
     generated.forEach(({name, typeName, code, isFragment, extraTypes}) => {
         // We write all generated files to a `__generated__` subdir to keep
         // things tidy.
-        const targetFileName = `${name}.js`;
+        const targetFileName = options.typeFileName
+            ? options.typeFileName.replace('[operationName]', name)
+            : `${name}.js`;
         const targetPath = path.join(generatedDir, targetFileName);
 
         let fileContents =
@@ -97,16 +100,30 @@ export const generateTypeFileContents = (
     return {files, indexContents};
 };
 
+const getGeneratedDir = (fileName: string, options: Options) => {
+    const generatedDirectory = options.generatedDirectory ?? '__generated__';
+    if (path.isAbsolute(generatedDirectory)) {
+        // fileName is absolute here, so we make it relative to cwd
+        // for more reasonable filenames.  We convert leading ..'s
+        // to `__` so this doesn't escape the output directory.
+        return path.join(
+            generatedDirectory,
+            path
+                .relative(process.cwd(), path.dirname(fileName))
+                .replace(/\.\.\//g, '__/'),
+        );
+    } else {
+        return path.join(path.dirname(fileName), generatedDirectory);
+    }
+};
+
 export const generateTypeFiles = (
     fileName: string,
     schema: Schema,
     document: DocumentNode,
     options: Options,
 ) => {
-    const generatedDir = path.join(
-        path.dirname(fileName),
-        options.generatedDirectory ?? '__generated__',
-    );
+    const generatedDir = getGeneratedDir(fileName, options);
     const indexFile = path.join(generatedDir, 'index.js');
 
     if (!fs.existsSync(generatedDir)) {
@@ -160,6 +177,7 @@ export const processPragmas = (
             splitTypes: options.splitTypes,
             generatedDirectory: options.generatedDirectory,
             exportAllObjectTypes: options.exportAllObjectTypes,
+            typeFileName: options.typeFileName,
         };
     } else {
         return null;

package/dist/generateTypeFiles.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateTypeFiles.js"],"names":["indexPrelude","regenerateCommand","generateTypeFileContents","fileName","schema","document","options","generatedDir","indexContents","files","addToIndex","filePath","typeName","newLine","path","basename","indexOf","lines","split","map","line","includes","join","generated","forEach","name","code","isFragment","extraTypes","targetFileName","targetPath","fileContents","splitTypes","Object","keys","replace","generateTypeFiles","dirname","generatedDirectory","indexFile","fs","existsSync","mkdirSync","recursive","writeFileSync","readFileSync","key","processPragmas","rawSource","ignorePragma","autogen","loosePragma","autogenStrict","pragma","noPragmas","strictNullability","readOnlyArray","scalars","exportAllObjectTypes"],"mappings":"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","sourcesContent":["// @flow\n// Import this in your jest setup, to mock out graphql-tag!\nimport type {DocumentNode} from 'graphql';\nimport type {Options, Schema, Scalars} from './types';\nimport fs from 'fs';\nimport path from 'path';\nimport {documentToFlowTypes} from '.';\n\nexport type ExternalOptions = {\n    pragma?: string,\n    loosePragma?: string,\n    ignorePragma?: string,\n    scalars?: Scalars,\n    strictNullability?: boolean,\n    /**\n     * The command that users should run to regenerate the types files.\n     */\n    regenerateCommand?: string,\n    readOnlyArray?: boolean,\n    splitTypes?: boolean,\n    generatedDirectory?: string,\n    exportAllObjectTypes?: boolean,\n};\n\nexport const indexPrelude = (regenerateCommand?: string): string => `// @flow\n//\n// AUTOGENERATED\n// NOTE: New response types are added to this file automatically.\n//       Outdated response types can be removed manually as they are deprecated.\n//${regenerateCommand ? '      To regenerate, run ' + regenerateCommand : ''}\n//\n\n`;\n\nexport const generateTypeFileContents = (\n    fileName: string,\n    schema: Schema,\n    document: DocumentNode,\n    options: Options,\n    generatedDir: string,\n    indexContents: string,\n): {indexContents: string, files: {[key: string]: string}} => {\n    const files = {};\n\n    /// Write export for __generated__/index.js if it doesn't exist\n    const addToIndex = (filePath, typeName) => {\n        const newLine = `export type {${typeName}} from './${path.basename(\n            filePath,\n        )}';`;\n        if (indexContents.indexOf('./' + path.basename(filePath)) === -1) {\n            indexContents += newLine + '\\n';\n        } else {\n            const lines = indexContents.split('\\n').map((line) => {\n                if (line.includes('./' + path.basename(filePath))) {\n                    return newLine;\n                }\n                return line;\n            });\n            indexContents = lines.join('\\n');\n        }\n    };\n\n    const generated = documentToFlowTypes(document, schema, options);\n    generated.forEach(({name, typeName, code, isFragment, extraTypes}) => {\n        // We write all generated files to a `__generated__` subdir to keep\n        // things tidy.\n        const targetFileName = `${name}.js`;\n        const targetPath = path.join(generatedDir, targetFileName);\n\n        let fileContents =\n            '// @' +\n            `flow\\n// AUTOGENERATED -- DO NOT EDIT\\n` +\n            `// Generated for operation '${name}' in file '../${path.basename(\n                fileName,\n            )}'\\n` +\n            (options.regenerateCommand\n                ? `// To regenerate, run '${options.regenerateCommand}'.\\n`\n                : '') +\n            code;\n        if (options.splitTypes && !isFragment) {\n            fileContents +=\n                `\\nexport type ${name} = ${typeName}['response'];\\n` +\n                `export type ${name}Variables = ${typeName}['variables'];\\n`;\n        }\n        Object.keys(extraTypes).forEach((name) => {\n            fileContents += `\\n\\nexport type ${name} = ${extraTypes[name]};`;\n        });\n\n        addToIndex(targetPath, typeName);\n        files[targetPath] =\n            fileContents\n                // Remove whitespace from the ends of lines; babel's generate sometimes\n                // leaves them hanging around.\n                .replace(/\\s+$/gm, '') + '\\n';\n    });\n\n    return {files, indexContents};\n};\n\nexport const generateTypeFiles = (\n    fileName: string,\n    schema: Schema,\n    document: DocumentNode,\n    options: Options,\n) => {\n    const generatedDir = path.join(\n        path.dirname(fileName),\n        options.generatedDirectory ?? '__generated__',\n    );\n    const indexFile = path.join(generatedDir, 'index.js');\n\n    if (!fs.existsSync(generatedDir)) {\n        fs.mkdirSync(generatedDir, {recursive: true});\n    }\n    if (!fs.existsSync(indexFile)) {\n        fs.writeFileSync(indexFile, indexPrelude(options.regenerateCommand));\n    }\n\n    const {indexContents, files} = generateTypeFileContents(\n        fileName,\n        schema,\n        document,\n        options,\n        generatedDir,\n        fs.readFileSync(indexFile, 'utf8'),\n    );\n\n    fs.writeFileSync(indexFile, indexContents);\n    Object.keys(files).forEach((key) => {\n        fs.writeFileSync(key, files[key]);\n    });\n\n    fs.writeFileSync(indexFile, indexContents);\n};\n\nexport const processPragmas = (\n    options: ExternalOptions,\n    rawSource: string,\n): null | Options => {\n    if (options.ignorePragma && rawSource.includes(options.ignorePragma)) {\n        return null;\n    }\n\n    const autogen = options.loosePragma\n        ? rawSource.includes(options.loosePragma)\n        : false;\n    const autogenStrict = options.pragma\n        ? rawSource.includes(options.pragma)\n        : false;\n    const noPragmas = !options.loosePragma && !options.pragma;\n\n    if (autogen || autogenStrict || noPragmas) {\n        return {\n            regenerateCommand: options.regenerateCommand,\n            strictNullability: noPragmas\n                ? options.strictNullability\n                : autogenStrict || !autogen,\n            readOnlyArray: options.readOnlyArray,\n            scalars: options.scalars,\n            splitTypes: options.splitTypes,\n            generatedDirectory: options.generatedDirectory,\n            exportAllObjectTypes: options.exportAllObjectTypes,\n        };\n    } else {\n        return null;\n    }\n};\n"],"file":"generateTypeFiles.js"}
+{"version":3,"sources":["../src/generateTypeFiles.js"],"names":["indexPrelude","regenerateCommand","generateTypeFileContents","fileName","schema","document","options","generatedDir","indexContents","files","addToIndex","filePath","typeName","newLine","path","basename","indexOf","lines","split","map","line","includes","join","generated","forEach","name","code","isFragment","extraTypes","targetFileName","typeFileName","replace","targetPath","fileContents","splitTypes","Object","keys","getGeneratedDir","generatedDirectory","isAbsolute","relative","process","cwd","dirname","generateTypeFiles","indexFile","fs","existsSync","mkdirSync","recursive","writeFileSync","readFileSync","key","processPragmas","rawSource","ignorePragma","autogen","loosePragma","autogenStrict","pragma","noPragmas","strictNullability","readOnlyArray","scalars","exportAllObjectTypes"],"mappings":"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","sourcesContent":["// @flow\n// Import this in your jest setup, to mock out graphql-tag!\nimport type {DocumentNode} from 'graphql';\nimport type {Options, Schema, Scalars} from './types';\nimport fs from 'fs';\nimport path from 'path';\nimport {documentToFlowTypes} from '.';\n\nexport type ExternalOptions = {\n    pragma?: string,\n    loosePragma?: string,\n    ignorePragma?: string,\n    scalars?: Scalars,\n    strictNullability?: boolean,\n    /**\n     * The command that users should run to regenerate the types files.\n     */\n    regenerateCommand?: string,\n    readOnlyArray?: boolean,\n    splitTypes?: boolean,\n    generatedDirectory?: string,\n    exportAllObjectTypes?: boolean,\n    typeFileName?: string,\n};\n\nexport const indexPrelude = (regenerateCommand?: string): string => `// @flow\n//\n// AUTOGENERATED\n// NOTE: New response types are added to this file automatically.\n//       Outdated response types can be removed manually as they are deprecated.\n//${regenerateCommand ? '      To regenerate, run ' + regenerateCommand : ''}\n//\n\n`;\n\nexport const generateTypeFileContents = (\n    fileName: string,\n    schema: Schema,\n    document: DocumentNode,\n    options: Options,\n    generatedDir: string,\n    indexContents: string,\n): {indexContents: string, files: {[key: string]: string}} => {\n    const files = {};\n\n    /// Write export for __generated__/index.js if it doesn't exist\n    const addToIndex = (filePath, typeName) => {\n        const newLine = `export type {${typeName}} from './${path.basename(\n            filePath,\n        )}';`;\n        if (indexContents.indexOf('./' + path.basename(filePath)) === -1) {\n            indexContents += newLine + '\\n';\n        } else {\n            const lines = indexContents.split('\\n').map((line) => {\n                if (line.includes('./' + path.basename(filePath))) {\n                    return newLine;\n                }\n                return line;\n            });\n            indexContents = lines.join('\\n');\n        }\n    };\n\n    const generated = documentToFlowTypes(document, schema, options);\n    generated.forEach(({name, typeName, code, isFragment, extraTypes}) => {\n        // We write all generated files to a `__generated__` subdir to keep\n        // things tidy.\n        const targetFileName = options.typeFileName\n            ? options.typeFileName.replace('[operationName]', name)\n            : `${name}.js`;\n        const targetPath = path.join(generatedDir, targetFileName);\n\n        let fileContents =\n            '// @' +\n            `flow\\n// AUTOGENERATED -- DO NOT EDIT\\n` +\n            `// Generated for operation '${name}' in file '../${path.basename(\n                fileName,\n            )}'\\n` +\n            (options.regenerateCommand\n                ? `// To regenerate, run '${options.regenerateCommand}'.\\n`\n                : '') +\n            code;\n        if (options.splitTypes && !isFragment) {\n            fileContents +=\n                `\\nexport type ${name} = ${typeName}['response'];\\n` +\n                `export type ${name}Variables = ${typeName}['variables'];\\n`;\n        }\n        Object.keys(extraTypes).forEach((name) => {\n            fileContents += `\\n\\nexport type ${name} = ${extraTypes[name]};`;\n        });\n\n        addToIndex(targetPath, typeName);\n        files[targetPath] =\n            fileContents\n                // Remove whitespace from the ends of lines; babel's generate sometimes\n                // leaves them hanging around.\n                .replace(/\\s+$/gm, '') + '\\n';\n    });\n\n    return {files, indexContents};\n};\n\nconst getGeneratedDir = (fileName: string, options: Options) => {\n    const generatedDirectory = options.generatedDirectory ?? '__generated__';\n    if (path.isAbsolute(generatedDirectory)) {\n        // fileName is absolute here, so we make it relative to cwd\n        // for more reasonable filenames.  We convert leading ..'s\n        // to `__` so this doesn't escape the output directory.\n        return path.join(\n            generatedDirectory,\n            path\n                .relative(process.cwd(), path.dirname(fileName))\n                .replace(/\\.\\.\\//g, '__/'),\n        );\n    } else {\n        return path.join(path.dirname(fileName), generatedDirectory);\n    }\n};\n\nexport const generateTypeFiles = (\n    fileName: string,\n    schema: Schema,\n    document: DocumentNode,\n    options: Options,\n) => {\n    const generatedDir = getGeneratedDir(fileName, options);\n    const indexFile = path.join(generatedDir, 'index.js');\n\n    if (!fs.existsSync(generatedDir)) {\n        fs.mkdirSync(generatedDir, {recursive: true});\n    }\n    if (!fs.existsSync(indexFile)) {\n        fs.writeFileSync(indexFile, indexPrelude(options.regenerateCommand));\n    }\n\n    const {indexContents, files} = generateTypeFileContents(\n        fileName,\n        schema,\n        document,\n        options,\n        generatedDir,\n        fs.readFileSync(indexFile, 'utf8'),\n    );\n\n    fs.writeFileSync(indexFile, indexContents);\n    Object.keys(files).forEach((key) => {\n        fs.writeFileSync(key, files[key]);\n    });\n\n    fs.writeFileSync(indexFile, indexContents);\n};\n\nexport const processPragmas = (\n    options: ExternalOptions,\n    rawSource: string,\n): null | Options => {\n    if (options.ignorePragma && rawSource.includes(options.ignorePragma)) {\n        return null;\n    }\n\n    const autogen = options.loosePragma\n        ? rawSource.includes(options.loosePragma)\n        : false;\n    const autogenStrict = options.pragma\n        ? rawSource.includes(options.pragma)\n        : false;\n    const noPragmas = !options.loosePragma && !options.pragma;\n\n    if (autogen || autogenStrict || noPragmas) {\n        return {\n            regenerateCommand: options.regenerateCommand,\n            strictNullability: noPragmas\n                ? options.strictNullability\n                : autogenStrict || !autogen,\n            readOnlyArray: options.readOnlyArray,\n            scalars: options.scalars,\n            splitTypes: options.splitTypes,\n            generatedDirectory: options.generatedDirectory,\n            exportAllObjectTypes: options.exportAllObjectTypes,\n            typeFileName: options.typeFileName,\n        };\n    } else {\n        return null;\n    }\n};\n"],"file":"generateTypeFiles.js"}

package/dist/types.js.flow

@@ -22,6 +22,7 @@ export type Options = {|
     splitTypes?: boolean,
     generatedDirectory?: string,
     exportAllObjectTypes?: boolean,
+    typeFileName?: string,
 |};
 
 export type Schema = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@khanacademy/graphql-flow",
-    "version": "0.2.2",
+    "version": "0.2.5",
     "bin": {
         "graphql-flow": "./dist/cli/run.js"
     },

package/src/__test__/generateTypeFileContents.test.js

@@ -58,4 +58,46 @@ describe('generateTypeFileContents', () => {
             "
         `);
     });
+
+    it('should respect the typeFileName option', () => {
+        const {files} = generateTypeFileContents(
+            'hello.js',
+            exampleSchema,
+            gql`
+                query Hello {
+                    human(id: "Han") {
+                        id
+                    }
+                }
+            `,
+            {
+                splitTypes: true,
+                typeFileName: 'prefix-[operationName]-suffix.js',
+            },
+            '__generated__',
+            indexPrelude('yarn queries'),
+        );
+        expect(
+            Object.keys(files)
+                .map((k) => `// ${k}\n${files[k]}`)
+                .join('\n\n'),
+        ).toMatchInlineSnapshot(`
+            "// __generated__/prefix-Hello-suffix.js
+            // @flow
+            // AUTOGENERATED -- DO NOT EDIT
+            // Generated for operation 'Hello' in file '../hello.js'
+            export type HelloType = {|
+                variables: {||},
+                response: {|
+              /** A human character*/
+              human: ?{|
+                id: string
+              |}
+            |}
+            |};
+            export type Hello = HelloType['response'];
+            export type HelloVariables = HelloType['variables'];
+            "
+        `);
+    });
 });

package/src/cli/config.js

@@ -18,6 +18,7 @@ import path from 'path';
 export type CliConfig = {
     excludes: Array<RegExp>,
     schemaFilePath: string,
+    dumpOperations?: string,
     options: ExternalOptions,
 };
 
@@ -29,12 +30,18 @@ type JSONConfig = {
     excludes?: Array<string>,
     schemaFilePath: string,
     options?: ExternalOptions,
+    dumpOperations?: string,
 };
 
 export const loadConfigFile = (configFile: string): CliConfig => {
     // eslint-disable-next-line flowtype-errors/uncovered
     const data: JSONConfig = JSON.parse(fs.readFileSync(configFile, 'utf8'));
-    const toplevelKeys = ['excludes', 'schemaFilePath', 'options'];
+    const toplevelKeys = [
+        'excludes',
+        'schemaFilePath',
+        'options',
+        'dumpOperations',
+    ];
     Object.keys(data).forEach((k) => {
         if (!toplevelKeys.includes(k)) {
             throw new Error(
@@ -56,6 +63,7 @@ export const loadConfigFile = (configFile: string): CliConfig => {
             'splitTypes',
             'generatedDirectory',
             'exportAllObjectTypes',
+            'typeFileName',
         ];
         Object.keys(data.options).forEach((k) => {
             if (!externalOptionsKeys.includes(k)) {
@@ -70,10 +78,10 @@ export const loadConfigFile = (configFile: string): CliConfig => {
     return {
         options: data.options ?? {},
         excludes: data.excludes?.map((string) => new RegExp(string)) ?? [],
-        schemaFilePath: path.join(
-            path.dirname(configFile),
-            data.schemaFilePath,
-        ),
+        schemaFilePath: path.isAbsolute(data.schemaFilePath)
+            ? data.schemaFilePath
+            : path.join(path.dirname(configFile), data.schemaFilePath),
+        dumpOperations: data.dumpOperations,
     };
 };
 

package/src/cli/run.js

@@ -9,11 +9,12 @@ import {getSchemas, loadConfigFile} from './config';
 import {addTypenameToDocument} from 'apollo-utilities'; // eslint-disable-line flowtype-errors/uncovered
 
 import {execSync} from 'child_process';
-import {readFileSync} from 'fs';
+import {existsSync, mkdirSync, readFileSync, writeFileSync} from 'fs';
 import {type DocumentNode} from 'graphql';
 import {print} from 'graphql/language/printer';
 import {validate} from 'graphql/validation';
 import path from 'path';
+import {dirname} from 'path';
 
 /**
  * This CLI tool executes the following steps:
@@ -68,7 +69,15 @@ const inputFiles = cliFiles.length
 
 /** Step (2) */
 
-const files = processFiles(inputFiles, (f) => readFileSync(f, 'utf8'));
+const files = processFiles(inputFiles, (f) => {
+    if (existsSync(f)) {
+        return readFileSync(f, 'utf8');
+    }
+    if (existsSync(f + '.js')) {
+        return readFileSync(f + '.js', 'utf8');
+    }
+    throw new Error(`Unable to find ${f}`);
+});
 
 let filesHadErrors = false;
 Object.keys(files).forEach((key) => {
@@ -103,6 +112,7 @@ console.log(Object.keys(resolved).length, 'resolved queries');
 /** Step (4) */
 
 let validationFailures: number = 0;
+const printedOperations: Array<string> = [];
 
 Object.keys(resolved).forEach((k) => {
     const {document, raw} = resolved[k];
@@ -113,14 +123,18 @@ Object.keys(resolved).forEach((k) => {
         ({kind}) => kind !== 'FragmentDefinition',
     );
     const rawSource: string = raw.literals[0];
-    const processedOptions = processPragmas(config.options, rawSource);
-    if (!processedOptions) {
-        return;
-    }
 
     // eslint-disable-next-line flowtype-errors/uncovered
     const withTypeNames: DocumentNode = addTypenameToDocument(document);
     const printed = print(withTypeNames);
+    if (hasNonFragments && !printedOperations.includes(printed)) {
+        printedOperations.push(printed);
+    }
+
+    const processedOptions = processPragmas(config.options, rawSource);
+    if (!processedOptions) {
+        return;
+    }
 
     if (hasNonFragments) {
         /* eslint-disable flowtype-errors/uncovered */
@@ -163,3 +177,13 @@ if (validationFailures) {
     // eslint-disable-next-line flowtype-errors/uncovered
     process.exit(1);
 }
+
+if (config.dumpOperations) {
+    const dumpOperations = config.dumpOperations;
+    const parent = dirname(dumpOperations);
+    mkdirSync(parent, {recursive: true});
+    writeFileSync(
+        dumpOperations,
+        JSON.stringify(printedOperations.sort(), null, 2),
+    );
+}

package/src/generateTypeFiles.js

@@ -20,6 +20,7 @@ export type ExternalOptions = {
     splitTypes?: boolean,
     generatedDirectory?: string,
     exportAllObjectTypes?: boolean,
+    typeFileName?: string,
 };
 
 export const indexPrelude = (regenerateCommand?: string): string => `// @flow
@@ -64,7 +65,9 @@ export const generateTypeFileContents = (
     generated.forEach(({name, typeName, code, isFragment, extraTypes}) => {
         // We write all generated files to a `__generated__` subdir to keep
         // things tidy.
-        const targetFileName = `${name}.js`;
+        const targetFileName = options.typeFileName
+            ? options.typeFileName.replace('[operationName]', name)
+            : `${name}.js`;
         const targetPath = path.join(generatedDir, targetFileName);
 
         let fileContents =
@@ -97,16 +100,30 @@ export const generateTypeFileContents = (
     return {files, indexContents};
 };
 
+const getGeneratedDir = (fileName: string, options: Options) => {
+    const generatedDirectory = options.generatedDirectory ?? '__generated__';
+    if (path.isAbsolute(generatedDirectory)) {
+        // fileName is absolute here, so we make it relative to cwd
+        // for more reasonable filenames.  We convert leading ..'s
+        // to `__` so this doesn't escape the output directory.
+        return path.join(
+            generatedDirectory,
+            path
+                .relative(process.cwd(), path.dirname(fileName))
+                .replace(/\.\.\//g, '__/'),
+        );
+    } else {
+        return path.join(path.dirname(fileName), generatedDirectory);
+    }
+};
+
 export const generateTypeFiles = (
     fileName: string,
     schema: Schema,
     document: DocumentNode,
     options: Options,
 ) => {
-    const generatedDir = path.join(
-        path.dirname(fileName),
-        options.generatedDirectory ?? '__generated__',
-    );
+    const generatedDir = getGeneratedDir(fileName, options);
     const indexFile = path.join(generatedDir, 'index.js');
 
     if (!fs.existsSync(generatedDir)) {
@@ -160,6 +177,7 @@ export const processPragmas = (
             splitTypes: options.splitTypes,
             generatedDirectory: options.generatedDirectory,
             exportAllObjectTypes: options.exportAllObjectTypes,
+            typeFileName: options.typeFileName,
         };
     } else {
         return null;

package/src/types.js

@@ -22,6 +22,7 @@ export type Options = {|
     splitTypes?: boolean,
     generatedDirectory?: string,
     exportAllObjectTypes?: boolean,
+    typeFileName?: string,
 |};
 
 export type Schema = {