@graphql-codegen/cli 2.7.0-alpha-7c50b8781.0 → 2.7.0-alpha-929a21bcb.0

package/bin.js

@@ -376,7 +376,12 @@ 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);
@@ -799,13 +804,14 @@ function hashContent(content) {
     return crypto.createHash('sha256').update(content).digest('hex');
 }
 function hashSchema(schema) {
-    return hashContent(utils.printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
+    return hashContent(graphql.print(pluginHelpers.getCachedDocumentNodeFromSchema(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) {
+            schema.extensions = {};
+        }
         schema.extensions['hash'] = hashSchema(schema);
         return schema;
     });

package/index.js

@@ -294,7 +294,12 @@ 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);
@@ -717,13 +722,14 @@ function hashContent(content) {
     return crypto.createHash('sha256').update(content).digest('hex');
 }
 function hashSchema(schema) {
-    return hashContent(utils.printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
+    return hashContent(graphql.print(pluginHelpers.getCachedDocumentNodeFromSchema(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) {
+            schema.extensions = {};
+        }
         schema.extensions['hash'] = hashSchema(schema);
         return schema;
     });

package/index.mjs

@@ -1,6 +1,6 @@
-import { isDetailedError, DetailedError, createNoopProfiler, createProfiler, normalizeInstanceOrArray, normalizeConfig, normalizeOutputParam, getCachedDocumentNodeFromSchema } from '@graphql-codegen/plugin-helpers';
+import { isDetailedError, DetailedError, createNoopProfiler, createProfiler, getCachedDocumentNodeFromSchema, normalizeInstanceOrArray, normalizeConfig, normalizeOutputParam } from '@graphql-codegen/plugin-helpers';
 import { codegen } from '@graphql-codegen/core';
-import { printSchemaWithDirectives, AggregateError, isValidPath } from '@graphql-tools/utils';
+import { AggregateError, isValidPath } from '@graphql-tools/utils';
 import chalk from 'chalk';
 import logSymbols from 'log-symbols';
 import ansiEscapes from 'ansi-escapes';
@@ -267,7 +267,12 @@ 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,
+        resolve(process.cwd(), name),
+    ];
     for (const moduleName of possibleNames) {
         try {
             const loaded = await loader(moduleName);
@@ -690,13 +695,14 @@ function hashContent(content) {
     return createHash('sha256').update(content).digest('hex');
 }
 function hashSchema(schema) {
-    return hashContent(printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
+    return hashContent(print(getCachedDocumentNodeFromSchema(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) {
+            schema.extensions = {};
+        }
         schema.extensions['hash'] = hashSchema(schema);
         return schema;
     });

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.7.0-alpha-7c50b8781.0",
+  "version": "2.7.0-alpha-929a21bcb.0",
   "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 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/core": "2.6.0-alpha-7c50b8781.0",
-    "@graphql-codegen/plugin-helpers": "2.5.0-alpha-7c50b8781.0",
+    "@graphql-codegen/core": "2.5.1",
+    "@graphql-codegen/plugin-helpers": "^2.4.1",
     "@graphql-tools/apollo-engine-loader": "^7.0.5",
-    "@graphql-tools/code-file-loader": "^7.0.6",
+    "@graphql-tools/code-file-loader": "^7.2.10",
     "@graphql-tools/git-loader": "^7.0.5",
     "@graphql-tools/github-loader": "^7.0.5",
     "@graphql-tools/graphql-file-loader": "^7.0.5",
@@ -36,7 +36,7 @@
     "listr": "^0.14.3",
     "listr-update-renderer": "^0.5.0",
     "log-symbols": "^4.0.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^5.0.0",
     "mkdirp": "^1.0.4",
     "string-env-interpolation": "^1.0.1",
     "ts-log": "^2.2.3",