docs/plugins/index.md

@@ -17,6 +17,7 @@ Below is a table that lists all available plugins which can be installed via NPM
 | `typescript-apollo-angular`        | Generate TypeScript types, and Apollo-Angular Services                                               | [`@graphql-codegen/typescript-apollo-angular`](./typescript-apollo-angular.md)               |
 | `typescript-react-apollo`          | Generate TypeScript types, and React-Apollo Components                                               | [`@graphql-codegen/typescript-react-apollo`](./typescript-react-apollo.md)                   |
 | `typescript-urql`                  | Generate TypeScript types, and Urql Components                                                       | [`@graphql-codegen/typescript-urql`](./typescript-urql.md)                                   |
+| `typescript-graphql-request`       | Generates fully-typed ready-to-use SDK for graphql-request                                           | [`@graphql-codegen/typescript-graphql-request`](./typescript-graphql-request.md)             |
 | `typescript-stencil-apollo`        | Generate TypeScript types, and Stencil Apollo Components                                             | [`@graphql-codegen/typescript-stencil-apollo`](./typescript-stencil-apollo.md)               |
 | `typescript-mongodb`               | Generate Generate server-side TypeScript types, with MongoDB models                                  | [`@graphql-codegen/typescript-mongodb`](./typescript-mongodb.md)                             |
 | `typescript-graphql-files-modules` | Generate `declare module` for `.graphql` files                                                       | [`@graphql-codegen/typescript-graphql-files-modules`](./typescript-graphql-files-modules.md) |
@@ -30,7 +31,7 @@ Below is a table that lists all available plugins which can be installed via NPM
 | `flow-resolvers`                   | Generate resolvers signature for Flow                                                                | [`@graphql-codegen/flow-resolvers`](./flow-resolvers.md)                                     |
 | `flow-operations`                  | Generate types for Flow type based on your GraphQL operations                                        | [`@graphql-codegen/flow-operations`](./flow-operations.md)                                   |
 | `reason-client`                    | Generate ReasonML types based on your GraphQL schema for use in a client application                 | [`@graphql-codegen/reason-client`](./reason-client.md)                                       |
-| `kotlin`                             | generates Kotlin backend `classes` for Enums and Input types                                           | [`@graphql-codegen/kotlin`](./kotlin.md)                                                         |
+| `kotlin`                           | generates Kotlin backend `classes` for Enums and Input types                                         | [`@graphql-codegen/kotlin`](./kotlin.md)                                                     |
 | `java`                             | generates Java backend `classes` for Enums and Input types                                           | [`@graphql-codegen/java`](./java.md)                                                         |
 | `java-resolvers`                   | generates Java backend resolvers signature                                                           | [`@graphql-codegen/java-resolvers`](./java-resolvers.md)                                     |
 | `java-apollo-android`              | generates Apollo Android parsers and mappers                                                         | [`@graphql-codegen/java-apollo-android`](./java-apollo-android.md)                           |

docs/plugins/typescript-graphql-request.md

@@ -0,0 +1,66 @@
+---
+id: typescript-graphql-request
+title: TypeScript GraphQL-Request
+---
+
+This plugin generates [`graphql-request`](https://www.npmjs.com/package/graphql-request) ready-to-use SDK, which is fully-typed.
+
+{@import: ../docs/plugins/client-note.md}
+
+## Installation
+
+[You can find a working example with this plugin here](https://github.com/dotansimha/graphql-codegen-graphql-request-example)
+
+    $ yarn add @graphql-codegen/typescript @graphql-codegen/typescript-operations @graphql-codegen/typescript-graphql-request
+
+The, make sure you have `typescript` plugin and `typescript-operations` as well in your configuration:
+
+```yml
+schema: https://countries.trevorblades.com/
+documents: 'src/graphql/**/*.graphql'
+generates:
+  src/sdk.ts:
+    plugins:
+      - typescript
+      - typescript-operations
+      - typescript-graphql-request
+```
+
+## Usage
+
+For the given input:
+
+```graphql
+query continents {
+  continents {
+    name
+    countries {
+      ...CountryFields
+    }
+  }
+}
+fragment CountryFields on Country {
+  name
+  currency
+}
+```
+
+It generates SDK you can import and wrap your `GraphQLClient` instance, and get fully-typed SDK based on your operations:
+
+```ts
+import { GraphQLClient } from 'graphql-request';
+import { getSdk } from './sdk'; // THIS FILE IS THE GENERATED FILE
+
+async function main() {
+  const client = new GraphQLClient('https://countries.trevorblades.com/');
+  const sdk = getSdk(client);
+  const { continents } = await sdk.continents(); // This is fully typed, based on the query
+
+  console.log(`GraphQL data:`, continents);
+}
+```
+
+## Configuration
+
+{@import: ../docs/generated-config/base-visitor.md}
+{@import: ../docs/generated-config/client-side-base-visitor.md}

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0",
+  "version": "1.8.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "concurrency": 2

package.json

@@ -42,10 +42,10 @@
     "@types/glob": "7.1.1",
     "@types/jest": "24.0.18",
     "@types/mkdirp": "0.5.2",
-    "@types/node": "10.14.19",
+    "@types/node": "10.14.20",
     "@types/request": "2.48.3",
     "apollo-link": "1.2.13",
-    "apollo-server": "2.9.4",
+    "apollo-server": "2.9.5",
     "graphql": "14.5.8",
     "graphql-tag": "2.10.1",
     "graphql-tools": "4.0.5",

packages/graphql-codegen-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "license": "MIT",
   "bin": {
     "gql-gen": "dist/commonjs/bin.js",
@@ -42,8 +42,8 @@
   "homepage": "https://github.com/dotansimha/graphql-code-generator#readme",
   "dependencies": {
     "@babel/parser": "7.6.2",
-    "@graphql-codegen/core": "1.8.0",
-    "@graphql-codegen/plugin-helpers": "1.8.0",
+    "@graphql-codegen/core": "1.8.1",
+    "@graphql-codegen/plugin-helpers": "1.8.1",
     "@types/debounce": "1.2.0",
     "@types/is-glob": "4.0.1",
     "@types/mkdirp": "0.5.2",
@@ -54,6 +54,7 @@
     "chokidar": "3.2.1",
     "commander": "3.0.2",
     "common-tags": "1.8.0",
+    "cosmiconfig": "5.2.1",
     "debounce": "1.2.0",
     "detect-indent": "6.0.0",
     "glob": "7.1.4",
@@ -66,7 +67,6 @@
     "inquirer": "7.0.0",
     "is-glob": "4.0.1",
     "is-valid-path": "0.1.1",
-    "js-yaml": "3.13.1",
     "json-to-pretty-yaml": "1.2.2",
     "listr": "0.14.3",
     "listr-update-renderer": "0.5.0",
@@ -81,13 +81,16 @@
   },
   "devDependencies": {
     "@types/chokidar": "1.7.5",
+    "@types/cosmiconfig": "5.0.3",
     "@types/detect-indent": "5.0.0",
     "@types/inquirer": "6.5.0",
     "@types/js-yaml": "3.12.1",
     "@types/listr": "0.14.2",
     "@types/log-symbols": "2.0.0",
     "bdd-stdin": "0.2.0",
     "graphql": "14.5.8",
+    "js-yaml": "3.13.1",
+    "make-dir": "3.0.0",
     "ts-jest": "24.1.0"
   },
   "peerDependencies": {

packages/graphql-codegen-cli/src/config.ts

@@ -1,8 +1,7 @@
-import { existsSync, readFileSync } from 'fs';
-import { join, resolve } from 'path';
+import * as cosmiconfig from 'cosmiconfig';
+import { resolve } from 'path';
 import { Types } from '@graphql-codegen/plugin-helpers';
 import { DetailedError } from '@graphql-codegen/core';
-import { parseConfigFile } from './yml';
 import { Command } from 'commander';
 
 export type YamlCliFlags = {
@@ -12,48 +11,114 @@ export type YamlCliFlags = {
   overwrite: boolean;
 };
 
-function getCustomConfigPath(cliFlags: YamlCliFlags): string | null | never {
-  const configFile = cliFlags.config;
+function generateSearchPlaces(moduleName: string) {
+  const extensions = ['json', 'yaml', 'yml', 'js', 'config.js'];
+  // gives codegen.json...
+  const regular = extensions.map(ext => `${moduleName}.${ext}`);
+  // gives .codegenrc.json... but no .codegenrc.config.js
+  const dot = extensions.filter(ext => ext !== 'config.js').map(ext => `.${moduleName}rc.${ext}`);
 
-  if (configFile) {
-    const configPath = resolve(process.cwd(), configFile);
+  return regular.concat(dot);
+}
 
-    if (!existsSync(configPath)) {
-      throw new DetailedError(
-        `Config ${configPath} does not exist`,
-        `
-        Config ${configPath} does not exist.
+function customLoader(ext: 'json' | 'yaml' | 'js') {
+  function loader(filepath: string, content: string) {
+    if (typeof process !== 'undefined' && 'env' in process) {
+      content = content.replace(/\$\{(.*)\}/g, (str, variable, index) => {
+        let varName = variable;
+        let defaultValue = '';
+
+        if (variable.includes(':')) {
+          const spl = variable.split(':');
+          varName = spl.shift();
+          defaultValue = spl.join(':');
+        }
+
+        return process.env[varName] || defaultValue;
+      });
+    }
 
-          $ graphql-codegen --config ${configPath}
+    if (ext === 'json') {
+      return (cosmiconfig as any).loadJson(filepath, content);
+    }
 
-        Please make sure the --config points to a correct file.
-      `
-      );
+    if (ext === 'yaml') {
+      return (cosmiconfig as any).loadYaml(filepath, content);
     }
 
-    return configPath;
+    if (ext === 'js') {
+      return (cosmiconfig as any).loadJs(filepath, content);
+    }
   }
 
-  return null;
+  return {
+    sync: loader,
+    async: loader,
+  };
 }
 
-export function loadAndParseConfig(filepath: string): Types.Config | never {
-  const ext = filepath.substr(filepath.lastIndexOf('.') + 1);
-  switch (ext) {
-    case 'yml':
-      return parseConfigFile(readFileSync(filepath, 'utf-8'));
-    case 'json':
-      return JSON.parse(readFileSync(filepath, 'utf-8'));
-    case 'js':
-      return require(resolve(process.cwd(), filepath));
-    default:
+export async function loadConfig(
+  configFilePath?: string
+):
+  | Promise<{
+      config: Types.Config;
+      filepath: string;
+    }>
+  | never {
+  const moduleName = 'codegen';
+  const cosmi = cosmiconfig(moduleName, {
+    searchPlaces: generateSearchPlaces(moduleName),
+    loaders: {
+      '.json': customLoader('json'),
+      '.yaml': customLoader('yaml'),
+      '.yml': customLoader('yaml'),
+      '.js': customLoader('js'),
+      noExt: customLoader('yaml'),
+    },
+  });
+  const result = await (configFilePath ? cosmi.load(configFilePath) : cosmi.search(process.cwd()));
+
+  if (!result) {
+    if (configFilePath) {
       throw new DetailedError(
-        `Extension '${ext}' is not supported`,
+        `Config ${configFilePath} does not exist`,
         `
-        Config ${filepath} couldn't be parsed. Extension '${ext}' is not supported.
+        Config ${configFilePath} does not exist.
+  
+          $ graphql-codegen --config ${configFilePath}
+  
+        Please make sure the --config points to a correct file.
       `
       );
+    }
+
+    throw new DetailedError(
+      `Unable to find Codegen config file!`,
+      `
+        Please make sure that you have a configuration file under the current directory! 
+      `
+    );
+  }
+
+  if (result.isEmpty) {
+    throw new DetailedError(
+      `Found Codegen config file but it was empty!`,
+      `
+        Please make sure that you have a valid configuration file under the current directory!
+      `
+    );
   }
+
+  return {
+    filepath: result.filepath,
+    config: result.config as Types.Config,
+  };
+}
+
+function getCustomConfigPath(cliFlags: YamlCliFlags): string | null | never {
+  const configFile = cliFlags.config;
+
+  return configFile ? resolve(process.cwd(), configFile) : null;
 }
 
 function collect<T = string>(val: T, memo: T[]): T[] {
@@ -76,31 +141,17 @@ export function parseArgv(argv = process.argv): Command & YamlCliFlags {
 
 export async function createConfig(cliFlags: Command & YamlCliFlags = parseArgv(process.argv)): Promise<Types.Config | never> {
   const customConfigPath = getCustomConfigPath(cliFlags);
-  const locations: string[] = [join(process.cwd(), './codegen.yml'), join(process.cwd(), './codegen.json')];
-
-  if (customConfigPath) {
-    locations.unshift(customConfigPath);
-  }
-
-  const filepath = locations.find(existsSync);
-
-  if (!filepath) {
-    throw new DetailedError(
-      `Unable to find Codegen config file!`,
-      `
-        Please make sure that you have a configuration file under the current directory! 
-      `
-    );
-  }
+  const configSearchResult = await loadConfig(customConfigPath);
 
   if (cliFlags.require && cliFlags.require.length > 0) {
     for (const mod of cliFlags.require) {
       await import(mod);
     }
   }
 
-  const parsedConfigFile = loadAndParseConfig(filepath);
-  parsedConfigFile.configFilePath = filepath;
+  const parsedConfigFile = configSearchResult.config as Types.Config;
+
+  parsedConfigFile.configFilePath = configSearchResult.filepath;
 
   if (cliFlags.watch === true) {
     parsedConfigFile.watch = cliFlags.watch;

packages/graphql-codegen-cli/src/utils/listr-renderer.ts

@@ -46,22 +46,22 @@ export class Renderer {
           .map(error => {
             debugLog(`[CLI] Exited with an error`, error);
 
-            return { msg: isDetailedError(error) ? error.details : error, rawError: error };
+            return { msg: isDetailedError(error) ? error.details : null, rawError: error };
           })
           .map(({ msg, rawError }, i) => {
             const source: string | Source | undefined = (err.errors[i] as any).source;
 
-            msg = chalk.gray(indentString(stripIndent(`${msg}`), 4));
+            msg = msg ? chalk.gray(indentString(stripIndent(`${msg}`), 4)) : null;
             const stack = rawError.stack ? chalk.gray(indentString(stripIndent(rawError.stack), 4)) : null;
 
             if (source) {
               const sourceOfError = typeof source === 'string' ? source : source.name;
               const title = indentString(`${logSymbol.error} ${sourceOfError}`, 2);
 
-              return [title, !stack ? msg : null, stack].filter(Boolean).join('\n');
+              return [title, msg, stack, stack].filter(Boolean).join('\n');
             }
 
-            return stack ? stack : msg;
+            return [msg, stack].filter(Boolean).join('\n');
           })
           .join('\n\n');
         logUpdate(['', count, details, ''].join('\n\n'));

packages/graphql-codegen-cli/src/utils/watcher.ts

@@ -9,8 +9,8 @@ import { debugLog } from './debugging';
 import { getLogger } from './logger';
 import { join } from 'path';
 import { FSWatcher } from 'chokidar';
-import { loadAndParseConfig } from '../config';
 import { lifecycleHooks } from '../hooks';
+import { loadConfig } from '../config';
 
 function log(msg: string) {
   // double spaces to inline the message with Listr
@@ -119,7 +119,9 @@ export const createWatcher = (initialConfig: Types.Config, onNext: (result: Type
 
       if (eventName === 'change' && config.configFilePath && fullPath === config.configFilePath) {
         log(`${logSymbols.info} Config file has changed, reloading...`);
-        const newParsedConfig = loadAndParseConfig(config.configFilePath);
+        const configSearchResult = await loadConfig(config.configFilePath);
+
+        const newParsedConfig = configSearchResult.config as Types.Config;
         newParsedConfig.watch = config.watch;
         newParsedConfig.silent = config.silent;
         newParsedConfig.overwrite = config.overwrite;