@constructive-io/graphql-codegen 3.1.1 → 3.1.2

package/core/codegen/templates/client.node.ts

@@ -1,86 +1,58 @@
 /**
- * GraphQL client configuration and execution (Node.js with undici)
+ * GraphQL client configuration and execution (Node.js with native http/https)
  *
  * This is the RUNTIME code that gets copied to generated output.
- * Uses undici fetch with dispatcher support for localhost DNS resolution.
+ * Uses native Node.js http/https modules.
  *
  * NOTE: This file is read at codegen time and written to output.
  * Any changes here will affect all generated clients.
  */
 
-import dns from 'node:dns';
-import { Agent, fetch, type RequestInit } from 'undici';
+import http from 'node:http';
+import https from 'node:https';
 
 // ============================================================================
-// Localhost DNS Resolution
+// HTTP Request Helper
 // ============================================================================
 
-/**
- * Check if a hostname is localhost or a localhost subdomain
- */
-function isLocalhostHostname(hostname: string): boolean {
-  return hostname === 'localhost' || hostname.endsWith('.localhost');
+interface HttpResponse {
+  statusCode: number;
+  statusMessage: string;
+  data: string;
 }
 
 /**
- * Create an undici Agent that resolves *.localhost to 127.0.0.1
- * This fixes DNS resolution issues on macOS where subdomains like api.localhost
- * don't resolve automatically (unlike browsers which handle *.localhost).
+ * Make an HTTP/HTTPS request using native Node modules
  */
-function createLocalhostAgent(): Agent {
-  return new Agent({
-    connect: {
-      lookup(hostname, opts, cb) {
-        if (isLocalhostHostname(hostname)) {
-          // When opts.all is true, callback expects an array of {address, family} objects
-          // When opts.all is false/undefined, callback expects (err, address, family)
-          if (opts.all) {
-            cb(null, [{ address: '127.0.0.1', family: 4 }]);
-          } else {
-            cb(null, '127.0.0.1', 4);
-          }
-          return;
-        }
-        dns.lookup(hostname, opts, cb);
-      },
-    },
+function makeRequest(
+  url: URL,
+  options: http.RequestOptions,
+  body: string
+): Promise<HttpResponse> {
+  return new Promise((resolve, reject) => {
+    const protocol = url.protocol === 'https:' ? https : http;
+
+    const req = protocol.request(url, options, (res) => {
+      let data = '';
+      res.setEncoding('utf8');
+      res.on('data', (chunk: string) => {
+        data += chunk;
+      });
+      res.on('end', () => {
+        resolve({
+          statusCode: res.statusCode || 0,
+          statusMessage: res.statusMessage || '',
+          data,
+        });
+      });
+    });
+
+    req.on('error', reject);
+    req.write(body);
+    req.end();
   });
 }
 
-let localhostAgent: Agent | null = null;
-
-function getLocalhostAgent(): Agent {
-  if (!localhostAgent) {
-    localhostAgent = createLocalhostAgent();
-  }
-  return localhostAgent;
-}
-
-/**
- * Get fetch options with localhost agent if needed
- */
-function getFetchOptions(
-  endpoint: string,
-  baseOptions: RequestInit
-): RequestInit {
-  const url = new URL(endpoint);
-  if (isLocalhostHostname(url.hostname)) {
-    const options: RequestInit = {
-      ...baseOptions,
-      dispatcher: getLocalhostAgent(),
-    };
-    // Set Host header for localhost subdomains to preserve routing
-    if (url.hostname !== 'localhost') {
-      options.headers = {
-        ...(baseOptions.headers as Record<string, string>),
-        Host: url.hostname,
-      };
-    }
-    return options;
-  }
-  return baseOptions;
-}
-
 // ============================================================================
 // Configuration
 // ============================================================================
@@ -174,7 +146,7 @@ export class GraphQLClientError extends Error {
   constructor(
     message: string,
     public errors: GraphQLError[],
-    public response?: Response
+    public statusCode?: number
   ) {
     super(message);
     this.name = 'GraphQLClientError';
@@ -188,8 +160,6 @@ export class GraphQLClientError extends Error {
 export interface ExecuteOptions {
   /** Override headers for this request */
   headers?: Record<string, string>;
-  /** AbortSignal for request cancellation */
-  signal?: AbortSignal;
 }
 
 /**
@@ -212,25 +182,29 @@ export async function execute<
   options?: ExecuteOptions
 ): Promise<TData> {
   const config = getConfig();
+  const url = new URL(config.endpoint);
+
+  const body = JSON.stringify({
+    query: document,
+    variables,
+  });
 
-  const baseOptions: RequestInit = {
+  const requestOptions: http.RequestOptions = {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
       ...config.headers,
       ...options?.headers,
     },
-    body: JSON.stringify({
-      query: document,
-      variables,
-    }),
-    signal: options?.signal,
   };
 
-  const fetchOptions = getFetchOptions(config.endpoint, baseOptions);
-  const response = await fetch(config.endpoint, fetchOptions);
+  const response = await makeRequest(url, requestOptions, body);
+
+  if (response.statusCode < 200 || response.statusCode >= 300) {
+    throw new Error(`HTTP ${response.statusCode}: ${response.statusMessage}`);
+  }
 
-  const json = (await response.json()) as {
+  const json = JSON.parse(response.data) as {
     data?: TData;
     errors?: GraphQLError[];
   };
@@ -239,7 +213,7 @@ export async function execute<
     throw new GraphQLClientError(
       json.errors[0].message || 'GraphQL request failed',
       json.errors,
-      response as unknown as Response
+      response.statusCode
     );
   }
 
@@ -259,25 +233,32 @@ export async function executeWithErrors<
   options?: ExecuteOptions
 ): Promise<{ data: TData | null; errors: GraphQLError[] | null }> {
   const config = getConfig();
+  const url = new URL(config.endpoint);
 
-  const baseOptions: RequestInit = {
+  const body = JSON.stringify({
+    query: document,
+    variables,
+  });
+
+  const requestOptions: http.RequestOptions = {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
       ...config.headers,
       ...options?.headers,
     },
-    body: JSON.stringify({
-      query: document,
-      variables,
-    }),
-    signal: options?.signal,
   };
 
-  const fetchOptions = getFetchOptions(config.endpoint, baseOptions);
-  const response = await fetch(config.endpoint, fetchOptions);
+  const response = await makeRequest(url, requestOptions, body);
+
+  if (response.statusCode < 200 || response.statusCode >= 300) {
+    return {
+      data: null,
+      errors: [{ message: `HTTP ${response.statusCode}: ${response.statusMessage}` }],
+    };
+  }
 
-  const json = (await response.json()) as {
+  const json = JSON.parse(response.data) as {
     data?: TData;
     errors?: GraphQLError[];
   };

package/core/introspect/fetch-schema.js

@@ -6,129 +6,120 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchSchema = fetchSchema;
 /**
  * Fetch GraphQL schema introspection from an endpoint
+ * Uses native Node.js http/https modules
  */
-const node_dns_1 = __importDefault(require("node:dns"));
-const undici_1 = require("undici");
+const node_http_1 = __importDefault(require("node:http"));
+const node_https_1 = __importDefault(require("node:https"));
 const schema_query_1 = require("./schema-query");
 /**
- * Check if a hostname is localhost or a localhost subdomain
+ * Make an HTTP/HTTPS request using native Node modules
  */
-function isLocalhostHostname(hostname) {
-    return hostname === 'localhost' || hostname.endsWith('.localhost');
-}
-/**
- * Create an undici Agent that resolves *.localhost to 127.0.0.1
- * This fixes DNS resolution issues on macOS where subdomains like api.localhost
- * don't resolve automatically (unlike browsers which handle *.localhost).
- */
-function createLocalhostAgent() {
-    return new undici_1.Agent({
-        connect: {
-            lookup(hostname, opts, cb) {
-                if (isLocalhostHostname(hostname)) {
-                    // When opts.all is true, callback expects an array of {address, family} objects
-                    // When opts.all is false/undefined, callback expects (err, address, family)
-                    if (opts.all) {
-                        cb(null, [{ address: '127.0.0.1', family: 4 }]);
-                    }
-                    else {
-                        cb(null, '127.0.0.1', 4);
-                    }
-                    return;
-                }
-                node_dns_1.default.lookup(hostname, opts, cb);
-            },
-        },
+function makeRequest(url, options, body, timeout) {
+    return new Promise((resolve, reject) => {
+        const protocol = url.protocol === 'https:' ? node_https_1.default : node_http_1.default;
+        const req = protocol.request(url, options, (res) => {
+            let data = '';
+            res.setEncoding('utf8');
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+            res.on('end', () => {
+                resolve({
+                    statusCode: res.statusCode || 0,
+                    statusMessage: res.statusMessage || '',
+                    data,
+                });
+            });
+        });
+        req.on('error', reject);
+        req.setTimeout(timeout, () => {
+            req.destroy();
+            reject(new Error(`Request timeout after ${timeout}ms`));
+        });
+        req.write(body);
+        req.end();
     });
 }
-let localhostAgent = null;
-function getLocalhostAgent() {
-    if (!localhostAgent) {
-        localhostAgent = createLocalhostAgent();
-    }
-    return localhostAgent;
-}
 /**
  * Fetch the full schema introspection from a GraphQL endpoint
  */
 async function fetchSchema(options) {
     const { endpoint, authorization, headers = {}, timeout = 30000 } = options;
-    // Parse the endpoint URL to check for localhost
     const url = new URL(endpoint);
-    const useLocalhostAgent = isLocalhostHostname(url.hostname);
-    // Build headers
     const requestHeaders = {
         'Content-Type': 'application/json',
         Accept: 'application/json',
         ...headers,
     };
-    // Set Host header for localhost subdomains to preserve routing
-    if (useLocalhostAgent && url.hostname !== 'localhost') {
-        requestHeaders['Host'] = url.hostname;
-    }
     if (authorization) {
         requestHeaders['Authorization'] = authorization;
     }
-    // Create abort controller for timeout
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), timeout);
-    // Build fetch options using undici's RequestInit type
-    const fetchOptions = {
+    const body = JSON.stringify({
+        query: schema_query_1.SCHEMA_INTROSPECTION_QUERY,
+        variables: {},
+    });
+    const requestOptions = {
         method: 'POST',
         headers: requestHeaders,
-        body: JSON.stringify({
-            query: schema_query_1.SCHEMA_INTROSPECTION_QUERY,
-            variables: {},
-        }),
-        signal: controller.signal,
     };
-    // Use custom agent for localhost to fix DNS resolution on macOS
-    if (useLocalhostAgent) {
-        fetchOptions.dispatcher = getLocalhostAgent();
-    }
     try {
-        const response = await (0, undici_1.fetch)(endpoint, fetchOptions);
-        clearTimeout(timeoutId);
-        if (!response.ok) {
+        const response = await makeRequest(url, requestOptions, body, timeout);
+        if (response.statusCode < 200 || response.statusCode >= 300) {
             return {
                 success: false,
-                error: `HTTP ${response.status}: ${response.statusText}`,
-                statusCode: response.status,
+                error: `HTTP ${response.statusCode}: ${response.statusMessage}`,
+                statusCode: response.statusCode,
             };
         }
-        const json = (await response.json());
-        // Check for GraphQL errors
+        const json = JSON.parse(response.data);
         if (json.errors && json.errors.length > 0) {
             const errorMessages = json.errors.map((e) => e.message).join('; ');
             return {
                 success: false,
                 error: `GraphQL errors: ${errorMessages}`,
-                statusCode: response.status,
+                statusCode: response.statusCode,
             };
         }
-        // Check if __schema is present
         if (!json.data?.__schema) {
             return {
                 success: false,
                 error: 'No __schema field in response. Introspection may be disabled on this endpoint.',
-                statusCode: response.status,
+                statusCode: response.statusCode,
             };
         }
         return {
             success: true,
             data: json.data,
-            statusCode: response.status,
+            statusCode: response.statusCode,
         };
     }
     catch (err) {
-        clearTimeout(timeoutId);
         if (err instanceof Error) {
-            if (err.name === 'AbortError') {
+            if (err.message.includes('timeout')) {
                 return {
                     success: false,
                     error: `Request timeout after ${timeout}ms`,
                 };
             }
+            const errorCode = err.code;
+            if (errorCode === 'ECONNREFUSED') {
+                return {
+                    success: false,
+                    error: `Connection refused - is the server running at ${endpoint}?`,
+                };
+            }
+            if (errorCode === 'ENOTFOUND') {
+                return {
+                    success: false,
+                    error: `DNS lookup failed for ${url.hostname} - check the endpoint URL`,
+                };
+            }
+            if (errorCode === 'ECONNRESET') {
+                return {
+                    success: false,
+                    error: `Connection reset by server at ${endpoint}`,
+                };
+            }
             return {
                 success: false,
                 error: err.message,

package/core/output/writer.d.ts

@@ -27,12 +27,12 @@ export interface WriteOptions {
  */
 export declare function writeGeneratedFiles(files: GeneratedFile[], outputDir: string, subdirs: string[], options?: WriteOptions): Promise<WriteResult>;
 /**
- * Format generated files using oxfmt
+ * Format generated files using oxfmt programmatically
  *
- * Runs oxfmt on the output directory after all files are written.
- * Uses the same formatting options as prettier: single quotes, trailing commas, 2-space tabs, semicolons.
+ * @deprecated Use writeGeneratedFiles with formatFiles option instead.
+ * This function is kept for backwards compatibility.
  */
-export declare function formatOutput(outputDir: string): {
+export declare function formatOutput(outputDir: string): Promise<{
     success: boolean;
     error?: string;
-};
+}>;

package/core/output/writer.js

@@ -43,7 +43,37 @@ exports.formatOutput = formatOutput;
  */
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
-const node_child_process_1 = require("node:child_process");
+/**
+ * Dynamically import oxfmt's format function
+ * Returns null if oxfmt is not available
+ */
+async function getOxfmtFormat() {
+    try {
+        const oxfmt = await Promise.resolve().then(() => __importStar(require('oxfmt')));
+        return oxfmt.format;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Format a single file's content using oxfmt programmatically
+ */
+async function formatFileContent(fileName, content, formatFn) {
+    try {
+        const result = await formatFn(fileName, content, {
+            singleQuote: true,
+            trailingComma: 'es5',
+            tabWidth: 2,
+            semi: true,
+        });
+        return result.code;
+    }
+    catch {
+        // If formatting fails, return original content
+        return content;
+    }
+}
 /**
  * Write generated files to disk
  *
@@ -83,6 +113,11 @@ async function writeGeneratedFiles(files, outputDir, subdirs, options = {}) {
     if (errors.length > 0) {
         return { success: false, errors };
     }
+    // Get oxfmt format function if formatting is enabled
+    const formatFn = formatFiles ? await getOxfmtFormat() : null;
+    if (formatFiles && !formatFn && showProgress) {
+        console.warn('Warning: oxfmt not available, files will not be formatted');
+    }
     for (let i = 0; i < files.length; i++) {
         const file = files[i];
         const filePath = path.join(outputDir, file.path);
@@ -105,8 +140,13 @@ async function writeGeneratedFiles(files, outputDir, subdirs, options = {}) {
         catch {
             // Ignore if already exists
         }
+        // Format content if oxfmt is available and file is TypeScript
+        let content = file.content;
+        if (formatFn && file.path.endsWith('.ts')) {
+            content = await formatFileContent(file.path, content, formatFn);
+        }
         try {
-            fs.writeFileSync(filePath, file.content, 'utf-8');
+            fs.writeFileSync(filePath, content, 'utf-8');
             written.push(filePath);
         }
         catch (err) {
@@ -118,16 +158,6 @@ async function writeGeneratedFiles(files, outputDir, subdirs, options = {}) {
     if (showProgress && isTTY) {
         process.stdout.write('\r' + ' '.repeat(40) + '\r');
     }
-    // Format all generated files with oxfmt
-    if (formatFiles && errors.length === 0) {
-        if (showProgress) {
-            console.log('Formatting generated files...');
-        }
-        const formatResult = formatOutput(outputDir);
-        if (!formatResult.success && showProgress) {
-            console.warn('Warning: Failed to format generated files:', formatResult.error);
-        }
-    }
     return {
         success: errors.length === 0,
         filesWritten: written,
@@ -135,18 +165,50 @@ async function writeGeneratedFiles(files, outputDir, subdirs, options = {}) {
     };
 }
 /**
- * Format generated files using oxfmt
+ * Recursively find all .ts files in a directory
+ */
+function findTsFiles(dir) {
+    const files = [];
+    try {
+        const entries = fs.readdirSync(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                files.push(...findTsFiles(fullPath));
+            }
+            else if (entry.isFile() && entry.name.endsWith('.ts')) {
+                files.push(fullPath);
+            }
+        }
+    }
+    catch {
+        // Ignore errors reading directories
+    }
+    return files;
+}
+/**
+ * Format generated files using oxfmt programmatically
  *
- * Runs oxfmt on the output directory after all files are written.
- * Uses the same formatting options as prettier: single quotes, trailing commas, 2-space tabs, semicolons.
+ * @deprecated Use writeGeneratedFiles with formatFiles option instead.
+ * This function is kept for backwards compatibility.
  */
-function formatOutput(outputDir) {
+async function formatOutput(outputDir) {
+    const formatFn = await getOxfmtFormat();
+    if (!formatFn) {
+        return {
+            success: false,
+            error: 'oxfmt not available. Install it with: npm install oxfmt',
+        };
+    }
     const absoluteOutputDir = path.resolve(outputDir);
     try {
-        (0, node_child_process_1.execSync)(`npx oxfmt --write "${absoluteOutputDir}"`, {
-            stdio: 'pipe',
-            encoding: 'utf-8',
-        });
+        // Find all .ts files in the output directory
+        const tsFiles = findTsFiles(absoluteOutputDir);
+        for (const filePath of tsFiles) {
+            const content = fs.readFileSync(filePath, 'utf-8');
+            const formatted = await formatFileContent(path.basename(filePath), content, formatFn);
+            fs.writeFileSync(filePath, formatted, 'utf-8');
+        }
         return { success: true };
     }
     catch (err) {

package/esm/core/introspect/fetch-schema.js

@@ -1,128 +1,119 @@
 /**
  * Fetch GraphQL schema introspection from an endpoint
+ * Uses native Node.js http/https modules
  */
-import dns from 'node:dns';
-import { Agent, fetch } from 'undici';
+import http from 'node:http';
+import https from 'node:https';
 import { SCHEMA_INTROSPECTION_QUERY } from './schema-query';
 /**
- * Check if a hostname is localhost or a localhost subdomain
+ * Make an HTTP/HTTPS request using native Node modules
  */
-function isLocalhostHostname(hostname) {
-    return hostname === 'localhost' || hostname.endsWith('.localhost');
-}
-/**
- * Create an undici Agent that resolves *.localhost to 127.0.0.1
- * This fixes DNS resolution issues on macOS where subdomains like api.localhost
- * don't resolve automatically (unlike browsers which handle *.localhost).
- */
-function createLocalhostAgent() {
-    return new Agent({
-        connect: {
-            lookup(hostname, opts, cb) {
-                if (isLocalhostHostname(hostname)) {
-                    // When opts.all is true, callback expects an array of {address, family} objects
-                    // When opts.all is false/undefined, callback expects (err, address, family)
-                    if (opts.all) {
-                        cb(null, [{ address: '127.0.0.1', family: 4 }]);
-                    }
-                    else {
-                        cb(null, '127.0.0.1', 4);
-                    }
-                    return;
-                }
-                dns.lookup(hostname, opts, cb);
-            },
-        },
+function makeRequest(url, options, body, timeout) {
+    return new Promise((resolve, reject) => {
+        const protocol = url.protocol === 'https:' ? https : http;
+        const req = protocol.request(url, options, (res) => {
+            let data = '';
+            res.setEncoding('utf8');
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+            res.on('end', () => {
+                resolve({
+                    statusCode: res.statusCode || 0,
+                    statusMessage: res.statusMessage || '',
+                    data,
+                });
+            });
+        });
+        req.on('error', reject);
+        req.setTimeout(timeout, () => {
+            req.destroy();
+            reject(new Error(`Request timeout after ${timeout}ms`));
+        });
+        req.write(body);
+        req.end();
     });
 }
-let localhostAgent = null;
-function getLocalhostAgent() {
-    if (!localhostAgent) {
-        localhostAgent = createLocalhostAgent();
-    }
-    return localhostAgent;
-}
 /**
  * Fetch the full schema introspection from a GraphQL endpoint
  */
 export async function fetchSchema(options) {
     const { endpoint, authorization, headers = {}, timeout = 30000 } = options;
-    // Parse the endpoint URL to check for localhost
     const url = new URL(endpoint);
-    const useLocalhostAgent = isLocalhostHostname(url.hostname);
-    // Build headers
     const requestHeaders = {
         'Content-Type': 'application/json',
         Accept: 'application/json',
         ...headers,
     };
-    // Set Host header for localhost subdomains to preserve routing
-    if (useLocalhostAgent && url.hostname !== 'localhost') {
-        requestHeaders['Host'] = url.hostname;
-    }
     if (authorization) {
         requestHeaders['Authorization'] = authorization;
     }
-    // Create abort controller for timeout
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), timeout);
-    // Build fetch options using undici's RequestInit type
-    const fetchOptions = {
+    const body = JSON.stringify({
+        query: SCHEMA_INTROSPECTION_QUERY,
+        variables: {},
+    });
+    const requestOptions = {
         method: 'POST',
         headers: requestHeaders,
-        body: JSON.stringify({
-            query: SCHEMA_INTROSPECTION_QUERY,
-            variables: {},
-        }),
-        signal: controller.signal,
     };
-    // Use custom agent for localhost to fix DNS resolution on macOS
-    if (useLocalhostAgent) {
-        fetchOptions.dispatcher = getLocalhostAgent();
-    }
     try {
-        const response = await fetch(endpoint, fetchOptions);
-        clearTimeout(timeoutId);
-        if (!response.ok) {
+        const response = await makeRequest(url, requestOptions, body, timeout);
+        if (response.statusCode < 200 || response.statusCode >= 300) {
             return {
                 success: false,
-                error: `HTTP ${response.status}: ${response.statusText}`,
-                statusCode: response.status,
+                error: `HTTP ${response.statusCode}: ${response.statusMessage}`,
+                statusCode: response.statusCode,
             };
         }
-        const json = (await response.json());
-        // Check for GraphQL errors
+        const json = JSON.parse(response.data);
         if (json.errors && json.errors.length > 0) {
             const errorMessages = json.errors.map((e) => e.message).join('; ');
             return {
                 success: false,
                 error: `GraphQL errors: ${errorMessages}`,
-                statusCode: response.status,
+                statusCode: response.statusCode,
             };
         }
-        // Check if __schema is present
         if (!json.data?.__schema) {
             return {
                 success: false,
                 error: 'No __schema field in response. Introspection may be disabled on this endpoint.',
-                statusCode: response.status,
+                statusCode: response.statusCode,
             };
         }
         return {
             success: true,
             data: json.data,
-            statusCode: response.status,
+            statusCode: response.statusCode,
         };
     }
     catch (err) {
-        clearTimeout(timeoutId);
         if (err instanceof Error) {
-            if (err.name === 'AbortError') {
+            if (err.message.includes('timeout')) {
                 return {
                     success: false,
                     error: `Request timeout after ${timeout}ms`,
                 };
             }
+            const errorCode = err.code;
+            if (errorCode === 'ECONNREFUSED') {
+                return {
+                    success: false,
+                    error: `Connection refused - is the server running at ${endpoint}?`,
+                };
+            }
+            if (errorCode === 'ENOTFOUND') {
+                return {
+                    success: false,
+                    error: `DNS lookup failed for ${url.hostname} - check the endpoint URL`,
+                };
+            }
+            if (errorCode === 'ECONNRESET') {
+                return {
+                    success: false,
+                    error: `Connection reset by server at ${endpoint}`,
+                };
+            }
             return {
                 success: false,
                 error: err.message,

package/esm/core/output/writer.d.ts

@@ -27,12 +27,12 @@ export interface WriteOptions {
  */
 export declare function writeGeneratedFiles(files: GeneratedFile[], outputDir: string, subdirs: string[], options?: WriteOptions): Promise<WriteResult>;
 /**
- * Format generated files using oxfmt
+ * Format generated files using oxfmt programmatically
  *
- * Runs oxfmt on the output directory after all files are written.
- * Uses the same formatting options as prettier: single quotes, trailing commas, 2-space tabs, semicolons.
+ * @deprecated Use writeGeneratedFiles with formatFiles option instead.
+ * This function is kept for backwards compatibility.
  */
-export declare function formatOutput(outputDir: string): {
+export declare function formatOutput(outputDir: string): Promise<{
     success: boolean;
     error?: string;
-};
+}>;

package/esm/core/output/writer.js

@@ -6,7 +6,37 @@
  */
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { execSync } from 'node:child_process';
+/**
+ * Dynamically import oxfmt's format function
+ * Returns null if oxfmt is not available
+ */
+async function getOxfmtFormat() {
+    try {
+        const oxfmt = await import('oxfmt');
+        return oxfmt.format;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Format a single file's content using oxfmt programmatically
+ */
+async function formatFileContent(fileName, content, formatFn) {
+    try {
+        const result = await formatFn(fileName, content, {
+            singleQuote: true,
+            trailingComma: 'es5',
+            tabWidth: 2,
+            semi: true,
+        });
+        return result.code;
+    }
+    catch {
+        // If formatting fails, return original content
+        return content;
+    }
+}
 /**
  * Write generated files to disk
  *
@@ -46,6 +76,11 @@ export async function writeGeneratedFiles(files, outputDir, subdirs, options = {
     if (errors.length > 0) {
         return { success: false, errors };
     }
+    // Get oxfmt format function if formatting is enabled
+    const formatFn = formatFiles ? await getOxfmtFormat() : null;
+    if (formatFiles && !formatFn && showProgress) {
+        console.warn('Warning: oxfmt not available, files will not be formatted');
+    }
     for (let i = 0; i < files.length; i++) {
         const file = files[i];
         const filePath = path.join(outputDir, file.path);
@@ -68,8 +103,13 @@ export async function writeGeneratedFiles(files, outputDir, subdirs, options = {
         catch {
             // Ignore if already exists
         }
+        // Format content if oxfmt is available and file is TypeScript
+        let content = file.content;
+        if (formatFn && file.path.endsWith('.ts')) {
+            content = await formatFileContent(file.path, content, formatFn);
+        }
         try {
-            fs.writeFileSync(filePath, file.content, 'utf-8');
+            fs.writeFileSync(filePath, content, 'utf-8');
             written.push(filePath);
         }
         catch (err) {
@@ -81,16 +121,6 @@ export async function writeGeneratedFiles(files, outputDir, subdirs, options = {
     if (showProgress && isTTY) {
         process.stdout.write('\r' + ' '.repeat(40) + '\r');
     }
-    // Format all generated files with oxfmt
-    if (formatFiles && errors.length === 0) {
-        if (showProgress) {
-            console.log('Formatting generated files...');
-        }
-        const formatResult = formatOutput(outputDir);
-        if (!formatResult.success && showProgress) {
-            console.warn('Warning: Failed to format generated files:', formatResult.error);
-        }
-    }
     return {
         success: errors.length === 0,
         filesWritten: written,
@@ -98,18 +128,50 @@ export async function writeGeneratedFiles(files, outputDir, subdirs, options = {
     };
 }
 /**
- * Format generated files using oxfmt
+ * Recursively find all .ts files in a directory
+ */
+function findTsFiles(dir) {
+    const files = [];
+    try {
+        const entries = fs.readdirSync(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                files.push(...findTsFiles(fullPath));
+            }
+            else if (entry.isFile() && entry.name.endsWith('.ts')) {
+                files.push(fullPath);
+            }
+        }
+    }
+    catch {
+        // Ignore errors reading directories
+    }
+    return files;
+}
+/**
+ * Format generated files using oxfmt programmatically
  *
- * Runs oxfmt on the output directory after all files are written.
- * Uses the same formatting options as prettier: single quotes, trailing commas, 2-space tabs, semicolons.
+ * @deprecated Use writeGeneratedFiles with formatFiles option instead.
+ * This function is kept for backwards compatibility.
  */
-export function formatOutput(outputDir) {
+export async function formatOutput(outputDir) {
+    const formatFn = await getOxfmtFormat();
+    if (!formatFn) {
+        return {
+            success: false,
+            error: 'oxfmt not available. Install it with: npm install oxfmt',
+        };
+    }
     const absoluteOutputDir = path.resolve(outputDir);
     try {
-        execSync(`npx oxfmt --write "${absoluteOutputDir}"`, {
-            stdio: 'pipe',
-            encoding: 'utf-8',
-        });
+        // Find all .ts files in the output directory
+        const tsFiles = findTsFiles(absoluteOutputDir);
+        for (const filePath of tsFiles) {
+            const content = fs.readFileSync(filePath, 'utf-8');
+            const formatted = await formatFileContent(path.basename(filePath), content, formatFn);
+            fs.writeFileSync(filePath, formatted, 'utf-8');
+        }
         return { success: true };
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "GraphQL SDK generator for Constructive databases with React Query hooks",
   "keywords": [
     "graphql",
@@ -99,5 +99,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "03cfe7dad85283c7364bc38261136933a20ba73d"
+  "gitHead": "96a9219694ed3a992f6d909867f777818979ee6b"
 }