Move functions from utils to load package

Author: kamilkisiela

packages/load/src/load-typedefs/load-file.ts

@@ -1,6 +1,28 @@
-import { Source, debugLog, makeCacheable, makeCacheableSync } from '@graphql-tools/utils';
+import { Source, debugLog, Cacheable } from '@graphql-tools/utils';
 import { LoadTypedefsOptions } from '../load-typedefs';
 
+function makeCacheable<TPointer, TOptions extends Cacheable>(
+  fn: (pointer: TPointer, options?: TOptions) => Promise<Source | never>,
+  pointer: TPointer,
+  options: TOptions
+): Promise<Source | never> {
+  if (options?.cacheable) {
+    return options.cacheable(fn, pointer, options);
+  }
+  return fn(pointer, options);
+}
+
+function makeCacheableSync<TPointer, TOptions extends Cacheable>(
+  fn: (pointer: TPointer, options?: TOptions) => Source | never,
+  pointer: TPointer,
+  options: TOptions
+): Source | never {
+  if (options?.cacheableSync) {
+    return options.cacheableSync(fn, pointer, options);
+  }
+  return fn(pointer, options);
+}
+
 export async function loadFile(pointer: string, options: LoadTypedefsOptions): Promise<Source> {
   const cached = useCache({ pointer, options });
 

packages/utils/src/loaders.ts

@@ -9,7 +9,7 @@ export interface Source {
   location?: string;
 }
 
-interface Cacheable {
+export interface Cacheable {
   cacheable?<TPointer, TOptions>(
     fn: (pointer: TPointer, options?: TOptions) => PromiseLike<Source | never>,
     pointer: TPointer,
@@ -60,25 +60,3 @@ export type UniversalLoader<TOptions extends SingleFileOptions = SingleFileOptio
   SchemaPointerSingle | DocumentPointerSingle,
   TOptions
 >;
-
-export function makeCacheable<TPointer, TOptions extends Cacheable>(
-  fn: (pointer: TPointer, options?: TOptions) => Promise<Source | never>,
-  pointer: TPointer,
-  options: TOptions
-): Promise<Source | never> {
-  if (options?.cacheable) {
-    return options.cacheable(fn, pointer, options);
-  }
-  return fn(pointer, options);
-}
-
-export function makeCacheableSync<TPointer, TOptions extends Cacheable>(
-  fn: (pointer: TPointer, options?: TOptions) => Source | never,
-  pointer: TPointer,
-  options: TOptions
-): Source | never {
-  if (options?.cacheableSync) {
-    return options.cacheableSync(fn, pointer, options);
-  }
-  return fn(pointer, options);
-}