Preserve generated GraphQL import spacing

Author: gonzaloriestra

bin/oxlint-fix.js

@@ -1,5 +1,5 @@
 import {createHash} from 'node:crypto'
-import {readdirSync, readFileSync} from 'node:fs'
+import {globSync, readdirSync, readFileSync, writeFileSync} from 'node:fs'
 import {dirname, join} from 'node:path'
 import {createRequire} from 'node:module'
 import {spawnSync} from 'node:child_process'
@@ -9,6 +9,20 @@ const oxlint = join(dirname(require.resolve('oxlint/package.json')), 'bin/oxlint
 const directories = process.argv.slice(2)
 if (directories.length === 0) throw new Error('Provide at least one generated-code directory.')
 
+// Keep the generated schema and scalar imports together, matching existing output.
+// The near-operation-file preset inserts a blank line before the scalar import.
+for (const directory of directories) {
+  for (const file of globSync('**/*.ts', {cwd: directory})) {
+    const filename = join(directory, file)
+    const source = readFileSync(filename, 'utf8')
+    const formatted = source.replace(
+      /^(import \* as Types from [^\n]+)\n\n(import \{JsonMapType\} from [^\n]+)\n/,
+      '$1\n$2\n\n',
+    )
+    if (formatted !== source) writeFileSync(filename, formatted)
+  }
+}
+
 function fingerprint(directory, hash) {
   for (const entry of readdirSync(directory, {withFileTypes: true}).sort((first, second) => first.name.localeCompare(second.name))) {
     const filename = join(directory, entry.name)

packages/app/src/cli/api/graphql/app-dev/generated/dev-session-create.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type DevSessionCreateMutationVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-dev/generated/dev-session-update.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type DevSessionUpdateMutationVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-management/generated/active-app-release-from-api-key.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type ActiveAppReleaseFromApiKeyQueryVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-management/generated/active-app-release.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type ActiveAppReleaseQueryVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-management/generated/app-version-by-id.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type AppVersionByIdQueryVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-management/generated/app-version-by-tag.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type AppVersionByTagQueryVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-management/generated/create-app-version.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type CreateAppVersionMutationVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-management/generated/create-app.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type CreateAppMutationVariables = Types.Exact<{

packages/app/src/cli/api/graphql/app-management/generated/release-version.ts

@@ -1,6 +1,6 @@
 import * as Types from './types.js'
-
 import {JsonMapType} from '@shopify/cli-kit/node/toml'
+
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
 export type ReleaseVersionMutationVariables = Types.Exact<{