Skip to content

Commit 7f281c9

Browse files
authored
Fix scalar overrides not giving full control to user (#320)
* Update e2e test for unmanaged scalar case * Fix issue where scalarsOverride do not give full control to user * Clarify whether a file has been added on filesystem * Ensure unmanagedScalarResolvers have higher priority than scalarsModule * Add changeset * Fix unit tests
1 parent 05a5863 commit 7f281c9

File tree

31 files changed

+183
-46
lines changed

31 files changed

+183
-46
lines changed

.changeset/early-terms-turn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eddeee888/gcg-typescript-resolver-files': patch
3+
---
4+
5+
Fix scalarOverrides not giving full control to users

packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/codegen.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,18 @@ const config: CodegenConfig = {
88
generates: {
99
'packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema':
1010
defineConfig(
11-
{ resolverGeneration: 'minimal', blacklistedModules: ['user'] },
11+
{
12+
resolverGeneration: 'minimal',
13+
blacklistedModules: ['user'],
14+
externalResolvers: {
15+
PetHouse: 'pet/resolvers/PetHouse#PetHouseResolvers',
16+
},
17+
scalarsOverrides: {
18+
Date: {
19+
resolver: 'base/resolvers/Date#DateResolver',
20+
},
21+
},
22+
},
1223
{
1324
schema: [
1425
'packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/**/*.graphqls',

packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/base/base.graphqls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ type PaginationResult {
4040
}
4141

4242
scalar DateTime
43+
scalar Date
4344
scalar SomeRandomScalar
4445
scalar CustomLogicScalar
4546
scalar JSON
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* This file has been created on filesystem by src/test-resolvers/auto-wireup/test-setup.js */
2+
3+
export const DateResolver = {}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { ErrorResolvers } from './../../types.generated';
2+
/* This file has been created on filesystem by src/test-resolvers/auto-wireup/test-setup.js */
23
export const Error: ErrorResolvers = {
34
/* Implement Error interface logic here */
45
};

packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/base/resolvers/ErrorType.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { ErrorTypeResolvers } from './../../types.generated';
2+
/* This file has been created on filesystem by src/test-resolvers/auto-wireup/test-setup.js */
23
/*
34
* Note: This enum file is generated because "ErrorTypeMapper" is declared. This is to ensure runtime safety.
45
* If you want to skip this file generation, remove the mapper or update the pattern in the `resolverGeneration.object` config.

packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/base/resolvers/SortOrder.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import type { SortOrderResolvers } from './../../types.generated';
2+
/* This file has been created on filesystem by src/test-resolvers/auto-wireup/test-setup.js */
3+
24
export const SortOrder: SortOrderResolvers = {
35
ASC: 'ASCENDING',
46
DESC: 'DESC',
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
import type { PetResolvers } from './../../types.generated';
2+
/* This file has been created on filesystem by src/test-resolvers/auto-wireup/test-setup.js */
3+
24
export const Pet: PetResolvers = {};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* This file has been created on filesystem by src/test-resolvers/auto-wireup/test-setup.js */
2+
3+
export const PetHouseResolvers = {};
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
import type { PetToyResolvers } from './../../types.generated';
2+
/* This file has been created on filesystem by src/test-resolvers/auto-wireup/test-setup.js */
3+
24
export const PetToy: PetToyResolvers = {};

0 commit comments

Comments
 (0)