@graphql-tools/utils 7.8.0-alpha-4fedab51.0 → 7.8.0

package/es5/loaders.d.ts

@@ -7,11 +7,7 @@ export interface Source {
     rawSDL?: string;
     location?: string;
 }
-export interface Cacheable {
-    cacheable?<TPointer, TOptions>(fn: (pointer: TPointer, options?: TOptions) => PromiseLike<Source | never>, pointer: TPointer, options?: TOptions): Promise<Source | never>;
-    cacheableSync?<TPointer, TOptions>(fn: (pointer: TPointer, options?: TOptions) => Source | never, pointer: TPointer, options?: TOptions): Source | never;
-}
-export declare type SingleFileOptions = GraphQLParseOptions & GraphQLSchemaValidationOptions & BuildSchemaOptions & Cacheable & {
+export declare type SingleFileOptions = GraphQLParseOptions & GraphQLSchemaValidationOptions & BuildSchemaOptions & {
     cwd?: string;
 };
 export declare type WithList<T> = T | T[];
@@ -22,7 +18,6 @@ export declare type DocumentGlobPathPointer = string;
 export declare type DocumentPointer = WithList<DocumentGlobPathPointer>;
 export declare type DocumentPointerSingle = ElementOf<DocumentPointer>;
 export interface Loader<TPointer = string, TOptions extends SingleFileOptions = SingleFileOptions> {
-    cacheable?: boolean;
     loaderId(): string;
     canLoad(pointer: TPointer, options?: TOptions): Promise<boolean>;
     canLoadSync?(pointer: TPointer, options?: TOptions): boolean;

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils/es5",
-  "version": "7.8.0-alpha-4fedab51.0",
+  "version": "7.8.0",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/es5/print-schema-with-directives.d.ts

@@ -3,7 +3,7 @@ import { GetDocumentNodeFromSchemaOptions, PrintSchemaWithDirectivesOptions } fr
 export declare function getDocumentNodeFromSchema(schema: GraphQLSchema, options?: GetDocumentNodeFromSchemaOptions): DocumentNode;
 export declare function printSchemaWithDirectives(schema: GraphQLSchema, options?: PrintSchemaWithDirectivesOptions): string;
 export declare function astFromSchema(schema: GraphQLSchema, pathToDirectivesInExtensions: Array<string>): SchemaDefinitionNode | SchemaExtensionNode;
-export declare function astFromDirective(directive: GraphQLDirective, schema: GraphQLSchema, pathToDirectivesInExtensions: Array<string>): DirectiveDefinitionNode;
+export declare function astFromDirective(directive: GraphQLDirective, schema?: GraphQLSchema, pathToDirectivesInExtensions?: Array<string>): DirectiveDefinitionNode;
 export declare function getDirectiveNodes(entity: GraphQLSchema | GraphQLNamedType | GraphQLEnumValue, schema: GraphQLSchema, pathToDirectivesInExtensions: Array<string>): Array<DirectiveNode>;
 export declare function getDeprecatableDirectiveNodes(entity: GraphQLArgument | GraphQLField<any, any> | GraphQLInputField, schema: GraphQLSchema, pathToDirectivesInExtensions: Array<string>): Array<DirectiveNode>;
 export declare function astFromArg(arg: GraphQLArgument, schema: GraphQLSchema, pathToDirectivesInExtensions: Array<string>): InputValueDefinitionNode;

package/index.cjs.js

@@ -450,6 +450,13 @@ function getDocumentNodeFromSchema(schema, options = {}) {
     const typesMap = schema.getTypeMap();
     const schemaNode = astFromSchema(schema, pathToDirectivesInExtensions);
     const definitions = schemaNode != null ? [schemaNode] : [];
+    const directives = schema.getDirectives();
+    for (const directive of directives) {
+        if (graphql.isSpecifiedDirective(directive)) {
+            continue;
+        }
+        definitions.push(astFromDirective(directive, schema, pathToDirectivesInExtensions));
+    }
     for (const typeName in typesMap) {
         const type = typesMap[typeName];
         const isPredefinedScalar = graphql.isSpecifiedScalarType(type);
@@ -479,13 +486,6 @@ function getDocumentNodeFromSchema(schema, options = {}) {
             throw new Error(`Unknown type ${type}.`);
         }
     }
-    const directives = schema.getDirectives();
-    for (const directive of directives) {
-        if (graphql.isSpecifiedDirective(directive)) {
-            continue;
-        }
-        definitions.push(astFromDirective(directive, schema, pathToDirectivesInExtensions));
-    }
     return {
         kind: graphql.Kind.DOCUMENT,
         definitions,
@@ -892,7 +892,7 @@ function makeDirectiveNode(name, args, directive) {
 function makeDirectiveNodes(schema, directiveValues) {
     const directiveNodes = [];
     Object.entries(directiveValues).forEach(([directiveName, arrayOrSingleValue]) => {
-        const directive = schema.getDirective(directiveName);
+        const directive = schema === null || schema === void 0 ? void 0 : schema.getDirective(directiveName);
         if (Array.isArray(arrayOrSingleValue)) {
             arrayOrSingleValue.forEach(value => {
                 directiveNodes.push(makeDirectiveNode(directiveName, value, directive));
@@ -1682,7 +1682,7 @@ function createNamedStub(name, type) {
     return new constructor({
         name,
         fields: {
-            __fake: {
+            _fake: {
                 type: graphql.GraphQLString,
             },
         },
@@ -1705,7 +1705,7 @@ function isNamedStub(type) {
     if (graphql.isObjectType(type) || graphql.isInterfaceType(type) || graphql.isInputObjectType(type)) {
         const fields = type.getFields();
         const fieldNames = Object.keys(fields);
-        return fieldNames.length === 1 && fields[fieldNames[0]].name === '__fake';
+        return fieldNames.length === 1 && fields[fieldNames[0]].name === '_fake';
     }
     return false;
 }