Fix options getting swallowed by client preset

dotansimha · Jun 10, 2023 · 9644912 · 9644912
1 parent 2139f1d
commit 9644912
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/packages/presets/client/src/index.ts b/packages/presets/client/src/index.ts
@@ -116,22 +116,6 @@ export const preset: Types.OutputPreset<ClientPresetConfig> = {
 
     const reexports: Array<string> = [];
 
-    // the `client` preset is restricting the config options inherited from `typescript`, `typescript-operations` and others.
-    const forwardedConfig = {
-      scalars: options.config.scalars,
-      defaultScalarType: options.config.defaultScalarType,
-      strictScalars: options.config.strictScalars,
-      namingConvention: options.config.namingConvention,
-      useTypeImports: options.config.useTypeImports,
-      skipTypename: options.config.skipTypename,
-      arrayInputCoercion: options.config.arrayInputCoercion,
-      enumsAsTypes: options.config.enumsAsTypes,
-      dedupeFragments: options.config.dedupeFragments,
-      nonOptionalTypename: options.config.nonOptionalTypename,
-      avoidOptionals: options.config.avoidOptionals,
-      documentMode: options.config.documentMode,
-    };
-
     const visitor = new ClientSideBaseVisitor(options.schemaAst!, [], options.config, options.config);
     let fragmentMaskingConfig: FragmentMaskingConfig | null = null;
 
@@ -252,9 +236,8 @@ export const preset: Types.OutputPreset<ClientPresetConfig> = {
         ],
         schema: options.schema,
         config: {
-          useTypeImports: options.config.useTypeImports,
+          ...options.config,
           unmaskFunctionName: fragmentMaskingConfig.unmaskFunctionName,
-          emitLegacyCommonJSImports: options.config.emitLegacyCommonJSImports,
           isStringDocumentMode: options.config.documentMode === DocumentMode.string,
         },
         documents: [],
@@ -283,7 +266,7 @@ export const preset: Types.OutputPreset<ClientPresetConfig> = {
           },
         ],
         schema: options.schema,
-        config: {},
+        config,
         documents: [],
         documentTransforms: options.documentTransforms,
       };
@@ -296,8 +279,8 @@ export const preset: Types.OutputPreset<ClientPresetConfig> = {
         pluginMap,
         schema: options.schema,
         config: {
+          ...options.config,
           inlineFragmentTypes: isMaskingFragments ? 'mask' : options.config['inlineFragmentTypes'],
-          ...forwardedConfig,
         },
         documents: sources,
         documentTransforms: options.documentTransforms,
@@ -334,7 +317,7 @@ export const preset: Types.OutputPreset<ClientPresetConfig> = {
                 },
               },
               schema: options.schema,
-              config: {},
+              config,
               documents: sources,
               documentTransforms: options.documentTransforms,
             },

diff --git a/packages/presets/client/tests/client-preset.spec.ts b/packages/presets/client/tests/client-preset.spec.ts
@@ -2513,4 +2513,30 @@ export * from "./gql.js";`);
       `);
     });
   });
+
+  // Note: The main test for "dedupeOperationSuffix" happens elsewhere. This is just a regression test to verify that
+  // the preset doesn't fundamentally break it.
+  it('Test for dedupeOperationSuffix', async () => {
+    const result = await executeCodegen({
+      schema: [
+        /* GraphQL */ `
+          type Query {
+            a: String
+          }
+        `,
+      ],
+      documents: path.join(__dirname, 'fixtures/operation-suffix.ts'),
+      generates: {
+        'out1/': {
+          preset,
+          config: {
+            dedupeOperationSuffix: true,
+          },
+        },
+      },
+    });
+
+    const graphqlFile = result.find(file => file.filename === 'out1/graphql.ts');
+    expect(graphqlFile.content).toContain('export type SomeQuery =');
+  });
 });
diff --git a/packages/presets/client/tests/fixtures/operation-suffix.ts b/packages/presets/client/tests/fixtures/operation-suffix.ts
@@ -0,0 +1,10 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+//@ts-ignore
+import gql from 'gql-tag';
+
+//@ts-ignore
+const A = gql(/* GraphQL */ `
+  query someQuery {
+    a
+  }
+`);