Fix issues after rebasing (#10563)

eddeee888 · github-actions[bot] · eddeee888 · commit 535105f862af · 2026-03-08T16:11:01.000+11:00
* Fix missing dep

* chore(dependencies): updated changesets for modified dependencies

* Fix dev-tests

---------

Co-authored-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;
diff --git a/.changeset/@graphql-codegen_typescript-operations-10563-dependencies.md b/.changeset/@graphql-codegen_typescript-operations-10563-dependencies.md
@@ -0,0 +1,5 @@
+---
+"@graphql-codegen/typescript-operations": patch
+---
+dependencies updates:
+  - Added dependency [`@graphql-codegen/schema-ast@^5.0.0` ↗︎](https://www.npmjs.com/package/@graphql-codegen/schema-ast/v/5.0.0) (to `dependencies`)
diff --git a/dev-test/standalone-operations/import-schema-types/_types.generated.ts b/dev-test/standalone-operations/import-schema-types/_types.generated.ts
@@ -1,4 +1,4 @@
-import type * as Types from './_base.generated';
+import type * as Types from './_base.generated.js';
 
 type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
 export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
diff --git a/packages/plugins/typescript/operations/package.json b/packages/plugins/typescript/operations/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^6.1.1",
-    "@graphql-codegen/typescript": "^5.0.9",
+    "@graphql-codegen/schema-ast": "^5.0.1",
     "@graphql-codegen/visitor-plugin-common": "^6.2.4",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
diff --git a/packages/plugins/typescript/operations/src/index.ts b/packages/plugins/typescript/operations/src/index.ts
@@ -64,7 +64,7 @@ export const plugin: PluginFunction<TypeScriptDocumentsPluginConfig, Types.Compl
   };
 };
 
-export { TypeScriptDocumentsVisitor };
+export { TypeScriptDocumentsVisitor, type TypeScriptDocumentsPluginConfig };
 
 const semanticToStrict = async (schema: GraphQLSchema): Promise<GraphQLSchema> => {
   try {
diff --git a/packages/plugins/typescript/operations/src/visitor.ts b/packages/plugins/typescript/operations/src/visitor.ts
@@ -23,6 +23,7 @@ import {
   getNodeComment,
   wrapTypeWithModifiers,
 } from '@graphql-codegen/visitor-plugin-common';
+import { normalizeImportExtension } from '@graphql-codegen/plugin-helpers';
 import autoBind from 'auto-bind';
 import {
   type DocumentNode,
@@ -370,8 +371,11 @@ export class TypeScriptDocumentsVisitor extends BaseDocumentsVisitor<
           identifiers: [],
         },
         typesImport: true,
-        // FIXME: rebase with master for the new extension
-        emitLegacyCommonJSImports: true,
+        emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+        importExtension: normalizeImportExtension({
+          emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+          importExtension: this.config.importExtension,
+        }),
       }),
     ];
   }
diff --git a/packages/plugins/typescript/operations/tests/extract-all-types.spec.ts b/packages/plugins/typescript/operations/tests/extract-all-types.spec.ts
@@ -1,12 +1,11 @@
 import { mergeOutputs, Types } from '@graphql-codegen/plugin-helpers';
 import { validateTs } from '@graphql-codegen/testing';
 import { buildSchema, parse } from 'graphql';
-import { plugin as tsPlugin } from '../../typescript/src/index.js';
-import { plugin, TypeScriptDocumentsPluginConfig } from '../src/index.js';
+import { plugin, type TypeScriptDocumentsPluginConfig } from '../src/index.js';
 
 describe('extractAllFieldsToTypes: true', () => {
-  const validate = async (content: Types.PluginOutput, config: any = {}, pluginSchema) => {
-    const m = mergeOutputs([await tsPlugin(pluginSchema, [], config, { outputFile: '' }), content]);
+  const validate = async (content: Types.PluginOutput) => {
+    const m = mergeOutputs([content]);
     validateTs(m, undefined, undefined, undefined, []);
 
     return m;
@@ -197,7 +196,7 @@ describe('extractAllFieldsToTypes: true', () => {
       "
     `);
 
-    await validate(content, config, dummyUserTestSchema);
+    await validate(content);
   });
 
   const complexTestSchemaWithUnionsAndInterfaces = buildSchema(/* GraphQL */ `
@@ -551,7 +550,7 @@ describe('extractAllFieldsToTypes: true', () => {
       "
     `);
 
-    await validate(content, config, complexTestSchemaWithUnionsAndInterfaces);
+    await validate(content);
   });
 
   it('should extract types from multiple fragments (mergeFragmentTypes: true)', async () => {
@@ -725,7 +724,7 @@ describe('extractAllFieldsToTypes: true', () => {
       "
     `);
 
-    await validate(content, config, complexTestSchemaWithUnionsAndInterfaces);
+    await validate(content);
   });
 
   it("should extract types from multiple fragments (inlineFragmentTypes: 'combine')", async () => {
@@ -968,7 +967,7 @@ describe('extractAllFieldsToTypes: true', () => {
       "
     `);
 
-    await validate(content, config, complexTestSchemaWithUnionsAndInterfaces);
+    await validate(content);
   });
 
   it("should extract types from multiple fragments (inlineFragmentTypes: 'mask')", async () => {
@@ -1209,7 +1208,7 @@ describe('extractAllFieldsToTypes: true', () => {
       "
     `);
 
-    await validate(content, config, complexTestSchemaWithUnionsAndInterfaces);
+    await validate(content);
   });
 
   it('fields with shared types and no fragments should use the shared type interface name', async () => {
@@ -1302,7 +1301,7 @@ describe('extractAllFieldsToTypes: true', () => {
       "
     `);
 
-    await validate(content, config, nestedInterfacesSchema);
+    await validate(content);
   });
 
   it('fragment spreads on the same interface should not force concrete parent type names (regression #10502)', async () => {
@@ -1518,7 +1517,7 @@ describe('extractAllFieldsToTypes: true', () => {
       export type GetNotificationsQuery = GetNotificationsQuery_Query;
       "
     `);
-    await validate(content, config, notificationSchema);
+    await validate(content);
   });
 
   it('named fragments should use their name and not parent type name', async () => {
@@ -1599,6 +1598,6 @@ describe('extractAllFieldsToTypes: true', () => {
       export type GetNotificationsQuery = GetNotificationsQuery_Query;
       "
     `);
-    await validate(content, config, notificationSchema);
+    await validate(content);
   });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -2820,16 +2820,6 @@
     "@graphql-tools/utils" "^11.0.0"
     tslib "^2.4.0"
 
-"@graphql-tools/import@7.1.11":
-  version "7.1.11"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-7.1.11.tgz#55c077107f89dfe48fe7105b639d446f58c0014b"
-  integrity sha512-depwWrqK2r9gcJhFDb/QC8cGFvZ15pAfBqxYVcuUIy+/pSjQXA5trMlgMqB1EhxL3aJevKMbiAqI46F3JOgwVg==
-  dependencies:
-    "@graphql-tools/utils" "^11.0.0"
-    "@theguild/federation-composition" "^0.22.0"
-    resolve-from "5.0.0"
-    tslib "^2.4.0"
-
 "@graphql-tools/import@^7.1.12":
   version "7.1.12"
   resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-7.1.12.tgz#a6b04c0c53b58cccb132950913e55b1f31f0f30a"
@@ -4513,16 +4503,6 @@
     eslint-plugin-unicorn "56.0.1"
     eslint-plugin-yml "1.16.0"
 
-"@theguild/federation-composition@^0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@theguild/federation-composition/-/federation-composition-0.22.0.tgz#49a0748c063bd4c58cbf8e6ca980c1b2cec605f5"
-  integrity sha512-bGueT2FzlwRG8ZpiCmXnheqPESxg/5FlqgczBJET5w9X7kUJr6F47BaPyL+xzY+uesyawu1KE7Nd2jvJf2AKTw==
-  dependencies:
-    constant-case "^3.0.4"
-    debug "4.4.3"
-    json5 "^2.2.3"
-    lodash.sortby "^4.7.0"
-
 "@theguild/prettier-config@0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@theguild/prettier-config/-/prettier-config-0.1.1.tgz#31935992aaacabe6bcc6578ba1b2c0166dab3410"
@@ -7154,20 +7134,20 @@ debug@4.3.6, debug@~4.3.6:
   dependencies:
     ms "2.1.2"
 
-debug@4.4.3, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.4.0, debug@^4.4.3:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
-  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
-  dependencies:
-    ms "^2.1.3"
-
 debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
+debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.4.0, debug@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+  dependencies:
+    ms "^2.1.3"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type * as Types from './_base.generated';`
	`1`	`+import type * as Types from './_base.generated.js';`
`2`	`2`
`3`	`3`	`type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };`
`4`	`4`	`export type Incremental<T> = T \| { [P in keyof T]?: P extends ' $fragmentName' \| '__typename' ? T[P] : never };`