Skip to content

Commit 579af0c

Browse files
pyramationpyramation
authored
Merge pull request #1152 from constructive-io/refactor/remove-node-http-adapter
refactor: remove NodeHttpAdapter in favor of @constructive-io/fetch
2 parents 70f9d20 + 2bd3b18 commit 579af0c

20 files changed

Lines changed: 32 additions & 1759 deletions

File tree

‎graphql/codegen/src/core/codegen/cli/executor-generator.ts‎

Lines changed: 19 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,9 @@ function createImportDeclaration(
3030
return decl;
3131
}
3232

33-
export interface ExecutorOptions {
34-
/** Enable NodeHttpAdapter for *.localhost subdomain routing */
35-
nodeHttpAdapter?: boolean;
36-
}
37-
38-
export function generateExecutorFile(toolName: string, options?: ExecutorOptions): GeneratedFile {
33+
export function generateExecutorFile(toolName: string): GeneratedFile {
3934
const statements: t.Statement[] = [];
4035

41-
// Import NodeHttpAdapter for *.localhost subdomain routing
42-
if (options?.nodeHttpAdapter) {
43-
statements.push(
44-
createImportDeclaration('./node-fetch', ['NodeHttpAdapter']),
45-
);
46-
}
47-
4836
statements.push(
4937
createImportDeclaration('appstash', ['createConfigStore']),
5038
);
@@ -215,39 +203,20 @@ export function generateExecutorFile(toolName: string, options?: ExecutorOptions
215203
]),
216204
),
217205

218-
// Build createClient config — use NodeHttpAdapter for *.localhost endpoints
219-
...(options?.nodeHttpAdapter
220-
? [
221-
t.returnStatement(
222-
t.callExpression(t.identifier('createClient'), [
223-
t.objectExpression([
224-
t.objectProperty(
225-
t.identifier('adapter'),
226-
t.newExpression(t.identifier('NodeHttpAdapter'), [
227-
t.memberExpression(t.identifier('ctx'), t.identifier('endpoint')),
228-
t.identifier('headers'),
229-
]),
230-
),
231-
]),
232-
]),
206+
t.returnStatement(
207+
t.callExpression(t.identifier('createClient'), [
208+
t.objectExpression([
209+
t.objectProperty(
210+
t.identifier('endpoint'),
211+
t.memberExpression(t.identifier('ctx'), t.identifier('endpoint')),
233212
),
234-
]
235-
: [
236-
t.returnStatement(
237-
t.callExpression(t.identifier('createClient'), [
238-
t.objectExpression([
239-
t.objectProperty(
240-
t.identifier('endpoint'),
241-
t.memberExpression(t.identifier('ctx'), t.identifier('endpoint')),
242-
),
243-
t.objectProperty(
244-
t.identifier('headers'),
245-
t.identifier('headers'),
246-
),
247-
]),
248-
]),
213+
t.objectProperty(
214+
t.identifier('headers'),
215+
t.identifier('headers'),
249216
),
250217
]),
218+
]),
219+
),
251220
]);
252221

253222
const getClientFunc = t.functionDeclaration(
@@ -269,17 +238,9 @@ export function generateExecutorFile(toolName: string, options?: ExecutorOptions
269238
export function generateMultiTargetExecutorFile(
270239
toolName: string,
271240
targets: MultiTargetExecutorInput[],
272-
options?: ExecutorOptions,
273241
): GeneratedFile {
274242
const statements: t.Statement[] = [];
275243

276-
// Import NodeHttpAdapter for *.localhost subdomain routing
277-
if (options?.nodeHttpAdapter) {
278-
statements.push(
279-
createImportDeclaration('./node-fetch', ['NodeHttpAdapter']),
280-
);
281-
}
282-
283244
statements.push(
284245
createImportDeclaration('appstash', ['createConfigStore']),
285246
);
@@ -538,33 +499,14 @@ export function generateMultiTargetExecutorFile(
538499
),
539500
]),
540501
),
541-
// Build createClient config — use NodeHttpAdapter for *.localhost endpoints
542-
...(options?.nodeHttpAdapter
543-
? [
544-
t.returnStatement(
545-
t.callExpression(t.identifier('createFn'), [
546-
t.objectExpression([
547-
t.objectProperty(
548-
t.identifier('adapter'),
549-
t.newExpression(t.identifier('NodeHttpAdapter'), [
550-
t.identifier('endpoint'),
551-
t.identifier('headers'),
552-
]),
553-
),
554-
]),
555-
]),
556-
),
557-
]
558-
: [
559-
t.returnStatement(
560-
t.callExpression(t.identifier('createFn'), [
561-
t.objectExpression([
562-
t.objectProperty(t.identifier('endpoint'), t.identifier('endpoint')),
563-
t.objectProperty(t.identifier('headers'), t.identifier('headers')),
564-
]),
565-
]),
566-
),
502+
t.returnStatement(
503+
t.callExpression(t.identifier('createFn'), [
504+
t.objectExpression([
505+
t.objectProperty(t.identifier('endpoint'), t.identifier('endpoint')),
506+
t.objectProperty(t.identifier('headers'), t.identifier('headers')),
567507
]),
508+
]),
509+
),
568510
]);
569511

570512
const getClientFunc = t.functionDeclaration(

‎graphql/codegen/src/core/codegen/cli/index.ts‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
generateMultiTargetContextCommand,
1515
} from './infra-generator';
1616
import { generateTableCommand } from './table-command-generator';
17-
import { generateUtilsFile, generateNodeFetchFile, generateEntryPointFile, generateEmbedderFile } from './utils-generator';
17+
import { generateUtilsFile, generateEntryPointFile, generateEmbedderFile } from './utils-generator';
1818

1919
export interface GenerateCliOptions {
2020
tables: Table[];
@@ -48,12 +48,7 @@ export function generateCli(options: GenerateCliOptions): GenerateCliResult {
4848
? cliConfig.toolName
4949
: 'app';
5050

51-
// Use top-level nodeHttpAdapter from config (auto-enabled for CLI by generate.ts)
52-
const useNodeHttpAdapter = !!config.nodeHttpAdapter;
53-
54-
const executorFile = generateExecutorFile(toolName, {
55-
nodeHttpAdapter: useNodeHttpAdapter,
56-
});
51+
const executorFile = generateExecutorFile(toolName);
5752
files.push(executorFile);
5853

5954
const utilsFile = generateUtilsFile();
@@ -67,11 +62,6 @@ export function generateCli(options: GenerateCliOptions): GenerateCliResult {
6762
files.push(generateEmbedderFile());
6863
}
6964

70-
// Generate node HTTP adapter if configured (for *.localhost subdomain routing)
71-
if (useNodeHttpAdapter) {
72-
files.push(generateNodeFetchFile());
73-
}
74-
7565
const contextFile = generateContextCommand(toolName);
7666
files.push(contextFile);
7767

@@ -139,8 +129,6 @@ export interface GenerateMultiTargetCliOptions {
139129
toolName: string;
140130
builtinNames?: BuiltinNames;
141131
targets: MultiTargetCliTarget[];
142-
/** Enable NodeHttpAdapter for *.localhost subdomain routing */
143-
nodeHttpAdapter?: boolean;
144132
/** Generate a runnable index.ts entry point */
145133
entryPoint?: boolean;
146134
}
@@ -180,9 +168,7 @@ export function generateMultiTargetCli(
180168
endpoint: t.endpoint,
181169
ormImportPath: t.ormImportPath,
182170
}));
183-
const executorFile = generateMultiTargetExecutorFile(toolName, executorInputs, {
184-
nodeHttpAdapter: !!options.nodeHttpAdapter,
185-
});
171+
const executorFile = generateMultiTargetExecutorFile(toolName, executorInputs);
186172
files.push(executorFile);
187173

188174
const utilsFile = generateUtilsFile();
@@ -198,11 +184,6 @@ export function generateMultiTargetCli(
198184
files.push(generateEmbedderFile());
199185
}
200186

201-
// Generate node HTTP adapter if configured (for *.localhost subdomain routing)
202-
if (options.nodeHttpAdapter) {
203-
files.push(generateNodeFetchFile());
204-
}
205-
206187
const contextFile = generateMultiTargetContextCommand(
207188
toolName,
208189
builtinNames.context,

‎graphql/codegen/src/core/codegen/cli/utils-generator.ts‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,6 @@ export function generateUtilsFile(): GeneratedFile {
6060
};
6161
}
6262

63-
/**
64-
* Generate a node-fetch.ts file with NodeHttpAdapter for CLI.
65-
*
66-
* Provides a GraphQLAdapter implementation using node:http/node:https
67-
* instead of the Fetch API. This cleanly handles *.localhost subdomain
68-
* routing (DNS resolution + Host header) without any global patching.
69-
*/
70-
export function generateNodeFetchFile(): GeneratedFile {
71-
return {
72-
fileName: 'node-fetch.ts',
73-
content: readTemplateFile(
74-
'node-fetch.ts',
75-
'Node HTTP adapter for localhost subdomain routing',
76-
),
77-
};
78-
}
79-
8063
/**
8164
* Generate an index.ts entry point file for the CLI.
8265
*

‎graphql/codegen/src/core/codegen/orm/client-generator.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ export function generateCreateClientFile(
137137
tables: Table[],
138138
hasCustomQueries: boolean,
139139
hasCustomMutations: boolean,
140-
options?: { nodeHttpAdapter?: boolean },
141140
): GeneratedClientFile {
142141
const statements: t.Statement[] = [];
143142

‎graphql/codegen/src/core/codegen/orm/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ export function generateOrm(options: GenerateOrmOptions): GenerateOrmResult {
177177
tables,
178178
hasCustomQueries,
179179
hasCustomMutations,
180-
{ nodeHttpAdapter: !!options.config.nodeHttpAdapter },
181180
);
182181
files.push({ path: indexFile.fileName, content: indexFile.content });
183182

0 commit comments

Comments
 (0)