@khanacademy/graphql-flow 0.2.3 → 0.3.0

package/dist/cli/run.js

@@ -21,9 +21,13 @@ 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 }; }
+var _utils = require("./utils");
+
+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
 
@@ -56,7 +60,17 @@ Usage: graphql-flow [configFile.json] [filesToCrawl...]`);
   process.exit(1); // eslint-disable-line flowtype-errors/uncovered
 }
 
-const config = (0, _config.loadConfigFile)(configFile);
+const config = (0, _config.loadConfigFile)(configFile); // find file paths ending with "graphql-flow.config.json"
+
+const subConfigsQuery = () => (0, _child_process.execSync)('git ls-files "*graphql-flow.config.json"', {
+  encoding: 'utf8',
+  cwd: process.cwd()
+});
+
+const subConfigMap = (0, _config.loadDirConfigFiles)(subConfigsQuery(), {
+  config,
+  path: configFile
+});
 const [schemaForValidation, schemaForTypeGeneration] = (0, _config.getSchemas)(config.schemaFilePath);
 const inputFiles = cliFiles.length ? cliFiles : findGraphqlTagReferences(process.cwd());
 /** Step (2) */
@@ -109,30 +123,41 @@ console.log(Object.keys(resolved).length, 'resolved queries');
 /** Step (4) */
 
 let validationFailures = 0;
+const printedOperations = [];
 Object.keys(resolved).forEach(k => {
   const {
     document,
     raw
   } = resolved[k];
+  let fileConfig = config;
+  const closestConfigPath = (0, _utils.longestMatchingPath)(raw.loc.path, Object.keys(subConfigMap)); // get longest match in the case of nested subconfigs
 
-  if (config.excludes.some(rx => rx.test(raw.loc.path))) {
+  if (closestConfigPath) {
+    fileConfig = subConfigMap[closestConfigPath];
+  }
+
+  if (fileConfig.excludes.some(rx => rx.test(raw.loc.path))) {
     return; // skip
   }
 
   const hasNonFragments = document.definitions.some(({
     kind
   }) => kind !== 'FragmentDefinition');
-  const rawSource = raw.literals[0];
-  const processedOptions = (0, _generateTypeFiles.processPragmas)(config.options, rawSource);
-
-  if (!processedOptions) {
-    return;
-  } // eslint-disable-next-line flowtype-errors/uncovered
-
+  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)(fileConfig.options, rawSource);
+
+  if (!processedOptions) {
+    return;
+  }
+
   if (hasNonFragments) {
     /* eslint-disable flowtype-errors/uncovered */
     const errors = (0, _validation.validate)(schemaForValidation, withTypeNames);
@@ -166,4 +191,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

@@ -4,16 +4,18 @@
 import {generateTypeFiles, processPragmas} from '../generateTypeFiles';
 import {processFiles} from '../parser/parse';
 import {resolveDocuments} from '../parser/resolve';
-import {getSchemas, loadConfigFile} from './config';
+import {loadDirConfigFiles, getSchemas, loadConfigFile} from './config';
 
 import {addTypenameToDocument} from 'apollo-utilities'; // eslint-disable-line flowtype-errors/uncovered
 
 import {execSync} from 'child_process';
-import {existsSync, 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';
+import {longestMatchingPath} from './utils';
 
 /**
  * This CLI tool executes the following steps:
@@ -58,6 +60,17 @@ Usage: graphql-flow [configFile.json] [filesToCrawl...]`);
 
 const config = loadConfigFile(configFile);
 
+// find file paths ending with "graphql-flow.config.json"
+const subConfigsQuery = () =>
+    execSync('git ls-files "*graphql-flow.config.json"', {
+        encoding: 'utf8',
+        cwd: process.cwd(),
+    });
+const subConfigMap = loadDirConfigFiles(subConfigsQuery(), {
+    config,
+    path: configFile,
+});
+
 const [schemaForValidation, schemaForTypeGeneration] = getSchemas(
     config.schemaFilePath,
 );
@@ -111,24 +124,39 @@ 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];
-    if (config.excludes.some((rx) => rx.test(raw.loc.path))) {
+
+    let fileConfig = config;
+    const closestConfigPath = longestMatchingPath(
+        raw.loc.path,
+        Object.keys(subConfigMap),
+    ); // get longest match in the case of nested subconfigs
+    if (closestConfigPath) {
+        fileConfig = subConfigMap[closestConfigPath];
+    }
+
+    if (fileConfig.excludes.some((rx) => rx.test(raw.loc.path))) {
         return; // skip
     }
     const hasNonFragments = document.definitions.some(
         ({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(fileConfig.options, rawSource);
+    if (!processedOptions) {
+        return;
+    }
 
     if (hasNonFragments) {
         /* eslint-disable flowtype-errors/uncovered */
@@ -171,3 +199,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","Error","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 {existsSync, 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) => {\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;\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","subConfigsQuery","subConfigMap","schemaForValidation","schemaForTypeGeneration","schemaFilePath","inputFiles","length","files","f","Error","filesHadErrors","Object","keys","forEach","key","file","errors","error","message","resolved","loc","validationFailures","printedOperations","k","document","raw","fileConfig","closestConfigPath","excludes","some","rx","test","hasNonFragments","definitions","kind","rawSource","literals","withTypeNames","printed","includes","push","processedOptions","options","err","dumpOperations","parent","recursive","JSON","stringify","sort"],"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 {loadDirConfigFiles, 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';\nimport {longestMatchingPath} from './utils';\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\n// find file paths ending with \"graphql-flow.config.json\"\nconst subConfigsQuery = () =>\n    execSync('git ls-files \"*graphql-flow.config.json\"', {\n        encoding: 'utf8',\n        cwd: process.cwd(),\n    });\nconst subConfigMap = loadDirConfigFiles(subConfigsQuery(), {\n    config,\n    path: configFile,\n});\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\n    let fileConfig = config;\n    const closestConfigPath = longestMatchingPath(\n        raw.loc.path,\n        Object.keys(subConfigMap),\n    ); // get longest match in the case of nested subconfigs\n    if (closestConfigPath) {\n        fileConfig = subConfigMap[closestConfigPath];\n    }\n\n    if (fileConfig.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(fileConfig.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/cli/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.longestMatchingPath = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const longestMatchingPath = (filePath, subConfigPaths) => {
+  const {
+    dir
+  } = _path.default.parse(filePath);
+
+  return subConfigPaths.reduce((closest, key) => dir.includes(key) && closest.length < key.length ? key : closest, '');
+};
+
+exports.longestMatchingPath = longestMatchingPath;
+//# sourceMappingURL=utils.js.map

package/dist/cli/utils.js.flow

@@ -0,0 +1,14 @@
+// @flow
+import path from 'path';
+
+export const longestMatchingPath = (
+    filePath: string,
+    subConfigPaths: string[],
+): string => {
+    const {dir} = path.parse(filePath);
+    return subConfigPaths.reduce(
+        (closest: string, key: string) =>
+            dir.includes(key) && closest.length < key.length ? key : closest,
+        '',
+    );
+};

package/dist/cli/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/cli/utils.js"],"names":["longestMatchingPath","filePath","subConfigPaths","dir","path","parse","reduce","closest","key","includes","length"],"mappings":";;;;;;;AACA;;;;AAEO,MAAMA,mBAAmB,GAAG,CAC/BC,QAD+B,EAE/BC,cAF+B,KAGtB;AACT,QAAM;AAACC,IAAAA;AAAD,MAAQC,cAAKC,KAAL,CAAWJ,QAAX,CAAd;;AACA,SAAOC,cAAc,CAACI,MAAf,CACH,CAACC,OAAD,EAAkBC,GAAlB,KACIL,GAAG,CAACM,QAAJ,CAAaD,GAAb,KAAqBD,OAAO,CAACG,MAAR,GAAiBF,GAAG,CAACE,MAA1C,GAAmDF,GAAnD,GAAyDD,OAF1D,EAGH,EAHG,CAAP;AAKH,CAVM","sourcesContent":["// @flow\nimport path from 'path';\n\nexport const longestMatchingPath = (\n    filePath: string,\n    subConfigPaths: string[],\n): string => {\n    const {dir} = path.parse(filePath);\n    return subConfigPaths.reduce(\n        (closest: string, key: string) =>\n            dir.includes(key) && closest.length < key.length ? key : closest,\n        '',\n    );\n};\n"],"file":"utils.js"}

package/dist/enums.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.scalarTypeToFlow = exports.enumTypeToFlow = exports.builtinScalars = void 0;
+exports.scalarTypeToFlow = exports.experimentalEnumTypeToFlow = exports.enumTypeToFlow = exports.builtinScalars = void 0;
 
 var babelTypes = _interopRequireWildcard(require("@babel/types"));
 
@@ -16,6 +16,19 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /**
  * Both input & output types can have enums & scalars.
  */
+const experimentalEnumTypeToFlow = (config, 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)))));
+
+  if (config.experimentalEnumsMap) {
+    config.experimentalEnumsMap[enumConfig.name] = enumDeclaration;
+  }
+
+  return (0, _utils.maybeAddDescriptionComment)(description, babelTypes.genericTypeAnnotation(enumDeclaration.id));
+};
+
+exports.experimentalEnumTypeToFlow = experimentalEnumTypeToFlow;
+
 const enumTypeToFlow = (config, name) => {
   const enumConfig = config.schema.enumsByName[name];
   let combinedDescription = enumConfig.enumValues.map(n => `- ${n.name}` + (n.description ? '\n\n      ' + n.description.replace(/\n/g, '\n      ') : '')).join('\n');
@@ -24,7 +37,7 @@ const enumTypeToFlow = (config, name) => {
     combinedDescription = enumConfig.description + '\n\n' + combinedDescription;
   }
 
-  return (0, _utils.maybeAddDescriptionComment)(combinedDescription, babelTypes.unionTypeAnnotation(enumConfig.enumValues.map(n => babelTypes.stringLiteralTypeAnnotation(n.name))));
+  return config.experimentalEnumsMap ? experimentalEnumTypeToFlow(config, enumConfig, combinedDescription) : (0, _utils.maybeAddDescriptionComment)(combinedDescription, babelTypes.unionTypeAnnotation(enumConfig.enumValues.map(n => babelTypes.stringLiteralTypeAnnotation(n.name))));
 };
 
 exports.enumTypeToFlow = enumTypeToFlow;

package/dist/enums.js.flow

@@ -3,9 +3,35 @@
  * Both input & output types can have enums & scalars.
  */
 import * as babelTypes from '@babel/types';
-import {type BabelNodeFlowType} from '@babel/types';
+import type {BabelNodeFlowType} from '@babel/types';
 import type {Config} from './types';
 import {maybeAddDescriptionComment} from './utils';
+import type {IntrospectionEnumType} from 'graphql/utilities/introspectionQuery';
+
+export const experimentalEnumTypeToFlow = (
+    config: Config,
+    enumConfig: IntrospectionEnumType,
+    description: string,
+): BabelNodeFlowType => {
+    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)),
+            ),
+        ),
+    );
+
+    if (config.experimentalEnumsMap) {
+        config.experimentalEnumsMap[enumConfig.name] = enumDeclaration;
+    }
+
+    return maybeAddDescriptionComment(
+        description,
+        babelTypes.genericTypeAnnotation(enumDeclaration.id),
+    );
+};
 
 export const enumTypeToFlow = (
     config: Config,
@@ -25,14 +51,17 @@ export const enumTypeToFlow = (
         combinedDescription =
             enumConfig.description + '\n\n' + combinedDescription;
     }
-    return maybeAddDescriptionComment(
-        combinedDescription,
-        babelTypes.unionTypeAnnotation(
-            enumConfig.enumValues.map((n) =>
-                babelTypes.stringLiteralTypeAnnotation(n.name),
-            ),
-        ),
-    );
+
+    return config.experimentalEnumsMap
+        ? experimentalEnumTypeToFlow(config, enumConfig, combinedDescription)
+        : maybeAddDescriptionComment(
+              combinedDescription,
+              babelTypes.unionTypeAnnotation(
+                  enumConfig.enumValues.map((n) =>
+                      babelTypes.stringLiteralTypeAnnotation(n.name),
+                  ),
+              ),
+          );
 };
 
 export const builtinScalars: {[key: string]: string} = {

package/dist/enums.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/enums.js"],"names":["enumTypeToFlow","config","name","enumConfig","schema","enumsByName","combinedDescription","enumValues","map","n","description","replace","join","babelTypes","unionTypeAnnotation","stringLiteralTypeAnnotation","builtinScalars","Boolean","String","DateTime","Date","ID","Int","Float","scalarTypeToFlow","genericTypeAnnotation","identifier","underlyingType","scalars","errors","push"],"mappings":";;;;;;;AAIA;;AAGA;;;;;;AANA;AACA;AACA;AAMO,MAAMA,cAAc,GAAG,CAC1BC,MAD0B,EAE1BC,IAF0B,KAGN;AACpB,QAAMC,UAAU,GAAGF,MAAM,CAACG,MAAP,CAAcC,WAAd,CAA0BH,IAA1B,CAAnB;AACA,MAAII,mBAAmB,GAAGH,UAAU,CAACI,UAAX,CACrBC,GADqB,CAEjBC,CAAD,IACK,KAAIA,CAAC,CAACP,IAAK,EAAZ,IACCO,CAAC,CAACC,WAAF,GACK,eAAeD,CAAC,CAACC,WAAF,CAAcC,OAAd,CAAsB,KAAtB,EAA6B,UAA7B,CADpB,GAEK,EAHN,CAHc,EAQrBC,IARqB,CAQhB,IARgB,CAA1B;;AASA,MAAIT,UAAU,CAACO,WAAf,EAA4B;AACxBJ,IAAAA,mBAAmB,GACfH,UAAU,CAACO,WAAX,GAAyB,MAAzB,GAAkCJ,mBADtC;AAEH;;AACD,SAAO,uCACHA,mBADG,EAEHO,UAAU,CAACC,mBAAX,CACIX,UAAU,CAACI,UAAX,CAAsBC,GAAtB,CAA2BC,CAAD,IACtBI,UAAU,CAACE,2BAAX,CAAuCN,CAAC,CAACP,IAAzC,CADJ,CADJ,CAFG,CAAP;AAQH,CA1BM;;;AA4BA,MAAMc,cAAuC,GAAG;AACnDC,EAAAA,OAAO,EAAE,SAD0C;AAEnDC,EAAAA,MAAM,EAAE,QAF2C;AAGnDC,EAAAA,QAAQ,EAAE,QAHyC;AAInDC,EAAAA,IAAI,EAAE,QAJ6C;AAKnDC,EAAAA,EAAE,EAAE,QAL+C;AAMnDC,EAAAA,GAAG,EAAE,QAN8C;AAOnDC,EAAAA,KAAK,EAAE;AAP4C,CAAhD;;;AAUA,MAAMC,gBAAgB,GAAG,CAC5BvB,MAD4B,EAE5BC,IAF4B,KAGR;AACpB,MAAIc,cAAc,CAACd,IAAD,CAAlB,EAA0B;AACtB,WAAOW,UAAU,CAACY,qBAAX,CACHZ,UAAU,CAACa,UAAX,CAAsBV,cAAc,CAACd,IAAD,CAApC,CADG,CAAP;AAGH;;AACD,QAAMyB,cAAc,GAAG1B,MAAM,CAAC2B,OAAP,CAAe1B,IAAf,CAAvB;;AACA,MAAIyB,cAAc,IAAI,IAAtB,EAA4B;AACxB,WAAOd,UAAU,CAACY,qBAAX,CACHZ,UAAU,CAACa,UAAX,CAAsBC,cAAtB,CADG,CAAP;AAGH;;AACD1B,EAAAA,MAAM,CAAC4B,MAAP,CAAcC,IAAd,CACK,sBAAqB5B,IAAK,sFAD/B;AAGA,SAAOW,UAAU,CAACY,qBAAX,CACHZ,UAAU,CAACa,UAAX,CAAuB,mBAAkBxB,IAAK,IAA9C,CADG,CAAP;AAGH,CArBM","sourcesContent":["// @flow\n/**\n * Both input & output types can have enums & scalars.\n */\nimport * as babelTypes from '@babel/types';\nimport {type BabelNodeFlowType} from '@babel/types';\nimport type {Config} from './types';\nimport {maybeAddDescriptionComment} from './utils';\n\nexport const enumTypeToFlow = (\n    config: Config,\n    name: string,\n): BabelNodeFlowType => {\n    const enumConfig = config.schema.enumsByName[name];\n    let combinedDescription = enumConfig.enumValues\n        .map(\n            (n) =>\n                `- ${n.name}` +\n                (n.description\n                    ? '\\n\\n      ' + n.description.replace(/\\n/g, '\\n      ')\n                    : ''),\n        )\n        .join('\\n');\n    if (enumConfig.description) {\n        combinedDescription =\n            enumConfig.description + '\\n\\n' + combinedDescription;\n    }\n    return maybeAddDescriptionComment(\n        combinedDescription,\n        babelTypes.unionTypeAnnotation(\n            enumConfig.enumValues.map((n) =>\n                babelTypes.stringLiteralTypeAnnotation(n.name),\n            ),\n        ),\n    );\n};\n\nexport const builtinScalars: {[key: string]: string} = {\n    Boolean: 'boolean',\n    String: 'string',\n    DateTime: 'string',\n    Date: 'string',\n    ID: 'string',\n    Int: 'number',\n    Float: 'number',\n};\n\nexport const scalarTypeToFlow = (\n    config: Config,\n    name: string,\n): BabelNodeFlowType => {\n    if (builtinScalars[name]) {\n        return babelTypes.genericTypeAnnotation(\n            babelTypes.identifier(builtinScalars[name]),\n        );\n    }\n    const underlyingType = config.scalars[name];\n    if (underlyingType != null) {\n        return babelTypes.genericTypeAnnotation(\n            babelTypes.identifier(underlyingType),\n        );\n    }\n    config.errors.push(\n        `Unexpected scalar '${name}'! Please add it to the \"scalars\" argument at the callsite of 'generateFlowTypes()'.`,\n    );\n    return babelTypes.genericTypeAnnotation(\n        babelTypes.identifier(`UNKNOWN_SCALAR[\"${name}\"]`),\n    );\n};\n"],"file":"enums.js"}
+{"version":3,"sources":["../src/enums.js"],"names":["experimentalEnumTypeToFlow","config","enumConfig","description","enumDeclaration","babelTypes","identifier","name","enumStringBody","enumValues","map","v","enumDefaultedMember","experimentalEnumsMap","genericTypeAnnotation","id","enumTypeToFlow","schema","enumsByName","combinedDescription","n","replace","join","unionTypeAnnotation","stringLiteralTypeAnnotation","builtinScalars","Boolean","String","DateTime","Date","ID","Int","Float","scalarTypeToFlow","underlyingType","scalars","errors","push"],"mappings":"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","sourcesContent":["// @flow\n/**\n * Both input & output types can have enums & scalars.\n */\nimport * as babelTypes from '@babel/types';\nimport type {BabelNodeFlowType} from '@babel/types';\nimport type {Config} from './types';\nimport {maybeAddDescriptionComment} from './utils';\nimport type {IntrospectionEnumType} from 'graphql/utilities/introspectionQuery';\n\nexport const experimentalEnumTypeToFlow = (\n    config: Config,\n    enumConfig: IntrospectionEnumType,\n    description: string,\n): BabelNodeFlowType => {\n    const enumDeclaration = babelTypes.enumDeclaration(\n        // pass id into generic type annotation\n        babelTypes.identifier(enumConfig.name),\n        babelTypes.enumStringBody(\n            enumConfig.enumValues.map((v) =>\n                babelTypes.enumDefaultedMember(babelTypes.identifier(v.name)),\n            ),\n        ),\n    );\n\n    if (config.experimentalEnumsMap) {\n        config.experimentalEnumsMap[enumConfig.name] = enumDeclaration;\n    }\n\n    return maybeAddDescriptionComment(\n        description,\n        babelTypes.genericTypeAnnotation(enumDeclaration.id),\n    );\n};\n\nexport const enumTypeToFlow = (\n    config: Config,\n    name: string,\n): BabelNodeFlowType => {\n    const enumConfig = config.schema.enumsByName[name];\n    let combinedDescription = enumConfig.enumValues\n        .map(\n            (n) =>\n                `- ${n.name}` +\n                (n.description\n                    ? '\\n\\n      ' + n.description.replace(/\\n/g, '\\n      ')\n                    : ''),\n        )\n        .join('\\n');\n    if (enumConfig.description) {\n        combinedDescription =\n            enumConfig.description + '\\n\\n' + combinedDescription;\n    }\n\n    return config.experimentalEnumsMap\n        ? experimentalEnumTypeToFlow(config, enumConfig, combinedDescription)\n        : maybeAddDescriptionComment(\n              combinedDescription,\n              babelTypes.unionTypeAnnotation(\n                  enumConfig.enumValues.map((n) =>\n                      babelTypes.stringLiteralTypeAnnotation(n.name),\n                  ),\n              ),\n          );\n};\n\nexport const builtinScalars: {[key: string]: string} = {\n    Boolean: 'boolean',\n    String: 'string',\n    DateTime: 'string',\n    Date: 'string',\n    ID: 'string',\n    Int: 'number',\n    Float: 'number',\n};\n\nexport const scalarTypeToFlow = (\n    config: Config,\n    name: string,\n): BabelNodeFlowType => {\n    if (builtinScalars[name]) {\n        return babelTypes.genericTypeAnnotation(\n            babelTypes.identifier(builtinScalars[name]),\n        );\n    }\n    const underlyingType = config.scalars[name];\n    if (underlyingType != null) {\n        return babelTypes.genericTypeAnnotation(\n            babelTypes.identifier(underlyingType),\n        );\n    }\n    config.errors.push(\n        `Unexpected scalar '${name}'! Please add it to the \"scalars\" argument at the callsite of 'generateFlowTypes()'.`,\n    );\n    return babelTypes.genericTypeAnnotation(\n        babelTypes.identifier(`UNKNOWN_SCALAR[\"${name}\"]`),\n    );\n};\n"],"file":"enums.js"}

package/dist/generateTypeFiles.js

@@ -52,7 +52,8 @@ const generateTypeFileContents = (fileName, schema, document, options, generated
     typeName,
     code,
     isFragment,
-    extraTypes
+    extraTypes,
+    experimentalEnums
   }) => {
     // We write all generated files to a `__generated__` subdir to keep
     // things tidy.
@@ -66,9 +67,17 @@ const generateTypeFileContents = (fileName, schema, document, options, generated
       fileContents += `\nexport type ${name} = ${typeName}['response'];\n` + `export type ${name}Variables = ${typeName}['variables'];\n`;
     }
 
-    Object.keys(extraTypes).forEach(name => {
-      fileContents += `\n\nexport type ${name} = ${extraTypes[name]};`;
-    });
+    Object.keys(extraTypes).forEach(name => fileContents += `\n\nexport type ${name} = ${extraTypes[name]};`);
+    const enumNames = Object.keys(experimentalEnums);
+
+    if (options.experimentalEnums && enumNames.length) {
+      // TODO(somewhatabstract, FEI-4172): Update to fixed eslint-plugin-flowtype
+      // and remove this disable.
+      fileContents += `\n\n/* eslint-disable no-undef */`;
+      enumNames.forEach(name => fileContents += `\nexport ${experimentalEnums[name]};\n`);
+      fileContents += `/* eslint-enable no-undef */`;
+    }
+
     addToIndex(targetPath, typeName);
     files[targetPath] = fileContents // Remove whitespace from the ends of lines; babel's generate sometimes
     // leaves them hanging around.
@@ -82,10 +91,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');
 
@@ -133,7 +155,8 @@ const processPragmas = (options, rawSource) => {
       splitTypes: options.splitTypes,
       generatedDirectory: options.generatedDirectory,
       exportAllObjectTypes: options.exportAllObjectTypes,
-      typeFileName: options.typeFileName
+      typeFileName: options.typeFileName,
+      experimentalEnums: options.experimentalEnums
     };
   } else {
     return null;

package/dist/generateTypeFiles.js.flow

@@ -21,6 +21,7 @@ export type ExternalOptions = {
     generatedDirectory?: string,
     exportAllObjectTypes?: boolean,
     typeFileName?: string,
+    experimentalEnums?: boolean,
 };
 
 export const indexPrelude = (regenerateCommand?: string): string => `// @flow
@@ -62,54 +63,82 @@ export const generateTypeFileContents = (
     };
 
     const generated = documentToFlowTypes(document, schema, options);
-    generated.forEach(({name, typeName, code, isFragment, extraTypes}) => {
-        // 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 targetPath = path.join(generatedDir, targetFileName);
-
-        let fileContents =
-            '// @' +
-            `flow\n// AUTOGENERATED -- DO NOT EDIT\n` +
-            `// Generated for operation '${name}' in file '../${path.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`;
-        }
-        Object.keys(extraTypes).forEach((name) => {
-            fileContents += `\n\nexport type ${name} = ${extraTypes[name]};`;
-        });
-
-        addToIndex(targetPath, typeName);
-        files[targetPath] =
-            fileContents
-                // Remove whitespace from the ends of lines; babel's generate sometimes
-                // leaves them hanging around.
-                .replace(/\s+$/gm, '') + '\n';
-    });
+    generated.forEach(
+        ({name, typeName, code, isFragment, extraTypes, experimentalEnums}) => {
+            // 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 targetPath = path.join(generatedDir, targetFileName);
+
+            let fileContents =
+                '// @' +
+                `flow\n// AUTOGENERATED -- DO NOT EDIT\n` +
+                `// Generated for operation '${name}' in file '../${path.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`;
+            }
+            Object.keys(extraTypes).forEach(
+                (name) =>
+                    (fileContents += `\n\nexport type ${name} = ${extraTypes[name]};`),
+            );
+            const enumNames = Object.keys(experimentalEnums);
+            if (options.experimentalEnums && enumNames.length) {
+                // TODO(somewhatabstract, FEI-4172): Update to fixed eslint-plugin-flowtype
+                // and remove this disable.
+                fileContents += `\n\n/* eslint-disable no-undef */`;
+                enumNames.forEach(
+                    (name) =>
+                        (fileContents += `\nexport ${experimentalEnums[name]};\n`),
+                );
+                fileContents += `/* eslint-enable no-undef */`;
+            }
+
+            addToIndex(targetPath, typeName);
+            files[targetPath] =
+                fileContents
+                    // Remove whitespace from the ends of lines; babel's generate sometimes
+                    // leaves them hanging around.
+                    .replace(/\s+$/gm, '') + '\n';
+        },
+    );
 
     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)) {
@@ -164,6 +193,7 @@ export const processPragmas = (
             generatedDirectory: options.generatedDirectory,
             exportAllObjectTypes: options.exportAllObjectTypes,
             typeFileName: options.typeFileName,
+            experimentalEnums: options.experimentalEnums,
         };
     } else {
         return null;