@graphql-codegen/cli 2.7.0-alpha-252a8d50d.0 → 2.7.0-alpha-0391ca185.0

package/bin.js

@@ -109,7 +109,7 @@ const DEFAULT_HOOKS = {
 function normalizeHooks(_hooks) {
     const keys = Object.keys({
         ...DEFAULT_HOOKS,
-        ...(_hooks || {}),
+        ..._hooks,
     });
     return keys.reduce((prev, hookName) => {
         if (typeof _hooks[hookName] === 'string') {
@@ -118,21 +118,19 @@ function normalizeHooks(_hooks) {
                 [hookName]: [_hooks[hookName]],
             };
         }
-        else if (typeof _hooks[hookName] === 'function') {
+        if (typeof _hooks[hookName] === 'function') {
             return {
                 ...prev,
                 [hookName]: [_hooks[hookName]],
             };
         }
-        else if (Array.isArray(_hooks[hookName])) {
+        if (Array.isArray(_hooks[hookName])) {
             return {
                 ...prev,
                 [hookName]: _hooks[hookName],
             };
         }
-        else {
-            return prev;
-        }
+        return prev;
     }, {});
 }
 function execShellCommand(cmd) {
@@ -376,14 +374,19 @@ async function getPluginByName(name, pluginLoader) {
 }
 
 async function getPresetByName(name, loader) {
-    const possibleNames = [`@graphql-codegen/${name}`, `@graphql-codegen/${name}-preset`, name];
+    const possibleNames = [
+        `@graphql-codegen/${name}`,
+        `@graphql-codegen/${name}-preset`,
+        name,
+        path.resolve(process.cwd(), name),
+    ];
     for (const moduleName of possibleNames) {
         try {
             const loaded = await loader(moduleName);
             if (loaded && loaded.preset) {
                 return loaded.preset;
             }
-            else if (loaded && loaded.default) {
+            if (loaded && loaded.default) {
                 return loaded.default;
             }
             return loaded;
@@ -689,7 +692,7 @@ function buildOptions() {
     };
 }
 function parseArgv(argv = process.argv) {
-    return yargs.options(buildOptions()).parse(argv);
+    return yargs(argv).options(buildOptions()).parse();
 }
 async function createContext(cliFlags = parseArgv(process.argv)) {
     if (cliFlags.require && cliFlags.require.length > 0) {
@@ -804,7 +807,7 @@ function hashSchema(schema) {
 function addHashToSchema(schemaPromise) {
     return schemaPromise.then(schema => {
         // It's consumed later on. The general purpose is to use it for caching.
-        if (schema.extensions) {
+        if (!schema.extensions) {
             schema.extensions = {};
         }
         schema.extensions['hash'] = hashSchema(schema);
@@ -1034,8 +1037,8 @@ async function executeCodegen(input) {
                                         const outputSchemaAst = await context.loadSchema(schemaPointerMap);
                                         const outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
                                         return {
-                                            outputSchemaAst: outputSchemaAst,
-                                            outputSchema: outputSchema,
+                                            outputSchemaAst,
+                                            outputSchema,
                                         };
                                     });
                                     outputSchemaAst = await result.outputSchemaAst;
@@ -1052,7 +1055,7 @@ async function executeCodegen(input) {
                                         return cache('documents', hash, async () => {
                                             const documents = await context.loadDocuments(docs);
                                             return {
-                                                documents: documents,
+                                                documents,
                                             };
                                         });
                                     }));
@@ -1757,12 +1760,10 @@ function getOutputDefaultValue(answers) {
     if (answers.plugins.some(plugin => plugin.defaultExtension === '.tsx')) {
         return 'src/generated/graphql.tsx';
     }
-    else if (answers.plugins.some(plugin => plugin.defaultExtension === '.ts')) {
+    if (answers.plugins.some(plugin => plugin.defaultExtension === '.ts')) {
         return 'src/generated/graphql.ts';
     }
-    else {
-        return 'src/generated/graphql.js';
-    }
+    return 'src/generated/graphql.js';
 }
 
 async function guessTargets() {