[typescript-react-query] Does not use own types when combined with import-types and typescript-operations

Describe the bug I would like to separate out my schema-types from operation-types+hooks, and I believe I’ve found the config which should accomplish it. However, when using import-types-preset, all of the types are referenced from the Types import, even if they’re being exported from the same file.

To Reproduce Steps to reproduce the behavior:

https://codesandbox.io/s/graphql-code-generator-6909-lu5rm?file=/hooks.ts

Note typescript errors for Types.UserQuery, since UserQuery is defined in the same file, not ./types.

1. My GraphQL schema:

See reproduction

1. My GraphQL operations:

See reproduction

1. My codegen.yml config file:

generates:
  ./types.ts:
    plugins:
      - typescript
  ./hooks.ts:
    preset: import-types
    presetConfig:
      typesPath: ./types
    plugins:
      - typescript-operations
      - typescript-react-query

Expected behavior I expect that types being exported from hooks.ts are not attempted to be imported from types.ts.

Environment:

• OS: mac
• @graphql-codegen/...: latest, see reproduction
• NodeJS: 16

Additional context A similar issue which was recently fixed: https://github.com/dotansimha/graphql-code-generator/issues/6520

[StampixSMO]

Sure, I added this file:

fix-types.js

const fs = require('fs');
const path = require('path');

const run = async () => {
  const file = path.join(__dirname, 'RELATIVE_PATH_TO_YOUR_GENERATED_FILE');
  let generatedContent = (await fs.promises.readFile(file)).toString();
  const reactQueryTypeMatches = Array.from(generatedContent.matchAll(/type (.+) =/g));
  for (const match of reactQueryTypeMatches) {
    const type = match[1];
    console.log(type);
    generatedContent = generatedContent.replace(new RegExp(`Types.${type}`, 'g'), type);
  }
  await fs.promises.writeFile(file, generatedContent);
};

run().catch((err) => {
  console.error(err);
  process.exit(1);
});

Then I run a hook in my codegen.yml file

hooks:
      afterOneFileWrite:
        - yarn graphql:codegen:fix

Then I added a graphql:codegen:fix script in my package.json that runs fix-types.js

[StampixSMO]

If anyone’s interested, I have temporarily solved my issue in a hacky way. I run an automated post-codegen script that replaces Types.X with X if X’s type is present in the file.