Skip to content

Commit 537a170

Browse files
committed
refactor: tidy type formatting
1 parent 83ebaeb commit 537a170

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

eslint.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import tsEslint from 'typescript-eslint'
33

44
export default tsEslint.config({
55
ignores: [
6+
'playground/**/*',
7+
'graffle/**/*',
68
'project/**/*',
79
'examples/35_custom-scalar/custom-scalar.ts',
810
'eslint.config.js',

src/documentBuilder/InferResult/OutputObject.ts

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,39 @@ import type { Alias } from './Alias.js'
66
import type { OutputField } from './OutputField.js'
77
import type { ScalarsWildcard } from './ScalarsWildcard.js'
88

9+
// dprint-ignore
910
export type OutputObject<$SelectionSet, $Schema extends Schema, $Node extends Schema.OutputObject> =
1011
Select.SelectScalarsWildcard.IsSelectScalarsWildcard<$SelectionSet> extends true
1112
// todo what about when scalars wildcard is combined with other fields like relations?
1213
? ScalarsWildcard<$SelectionSet, $Schema, $Node>
1314
: SimplifyExcept<
14-
$Schema['scalars']['typesDecoded'],
15-
& SelectionNonSelectAlias<$SelectionSet, $Schema, $Node>
16-
& Alias<$Schema, $Node, $SelectionSet>
17-
>
15+
$Schema['scalars']['typesDecoded'],
16+
& NonAlias<$SelectionSet, $Schema, $Node>
17+
& Alias<$Schema, $Node, $SelectionSet>
18+
>
1819

19-
type SelectionNonSelectAlias<$SelectionSet, $Schema extends Schema, $Node extends Schema.OutputObject> = {
20+
type NonAlias<$SelectionSet, $Schema extends Schema, $Node extends Schema.OutputObject> = {
2021
[$Key in PickSelectsPositiveIndicatorAndNotSelectAlias<$SelectionSet>]: $Key extends keyof $Node['fields']
2122
? OutputField<$SelectionSet[$Key], $Node['fields'][$Key], $Schema>
2223
: Errors.UnknownFieldName<$Key, $Node>
2324
}
2425

25-
export namespace Errors {
26-
export type UnknownFieldName<
27-
$FieldName extends string,
28-
$Object extends Schema.OutputObject,
29-
> = TSErrorDescriptive<'Object', `field "${$FieldName}" does not exist on object "${$Object['name']}"`>
30-
}
31-
26+
// dprint-ignore
3227
export type PickSelectsPositiveIndicatorAndNotSelectAlias<$SelectionSet> = StringKeyof<
3328
{
3429
[
35-
$FieldName in keyof $SelectionSet as $SelectionSet[$FieldName] extends Select.Indicator.Negative ? never
36-
: $SelectionSet[$FieldName] extends any[] ? never
37-
: $FieldName
30+
$FieldName in keyof $SelectionSet as $SelectionSet[$FieldName] extends Select.Indicator.Negative
31+
? never
32+
: $SelectionSet[$FieldName] extends any[]
33+
? never
34+
: $FieldName
3835
]: 0
3936
}
4037
>
38+
39+
export namespace Errors {
40+
export type UnknownFieldName<
41+
$FieldName extends string,
42+
$Object extends Schema.OutputObject,
43+
> = TSErrorDescriptive<'Object', `field "${$FieldName}" does not exist on object "${$Object['name']}"`>
44+
}

0 commit comments

Comments
 (0)