@constructive-io/graphql-codegen 2.24.1 → 2.26.0

package/cli/index.js

@@ -42,6 +42,17 @@ const generate_1 = require("./commands/generate");
 const generate_orm_1 = require("./commands/generate-orm");
 const watch_1 = require("./watch");
 const config_1 = require("../types/config");
+/**
+ * Format duration in a human-readable way
+ * - Under 1 second: show milliseconds (e.g., "123ms")
+ * - Over 1 second: show seconds with 2 decimal places (e.g., "1.23s")
+ */
+function formatDuration(ms) {
+    if (ms < 1000) {
+        return `${Math.round(ms)}ms`;
+    }
+    return `${(ms / 1000).toFixed(2)}s`;
+}
 const program = new commander_1.Command();
 /**
  * Load configuration for watch mode, merging CLI options with config file
@@ -61,23 +72,27 @@ async function loadWatchConfig(options) {
         }
         baseConfig = loadResult.config;
     }
-    // Merge CLI options with config
-    const mergedConfig = {
-        endpoint: options.endpoint || baseConfig.endpoint || '',
-        output: baseConfig.output,
-        headers: baseConfig.headers,
-        tables: baseConfig.tables,
-        queries: baseConfig.queries,
-        mutations: baseConfig.mutations,
-        excludeFields: baseConfig.excludeFields,
-        hooks: baseConfig.hooks,
-        postgraphile: baseConfig.postgraphile,
-        codegen: baseConfig.codegen,
-        orm: baseConfig.orm,
-        reactQuery: baseConfig.reactQuery,
+    if ((0, config_1.isMultiConfig)(baseConfig)) {
+        if (!options.target) {
+            console.error('x Watch mode requires --target when using multiple targets.');
+            return null;
+        }
+        if (!baseConfig.targets[options.target]) {
+            console.error(`x Target "${options.target}" not found in config file.`);
+            return null;
+        }
+    }
+    else if (options.target) {
+        console.error('x Config file does not define targets. Remove --target.');
+        return null;
+    }
+    const sourceOverrides = {};
+    if (options.endpoint) {
+        sourceOverrides.endpoint = options.endpoint;
+        sourceOverrides.schema = undefined;
+    }
+    const watchOverrides = {
         watch: {
-            ...baseConfig.watch,
-            // CLI options override config
             ...(options.pollInterval !== undefined && {
                 pollInterval: options.pollInterval,
             }),
@@ -86,11 +101,26 @@ async function loadWatchConfig(options) {
             ...(options.clear !== undefined && { clearScreen: options.clear }),
         },
     };
-    if (!mergedConfig.endpoint) {
-        console.error('x No endpoint specified. Use --endpoint or create a config file with "graphql-codegen init".');
+    let mergedTarget;
+    if ((0, config_1.isMultiConfig)(baseConfig)) {
+        const defaults = baseConfig.defaults ?? {};
+        const targetConfig = baseConfig.targets[options.target];
+        mergedTarget = (0, config_1.mergeConfig)(defaults, targetConfig);
+    }
+    else {
+        mergedTarget = baseConfig;
+    }
+    mergedTarget = (0, config_1.mergeConfig)(mergedTarget, sourceOverrides);
+    mergedTarget = (0, config_1.mergeConfig)(mergedTarget, watchOverrides);
+    if (!mergedTarget.endpoint) {
+        console.error('x No endpoint specified. Watch mode only supports live endpoints.');
+        return null;
+    }
+    if (mergedTarget.schema) {
+        console.error('x Watch mode is only supported with an endpoint, not schema.');
         return null;
     }
-    return (0, config_1.resolveConfig)(mergedConfig);
+    return (0, config_1.resolveConfig)(mergedTarget);
 }
 program
     .name('graphql-codegen')
@@ -105,17 +135,19 @@ program
     .option('-e, --endpoint <url>', 'GraphQL endpoint URL to pre-populate')
     .option('-o, --output <dir>', 'Output directory to pre-populate', './generated')
     .action(async (options) => {
+    const startTime = performance.now();
     const result = await (0, init_1.initCommand)({
         directory: options.directory,
         force: options.force,
         endpoint: options.endpoint,
         output: options.output,
     });
+    const duration = formatDuration(performance.now() - startTime);
     if (result.success) {
-        console.log('[ok]', result.message);
+        console.log('[ok]', result.message, `(${duration})`);
     }
     else {
-        console.error('x', result.message);
+        console.error('x', result.message, `(${duration})`);
         process.exit(1);
     }
 });
@@ -124,6 +156,7 @@ program
     .command('generate')
     .description('Generate SDK from GraphQL endpoint or schema file')
     .option('-c, --config <path>', 'Path to config file')
+    .option('-t, --target <name>', 'Target name in config file')
     .option('-e, --endpoint <url>', 'GraphQL endpoint URL (overrides config)')
     .option('-s, --schema <path>', 'Path to GraphQL schema file (.graphql)')
     .option('-o, --output <dir>', 'Output directory (overrides config)')
@@ -136,6 +169,7 @@ program
     .option('--touch <file>', 'File to touch on schema change')
     .option('--no-clear', 'Do not clear terminal on regeneration')
     .action(async (options) => {
+    const startTime = performance.now();
     // Validate source options
     if (options.endpoint && options.schema) {
         console.error('x Cannot use both --endpoint and --schema. Choose one source.');
@@ -156,6 +190,8 @@ program
             generatorType: 'generate',
             verbose: options.verbose,
             authorization: options.authorization,
+            configPath: options.config,
+            target: options.target,
             outputDir: options.output,
         });
         return;
@@ -163,6 +199,7 @@ program
     // Normal one-shot generation
     const result = await (0, generate_1.generateCommand)({
         config: options.config,
+        target: options.target,
         endpoint: options.endpoint,
         schema: options.schema,
         output: options.output,
@@ -170,8 +207,34 @@ program
         verbose: options.verbose,
         dryRun: options.dryRun,
     });
+    const duration = formatDuration(performance.now() - startTime);
+    const targetResults = result.targets ?? [];
+    const hasNamedTargets = targetResults.length > 0 &&
+        (targetResults.length > 1 || targetResults[0]?.name !== 'default');
+    if (hasNamedTargets) {
+        console.log(result.success ? '[ok]' : 'x', result.message);
+        targetResults.forEach((target) => {
+            const status = target.success ? '[ok]' : 'x';
+            console.log(`\n${status} ${target.message}`);
+            if (target.tables && target.tables.length > 0) {
+                console.log('  Tables:');
+                target.tables.forEach((table) => console.log(`    - ${table}`));
+            }
+            if (target.filesWritten && target.filesWritten.length > 0) {
+                console.log('  Files written:');
+                target.filesWritten.forEach((file) => console.log(`    - ${file}`));
+            }
+            if (!target.success && target.errors) {
+                target.errors.forEach((error) => console.error(`  - ${error}`));
+            }
+        });
+        if (!result.success) {
+            process.exit(1);
+        }
+        return;
+    }
     if (result.success) {
-        console.log('[ok]', result.message);
+        console.log('[ok]', result.message, `(${duration})`);
         if (result.tables && result.tables.length > 0) {
             console.log('\nTables:');
             result.tables.forEach((t) => console.log(`  - ${t}`));
@@ -182,7 +245,7 @@ program
         }
     }
     else {
-        console.error('x', result.message);
+        console.error('x', result.message, `(${duration})`);
         if (result.errors) {
             result.errors.forEach((e) => console.error('  -', e));
         }
@@ -194,9 +257,10 @@ program
     .command('generate-orm')
     .description('Generate Prisma-like ORM client from GraphQL endpoint or schema file')
     .option('-c, --config <path>', 'Path to config file')
+    .option('-t, --target <name>', 'Target name in config file')
     .option('-e, --endpoint <url>', 'GraphQL endpoint URL (overrides config)')
     .option('-s, --schema <path>', 'Path to GraphQL schema file (.graphql)')
-    .option('-o, --output <dir>', 'Output directory (overrides config)', './generated/orm')
+    .option('-o, --output <dir>', 'Output directory (overrides config)')
     .option('-a, --authorization <header>', 'Authorization header value')
     .option('-v, --verbose', 'Verbose output', false)
     .option('--dry-run', 'Dry run - show what would be generated without writing files', false)
@@ -207,6 +271,7 @@ program
     .option('--touch <file>', 'File to touch on schema change')
     .option('--no-clear', 'Do not clear terminal on regeneration')
     .action(async (options) => {
+    const startTime = performance.now();
     // Validate source options
     if (options.endpoint && options.schema) {
         console.error('x Cannot use both --endpoint and --schema. Choose one source.');
@@ -227,6 +292,8 @@ program
             generatorType: 'generate-orm',
             verbose: options.verbose,
             authorization: options.authorization,
+            configPath: options.config,
+            target: options.target,
             outputDir: options.output,
             skipCustomOperations: options.skipCustomOperations,
         });
@@ -235,6 +302,7 @@ program
     // Normal one-shot generation
     const result = await (0, generate_orm_1.generateOrmCommand)({
         config: options.config,
+        target: options.target,
         endpoint: options.endpoint,
         schema: options.schema,
         output: options.output,
@@ -243,8 +311,42 @@ program
         dryRun: options.dryRun,
         skipCustomOperations: options.skipCustomOperations,
     });
+    const duration = formatDuration(performance.now() - startTime);
+    const targetResults = result.targets ?? [];
+    const hasNamedTargets = targetResults.length > 0 &&
+        (targetResults.length > 1 || targetResults[0]?.name !== 'default');
+    if (hasNamedTargets) {
+        console.log(result.success ? '[ok]' : 'x', result.message);
+        targetResults.forEach((target) => {
+            const status = target.success ? '[ok]' : 'x';
+            console.log(`\n${status} ${target.message}`);
+            if (target.tables && target.tables.length > 0) {
+                console.log('  Tables:');
+                target.tables.forEach((table) => console.log(`    - ${table}`));
+            }
+            if (target.customQueries && target.customQueries.length > 0) {
+                console.log('  Custom Queries:');
+                target.customQueries.forEach((query) => console.log(`    - ${query}`));
+            }
+            if (target.customMutations && target.customMutations.length > 0) {
+                console.log('  Custom Mutations:');
+                target.customMutations.forEach((mutation) => console.log(`    - ${mutation}`));
+            }
+            if (target.filesWritten && target.filesWritten.length > 0) {
+                console.log('  Files written:');
+                target.filesWritten.forEach((file) => console.log(`    - ${file}`));
+            }
+            if (!target.success && target.errors) {
+                target.errors.forEach((error) => console.error(`  - ${error}`));
+            }
+        });
+        if (!result.success) {
+            process.exit(1);
+        }
+        return;
+    }
     if (result.success) {
-        console.log('[ok]', result.message);
+        console.log('[ok]', result.message, `(${duration})`);
         if (result.tables && result.tables.length > 0) {
             console.log('\nTables:');
             result.tables.forEach((t) => console.log(`  - ${t}`));
@@ -263,7 +365,7 @@ program
         }
     }
     else {
-        console.error('x', result.message);
+        console.error('x', result.message, `(${duration})`);
         if (result.errors) {
             result.errors.forEach((e) => console.error('  -', e));
         }
@@ -279,6 +381,7 @@ program
     .option('-a, --authorization <header>', 'Authorization header value')
     .option('--json', 'Output as JSON', false)
     .action(async (options) => {
+    const startTime = performance.now();
     // Validate source options
     if (!options.endpoint && !options.schema) {
         console.error('x Either --endpoint or --schema must be provided.');
@@ -299,11 +402,12 @@ program
         console.log('Fetching schema from', source.describe(), '...');
         const { introspection } = await source.fetch();
         const tables = inferTablesFromIntrospection(introspection);
+        const duration = formatDuration(performance.now() - startTime);
         if (options.json) {
             console.log(JSON.stringify(tables, null, 2));
         }
         else {
-            console.log(`\n[ok] Found ${tables.length} tables:\n`);
+            console.log(`\n[ok] Found ${tables.length} tables (${duration}):\n`);
             tables.forEach((table) => {
                 const fieldCount = table.fields.length;
                 const relationCount = table.relations.belongsTo.length +
@@ -315,7 +419,8 @@ program
         }
     }
     catch (err) {
-        console.error('x Failed to introspect schema:', err instanceof Error ? err.message : err);
+        const duration = formatDuration(performance.now() - startTime);
+        console.error('x Failed to introspect schema:', err instanceof Error ? err.message : err, `(${duration})`);
         process.exit(1);
     }
 });

package/cli/watch/orchestrator.d.ts

@@ -10,6 +10,10 @@ export interface WatchOrchestratorOptions {
     generatorType: GeneratorType;
     verbose: boolean;
     authorization?: string;
+    /** Config file path for regeneration */
+    configPath?: string;
+    /** Target name for multi-target configs */
+    target?: string;
     /** Override output directory (for ORM) */
     outputDir?: string;
     /** Skip custom operations flag */

package/cli/watch/orchestrator.js

@@ -138,6 +138,8 @@ class WatchOrchestrator {
             let result;
             if (this.options.generatorType === 'generate') {
                 result = await (0, generate_1.generateCommand)({
+                    config: this.options.configPath,
+                    target: this.options.target,
                     endpoint: this.options.config.endpoint,
                     output: this.options.outputDir ?? this.options.config.output,
                     authorization: this.options.authorization,
@@ -147,6 +149,8 @@ class WatchOrchestrator {
             }
             else {
                 result = await (0, generate_orm_1.generateOrmCommand)({
+                    config: this.options.configPath,
+                    target: this.options.target,
                     endpoint: this.options.config.endpoint,
                     output: this.options.outputDir ?? this.options.config.orm?.output,
                     authorization: this.options.authorization,