@graphql-codegen/cli 1.19.3 → 1.20.1

package/index.esm.js

@@ -23,6 +23,7 @@ import { loadSchema as loadSchema$1, loadDocuments as loadDocuments$1 } from '@g
 import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader';
 import { JsonFileLoader } from '@graphql-tools/json-file-loader';
 import { UrlLoader } from '@graphql-tools/url-loader';
+import yaml from 'yaml';
 import fs, { readFileSync, writeFileSync, statSync, unlink } from 'fs';
 import { createRequire, createRequireFromPath } from 'module';
 import { exec } from 'child_process';
@@ -208,7 +209,7 @@ async function getPluginByName(name, pluginLoader) {
             return await pluginLoader(moduleName);
         }
         catch (err) {
-            if (err.code !== 'MODULE_NOT_FOUND') {
+            if (err.code !== 'MODULE_NOT_FOUND' || !err.message.includes(moduleName)) {
                 throw new DetailedError(`Unable to load template plugin matching ${name}`, `
               Unable to load template plugin matching '${name}'.
               Reason: 
@@ -244,7 +245,7 @@ async function getPresetByName(name, loader) {
             return loaded;
         }
         catch (err) {
-            if (err.code !== 'MODULE_NOT_FOUND') {
+            if (err.code !== 'MODULE_NOT_FOUND' || !err.message.includes(moduleName)) {
                 throw new DetailedError(`Unable to load preset matching ${name}`, `
               Unable to load preset matching '${name}'.
               Reason: 
@@ -382,7 +383,7 @@ function generateSearchPlaces(moduleName) {
     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}`);
-    return regular.concat(dot);
+    return [...regular.concat(dot), 'package.json'];
 }
 function customLoader(ext) {
     function loader(filepath, content) {
@@ -393,7 +394,14 @@ function customLoader(ext) {
             return defaultLoaders['.json'](filepath, content);
         }
         if (ext === 'yaml') {
-            return defaultLoaders['.yaml'](filepath, content);
+            try {
+                const result = yaml.parse(content, { prettyErrors: true, merge: true });
+                return result;
+            }
+            catch (error) {
+                error.message = `YAML Error in ${filepath}:\n${error.message}`;
+                throw error;
+            }
         }
         if (ext === 'js') {
             return defaultLoaders['.js'](filepath, content);
@@ -405,6 +413,7 @@ async function loadContext(configFilePath) {
     const moduleName = 'codegen';
     const cosmi = cosmiconfig(moduleName, {
         searchPlaces: generateSearchPlaces(moduleName),
+        packageProp: moduleName,
         loaders: {
             '.json': customLoader('json'),
             '.yaml': customLoader('yaml'),
@@ -869,6 +878,12 @@ function normalizeHooks(_hooks) {
                 [hookName]: [_hooks[hookName]],
             };
         }
+        else if (typeof _hooks[hookName] === 'function') {
+            return {
+                ...prev,
+                [hookName]: [_hooks[hookName]],
+            };
+        }
         else if (Array.isArray(_hooks[hookName])) {
             return {
                 ...prev,
@@ -1026,6 +1041,7 @@ const createWatcher = (initalContext, onNext) => {
                 newParsedConfig.overwrite = config.overwrite;
                 newParsedConfig.configFilePath = config.configFilePath;
                 config = newParsedConfig;
+                initalContext.updateConfig(config);
             }
             debouncedExec();
         });