@pothos/core - npm Package Compare versions

Comparing version 4.7.0 to 4.7.1

CHANGELOG.md

 # Change Log
 
+## 4.7.1
+
+### Patch Changes
+
+- f7f8c25: Add fix for AsyncIterable when ts target is <es2018
+
 ## 4.7.0
@@ -4,0 +10,0 @@

dts/types/builder-options.d.ts

@@ -12,5 +12,5 @@ import type { GraphQLResolveInfo } from 'graphql';
 export type Resolver<Parent, Args, Context, Type, Return = unknown> = (parent: Parent, args: Args, context: Context, info: GraphQLResolveInfo) => [Type] extends [readonly (infer Item)[] | null | undefined] ? ListResolveValue<Type, Item, Return> : MaybePromise<Type>;
-export type ListResolveValue<Type, Item, Return> = Return extends AsyncIterable<unknown, unknown> ? AsyncIterableResolverResult<Type, Item> & Return : Return extends readonly unknown[] ? ArrayResolverResult<Type, Item, Return> : IterableResolverResult<Type, Item> & Return;
+export type ListResolveValue<Type, Item, Return> = unknown extends AsyncIterable<unknown> ? Return extends readonly unknown[] ? ArrayResolverResult<Type, Item, Return> : IterableResolverResult<Type, Item> & Return : Return extends AsyncIterable<unknown, unknown> ? AsyncIterableResolverResult<Type, Item> & Return : Return extends readonly unknown[] ? ArrayResolverResult<Type, Item, Return> : Return extends Iterable<unknown> ? IterableResolverResult<Type, Item> & Return : (IterableResolverResult<Type, Item> | AsyncIterableResolverResult<Type, Item>) & Return;
 type ArrayResolverResult<Type, Item, Return> = null extends Type ? Return extends MaybePromise<readonly MaybePromise<Item>[] | null | undefined> ? Return : MaybePromise<readonly MaybePromise<Item>[]> | null | undefined : Return extends MaybePromise<readonly MaybePromise<Item>[]> ? Return : MaybePromise<readonly MaybePromise<Item>[]>;
-type AsyncIterableResolverResult<Type, Item> = null extends Type ? MaybePromise<AsyncIterable<MaybePromise<Item>> | null | undefined> : MaybePromise<AsyncIterable<MaybePromise<Item>>>;
+type AsyncIterableResolverResult<Type, Item> = null extends Type ? MaybePromise<AsyncIterable<Item> | null | undefined> : MaybePromise<AsyncIterable<Item>>;
 type IterableResolverResult<Type, Item> = null extends Type ? MaybePromise<Iterable<MaybePromise<Item>> | null | undefined> : MaybePromise<Iterable<MaybePromise<Item>>>;
@@ -17,0 +17,0 @@ export type Subscriber<Parent, Args, Context, Shape> = (parent: Parent, args: Args, context: Context, info: GraphQLResolveInfo) => MaybePromise<AsyncIterable<Shape>>;

esm/types/builder-options.d.ts

@@ -16,5 +16,5 @@ import type { GraphQLResolveInfo } from 'graphql';
 ] ? ListResolveValue<Type, Item, Return> : MaybePromise<Type>;
-export type ListResolveValue<Type, Item, Return> = Return extends AsyncIterable<unknown, unknown> ? AsyncIterableResolverResult<Type, Item> & Return : Return extends readonly unknown[] ? ArrayResolverResult<Type, Item, Return> : IterableResolverResult<Type, Item> & Return;
+export type ListResolveValue<Type, Item, Return> = unknown extends AsyncIterable<unknown> ? Return extends readonly unknown[] ? ArrayResolverResult<Type, Item, Return> : IterableResolverResult<Type, Item> & Return : Return extends AsyncIterable<unknown, unknown> ? AsyncIterableResolverResult<Type, Item> & Return : Return extends readonly unknown[] ? ArrayResolverResult<Type, Item, Return> : Return extends Iterable<unknown> ? IterableResolverResult<Type, Item> & Return : (IterableResolverResult<Type, Item> | AsyncIterableResolverResult<Type, Item>) & Return;
 type ArrayResolverResult<Type, Item, Return> = null extends Type ? Return extends MaybePromise<readonly MaybePromise<Item>[] | null | undefined> ? Return : MaybePromise<readonly MaybePromise<Item>[]> | null | undefined : Return extends MaybePromise<readonly MaybePromise<Item>[]> ? Return : MaybePromise<readonly MaybePromise<Item>[]>;
-type AsyncIterableResolverResult<Type, Item> = null extends Type ? MaybePromise<AsyncIterable<MaybePromise<Item>> | null | undefined> : MaybePromise<AsyncIterable<MaybePromise<Item>>>;
+type AsyncIterableResolverResult<Type, Item> = null extends Type ? MaybePromise<AsyncIterable<Item> | null | undefined> : MaybePromise<AsyncIterable<Item>>;
 type IterableResolverResult<Type, Item> = null extends Type ? MaybePromise<Iterable<MaybePromise<Item>> | null | undefined> : MaybePromise<Iterable<MaybePromise<Item>>>;
@@ -21,0 +21,0 @@ export type Subscriber<Parent, Args, Context, Shape> = (parent: Parent, args: Args, context: Context, info: GraphQLResolveInfo) => MaybePromise<AsyncIterable<Shape>>;

package.json

 {
   "name": "@pothos/core",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Pothos (formerly GiraphQL) is a plugin based schema builder for creating code-first GraphQL schemas in typescript",
@@ -5,0 +5,0 @@ "main": "./lib/index.js",

src/types/builder-options.ts

@@ -52,7 +52,13 @@ import type { GraphQLResolveInfo } from 'graphql';
 
-export type ListResolveValue<Type, Item, Return> = Return extends AsyncIterable<unknown, unknown>
-  ? AsyncIterableResolverResult<Type, Item> & Return
-  : Return extends readonly unknown[]
+export type ListResolveValue<Type, Item, Return> = unknown extends AsyncIterable<unknown> // hack for target:<es2018
+  ? Return extends readonly unknown[]
     ? ArrayResolverResult<Type, Item, Return>
-    : IterableResolverResult<Type, Item> & Return;
+    : IterableResolverResult<Type, Item> & Return
+  : Return extends AsyncIterable<unknown, unknown>
+    ? AsyncIterableResolverResult<Type, Item> & Return
+    : Return extends readonly unknown[]
+      ? ArrayResolverResult<Type, Item, Return>
+      : Return extends Iterable<unknown>
+        ? IterableResolverResult<Type, Item> & Return
+        : (IterableResolverResult<Type, Item> | AsyncIterableResolverResult<Type, Item>) & Return;
 
@@ -68,4 +74,4 @@ type ArrayResolverResult<Type, Item, Return> = null extends Type
 type AsyncIterableResolverResult<Type, Item> = null extends Type
-  ? MaybePromise<AsyncIterable<MaybePromise<Item>> | null | undefined>
-  : MaybePromise<AsyncIterable<MaybePromise<Item>>>;
+  ? MaybePromise<AsyncIterable<Item> | null | undefined>
+  : MaybePromise<AsyncIterable<Item>>;
 
@@ -72,0 +78,0 @@ type IterableResolverResult<Type, Item> = null extends Type

No alert changes

Improved metrics

Total package byte prevSize

1144652

0.13%

Lines of code

16661

0.05%

No dependency changes