@gqloom/core 0.9.6 → 0.9.7

package/dist/index.cjs

@@ -22,10 +22,11 @@ var src_exports = {};
 __export(src_exports, {
   BaseChainFactory: () => BaseChainFactory,
   ChainResolver: () => ChainResolver,
-  EasyDataLoader: () => EasyDataLoader,
+  EasyDataLoader: () => LoomDataLoader,
   FieldChainFactory: () => FieldChainFactory,
   FieldFactoryWithResolve: () => FieldFactoryWithResolve,
   GraphQLSchemaLoom: () => GraphQLSchemaLoom,
+  LoomDataLoader: () => LoomDataLoader,
   LoomObjectType: () => LoomObjectType,
   MutationChainFactory: () => MutationChainFactory,
   MutationFactoryWithResolve: () => MutationFactoryWithResolve,
@@ -410,48 +411,46 @@ function markLocation(message, ...locations) {
 }
 
 // src/utils/loader.ts
-var EasyDataLoader = class _EasyDataLoader {
+var LoomDataLoader = class _LoomDataLoader {
   constructor(batchLoadFn) {
     this.batchLoadFn = batchLoadFn;
-    this.queue = [];
-    this.cache = /* @__PURE__ */ new Map();
+    this.results = /* @__PURE__ */ new Map();
     this.resolvers = /* @__PURE__ */ new Map();
   }
-  queue;
-  cache;
+  results;
   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);
       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,7 +466,17 @@ 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() {
@@ -902,7 +911,7 @@ var FieldChainFactory = class _FieldChainFactory extends BaseChainFactory {
   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 initLoader = () => new LoomDataLoader((args) => {
       const parents = args.map(
         ([parent, input]) => hasInput ? [parent, input] : parent
       );
@@ -2041,6 +2050,7 @@ function ensureInterfaceType(gqlType, interfaceConfig) {
   FieldChainFactory,
   FieldFactoryWithResolve,
   GraphQLSchemaLoom,
+  LoomDataLoader,
   LoomObjectType,
   MutationChainFactory,
   MutationFactoryWithResolve,

package/dist/index.d.cts

@@ -271,18 +271,27 @@ 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> {
+/**
+ * GraphQL Loom built-in data loader.
+ */
+declare class LoomDataLoader<TKey, TData> {
     protected readonly batchLoadFn: BatchLoadFn<TKey, TData>;
-    protected queue: TKey[];
-    protected cache: Map<TKey, Promise<TData>>;
+    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>);
+    /**
+     * 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>;
@@ -467,4 +476,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, LoomDataLoader as 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

@@ -271,18 +271,27 @@ 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> {
+/**
+ * GraphQL Loom built-in data loader.
+ */
+declare class LoomDataLoader<TKey, TData> {
     protected readonly batchLoadFn: BatchLoadFn<TKey, TData>;
-    protected queue: TKey[];
-    protected cache: Map<TKey, Promise<TData>>;
+    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>);
+    /**
+     * 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>;
@@ -467,4 +476,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, LoomDataLoader as 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,46 @@ function markLocation(message, ...locations) {
 }
 
 // src/utils/loader.ts
-var EasyDataLoader = class _EasyDataLoader {
+var LoomDataLoader = class _LoomDataLoader {
   constructor(batchLoadFn) {
     this.batchLoadFn = batchLoadFn;
-    this.queue = [];
-    this.cache = /* @__PURE__ */ new Map();
+    this.results = /* @__PURE__ */ new Map();
     this.resolvers = /* @__PURE__ */ new Map();
   }
-  queue;
-  cache;
+  results;
   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);
       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,7 +224,17 @@ 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() {
@@ -633,7 +641,7 @@ var FieldChainFactory = class _FieldChainFactory extends BaseChainFactory {
   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 initLoader = () => new LoomDataLoader((args) => {
       const parents = args.map(
         ([parent, input]) => hasInput ? [parent, input] : parent
       );
@@ -1798,10 +1806,11 @@ function ensureInterfaceType(gqlType, interfaceConfig) {
 export {
   BaseChainFactory,
   ChainResolver,
-  EasyDataLoader,
+  LoomDataLoader as EasyDataLoader,
   FieldChainFactory,
   FieldFactoryWithResolve,
   GraphQLSchemaLoom,
+  LoomDataLoader,
   LoomObjectType,
   MutationChainFactory,
   MutationFactoryWithResolve,

package/package.json

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