@gqloom/core 0.9.6 → 0.10.0

package/dist/{context-D0Bwgtgg.d.cts → context-uzUlbx3r.d.cts}

@@ -276,16 +276,10 @@ declare class FieldChainFactory<TOutput extends GraphQLSilk = never, TInput exte
      * by batching them together and handling caching automatically.
      *
      * @template TParent - The parent type that extends GraphQLSilk
-     * @param resolve - A function that handles batch loading of data. The function receives:
-     *   - When no input type is defined: An array of parent objects
-     *   - When input type is defined: An array of tuples containing [parent, input]
-     *   - An array of resolver payloads
+     * @param resolve - A function that handles batch loading of data.
      * @returns A GraphQL field resolver that implements batch loading
      */
-    load<TParent extends GraphQLSilk>(resolve: (parameters: InferInputO<TInput> extends void | undefined ? InferParent<TParent, TDependencies>[] : [
-        parent: InferParent<TParent, TDependencies>,
-        input: InferInputO<TInput>
-    ][], payloads: (ResolverPayload | undefined)[]) => MayPromise<StandardSchemaV1.InferOutput<TOutput>[]>): Field<TParent, TOutput, TInput, TDependencies>;
+    load<TParent extends GraphQLSilk>(resolve: (parents: InferParent<TParent, TDependencies>[], input: InferInputO<TInput>, payloads: (ResolverPayload | undefined)[]) => MayPromise<StandardSchemaV1.InferOutput<TOutput>[]>): Field<TParent, TOutput, TInput, TDependencies>;
 }
 type InferParent<TParent extends GraphQLSilk, TDependencies extends string[] | undefined = undefined> = TDependencies extends string[] ? RequireKeys<NonNullable<StandardSchemaV1.InferOutput<TParent>>, TDependencies[number]> : NonNullable<StandardSchemaV1.InferOutput<TParent>>;
 /**
@@ -451,13 +445,14 @@ declare class MutationFactoryWithResolve<TInputO, TOutput extends GraphQLSilk, T
     input<TInputNew extends GraphQLSilk<TInputO>>(input: TInputNew): MutationFactoryWithResolve<TInputO, TOutput, TInputNew>;
     output<TOutputNew extends GraphQLSilk>(output: TOutputNew, transform: (output: StandardSchemaV1.InferOutput<TOutput>) => MayPromise<StandardSchemaV1.InferOutput<TOutputNew>>): MutationFactoryWithResolve<TInputO, TOutputNew, TInput>;
 }
-declare class FieldFactoryWithResolve<TParent extends GraphQLSilk, TOutput extends GraphQLSilk> extends BaseChainFactory<Field<TParent, TOutput, undefined, string[] | undefined>> {
+declare class FieldFactoryWithResolve<TParent extends GraphQLSilk, TOutput extends GraphQLSilk, TInputO = never, TInput extends GraphQLSilk<TInputO> | void = void> extends BaseChainFactory<Field<TParent, TOutput, TInput, string[] | undefined>> {
     protected outputSilk: TOutput;
-    protected readonly options: FieldOptions<TParent, TOutput, undefined, string[] | undefined>;
-    get "~meta"(): Field<TParent, TOutput, undefined, string[] | undefined>["~meta"];
-    constructor(outputSilk: TOutput, options: FieldOptions<TParent, TOutput, undefined, string[] | undefined>);
+    protected readonly options: FieldOptions<TParent, TOutput, TInput, string[] | undefined>;
+    get "~meta"(): Field<TParent, TOutput, TInput, string[] | undefined>["~meta"];
+    constructor(outputSilk: TOutput, options: FieldOptions<TParent, TOutput, TInput, string[] | undefined>);
     protected clone(options?: Partial<typeof this.options> | undefined): this;
-    output<TOutputNew extends GraphQLSilk>(output: TOutputNew, transform: (output: StandardSchemaV1.InferOutput<TOutput>) => MayPromise<StandardSchemaV1.InferOutput<TOutputNew>>): FieldFactoryWithResolve<TParent, TOutputNew>;
+    input<TInputNew extends GraphQLSilk<TInputO>>(input: TInputNew): FieldFactoryWithResolve<TParent, TOutput, TInputO, TInputNew>;
+    output<TOutputNew extends GraphQLSilk>(output: TOutputNew, transform: (output: StandardSchemaV1.InferOutput<TOutput>) => MayPromise<StandardSchemaV1.InferOutput<TOutputNew>>): FieldFactoryWithResolve<TParent, TOutputNew, TInputO, TInput>;
 }
 
 interface FieldMeta extends GraphQLFieldOptions {

package/dist/{context-D0Bwgtgg.d.ts → context-uzUlbx3r.d.ts}

@@ -276,16 +276,10 @@ declare class FieldChainFactory<TOutput extends GraphQLSilk = never, TInput exte
      * by batching them together and handling caching automatically.
      *
      * @template TParent - The parent type that extends GraphQLSilk
-     * @param resolve - A function that handles batch loading of data. The function receives:
-     *   - When no input type is defined: An array of parent objects
-     *   - When input type is defined: An array of tuples containing [parent, input]
-     *   - An array of resolver payloads
+     * @param resolve - A function that handles batch loading of data.
      * @returns A GraphQL field resolver that implements batch loading
      */
-    load<TParent extends GraphQLSilk>(resolve: (parameters: InferInputO<TInput> extends void | undefined ? InferParent<TParent, TDependencies>[] : [
-        parent: InferParent<TParent, TDependencies>,
-        input: InferInputO<TInput>
-    ][], payloads: (ResolverPayload | undefined)[]) => MayPromise<StandardSchemaV1.InferOutput<TOutput>[]>): Field<TParent, TOutput, TInput, TDependencies>;
+    load<TParent extends GraphQLSilk>(resolve: (parents: InferParent<TParent, TDependencies>[], input: InferInputO<TInput>, payloads: (ResolverPayload | undefined)[]) => MayPromise<StandardSchemaV1.InferOutput<TOutput>[]>): Field<TParent, TOutput, TInput, TDependencies>;
 }
 type InferParent<TParent extends GraphQLSilk, TDependencies extends string[] | undefined = undefined> = TDependencies extends string[] ? RequireKeys<NonNullable<StandardSchemaV1.InferOutput<TParent>>, TDependencies[number]> : NonNullable<StandardSchemaV1.InferOutput<TParent>>;
 /**
@@ -451,13 +445,14 @@ declare class MutationFactoryWithResolve<TInputO, TOutput extends GraphQLSilk, T
     input<TInputNew extends GraphQLSilk<TInputO>>(input: TInputNew): MutationFactoryWithResolve<TInputO, TOutput, TInputNew>;
     output<TOutputNew extends GraphQLSilk>(output: TOutputNew, transform: (output: StandardSchemaV1.InferOutput<TOutput>) => MayPromise<StandardSchemaV1.InferOutput<TOutputNew>>): MutationFactoryWithResolve<TInputO, TOutputNew, TInput>;
 }
-declare class FieldFactoryWithResolve<TParent extends GraphQLSilk, TOutput extends GraphQLSilk> extends BaseChainFactory<Field<TParent, TOutput, undefined, string[] | undefined>> {
+declare class FieldFactoryWithResolve<TParent extends GraphQLSilk, TOutput extends GraphQLSilk, TInputO = never, TInput extends GraphQLSilk<TInputO> | void = void> extends BaseChainFactory<Field<TParent, TOutput, TInput, string[] | undefined>> {
     protected outputSilk: TOutput;
-    protected readonly options: FieldOptions<TParent, TOutput, undefined, string[] | undefined>;
-    get "~meta"(): Field<TParent, TOutput, undefined, string[] | undefined>["~meta"];
-    constructor(outputSilk: TOutput, options: FieldOptions<TParent, TOutput, undefined, string[] | undefined>);
+    protected readonly options: FieldOptions<TParent, TOutput, TInput, string[] | undefined>;
+    get "~meta"(): Field<TParent, TOutput, TInput, string[] | undefined>["~meta"];
+    constructor(outputSilk: TOutput, options: FieldOptions<TParent, TOutput, TInput, string[] | undefined>);
     protected clone(options?: Partial<typeof this.options> | undefined): this;
-    output<TOutputNew extends GraphQLSilk>(output: TOutputNew, transform: (output: StandardSchemaV1.InferOutput<TOutput>) => MayPromise<StandardSchemaV1.InferOutput<TOutputNew>>): FieldFactoryWithResolve<TParent, TOutputNew>;
+    input<TInputNew extends GraphQLSilk<TInputO>>(input: TInputNew): FieldFactoryWithResolve<TParent, TOutput, TInputO, TInputNew>;
+    output<TOutputNew extends GraphQLSilk>(output: TOutputNew, transform: (output: StandardSchemaV1.InferOutput<TOutput>) => MayPromise<StandardSchemaV1.InferOutput<TOutputNew>>): FieldFactoryWithResolve<TParent, TOutputNew, TInputO, TInput>;
 }
 
 interface FieldMeta extends GraphQLFieldOptions {

package/dist/context.d.cts

@@ -1,4 +1,4 @@
-import { P as OnlyMemoizationPayload, R as ResolverPayload, B as BaseField, v as Middleware, K as ResolvingFields } from './context-D0Bwgtgg.cjs';
+import { P as OnlyMemoizationPayload, R as ResolverPayload, B as BaseField, v as Middleware, K as ResolvingFields } from './context-uzUlbx3r.cjs';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import 'graphql';
 

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-import { P as OnlyMemoizationPayload, R as ResolverPayload, B as BaseField, v as Middleware, K as ResolvingFields } from './context-D0Bwgtgg.js';
+import { P as OnlyMemoizationPayload, R as ResolverPayload, B as BaseField, v as Middleware, K as ResolvingFields } from './context-uzUlbx3r.js';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import 'graphql';
 

package/dist/index.cjs

@@ -26,6 +26,7 @@ __export(src_exports, {
   FieldChainFactory: () => FieldChainFactory,
   FieldFactoryWithResolve: () => FieldFactoryWithResolve,
   GraphQLSchemaLoom: () => GraphQLSchemaLoom,
+  LoomDataLoader: () => LoomDataLoader,
   LoomObjectType: () => LoomObjectType,
   MutationChainFactory: () => MutationChainFactory,
   MutationFactoryWithResolve: () => MutationFactoryWithResolve,
@@ -410,48 +411,45 @@ function markLocation(message, ...locations) {
 }
 
 // src/utils/loader.ts
-var EasyDataLoader = class _EasyDataLoader {
-  constructor(batchLoadFn) {
-    this.batchLoadFn = batchLoadFn;
-    this.queue = [];
-    this.cache = /* @__PURE__ */ new Map();
+var LoomDataLoader = class _LoomDataLoader {
+  results;
+  resolvers;
+  constructor() {
+    this.results = /* @__PURE__ */ new Map();
     this.resolvers = /* @__PURE__ */ new Map();
   }
-  queue;
-  cache;
-  resolvers;
+  /**
+   * Load data for a given key.
+   * @param key - The key to load data for.
+   * @returns A promise that resolves to the loaded data.
+   */
   load(key) {
-    const existing = this.cache.get(key);
+    const existing = this.results.get(key);
     if (existing) return existing;
     const promise = new Promise((resolve, reject) => {
-      this.queue.push(key);
       this.resolvers.set(key, [resolve, reject]);
       this.nextTickBatchLoad();
     });
-    this.cache.set(key, promise);
+    this.results.set(key, promise);
     return promise;
   }
+  /**
+   * Clear the cache and reset the loader.
+   */
   clear() {
-    this.queue = [];
-    this.cache = /* @__PURE__ */ new Map();
+    this.results = /* @__PURE__ */ new Map();
     this.resolvers = /* @__PURE__ */ new Map();
   }
-  clearByKey(key) {
-    this.queue = this.queue.filter((k) => k !== key);
-    this.cache.delete(key);
-    this.resolvers.delete(key);
-  }
   async executeBatchLoad() {
-    if (this.queue.length === 0) return;
-    const [keys, resolvers] = [this.queue, this.resolvers];
-    this.queue = [];
+    if (this.resolvers.size === 0) return;
+    const resolvers = this.resolvers;
     this.resolvers = /* @__PURE__ */ new Map();
+    const keys = Array.from(resolvers.keys());
     try {
-      const list = await this.batchLoadFn(keys);
+      const list = await this.batchLoad(keys);
       for (let i = 0; i < list.length; i++) {
         const data = list[i];
-        const resolve = resolvers.get(keys[i])?.[0];
-        const reject = resolvers.get(keys[i])?.[1];
+        const [resolve, reject] = resolvers.get(keys[i]) ?? [];
         if (data instanceof Error) {
           reject?.(data);
         } else {
@@ -467,13 +465,32 @@ var EasyDataLoader = class _EasyDataLoader {
   }
   nextTickPromise;
   nextTickBatchLoad() {
-    this.nextTickPromise ??= _EasyDataLoader.nextTick().then(() => this.executeBatchLoad()).finally(() => this.nextTickPromise = void 0);
+    const load = async () => {
+      try {
+        while (this.resolvers.size > 0) {
+          await _LoomDataLoader.nextTick();
+          await this.executeBatchLoad();
+        }
+      } finally {
+        this.nextTickPromise = void 0;
+      }
+    };
+    this.nextTickPromise ??= load();
     return this.nextTickPromise;
   }
   static nextTick() {
     return new Promise((resolve) => setTimeout(resolve));
   }
 };
+var EasyDataLoader = class extends LoomDataLoader {
+  constructor(batchLoadFn) {
+    super();
+    this.batchLoadFn = batchLoadFn;
+  }
+  batchLoad(keys) {
+    return this.batchLoadFn(keys);
+  }
+};
 
 // src/utils/symbols.ts
 var symbols_exports = {};
@@ -831,6 +848,38 @@ var BaseChainFactory = class _BaseChainFactory {
     });
   }
 };
+var FieldLoader = class _FieldLoader extends LoomDataLoader {
+  constructor(resolve) {
+    super();
+    this.resolve = resolve;
+  }
+  static getByPath(payload, resolve, getByPath = true) {
+    if (!payload) return new _FieldLoader(resolve);
+    const memoMap = getMemoizationMap(payload);
+    if (!getByPath) {
+      const loader = memoMap.get(resolve) ?? new _FieldLoader(resolve);
+      memoMap.set(resolve, loader);
+      return loader;
+    }
+    const fullPath = [];
+    let path = payload.info.path;
+    while (path) {
+      fullPath.push(path);
+      path = path.prev;
+    }
+    const pathKey = fullPath.reverse().map((p) => typeof p.key === "number" ? "[n]" : p.key).join(".");
+    const fieldLoaders = memoMap.get(resolve) ?? /* @__PURE__ */ new Map();
+    memoMap.set(resolve, fieldLoaders);
+    const fieldLoader = fieldLoaders.get(pathKey) ?? new _FieldLoader(resolve);
+    fieldLoaders.set(pathKey, fieldLoader);
+    return fieldLoader;
+  }
+  batchLoad(args) {
+    const parents = args.map(([parent]) => parent);
+    const payloads = args.map(([, , payload]) => payload);
+    return this.resolve(parents, args[0]?.[1], payloads);
+  }
+};
 var FieldChainFactory = class _FieldChainFactory extends BaseChainFactory {
   /**
    * Returns the available methods for the field chain factory
@@ -893,31 +942,19 @@ var FieldChainFactory = class _FieldChainFactory extends BaseChainFactory {
    * by batching them together and handling caching automatically.
    *
    * @template TParent - The parent type that extends GraphQLSilk
-   * @param resolve - A function that handles batch loading of data. The function receives:
-   *   - When no input type is defined: An array of parent objects
-   *   - When input type is defined: An array of tuples containing [parent, input]
-   *   - An array of resolver payloads
+   * @param resolve - A function that handles batch loading of data.
    * @returns A GraphQL field resolver that implements batch loading
    */
   load(resolve) {
     if (!this.options?.output) throw new Error("Output is required");
-    const hasInput = typeof this.options.input !== "undefined";
-    const initLoader = () => new EasyDataLoader((args) => {
-      const parents = args.map(
-        ([parent, input]) => hasInput ? [parent, input] : parent
-      );
-      const payloads = args.map(([, , payload]) => payload);
-      return resolve(parents, payloads);
-    });
     return createField(this.options.output, {
       ...this.options,
       resolve: (parent, input, payload) => {
-        const loader = (() => {
-          if (!payload) return initLoader();
-          const memoMap = getMemoizationMap(payload);
-          if (!memoMap.has(resolve)) memoMap.set(resolve, initLoader());
-          return memoMap.get(resolve);
-        })();
+        const loader = FieldLoader.getByPath(
+          payload,
+          resolve,
+          this.options?.input != null
+        );
         return loader.load([parent, input, payload]);
       }
     });
@@ -1169,7 +1206,10 @@ var FieldFactoryWithResolve = class _FieldFactoryWithResolve extends BaseChainFa
     this.options = options;
   }
   get "~meta"() {
-    return loom.field(this.outputSilk, this.options)["~meta"];
+    return loom.field(
+      this.outputSilk,
+      this.options
+    )["~meta"];
   }
   clone(options) {
     return new _FieldFactoryWithResolve(this.outputSilk, {
@@ -1177,6 +1217,12 @@ var FieldFactoryWithResolve = class _FieldFactoryWithResolve extends BaseChainFa
       ...options
     });
   }
+  input(input) {
+    return new _FieldFactoryWithResolve(this.outputSilk, {
+      ...this.options,
+      input
+    });
+  }
   output(output, transform) {
     return new _FieldFactoryWithResolve(output, {
       ...this.options,
@@ -2041,6 +2087,7 @@ function ensureInterfaceType(gqlType, interfaceConfig) {
   FieldChainFactory,
   FieldFactoryWithResolve,
   GraphQLSchemaLoom,
+  LoomDataLoader,
   LoomObjectType,
   MutationChainFactory,
   MutationFactoryWithResolve,

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { F as FieldOptions, Q as QueryOptions, M as MutationOptions, R as ResolverPayload, S as SubscriptionOptions, G as GraphQLFieldOptions, a as StandardSchemaV1, b as GraphQLSilk, c as MayPromise, d as Query, e as QueryChainFactory, f as QueryFactoryWithChain, g as Mutation, h as MutationChainFactory, i as MutationFactoryWithChain, j as Field, k as FieldChainFactory, l as FieldFactoryWithUtils, m as SubscriptionChainFactory, n as Subscription, o as SubscriptionFactoryWithChain, O as Operation, p as FIELD_HIDDEN, q as ResolverOptionsWithExtensions, r as OmitInUnion, V as ValueOf, s as ResolverOptions, t as FieldOrOperation, u as Resolver, I as IS_RESOLVER, v as Middleware, w as InferInputI, W as WEAVER_CONFIG, B as BaseField } from './context-D0Bwgtgg.cjs';
-export { $ as BaseChainFactory, ai as CallableInputParser, D as CallableMiddlewareOptions, _ as ChainFactoryOptions, ae as FieldFactory, a4 as FieldFactoryWithResolve, ag as FieldMeta, a9 as FieldOrOperationType, Z as IChainFactory, aa as InferFieldInput, ab as InferFieldOutput, ah as InferInputO, y as IsAny, a5 as Loom, E as MiddlewareConfig, A as MiddlewareOperation, C as MiddlewareOptions, ad as MutationFactory, a3 as MutationFactoryWithResolve, P as OnlyMemoizationPayload, a8 as OperationType, ac as QueryFactory, a2 as QueryFactoryWithResolve, z as RequireKeys, a0 as ResolvableSubscription, a6 as ResolverOptionsWithParent, K as ResolvingFields, a7 as ResolvingOptions, x as SYMBOLS, af as SubscriptionFactory, a1 as SubscriptionNeedResolve, H as applyMiddlewares, Y as assignContextMap, aj as createInputParser, J as filterMiddlewares, X as getMemoizationMap, L as getResolvingFields, al as getStandardValue, U as isOnlyMemoryPayload, T as onlyMemoization, ak as parseInputValue, N as parseResolvingFields } from './context-D0Bwgtgg.cjs';
+import { F as FieldOptions, Q as QueryOptions, M as MutationOptions, R as ResolverPayload, S as SubscriptionOptions, G as GraphQLFieldOptions, a as StandardSchemaV1, b as GraphQLSilk, c as MayPromise, d as Query, e as QueryChainFactory, f as QueryFactoryWithChain, g as Mutation, h as MutationChainFactory, i as MutationFactoryWithChain, j as Field, k as FieldChainFactory, l as FieldFactoryWithUtils, m as SubscriptionChainFactory, n as Subscription, o as SubscriptionFactoryWithChain, O as Operation, p as FIELD_HIDDEN, q as ResolverOptionsWithExtensions, r as OmitInUnion, V as ValueOf, s as ResolverOptions, t as FieldOrOperation, u as Resolver, I as IS_RESOLVER, v as Middleware, w as InferInputI, W as WEAVER_CONFIG, B as BaseField } from './context-uzUlbx3r.cjs';
+export { $ as BaseChainFactory, ai as CallableInputParser, D as CallableMiddlewareOptions, _ as ChainFactoryOptions, ae as FieldFactory, a4 as FieldFactoryWithResolve, ag as FieldMeta, a9 as FieldOrOperationType, Z as IChainFactory, aa as InferFieldInput, ab as InferFieldOutput, ah as InferInputO, y as IsAny, a5 as Loom, E as MiddlewareConfig, A as MiddlewareOperation, C as MiddlewareOptions, ad as MutationFactory, a3 as MutationFactoryWithResolve, P as OnlyMemoizationPayload, a8 as OperationType, ac as QueryFactory, a2 as QueryFactoryWithResolve, z as RequireKeys, a0 as ResolvableSubscription, a6 as ResolverOptionsWithParent, K as ResolvingFields, a7 as ResolvingOptions, x as SYMBOLS, af as SubscriptionFactory, a1 as SubscriptionNeedResolve, H as applyMiddlewares, Y as assignContextMap, aj as createInputParser, J as filterMiddlewares, X as getMemoizationMap, L as getResolvingFields, al as getStandardValue, U as isOnlyMemoryPayload, T as onlyMemoization, ak as parseInputValue, N as parseResolvingFields } from './context-uzUlbx3r.cjs';
 import { GraphQLFieldExtensions, GraphQLScalarType, GraphQLObjectType, GraphQLOutputType, GraphQLNullableType, GraphQLList, GraphQLNonNull, GraphQLObjectTypeConfig, GraphQLUnionType, GraphQLInterfaceType, GraphQLInputObjectType, GraphQLFieldMap, GraphQLFieldConfig, GraphQLSchemaConfig, GraphQLNamedType, GraphQLSchema, GraphQLFieldConfigArgumentMap, GraphQLType, GraphQLInputType, GraphQLInterfaceTypeConfig } from 'graphql';
 
 declare function getOperationOptions(resolveOrOptions: ((...args: any) => any) | FieldOptions<any, any, any, any> | QueryOptions<any, any> | MutationOptions<any, any>): any;
@@ -271,23 +271,37 @@ declare function tryIn<T>(func: () => T, ...locations: string[]): T;
 declare function markLocation(message: string, ...locations: string[]): string;
 
 type BatchLoadFn<TKey, TData> = (keys: TKey[]) => Promise<(TData | Error)[]>;
-declare class EasyDataLoader<TKey, TData> {
-    protected readonly batchLoadFn: BatchLoadFn<TKey, TData>;
-    protected queue: TKey[];
-    protected cache: Map<TKey, Promise<TData>>;
+/**
+ * GraphQL Loom built-in data loader.
+ */
+declare abstract class LoomDataLoader<TKey, TData> {
+    protected abstract batchLoad(keys: TKey[]): Promise<(TData | Error)[]>;
+    protected results: Map<TKey, Promise<TData>>;
     protected resolvers: Map<TKey, [
         resolve: (value: TData | PromiseLike<TData>) => void,
         reject: (reason?: any) => void
     ]>;
-    constructor(batchLoadFn: BatchLoadFn<TKey, TData>);
+    constructor();
+    /**
+     * Load data for a given key.
+     * @param key - The key to load data for.
+     * @returns A promise that resolves to the loaded data.
+     */
     load(key: TKey): Promise<TData>;
+    /**
+     * Clear the cache and reset the loader.
+     */
     clear(): void;
-    clearByKey(key: TKey): void;
     protected executeBatchLoad(): Promise<void>;
     protected nextTickPromise?: Promise<void>;
     protected nextTickBatchLoad(): Promise<void>;
     static nextTick(): Promise<void>;
 }
+declare class EasyDataLoader<TKey, TData> extends LoomDataLoader<TKey, TData> {
+    protected readonly batchLoadFn: BatchLoadFn<TKey, TData>;
+    protected batchLoad(keys: TKey[]): Promise<(TData | Error)[]>;
+    constructor(batchLoadFn: BatchLoadFn<TKey, TData>);
+}
 
 interface SchemaWeaver {
     vendor: string;
@@ -467,4 +481,4 @@ interface GQLoomExtensionAttribute {
     directives?: string[];
 }
 
-export { BaseField, type BatchLoadFn, ChainResolver, type CoreSchemaWeaverConfig, type CoreSchemaWeaverConfigOptions, type DirectiveItem, type DirectiveRecord, EasyDataLoader, type Executor, Field, FieldChainFactory, FieldFactoryWithUtils, FieldOptions, FieldOrOperation, type GQLoomExtensionAttribute, type GQLoomExtensions, type GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, InferInputI, type ListSilk, LoomObjectType, MayPromise, Middleware, Mutation, MutationChainFactory, MutationFactoryWithChain, MutationOptions, type NonNullSilk, type NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, Operation, Query, QueryChainFactory, QueryFactoryWithChain, QueryOptions, Resolver, type ResolverFactory, ResolverOptions, ResolverOptionsWithExtensions, ResolverPayload, type SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactoryWithChain, SubscriptionOptions, type ToExecutorProps, ValueOf, type WeaverConfig, type WeaverContext, capitalize, collectName, collectNames, createField, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, getCacheType, getFieldOptions, getGraphQLType, getOperationOptions, getSubscriptionOptions, initWeaverContext, inputToArgs, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };
+export { BaseField, type BatchLoadFn, ChainResolver, type CoreSchemaWeaverConfig, type CoreSchemaWeaverConfigOptions, type DirectiveItem, type DirectiveRecord, EasyDataLoader, type Executor, Field, FieldChainFactory, FieldFactoryWithUtils, FieldOptions, FieldOrOperation, type GQLoomExtensionAttribute, type GQLoomExtensions, type GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, InferInputI, type ListSilk, LoomDataLoader, LoomObjectType, MayPromise, Middleware, Mutation, MutationChainFactory, MutationFactoryWithChain, MutationOptions, type NonNullSilk, type NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, Operation, Query, QueryChainFactory, QueryFactoryWithChain, QueryOptions, Resolver, type ResolverFactory, ResolverOptions, ResolverOptionsWithExtensions, ResolverPayload, type SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactoryWithChain, SubscriptionOptions, type ToExecutorProps, ValueOf, type WeaverConfig, type WeaverContext, capitalize, collectName, collectNames, createField, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, getCacheType, getFieldOptions, getGraphQLType, getOperationOptions, getSubscriptionOptions, initWeaverContext, inputToArgs, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { F as FieldOptions, Q as QueryOptions, M as MutationOptions, R as ResolverPayload, S as SubscriptionOptions, G as GraphQLFieldOptions, a as StandardSchemaV1, b as GraphQLSilk, c as MayPromise, d as Query, e as QueryChainFactory, f as QueryFactoryWithChain, g as Mutation, h as MutationChainFactory, i as MutationFactoryWithChain, j as Field, k as FieldChainFactory, l as FieldFactoryWithUtils, m as SubscriptionChainFactory, n as Subscription, o as SubscriptionFactoryWithChain, O as Operation, p as FIELD_HIDDEN, q as ResolverOptionsWithExtensions, r as OmitInUnion, V as ValueOf, s as ResolverOptions, t as FieldOrOperation, u as Resolver, I as IS_RESOLVER, v as Middleware, w as InferInputI, W as WEAVER_CONFIG, B as BaseField } from './context-D0Bwgtgg.js';
-export { $ as BaseChainFactory, ai as CallableInputParser, D as CallableMiddlewareOptions, _ as ChainFactoryOptions, ae as FieldFactory, a4 as FieldFactoryWithResolve, ag as FieldMeta, a9 as FieldOrOperationType, Z as IChainFactory, aa as InferFieldInput, ab as InferFieldOutput, ah as InferInputO, y as IsAny, a5 as Loom, E as MiddlewareConfig, A as MiddlewareOperation, C as MiddlewareOptions, ad as MutationFactory, a3 as MutationFactoryWithResolve, P as OnlyMemoizationPayload, a8 as OperationType, ac as QueryFactory, a2 as QueryFactoryWithResolve, z as RequireKeys, a0 as ResolvableSubscription, a6 as ResolverOptionsWithParent, K as ResolvingFields, a7 as ResolvingOptions, x as SYMBOLS, af as SubscriptionFactory, a1 as SubscriptionNeedResolve, H as applyMiddlewares, Y as assignContextMap, aj as createInputParser, J as filterMiddlewares, X as getMemoizationMap, L as getResolvingFields, al as getStandardValue, U as isOnlyMemoryPayload, T as onlyMemoization, ak as parseInputValue, N as parseResolvingFields } from './context-D0Bwgtgg.js';
+import { F as FieldOptions, Q as QueryOptions, M as MutationOptions, R as ResolverPayload, S as SubscriptionOptions, G as GraphQLFieldOptions, a as StandardSchemaV1, b as GraphQLSilk, c as MayPromise, d as Query, e as QueryChainFactory, f as QueryFactoryWithChain, g as Mutation, h as MutationChainFactory, i as MutationFactoryWithChain, j as Field, k as FieldChainFactory, l as FieldFactoryWithUtils, m as SubscriptionChainFactory, n as Subscription, o as SubscriptionFactoryWithChain, O as Operation, p as FIELD_HIDDEN, q as ResolverOptionsWithExtensions, r as OmitInUnion, V as ValueOf, s as ResolverOptions, t as FieldOrOperation, u as Resolver, I as IS_RESOLVER, v as Middleware, w as InferInputI, W as WEAVER_CONFIG, B as BaseField } from './context-uzUlbx3r.js';
+export { $ as BaseChainFactory, ai as CallableInputParser, D as CallableMiddlewareOptions, _ as ChainFactoryOptions, ae as FieldFactory, a4 as FieldFactoryWithResolve, ag as FieldMeta, a9 as FieldOrOperationType, Z as IChainFactory, aa as InferFieldInput, ab as InferFieldOutput, ah as InferInputO, y as IsAny, a5 as Loom, E as MiddlewareConfig, A as MiddlewareOperation, C as MiddlewareOptions, ad as MutationFactory, a3 as MutationFactoryWithResolve, P as OnlyMemoizationPayload, a8 as OperationType, ac as QueryFactory, a2 as QueryFactoryWithResolve, z as RequireKeys, a0 as ResolvableSubscription, a6 as ResolverOptionsWithParent, K as ResolvingFields, a7 as ResolvingOptions, x as SYMBOLS, af as SubscriptionFactory, a1 as SubscriptionNeedResolve, H as applyMiddlewares, Y as assignContextMap, aj as createInputParser, J as filterMiddlewares, X as getMemoizationMap, L as getResolvingFields, al as getStandardValue, U as isOnlyMemoryPayload, T as onlyMemoization, ak as parseInputValue, N as parseResolvingFields } from './context-uzUlbx3r.js';
 import { GraphQLFieldExtensions, GraphQLScalarType, GraphQLObjectType, GraphQLOutputType, GraphQLNullableType, GraphQLList, GraphQLNonNull, GraphQLObjectTypeConfig, GraphQLUnionType, GraphQLInterfaceType, GraphQLInputObjectType, GraphQLFieldMap, GraphQLFieldConfig, GraphQLSchemaConfig, GraphQLNamedType, GraphQLSchema, GraphQLFieldConfigArgumentMap, GraphQLType, GraphQLInputType, GraphQLInterfaceTypeConfig } from 'graphql';
 
 declare function getOperationOptions(resolveOrOptions: ((...args: any) => any) | FieldOptions<any, any, any, any> | QueryOptions<any, any> | MutationOptions<any, any>): any;
@@ -271,23 +271,37 @@ declare function tryIn<T>(func: () => T, ...locations: string[]): T;
 declare function markLocation(message: string, ...locations: string[]): string;
 
 type BatchLoadFn<TKey, TData> = (keys: TKey[]) => Promise<(TData | Error)[]>;
-declare class EasyDataLoader<TKey, TData> {
-    protected readonly batchLoadFn: BatchLoadFn<TKey, TData>;
-    protected queue: TKey[];
-    protected cache: Map<TKey, Promise<TData>>;
+/**
+ * GraphQL Loom built-in data loader.
+ */
+declare abstract class LoomDataLoader<TKey, TData> {
+    protected abstract batchLoad(keys: TKey[]): Promise<(TData | Error)[]>;
+    protected results: Map<TKey, Promise<TData>>;
     protected resolvers: Map<TKey, [
         resolve: (value: TData | PromiseLike<TData>) => void,
         reject: (reason?: any) => void
     ]>;
-    constructor(batchLoadFn: BatchLoadFn<TKey, TData>);
+    constructor();
+    /**
+     * Load data for a given key.
+     * @param key - The key to load data for.
+     * @returns A promise that resolves to the loaded data.
+     */
     load(key: TKey): Promise<TData>;
+    /**
+     * Clear the cache and reset the loader.
+     */
     clear(): void;
-    clearByKey(key: TKey): void;
     protected executeBatchLoad(): Promise<void>;
     protected nextTickPromise?: Promise<void>;
     protected nextTickBatchLoad(): Promise<void>;
     static nextTick(): Promise<void>;
 }
+declare class EasyDataLoader<TKey, TData> extends LoomDataLoader<TKey, TData> {
+    protected readonly batchLoadFn: BatchLoadFn<TKey, TData>;
+    protected batchLoad(keys: TKey[]): Promise<(TData | Error)[]>;
+    constructor(batchLoadFn: BatchLoadFn<TKey, TData>);
+}
 
 interface SchemaWeaver {
     vendor: string;
@@ -467,4 +481,4 @@ interface GQLoomExtensionAttribute {
     directives?: string[];
 }
 
-export { BaseField, type BatchLoadFn, ChainResolver, type CoreSchemaWeaverConfig, type CoreSchemaWeaverConfigOptions, type DirectiveItem, type DirectiveRecord, EasyDataLoader, type Executor, Field, FieldChainFactory, FieldFactoryWithUtils, FieldOptions, FieldOrOperation, type GQLoomExtensionAttribute, type GQLoomExtensions, type GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, InferInputI, type ListSilk, LoomObjectType, MayPromise, Middleware, Mutation, MutationChainFactory, MutationFactoryWithChain, MutationOptions, type NonNullSilk, type NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, Operation, Query, QueryChainFactory, QueryFactoryWithChain, QueryOptions, Resolver, type ResolverFactory, ResolverOptions, ResolverOptionsWithExtensions, ResolverPayload, type SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactoryWithChain, SubscriptionOptions, type ToExecutorProps, ValueOf, type WeaverConfig, type WeaverContext, capitalize, collectName, collectNames, createField, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, getCacheType, getFieldOptions, getGraphQLType, getOperationOptions, getSubscriptionOptions, initWeaverContext, inputToArgs, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };
+export { BaseField, type BatchLoadFn, ChainResolver, type CoreSchemaWeaverConfig, type CoreSchemaWeaverConfigOptions, type DirectiveItem, type DirectiveRecord, EasyDataLoader, type Executor, Field, FieldChainFactory, FieldFactoryWithUtils, FieldOptions, FieldOrOperation, type GQLoomExtensionAttribute, type GQLoomExtensions, type GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, InferInputI, type ListSilk, LoomDataLoader, LoomObjectType, MayPromise, Middleware, Mutation, MutationChainFactory, MutationFactoryWithChain, MutationOptions, type NonNullSilk, type NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, Operation, Query, QueryChainFactory, QueryFactoryWithChain, QueryOptions, Resolver, type ResolverFactory, ResolverOptions, ResolverOptionsWithExtensions, ResolverPayload, type SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactoryWithChain, SubscriptionOptions, type ToExecutorProps, ValueOf, type WeaverConfig, type WeaverContext, capitalize, collectName, collectNames, createField, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, getCacheType, getFieldOptions, getGraphQLType, getOperationOptions, getSubscriptionOptions, initWeaverContext, inputToArgs, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };

package/dist/index.js

@@ -169,48 +169,45 @@ function markLocation(message, ...locations) {
 }
 
 // src/utils/loader.ts
-var EasyDataLoader = class _EasyDataLoader {
-  constructor(batchLoadFn) {
-    this.batchLoadFn = batchLoadFn;
-    this.queue = [];
-    this.cache = /* @__PURE__ */ new Map();
+var LoomDataLoader = class _LoomDataLoader {
+  results;
+  resolvers;
+  constructor() {
+    this.results = /* @__PURE__ */ new Map();
     this.resolvers = /* @__PURE__ */ new Map();
   }
-  queue;
-  cache;
-  resolvers;
+  /**
+   * Load data for a given key.
+   * @param key - The key to load data for.
+   * @returns A promise that resolves to the loaded data.
+   */
   load(key) {
-    const existing = this.cache.get(key);
+    const existing = this.results.get(key);
     if (existing) return existing;
     const promise = new Promise((resolve, reject) => {
-      this.queue.push(key);
       this.resolvers.set(key, [resolve, reject]);
       this.nextTickBatchLoad();
     });
-    this.cache.set(key, promise);
+    this.results.set(key, promise);
     return promise;
   }
+  /**
+   * Clear the cache and reset the loader.
+   */
   clear() {
-    this.queue = [];
-    this.cache = /* @__PURE__ */ new Map();
+    this.results = /* @__PURE__ */ new Map();
     this.resolvers = /* @__PURE__ */ new Map();
   }
-  clearByKey(key) {
-    this.queue = this.queue.filter((k) => k !== key);
-    this.cache.delete(key);
-    this.resolvers.delete(key);
-  }
   async executeBatchLoad() {
-    if (this.queue.length === 0) return;
-    const [keys, resolvers] = [this.queue, this.resolvers];
-    this.queue = [];
+    if (this.resolvers.size === 0) return;
+    const resolvers = this.resolvers;
     this.resolvers = /* @__PURE__ */ new Map();
+    const keys = Array.from(resolvers.keys());
     try {
-      const list = await this.batchLoadFn(keys);
+      const list = await this.batchLoad(keys);
       for (let i = 0; i < list.length; i++) {
         const data = list[i];
-        const resolve = resolvers.get(keys[i])?.[0];
-        const reject = resolvers.get(keys[i])?.[1];
+        const [resolve, reject] = resolvers.get(keys[i]) ?? [];
         if (data instanceof Error) {
           reject?.(data);
         } else {
@@ -226,13 +223,32 @@ var EasyDataLoader = class _EasyDataLoader {
   }
   nextTickPromise;
   nextTickBatchLoad() {
-    this.nextTickPromise ??= _EasyDataLoader.nextTick().then(() => this.executeBatchLoad()).finally(() => this.nextTickPromise = void 0);
+    const load = async () => {
+      try {
+        while (this.resolvers.size > 0) {
+          await _LoomDataLoader.nextTick();
+          await this.executeBatchLoad();
+        }
+      } finally {
+        this.nextTickPromise = void 0;
+      }
+    };
+    this.nextTickPromise ??= load();
     return this.nextTickPromise;
   }
   static nextTick() {
     return new Promise((resolve) => setTimeout(resolve));
   }
 };
+var EasyDataLoader = class extends LoomDataLoader {
+  constructor(batchLoadFn) {
+    super();
+    this.batchLoadFn = batchLoadFn;
+  }
+  batchLoad(keys) {
+    return this.batchLoadFn(keys);
+  }
+};
 
 // src/resolver/silk.ts
 import {
@@ -562,6 +578,38 @@ var BaseChainFactory = class _BaseChainFactory {
     });
   }
 };
+var FieldLoader = class _FieldLoader extends LoomDataLoader {
+  constructor(resolve) {
+    super();
+    this.resolve = resolve;
+  }
+  static getByPath(payload, resolve, getByPath = true) {
+    if (!payload) return new _FieldLoader(resolve);
+    const memoMap = getMemoizationMap(payload);
+    if (!getByPath) {
+      const loader = memoMap.get(resolve) ?? new _FieldLoader(resolve);
+      memoMap.set(resolve, loader);
+      return loader;
+    }
+    const fullPath = [];
+    let path = payload.info.path;
+    while (path) {
+      fullPath.push(path);
+      path = path.prev;
+    }
+    const pathKey = fullPath.reverse().map((p) => typeof p.key === "number" ? "[n]" : p.key).join(".");
+    const fieldLoaders = memoMap.get(resolve) ?? /* @__PURE__ */ new Map();
+    memoMap.set(resolve, fieldLoaders);
+    const fieldLoader = fieldLoaders.get(pathKey) ?? new _FieldLoader(resolve);
+    fieldLoaders.set(pathKey, fieldLoader);
+    return fieldLoader;
+  }
+  batchLoad(args) {
+    const parents = args.map(([parent]) => parent);
+    const payloads = args.map(([, , payload]) => payload);
+    return this.resolve(parents, args[0]?.[1], payloads);
+  }
+};
 var FieldChainFactory = class _FieldChainFactory extends BaseChainFactory {
   /**
    * Returns the available methods for the field chain factory
@@ -624,31 +672,19 @@ var FieldChainFactory = class _FieldChainFactory extends BaseChainFactory {
    * by batching them together and handling caching automatically.
    *
    * @template TParent - The parent type that extends GraphQLSilk
-   * @param resolve - A function that handles batch loading of data. The function receives:
-   *   - When no input type is defined: An array of parent objects
-   *   - When input type is defined: An array of tuples containing [parent, input]
-   *   - An array of resolver payloads
+   * @param resolve - A function that handles batch loading of data.
    * @returns A GraphQL field resolver that implements batch loading
    */
   load(resolve) {
     if (!this.options?.output) throw new Error("Output is required");
-    const hasInput = typeof this.options.input !== "undefined";
-    const initLoader = () => new EasyDataLoader((args) => {
-      const parents = args.map(
-        ([parent, input]) => hasInput ? [parent, input] : parent
-      );
-      const payloads = args.map(([, , payload]) => payload);
-      return resolve(parents, payloads);
-    });
     return createField(this.options.output, {
       ...this.options,
       resolve: (parent, input, payload) => {
-        const loader = (() => {
-          if (!payload) return initLoader();
-          const memoMap = getMemoizationMap(payload);
-          if (!memoMap.has(resolve)) memoMap.set(resolve, initLoader());
-          return memoMap.get(resolve);
-        })();
+        const loader = FieldLoader.getByPath(
+          payload,
+          resolve,
+          this.options?.input != null
+        );
         return loader.load([parent, input, payload]);
       }
     });
@@ -900,7 +936,10 @@ var FieldFactoryWithResolve = class _FieldFactoryWithResolve extends BaseChainFa
     this.options = options;
   }
   get "~meta"() {
-    return loom.field(this.outputSilk, this.options)["~meta"];
+    return loom.field(
+      this.outputSilk,
+      this.options
+    )["~meta"];
   }
   clone(options) {
     return new _FieldFactoryWithResolve(this.outputSilk, {
@@ -908,6 +947,12 @@ var FieldFactoryWithResolve = class _FieldFactoryWithResolve extends BaseChainFa
       ...options
     });
   }
+  input(input) {
+    return new _FieldFactoryWithResolve(this.outputSilk, {
+      ...this.options,
+      input
+    });
+  }
   output(output, transform) {
     return new _FieldFactoryWithResolve(output, {
       ...this.options,
@@ -1802,6 +1847,7 @@ export {
   FieldChainFactory,
   FieldFactoryWithResolve,
   GraphQLSchemaLoom,
+  LoomDataLoader,
   LoomObjectType,
   MutationChainFactory,
   MutationFactoryWithResolve,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gqloom/core",
-  "version": "0.9.6",
+  "version": "0.10.0",
   "description": "Create GraphQL schema and resolvers with TypeScript.",
   "type": "module",
   "main": "./dist/index.js",