@graphql-codegen/cli 2.3.0-alpha-5ed8c1163.0 → 2.3.1

package/bin.js

@@ -547,6 +547,7 @@ async function loadDocuments(documentPointers, config) {
     return loadedFromToolkit;
 }
 
+const { lstat } = fs.promises;
 function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'config.js'];
     // gives codegen.json...
@@ -579,20 +580,24 @@ function customLoader(ext) {
     }
     return loader;
 }
-function loadCodegenConfig(configFilePath) {
-    const moduleName = 'codegen';
+async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }) {
+    configFilePath = configFilePath || process.cwd();
+    moduleName = moduleName || 'codegen';
+    packageProp = packageProp || moduleName;
     const cosmi = cosmiconfig.cosmiconfig(moduleName, {
-        searchPlaces: generateSearchPlaces(moduleName),
-        packageProp: moduleName,
+        searchPlaces: generateSearchPlaces(moduleName).concat(additionalSearchPlaces || []),
+        packageProp,
         loaders: {
             '.json': customLoader('json'),
             '.yaml': customLoader('yaml'),
             '.yml': customLoader('yaml'),
             '.js': customLoader('js'),
             noExt: customLoader('yaml'),
+            ...customLoaders,
         },
     });
-    return configFilePath ? cosmi.load(configFilePath) : cosmi.search(process.cwd());
+    const pathStats = await lstat(configFilePath);
+    return pathStats.isDirectory() ? cosmi.search(configFilePath) : cosmi.load(configFilePath);
 }
 async function loadContext(configFilePath) {
     const graphqlConfig = await findAndLoadGraphQLConfig(configFilePath);
@@ -601,7 +606,7 @@ async function loadContext(configFilePath) {
             graphqlConfig,
         });
     }
-    const result = await loadCodegenConfig(configFilePath);
+    const result = await loadCodegenConfig({ configFilePath });
     if (!result) {
         if (configFilePath) {
             throw new pluginHelpers.DetailedError(`Config ${configFilePath} does not exist`, `

package/config.d.ts

@@ -10,12 +10,37 @@ export declare type YamlCliFlags = {
     silent: boolean;
     errorsOnly: boolean;
 };
-export interface LoadedCodegenConfig {
+export declare function generateSearchPlaces(moduleName: string): string[];
+export interface LoadCodegenConfigOptions {
+    /**
+     * The path to the config file or directory contains the config file.
+     * @default process.cwd()
+     */
+    configFilePath?: string;
+    /**
+     * The name of the config file
+     * @default codegen
+     */
+    moduleName?: string;
+    /**
+     * Additional search paths for the config file you want to check
+     */
+    searchPlaces?: string[];
+    /**
+     * @default codegen
+     */
+    packageProp?: string;
+    /**
+     * Overrides or extends the loaders for specific file extensions
+     */
+    loaders?: Record<string, (filepath: string, content: string) => Promise<Types.Config> | Types.Config>;
+}
+export interface LoadCodegenConfigResult {
     filepath: string;
     config: Types.Config;
     isEmpty?: boolean;
 }
-export declare function loadCodegenConfig(configFilePath?: string): Promise<LoadedCodegenConfig>;
+export declare function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }: LoadCodegenConfigOptions): Promise<LoadCodegenConfigResult>;
 export declare function loadContext(configFilePath?: string): Promise<CodegenContext> | never;
 export declare function buildOptions(): {
     c: {

package/index.js

@@ -465,6 +465,7 @@ async function loadDocuments(documentPointers, config) {
     return loadedFromToolkit;
 }
 
+const { lstat } = fs.promises;
 function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'config.js'];
     // gives codegen.json...
@@ -497,20 +498,24 @@ function customLoader(ext) {
     }
     return loader;
 }
-function loadCodegenConfig(configFilePath) {
-    const moduleName = 'codegen';
+async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }) {
+    configFilePath = configFilePath || process.cwd();
+    moduleName = moduleName || 'codegen';
+    packageProp = packageProp || moduleName;
     const cosmi = cosmiconfig.cosmiconfig(moduleName, {
-        searchPlaces: generateSearchPlaces(moduleName),
-        packageProp: moduleName,
+        searchPlaces: generateSearchPlaces(moduleName).concat(additionalSearchPlaces || []),
+        packageProp,
         loaders: {
             '.json': customLoader('json'),
             '.yaml': customLoader('yaml'),
             '.yml': customLoader('yaml'),
             '.js': customLoader('js'),
             noExt: customLoader('yaml'),
+            ...customLoaders,
         },
     });
-    return configFilePath ? cosmi.load(configFilePath) : cosmi.search(process.cwd());
+    const pathStats = await lstat(configFilePath);
+    return pathStats.isDirectory() ? cosmi.search(configFilePath) : cosmi.load(configFilePath);
 }
 async function loadContext(configFilePath) {
     const graphqlConfig = await findAndLoadGraphQLConfig(configFilePath);
@@ -519,7 +524,7 @@ async function loadContext(configFilePath) {
             graphqlConfig,
         });
     }
-    const result = await loadCodegenConfig(configFilePath);
+    const result = await loadCodegenConfig({ configFilePath });
     if (!result) {
         if (configFilePath) {
             throw new pluginHelpers.DetailedError(`Config ${configFilePath} does not exist`, `
@@ -1781,6 +1786,7 @@ exports.ensureGraphQlPackage = ensureGraphQlPackage;
 exports.executeCodegen = executeCodegen;
 exports.findAndLoadGraphQLConfig = findAndLoadGraphQLConfig;
 exports.generate = generate;
+exports.generateSearchPlaces = generateSearchPlaces;
 exports.init = init;
 exports.loadCodegenConfig = loadCodegenConfig;
 exports.loadContext = loadContext;

package/index.mjs

@@ -24,7 +24,7 @@ import { JsonFileLoader } from '@graphql-tools/json-file-loader';
 import { UrlLoader } from '@graphql-tools/url-loader';
 import yaml from 'yaml';
 import { createRequire } from 'module';
-import fs, { readFileSync, writeFileSync, statSync, unlink } from 'fs';
+import fs, { promises, readFileSync, writeFileSync, statSync, unlink } from 'fs';
 import Listr from 'listr';
 import { exec } from 'child_process';
 import isGlob from 'is-glob';
@@ -438,6 +438,7 @@ async function loadDocuments(documentPointers, config) {
     return loadedFromToolkit;
 }
 
+const { lstat } = promises;
 function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'config.js'];
     // gives codegen.json...
@@ -470,20 +471,24 @@ function customLoader(ext) {
     }
     return loader;
 }
-function loadCodegenConfig(configFilePath) {
-    const moduleName = 'codegen';
+async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }) {
+    configFilePath = configFilePath || process.cwd();
+    moduleName = moduleName || 'codegen';
+    packageProp = packageProp || moduleName;
     const cosmi = cosmiconfig(moduleName, {
-        searchPlaces: generateSearchPlaces(moduleName),
-        packageProp: moduleName,
+        searchPlaces: generateSearchPlaces(moduleName).concat(additionalSearchPlaces || []),
+        packageProp,
         loaders: {
             '.json': customLoader('json'),
             '.yaml': customLoader('yaml'),
             '.yml': customLoader('yaml'),
             '.js': customLoader('js'),
             noExt: customLoader('yaml'),
+            ...customLoaders,
         },
     });
-    return configFilePath ? cosmi.load(configFilePath) : cosmi.search(process.cwd());
+    const pathStats = await lstat(configFilePath);
+    return pathStats.isDirectory() ? cosmi.search(configFilePath) : cosmi.load(configFilePath);
 }
 async function loadContext(configFilePath) {
     const graphqlConfig = await findAndLoadGraphQLConfig(configFilePath);
@@ -492,7 +497,7 @@ async function loadContext(configFilePath) {
             graphqlConfig,
         });
     }
-    const result = await loadCodegenConfig(configFilePath);
+    const result = await loadCodegenConfig({ configFilePath });
     if (!result) {
         if (configFilePath) {
             throw new DetailedError(`Config ${configFilePath} does not exist`, `
@@ -1744,4 +1749,4 @@ async function ensureGraphQlPackage() {
     }
 }
 
-export { CodegenContext, CodegenExtension, buildOptions, cliError, createContext, ensureContext, ensureGraphQlPackage, executeCodegen, findAndLoadGraphQLConfig, generate, init, loadCodegenConfig, loadContext, parseArgv, runCli, updateContextWithCliFlags };
+export { CodegenContext, CodegenExtension, buildOptions, cliError, createContext, ensureContext, ensureGraphQlPackage, executeCodegen, findAndLoadGraphQLConfig, generate, generateSearchPlaces, init, loadCodegenConfig, loadContext, parseArgv, runCli, updateContextWithCliFlags };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.3.0-alpha-5ed8c1163.0",
+  "version": "2.3.1",
   "peerDependencies": {
-    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/core": "2.2.0",
-    "@graphql-codegen/plugin-helpers": "^2.2.0",
+    "@graphql-codegen/core": "2.4.0",
+    "@graphql-codegen/plugin-helpers": "^2.3.2",
     "@graphql-tools/apollo-engine-loader": "^7.0.5",
     "@graphql-tools/code-file-loader": "^7.0.6",
     "@graphql-tools/git-loader": "^7.0.5",
@@ -28,8 +28,8 @@
     "detect-indent": "^6.0.0",
     "glob": "^7.1.6",
     "globby": "^11.0.4",
-    "graphql-config": "^4.0.1",
-    "inquirer": "^7.3.3",
+    "graphql-config": "^4.1.0",
+    "inquirer": "^8.0.0",
     "is-glob": "^4.0.1",
     "json-to-pretty-yaml": "^1.2.2",
     "latest-version": "5.1.0",
@@ -78,6 +78,7 @@
     "definition": "index.d.ts"
   },
   "exports": {
+    "./package.json": "./package.json",
     ".": {
       "require": "./index.js",
       "import": "./index.mjs"