@constructive-io/graphql-codegen 2.31.0 → 2.32.0

package/cli/codegen/orm/index.js

@@ -13,7 +13,7 @@ const input_types_generator_1 = require("./input-types-generator");
 function generateOrm(options) {
     const { tables, customOperations, config } = options;
     const files = [];
-    const useSharedTypes = config.orm?.useSharedTypes ?? true;
+    const useSharedTypes = config.orm.useSharedTypes;
     const hasCustomQueries = (customOperations?.queries.length ?? 0) > 0;
     const hasCustomMutations = (customOperations?.mutations.length ?? 0) > 0;
     const typeRegistry = customOperations?.typeRegistry;

package/cli/commands/generate-orm.d.ts

@@ -48,6 +48,6 @@ export interface GenerateOrmResult {
     errors?: string[];
 }
 /**
- * Execute the generate-orm command
+ * Execute the generate-orm command (generates ORM client)
  */
-export declare function generateOrmCommand(options?: GenerateOrmOptions): Promise<GenerateOrmResult>;
+export declare function generateOrm(options?: GenerateOrmOptions): Promise<GenerateOrmResult>;

package/cli/commands/generate-orm.js

@@ -8,7 +8,7 @@
  * 3. Generates a Prisma-like ORM client with fluent API
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateOrmCommand = generateOrmCommand;
+exports.generateOrm = generateOrm;
 const config_1 = require("../../types/config");
 const source_1 = require("../introspect/source");
 const shared_1 = require("./shared");
@@ -16,9 +16,9 @@ const init_1 = require("./init");
 const generate_1 = require("./generate");
 const orm_1 = require("../codegen/orm");
 /**
- * Execute the generate-orm command
+ * Execute the generate-orm command (generates ORM client)
  */
-async function generateOrmCommand(options = {}) {
+async function generateOrm(options = {}) {
     if (options.verbose) {
         console.log('Loading configuration...');
     }
@@ -71,7 +71,7 @@ async function generateOrmCommand(options = {}) {
 }
 async function generateOrmForTarget(target, options, isMultiTarget) {
     const config = target.config;
-    const outputDir = options.output || config.orm?.output || './generated/orm';
+    const outputDir = options.output || config.orm.output;
     const prefix = isMultiTarget ? `[${target.name}] ` : '';
     const log = options.verbose
         ? (message) => console.log(`${prefix}${message}`)

package/cli/commands/generate.d.ts

@@ -40,9 +40,9 @@ export interface GenerateResult {
     errors?: string[];
 }
 /**
- * Execute the generate command
+ * Execute the generate command (generates React Query SDK)
  */
-export declare function generateCommand(options?: GenerateOptions): Promise<GenerateResult>;
+export declare function generateReactQuery(options?: GenerateOptions): Promise<GenerateResult>;
 export interface GeneratedFile {
     path: string;
     content: string;

package/cli/commands/generate.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCommand = generateCommand;
+exports.generateReactQuery = generateReactQuery;
 exports.writeGeneratedFiles = writeGeneratedFiles;
 exports.formatOutput = formatOutput;
 /**
@@ -53,9 +53,9 @@ const shared_1 = require("./shared");
 const init_1 = require("./init");
 const codegen_1 = require("../codegen");
 /**
- * Execute the generate command
+ * Execute the generate command (generates React Query SDK)
  */
-async function generateCommand(options = {}) {
+async function generateReactQuery(options = {}) {
     if (options.verbose) {
         console.log('Loading configuration...');
     }

package/cli/commands/index.d.ts

@@ -3,7 +3,7 @@
  */
 export { initCommand, findConfigFile, loadConfigFile } from './init';
 export type { InitOptions, InitResult } from './init';
-export { generateCommand } from './generate';
+export { generateReactQuery } from './generate';
 export type { GenerateOptions, GenerateResult, GenerateTargetResult } from './generate';
-export { generateOrmCommand } from './generate-orm';
+export { generateOrm } from './generate-orm';
 export type { GenerateOrmOptions, GenerateOrmResult, GenerateOrmTargetResult } from './generate-orm';

package/cli/commands/index.js

@@ -3,12 +3,12 @@
  * CLI commands exports
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateOrmCommand = exports.generateCommand = exports.loadConfigFile = exports.findConfigFile = exports.initCommand = void 0;
+exports.generateOrm = exports.generateReactQuery = exports.loadConfigFile = exports.findConfigFile = exports.initCommand = void 0;
 var init_1 = require("./init");
 Object.defineProperty(exports, "initCommand", { enumerable: true, get: function () { return init_1.initCommand; } });
 Object.defineProperty(exports, "findConfigFile", { enumerable: true, get: function () { return init_1.findConfigFile; } });
 Object.defineProperty(exports, "loadConfigFile", { enumerable: true, get: function () { return init_1.loadConfigFile; } });
 var generate_1 = require("./generate");
-Object.defineProperty(exports, "generateCommand", { enumerable: true, get: function () { return generate_1.generateCommand; } });
+Object.defineProperty(exports, "generateReactQuery", { enumerable: true, get: function () { return generate_1.generateReactQuery; } });
 var generate_orm_1 = require("./generate-orm");
-Object.defineProperty(exports, "generateOrmCommand", { enumerable: true, get: function () { return generate_orm_1.generateOrmCommand; } });
+Object.defineProperty(exports, "generateOrm", { enumerable: true, get: function () { return generate_orm_1.generateOrm; } });

package/cli/commands/shared.js

@@ -29,8 +29,11 @@ async function runCodegenPipeline(options) {
     let tables = (0, infer_tables_1.inferTablesFromIntrospection)(introspection);
     const totalTables = tables.length;
     log(`  Found ${totalTables} tables`);
-    // 3. Filter tables by config
-    tables = (0, transform_1.filterTables)(tables, config.tables.include, config.tables.exclude);
+    // 3. Filter tables by config (combine exclude and systemExclude)
+    tables = (0, transform_1.filterTables)(tables, config.tables.include, [
+        ...config.tables.exclude,
+        ...config.tables.systemExclude,
+    ]);
     const filteredTables = tables.length;
     log(`  After filtering: ${filteredTables} tables`);
     // 4. Transform introspection to operations
@@ -45,9 +48,9 @@ async function runCodegenPipeline(options) {
     let customQueries = [];
     let customMutations = [];
     if (!skipCustomOperations) {
-        // Filter by config include/exclude
-        const filteredQueries = (0, transform_schema_1.filterOperations)(allQueries, config.queries.include, config.queries.exclude);
-        const filteredMutations = (0, transform_schema_1.filterOperations)(allMutations, config.mutations.include, config.mutations.exclude);
+        // Filter by config include/exclude (combine exclude and systemExclude)
+        const filteredQueries = (0, transform_schema_1.filterOperations)(allQueries, config.queries.include, [...config.queries.exclude, ...config.queries.systemExclude]);
+        const filteredMutations = (0, transform_schema_1.filterOperations)(allMutations, config.mutations.include, [...config.mutations.exclude, ...config.mutations.systemExclude]);
         log(`  After config filtering: ${filteredQueries.length} queries, ${filteredMutations.length} mutations`);
         // Remove table operations (already handled by table generators)
         customQueries = (0, transform_schema_1.getCustomOperations)(filteredQueries, tableOperationNames);

package/cli/index.js

@@ -294,7 +294,7 @@ async function handleGenerate(argv) {
         });
         return;
     }
-    const result = await (0, generate_1.generateCommand)({
+    const result = await (0, generate_1.generateReactQuery)({
         config,
         target,
         endpoint,
@@ -410,7 +410,7 @@ async function handleGenerateOrm(argv) {
         });
         return;
     }
-    const result = await (0, generate_orm_1.generateOrmCommand)({
+    const result = await (0, generate_orm_1.generateOrm)({
         config,
         target,
         endpoint,

package/cli/watch/orchestrator.js

@@ -137,7 +137,7 @@ class WatchOrchestrator {
         try {
             let result;
             if (this.options.generatorType === 'generate') {
-                result = await (0, generate_1.generateCommand)({
+                result = await (0, generate_1.generateReactQuery)({
                     config: this.options.configPath,
                     target: this.options.target,
                     endpoint: this.options.config.endpoint,
@@ -148,11 +148,11 @@ class WatchOrchestrator {
                 });
             }
             else {
-                result = await (0, generate_orm_1.generateOrmCommand)({
+                result = await (0, generate_orm_1.generateOrm)({
                     config: this.options.configPath,
                     target: this.options.target,
                     endpoint: this.options.config.endpoint,
-                    output: this.options.outputDir ?? this.options.config.orm?.output,
+                    output: this.options.outputDir ?? this.options.config.orm.output,
                     authorization: this.options.authorization,
                     verbose: this.watchOptions.verbose,
                     skipCustomOperations: this.options.skipCustomOperations,

package/esm/cli/codegen/orm/index.js

@@ -9,7 +9,7 @@ import { generateInputTypesFile, collectInputTypeNames, collectPayloadTypeNames
 export function generateOrm(options) {
     const { tables, customOperations, config } = options;
     const files = [];
-    const useSharedTypes = config.orm?.useSharedTypes ?? true;
+    const useSharedTypes = config.orm.useSharedTypes;
     const hasCustomQueries = (customOperations?.queries.length ?? 0) > 0;
     const hasCustomMutations = (customOperations?.mutations.length ?? 0) > 0;
     const typeRegistry = customOperations?.typeRegistry;

package/esm/cli/commands/generate-orm.d.ts

@@ -48,6 +48,6 @@ export interface GenerateOrmResult {
     errors?: string[];
 }
 /**
- * Execute the generate-orm command
+ * Execute the generate-orm command (generates ORM client)
  */
-export declare function generateOrmCommand(options?: GenerateOrmOptions): Promise<GenerateOrmResult>;
+export declare function generateOrm(options?: GenerateOrmOptions): Promise<GenerateOrmResult>;

package/esm/cli/commands/generate-orm.js

@@ -11,11 +11,11 @@ import { createSchemaSource, validateSourceOptions, } from '../introspect/source
 import { runCodegenPipeline, validateTablesFound } from './shared';
 import { findConfigFile, loadConfigFile } from './init';
 import { writeGeneratedFiles } from './generate';
-import { generateOrm } from '../codegen/orm';
+import { generateOrm as generateOrmFiles } from '../codegen/orm';
 /**
- * Execute the generate-orm command
+ * Execute the generate-orm command (generates ORM client)
  */
-export async function generateOrmCommand(options = {}) {
+export async function generateOrm(options = {}) {
     if (options.verbose) {
         console.log('Loading configuration...');
     }
@@ -68,7 +68,7 @@ export async function generateOrmCommand(options = {}) {
 }
 async function generateOrmForTarget(target, options, isMultiTarget) {
     const config = target.config;
-    const outputDir = options.output || config.orm?.output || './generated/orm';
+    const outputDir = options.output || config.orm.output;
     const prefix = isMultiTarget ? `[${target.name}] ` : '';
     const log = options.verbose
         ? (message) => console.log(`${prefix}${message}`)
@@ -132,7 +132,7 @@ async function generateOrmForTarget(target, options, isMultiTarget) {
     }
     // 4. Generate ORM code
     console.log(`${prefix}Generating code...`);
-    const { files: generatedFiles, stats: genStats } = generateOrm({
+    const { files: generatedFiles, stats: genStats } = generateOrmFiles({
         tables,
         customOperations: {
             queries: customOperations.queries,

package/esm/cli/commands/generate.d.ts

@@ -40,9 +40,9 @@ export interface GenerateResult {
     errors?: string[];
 }
 /**
- * Execute the generate command
+ * Execute the generate command (generates React Query SDK)
  */
-export declare function generateCommand(options?: GenerateOptions): Promise<GenerateResult>;
+export declare function generateReactQuery(options?: GenerateOptions): Promise<GenerateResult>;
 export interface GeneratedFile {
     path: string;
     content: string;

package/esm/cli/commands/generate.js

@@ -15,9 +15,9 @@ import { runCodegenPipeline, validateTablesFound } from './shared';
 import { findConfigFile, loadConfigFile } from './init';
 import { generate } from '../codegen';
 /**
- * Execute the generate command
+ * Execute the generate command (generates React Query SDK)
  */
-export async function generateCommand(options = {}) {
+export async function generateReactQuery(options = {}) {
     if (options.verbose) {
         console.log('Loading configuration...');
     }

package/esm/cli/commands/index.d.ts

@@ -3,7 +3,7 @@
  */
 export { initCommand, findConfigFile, loadConfigFile } from './init';
 export type { InitOptions, InitResult } from './init';
-export { generateCommand } from './generate';
+export { generateReactQuery } from './generate';
 export type { GenerateOptions, GenerateResult, GenerateTargetResult } from './generate';
-export { generateOrmCommand } from './generate-orm';
+export { generateOrm } from './generate-orm';
 export type { GenerateOrmOptions, GenerateOrmResult, GenerateOrmTargetResult } from './generate-orm';

package/esm/cli/commands/index.js

@@ -2,5 +2,5 @@
  * CLI commands exports
  */
 export { initCommand, findConfigFile, loadConfigFile } from './init';
-export { generateCommand } from './generate';
-export { generateOrmCommand } from './generate-orm';
+export { generateReactQuery } from './generate';
+export { generateOrm } from './generate-orm';

package/esm/cli/commands/shared.js

@@ -25,8 +25,11 @@ export async function runCodegenPipeline(options) {
     let tables = inferTablesFromIntrospection(introspection);
     const totalTables = tables.length;
     log(`  Found ${totalTables} tables`);
-    // 3. Filter tables by config
-    tables = filterTables(tables, config.tables.include, config.tables.exclude);
+    // 3. Filter tables by config (combine exclude and systemExclude)
+    tables = filterTables(tables, config.tables.include, [
+        ...config.tables.exclude,
+        ...config.tables.systemExclude,
+    ]);
     const filteredTables = tables.length;
     log(`  After filtering: ${filteredTables} tables`);
     // 4. Transform introspection to operations
@@ -41,9 +44,9 @@ export async function runCodegenPipeline(options) {
     let customQueries = [];
     let customMutations = [];
     if (!skipCustomOperations) {
-        // Filter by config include/exclude
-        const filteredQueries = filterOperations(allQueries, config.queries.include, config.queries.exclude);
-        const filteredMutations = filterOperations(allMutations, config.mutations.include, config.mutations.exclude);
+        // Filter by config include/exclude (combine exclude and systemExclude)
+        const filteredQueries = filterOperations(allQueries, config.queries.include, [...config.queries.exclude, ...config.queries.systemExclude]);
+        const filteredMutations = filterOperations(allMutations, config.mutations.include, [...config.mutations.exclude, ...config.mutations.systemExclude]);
         log(`  After config filtering: ${filteredQueries.length} queries, ${filteredMutations.length} mutations`);
         // Remove table operations (already handled by table generators)
         customQueries = getCustomOperations(filteredQueries, tableOperationNames);

package/esm/cli/index.js

@@ -4,8 +4,8 @@
  */
 import { CLI, cliExitWithError, extractFirst, getPackageJson } from 'inquirerer';
 import { initCommand, findConfigFile, loadConfigFile } from './commands/init';
-import { generateCommand } from './commands/generate';
-import { generateOrmCommand } from './commands/generate-orm';
+import { generateReactQuery } from './commands/generate';
+import { generateOrm } from './commands/generate-orm';
 import { startWatch } from './watch';
 import { isMultiConfig, mergeConfig, resolveConfig, } from '../types/config';
 const usageText = `
@@ -258,7 +258,7 @@ async function handleGenerate(argv) {
         });
         return;
     }
-    const result = await generateCommand({
+    const result = await generateReactQuery({
         config,
         target,
         endpoint,
@@ -374,7 +374,7 @@ async function handleGenerateOrm(argv) {
         });
         return;
     }
-    const result = await generateOrmCommand({
+    const result = await generateOrm({
         config,
         target,
         endpoint,

package/esm/cli/watch/orchestrator.js

@@ -5,8 +5,8 @@
  */
 import { SchemaPoller } from './poller';
 import { debounce } from './debounce';
-import { generateCommand } from '../commands/generate';
-import { generateOrmCommand, } from '../commands/generate-orm';
+import { generateReactQuery } from '../commands/generate';
+import { generateOrm, } from '../commands/generate-orm';
 /**
  * Main watch orchestrator class
  */
@@ -133,7 +133,7 @@ export class WatchOrchestrator {
         try {
             let result;
             if (this.options.generatorType === 'generate') {
-                result = await generateCommand({
+                result = await generateReactQuery({
                     config: this.options.configPath,
                     target: this.options.target,
                     endpoint: this.options.config.endpoint,
@@ -144,11 +144,11 @@ export class WatchOrchestrator {
                 });
             }
             else {
-                result = await generateOrmCommand({
+                result = await generateOrm({
                     config: this.options.configPath,
                     target: this.options.target,
                     endpoint: this.options.config.endpoint,
-                    output: this.options.outputDir ?? this.options.config.orm?.output,
+                    output: this.options.outputDir ?? this.options.config.orm.output,
                     authorization: this.options.authorization,
                     verbose: this.watchOptions.verbose,
                     skipCustomOperations: this.options.skipCustomOperations,

package/esm/index.d.ts

@@ -10,5 +10,5 @@ export * from './core';
 export * from './generators';
 export * from './client';
 export { defineConfig } from './types/config';
-export { generateCommand, generateOrmCommand, findConfigFile, loadConfigFile, } from './cli/commands';
+export { generateReactQuery, generateOrm, findConfigFile, loadConfigFile, } from './cli/commands';
 export type { GenerateOptions, GenerateResult, GenerateTargetResult, GenerateOrmOptions, GenerateOrmResult, GenerateOrmTargetResult, InitOptions, InitResult, } from './cli/commands';

package/esm/index.js

@@ -16,4 +16,4 @@ export * from './client';
 // Config definition helper
 export { defineConfig } from './types/config';
 // CLI command exports (for packages/cli consumption)
-export { generateCommand, generateOrmCommand, findConfigFile, loadConfigFile, } from './cli/commands';
+export { generateReactQuery, generateOrm, findConfigFile, loadConfigFile, } from './cli/commands';

package/esm/types/config.d.ts

@@ -88,6 +88,8 @@ export interface GraphQLSDKConfigTarget {
         include?: string[];
         /** Tables to exclude (glob patterns supported) */
         exclude?: string[];
+        /** System-level tables to always exclude (can be overridden to [] to disable) */
+        systemExclude?: string[];
     };
     /**
      * Query operation filtering (for ALL queries from __schema introspection)
@@ -96,8 +98,10 @@ export interface GraphQLSDKConfigTarget {
     queries?: {
         /** Query names to include - defaults to ['*'] */
         include?: string[];
-        /** Query names to exclude - defaults to ['_meta', 'query'] */
+        /** Query names to exclude */
         exclude?: string[];
+        /** System-level queries to always exclude (defaults to ['_meta', 'query'], can be overridden to [] to disable) */
+        systemExclude?: string[];
     };
     /**
      * Mutation operation filtering (for ALL mutations from __schema introspection)
@@ -108,6 +112,8 @@ export interface GraphQLSDKConfigTarget {
         include?: string[];
         /** Mutation names to exclude */
         exclude?: string[];
+        /** System-level mutations to always exclude (can be overridden to [] to disable) */
+        systemExclude?: string[];
     };
     /**
      * Fields to exclude globally from all tables
@@ -145,6 +151,11 @@ export interface GraphQLSDKConfigTarget {
      * When set, generates a Prisma-like ORM client in addition to or instead of React Query hooks
      */
     orm?: {
+        /**
+         * Whether to generate ORM client
+         * @default false
+         */
+        enabled?: boolean;
         /**
          * Output directory for generated ORM client
          * @default './generated/orm'
@@ -262,14 +273,17 @@ export interface ResolvedConfig {
     tables: {
         include: string[];
         exclude: string[];
+        systemExclude: string[];
     };
     queries: {
         include: string[];
         exclude: string[];
+        systemExclude: string[];
     };
     mutations: {
         include: string[];
         exclude: string[];
+        systemExclude: string[];
     };
     excludeFields: string[];
     hooks: {
@@ -285,9 +299,10 @@ export interface ResolvedConfig {
         skipQueryField: boolean;
     };
     orm: {
+        enabled: boolean;
         output: string;
         useSharedTypes: boolean;
-    } | null;
+    };
     reactQuery: {
         enabled: boolean;
     };
@@ -305,14 +320,7 @@ export declare const DEFAULT_QUERY_KEY_CONFIG: ResolvedQueryKeyConfig;
 /**
  * Default configuration values
  */
-export declare const DEFAULT_CONFIG: Omit<ResolvedConfig, 'endpoint' | 'schema'>;
-/**
- * Default ORM configuration values
- */
-export declare const DEFAULT_ORM_CONFIG: {
-    output: string;
-    useSharedTypes: boolean;
-};
+export declare const DEFAULT_CONFIG: ResolvedConfig;
 /**
  * Helper function to define configuration with type checking
  */
@@ -329,11 +337,14 @@ export interface ResolvedTargetConfig {
  */
 export declare function isMultiConfig(config: GraphQLSDKConfig): config is GraphQLSDKMultiConfig;
 /**
- * Merge two target configs (defaults + overrides)
+ * Merge two target configs (defaults + overrides).
+ * Uses deepmerge with array replacement strategy - when a user specifies
+ * an array like include: ['users'], it replaces the default ['*'] entirely.
  */
 export declare function mergeConfig(base: GraphQLSDKConfigTarget, overrides: GraphQLSDKConfigTarget): GraphQLSDKConfigTarget;
 /**
- * Resolve configuration by applying defaults
+ * Resolve configuration by applying defaults.
+ * Uses deepmerge with array replacement strategy.
  */
 export declare function resolveConfig(config: GraphQLSDKConfig): ResolvedConfig;
 /**

package/esm/types/config.js

@@ -1,6 +1,13 @@
 /**
  * SDK Configuration types
  */
+import deepmerge from 'deepmerge';
+/**
+ * Array merge strategy that replaces arrays (source wins over target).
+ * This ensures that when a user specifies include: ['users'], it replaces
+ * the default ['*'] rather than merging to ['*', 'users'].
+ */
+const replaceArrays = (_target, source) => source;
 /**
  * Default watch configuration values
  */
@@ -24,19 +31,24 @@ export const DEFAULT_QUERY_KEY_CONFIG = {
  * Default configuration values
  */
 export const DEFAULT_CONFIG = {
+    endpoint: '',
+    schema: null,
     headers: {},
     output: './generated/graphql',
     tables: {
         include: ['*'],
         exclude: [],
+        systemExclude: [],
     },
     queries: {
         include: ['*'],
-        exclude: ['_meta', 'query'], // Internal PostGraphile queries
+        exclude: [],
+        systemExclude: ['_meta', 'query'], // Internal PostGraphile queries
     },
     mutations: {
         include: ['*'],
         exclude: [],
+        systemExclude: [],
     },
     excludeFields: [],
     hooks: {
@@ -51,20 +63,17 @@ export const DEFAULT_CONFIG = {
         maxFieldDepth: 2,
         skipQueryField: true,
     },
-    orm: null, // ORM generation disabled by default
+    orm: {
+        enabled: false,
+        output: './generated/orm',
+        useSharedTypes: true,
+    },
     reactQuery: {
-        enabled: true, // React Query hooks enabled by default for generate command
+        enabled: false,
     },
     queryKeys: DEFAULT_QUERY_KEY_CONFIG,
     watch: DEFAULT_WATCH_CONFIG,
 };
-/**
- * Default ORM configuration values
- */
-export const DEFAULT_ORM_CONFIG = {
-    output: './generated/orm',
-    useSharedTypes: true,
-};
 /**
  * Helper function to define configuration with type checking
  */
@@ -79,129 +88,22 @@ export function isMultiConfig(config) {
     return typeof targets === 'object' && targets !== null;
 }
 /**
- * Merge two target configs (defaults + overrides)
+ * Merge two target configs (defaults + overrides).
+ * Uses deepmerge with array replacement strategy - when a user specifies
+ * an array like include: ['users'], it replaces the default ['*'] entirely.
  */
 export function mergeConfig(base, overrides) {
-    const headers = base.headers || overrides.headers
-        ? { ...(base.headers ?? {}), ...(overrides.headers ?? {}) }
-        : undefined;
-    const tables = base.tables || overrides.tables
-        ? { ...(base.tables ?? {}), ...(overrides.tables ?? {}) }
-        : undefined;
-    const queries = base.queries || overrides.queries
-        ? { ...(base.queries ?? {}), ...(overrides.queries ?? {}) }
-        : undefined;
-    const mutations = base.mutations || overrides.mutations
-        ? { ...(base.mutations ?? {}), ...(overrides.mutations ?? {}) }
-        : undefined;
-    const hooks = base.hooks || overrides.hooks
-        ? { ...(base.hooks ?? {}), ...(overrides.hooks ?? {}) }
-        : undefined;
-    const postgraphile = base.postgraphile || overrides.postgraphile
-        ? { ...(base.postgraphile ?? {}), ...(overrides.postgraphile ?? {}) }
-        : undefined;
-    const codegen = base.codegen || overrides.codegen
-        ? { ...(base.codegen ?? {}), ...(overrides.codegen ?? {}) }
-        : undefined;
-    const orm = base.orm || overrides.orm
-        ? { ...(base.orm ?? {}), ...(overrides.orm ?? {}) }
-        : undefined;
-    const reactQuery = base.reactQuery || overrides.reactQuery
-        ? { ...(base.reactQuery ?? {}), ...(overrides.reactQuery ?? {}) }
-        : undefined;
-    const queryKeys = base.queryKeys || overrides.queryKeys
-        ? {
-            ...(base.queryKeys ?? {}),
-            ...(overrides.queryKeys ?? {}),
-            relationships: {
-                ...(base.queryKeys?.relationships ?? {}),
-                ...(overrides.queryKeys?.relationships ?? {}),
-            },
-        }
-        : undefined;
-    const watch = base.watch || overrides.watch
-        ? { ...(base.watch ?? {}), ...(overrides.watch ?? {}) }
-        : undefined;
-    return {
-        ...base,
-        ...overrides,
-        headers,
-        tables,
-        queries,
-        mutations,
-        hooks,
-        postgraphile,
-        codegen,
-        orm,
-        reactQuery,
-        queryKeys,
-        watch,
-    };
+    return deepmerge(base, overrides, { arrayMerge: replaceArrays });
 }
 /**
- * Resolve configuration by applying defaults
+ * Resolve configuration by applying defaults.
+ * Uses deepmerge with array replacement strategy.
  */
 export function resolveConfig(config) {
     if (isMultiConfig(config)) {
         throw new Error('Multi-target config cannot be resolved with resolveConfig(). Use resolveConfigTargets().');
     }
-    return {
-        endpoint: config.endpoint ?? '',
-        schema: config.schema ?? null,
-        headers: config.headers ?? DEFAULT_CONFIG.headers,
-        output: config.output ?? DEFAULT_CONFIG.output,
-        tables: {
-            include: config.tables?.include ?? DEFAULT_CONFIG.tables.include,
-            exclude: config.tables?.exclude ?? DEFAULT_CONFIG.tables.exclude,
-        },
-        queries: {
-            include: config.queries?.include ?? DEFAULT_CONFIG.queries.include,
-            exclude: config.queries?.exclude ?? DEFAULT_CONFIG.queries.exclude,
-        },
-        mutations: {
-            include: config.mutations?.include ?? DEFAULT_CONFIG.mutations.include,
-            exclude: config.mutations?.exclude ?? DEFAULT_CONFIG.mutations.exclude,
-        },
-        excludeFields: config.excludeFields ?? DEFAULT_CONFIG.excludeFields,
-        hooks: {
-            queries: config.hooks?.queries ?? DEFAULT_CONFIG.hooks.queries,
-            mutations: config.hooks?.mutations ?? DEFAULT_CONFIG.hooks.mutations,
-            queryKeyPrefix: config.hooks?.queryKeyPrefix ?? DEFAULT_CONFIG.hooks.queryKeyPrefix,
-        },
-        postgraphile: {
-            schema: config.postgraphile?.schema ?? DEFAULT_CONFIG.postgraphile.schema,
-        },
-        codegen: {
-            maxFieldDepth: config.codegen?.maxFieldDepth ?? DEFAULT_CONFIG.codegen.maxFieldDepth,
-            skipQueryField: config.codegen?.skipQueryField ?? DEFAULT_CONFIG.codegen.skipQueryField,
-        },
-        orm: config.orm
-            ? {
-                output: config.orm.output ?? DEFAULT_ORM_CONFIG.output,
-                useSharedTypes: config.orm.useSharedTypes ?? DEFAULT_ORM_CONFIG.useSharedTypes,
-            }
-            : null,
-        reactQuery: {
-            enabled: config.reactQuery?.enabled ?? DEFAULT_CONFIG.reactQuery.enabled,
-        },
-        queryKeys: {
-            style: config.queryKeys?.style ?? DEFAULT_QUERY_KEY_CONFIG.style,
-            relationships: config.queryKeys?.relationships ??
-                DEFAULT_QUERY_KEY_CONFIG.relationships,
-            generateScopedKeys: config.queryKeys?.generateScopedKeys ??
-                DEFAULT_QUERY_KEY_CONFIG.generateScopedKeys,
-            generateCascadeHelpers: config.queryKeys?.generateCascadeHelpers ??
-                DEFAULT_QUERY_KEY_CONFIG.generateCascadeHelpers,
-            generateMutationKeys: config.queryKeys?.generateMutationKeys ??
-                DEFAULT_QUERY_KEY_CONFIG.generateMutationKeys,
-        },
-        watch: {
-            pollInterval: config.watch?.pollInterval ?? DEFAULT_WATCH_CONFIG.pollInterval,
-            debounce: config.watch?.debounce ?? DEFAULT_WATCH_CONFIG.debounce,
-            touchFile: config.watch?.touchFile ?? DEFAULT_WATCH_CONFIG.touchFile,
-            clearScreen: config.watch?.clearScreen ?? DEFAULT_WATCH_CONFIG.clearScreen,
-        },
-    };
+    return deepmerge(DEFAULT_CONFIG, config, { arrayMerge: replaceArrays });
 }
 /**
  * Resolve all targets in a multi-target config

package/index.d.ts

@@ -10,5 +10,5 @@ export * from './core';
 export * from './generators';
 export * from './client';
 export { defineConfig } from './types/config';
-export { generateCommand, generateOrmCommand, findConfigFile, loadConfigFile, } from './cli/commands';
+export { generateReactQuery, generateOrm, findConfigFile, loadConfigFile, } from './cli/commands';
 export type { GenerateOptions, GenerateResult, GenerateTargetResult, GenerateOrmOptions, GenerateOrmResult, GenerateOrmTargetResult, InitOptions, InitResult, } from './cli/commands';

package/index.js

@@ -21,7 +21,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfigFile = exports.findConfigFile = exports.generateOrmCommand = exports.generateCommand = exports.defineConfig = void 0;
+exports.loadConfigFile = exports.findConfigFile = exports.generateOrm = exports.generateReactQuery = exports.defineConfig = void 0;
 // Core types
 __exportStar(require("./types"), exports);
 // Core query building
@@ -35,7 +35,7 @@ var config_1 = require("./types/config");
 Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return config_1.defineConfig; } });
 // CLI command exports (for packages/cli consumption)
 var commands_1 = require("./cli/commands");
-Object.defineProperty(exports, "generateCommand", { enumerable: true, get: function () { return commands_1.generateCommand; } });
-Object.defineProperty(exports, "generateOrmCommand", { enumerable: true, get: function () { return commands_1.generateOrmCommand; } });
+Object.defineProperty(exports, "generateReactQuery", { enumerable: true, get: function () { return commands_1.generateReactQuery; } });
+Object.defineProperty(exports, "generateOrm", { enumerable: true, get: function () { return commands_1.generateOrm; } });
 Object.defineProperty(exports, "findConfigFile", { enumerable: true, get: function () { return commands_1.findConfigFile; } });
 Object.defineProperty(exports, "loadConfigFile", { enumerable: true, get: function () { return commands_1.loadConfigFile; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "2.31.0",
+  "version": "2.32.0",
   "description": "CLI-based GraphQL SDK generator for PostGraphile endpoints with React Query hooks",
   "keywords": [
     "graphql",
@@ -59,6 +59,7 @@
     "@constructive-io/graphql-types": "^2.14.0",
     "@inquirerer/utils": "^3.2.0",
     "ajv": "^8.17.1",
+    "deepmerge": "^4.3.1",
     "find-and-require-package-json": "^0.9.0",
     "gql-ast": "^2.6.0",
     "graphql": "15.10.1",
@@ -91,5 +92,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "57fdad16730e5a09c033ac218c8674e7599db7da"
+  "gitHead": "39b5c59b01b8ce391dc14daf5a9430ca0ff67574"
 }

package/types/config.d.ts

@@ -88,6 +88,8 @@ export interface GraphQLSDKConfigTarget {
         include?: string[];
         /** Tables to exclude (glob patterns supported) */
         exclude?: string[];
+        /** System-level tables to always exclude (can be overridden to [] to disable) */
+        systemExclude?: string[];
     };
     /**
      * Query operation filtering (for ALL queries from __schema introspection)
@@ -96,8 +98,10 @@ export interface GraphQLSDKConfigTarget {
     queries?: {
         /** Query names to include - defaults to ['*'] */
         include?: string[];
-        /** Query names to exclude - defaults to ['_meta', 'query'] */
+        /** Query names to exclude */
         exclude?: string[];
+        /** System-level queries to always exclude (defaults to ['_meta', 'query'], can be overridden to [] to disable) */
+        systemExclude?: string[];
     };
     /**
      * Mutation operation filtering (for ALL mutations from __schema introspection)
@@ -108,6 +112,8 @@ export interface GraphQLSDKConfigTarget {
         include?: string[];
         /** Mutation names to exclude */
         exclude?: string[];
+        /** System-level mutations to always exclude (can be overridden to [] to disable) */
+        systemExclude?: string[];
     };
     /**
      * Fields to exclude globally from all tables
@@ -145,6 +151,11 @@ export interface GraphQLSDKConfigTarget {
      * When set, generates a Prisma-like ORM client in addition to or instead of React Query hooks
      */
     orm?: {
+        /**
+         * Whether to generate ORM client
+         * @default false
+         */
+        enabled?: boolean;
         /**
          * Output directory for generated ORM client
          * @default './generated/orm'
@@ -262,14 +273,17 @@ export interface ResolvedConfig {
     tables: {
         include: string[];
         exclude: string[];
+        systemExclude: string[];
     };
     queries: {
         include: string[];
         exclude: string[];
+        systemExclude: string[];
     };
     mutations: {
         include: string[];
         exclude: string[];
+        systemExclude: string[];
     };
     excludeFields: string[];
     hooks: {
@@ -285,9 +299,10 @@ export interface ResolvedConfig {
         skipQueryField: boolean;
     };
     orm: {
+        enabled: boolean;
         output: string;
         useSharedTypes: boolean;
-    } | null;
+    };
     reactQuery: {
         enabled: boolean;
     };
@@ -305,14 +320,7 @@ export declare const DEFAULT_QUERY_KEY_CONFIG: ResolvedQueryKeyConfig;
 /**
  * Default configuration values
  */
-export declare const DEFAULT_CONFIG: Omit<ResolvedConfig, 'endpoint' | 'schema'>;
-/**
- * Default ORM configuration values
- */
-export declare const DEFAULT_ORM_CONFIG: {
-    output: string;
-    useSharedTypes: boolean;
-};
+export declare const DEFAULT_CONFIG: ResolvedConfig;
 /**
  * Helper function to define configuration with type checking
  */
@@ -329,11 +337,14 @@ export interface ResolvedTargetConfig {
  */
 export declare function isMultiConfig(config: GraphQLSDKConfig): config is GraphQLSDKMultiConfig;
 /**
- * Merge two target configs (defaults + overrides)
+ * Merge two target configs (defaults + overrides).
+ * Uses deepmerge with array replacement strategy - when a user specifies
+ * an array like include: ['users'], it replaces the default ['*'] entirely.
  */
 export declare function mergeConfig(base: GraphQLSDKConfigTarget, overrides: GraphQLSDKConfigTarget): GraphQLSDKConfigTarget;
 /**
- * Resolve configuration by applying defaults
+ * Resolve configuration by applying defaults.
+ * Uses deepmerge with array replacement strategy.
  */
 export declare function resolveConfig(config: GraphQLSDKConfig): ResolvedConfig;
 /**

package/types/config.js

@@ -2,13 +2,23 @@
 /**
  * SDK Configuration types
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_ORM_CONFIG = exports.DEFAULT_CONFIG = exports.DEFAULT_QUERY_KEY_CONFIG = exports.DEFAULT_WATCH_CONFIG = void 0;
+exports.DEFAULT_CONFIG = exports.DEFAULT_QUERY_KEY_CONFIG = exports.DEFAULT_WATCH_CONFIG = void 0;
 exports.defineConfig = defineConfig;
 exports.isMultiConfig = isMultiConfig;
 exports.mergeConfig = mergeConfig;
 exports.resolveConfig = resolveConfig;
 exports.resolveConfigTargets = resolveConfigTargets;
+const deepmerge_1 = __importDefault(require("deepmerge"));
+/**
+ * Array merge strategy that replaces arrays (source wins over target).
+ * This ensures that when a user specifies include: ['users'], it replaces
+ * the default ['*'] rather than merging to ['*', 'users'].
+ */
+const replaceArrays = (_target, source) => source;
 /**
  * Default watch configuration values
  */
@@ -32,19 +42,24 @@ exports.DEFAULT_QUERY_KEY_CONFIG = {
  * Default configuration values
  */
 exports.DEFAULT_CONFIG = {
+    endpoint: '',
+    schema: null,
     headers: {},
     output: './generated/graphql',
     tables: {
         include: ['*'],
         exclude: [],
+        systemExclude: [],
     },
     queries: {
         include: ['*'],
-        exclude: ['_meta', 'query'], // Internal PostGraphile queries
+        exclude: [],
+        systemExclude: ['_meta', 'query'], // Internal PostGraphile queries
     },
     mutations: {
         include: ['*'],
         exclude: [],
+        systemExclude: [],
     },
     excludeFields: [],
     hooks: {
@@ -59,20 +74,17 @@ exports.DEFAULT_CONFIG = {
         maxFieldDepth: 2,
         skipQueryField: true,
     },
-    orm: null, // ORM generation disabled by default
+    orm: {
+        enabled: false,
+        output: './generated/orm',
+        useSharedTypes: true,
+    },
     reactQuery: {
-        enabled: true, // React Query hooks enabled by default for generate command
+        enabled: false,
     },
     queryKeys: exports.DEFAULT_QUERY_KEY_CONFIG,
     watch: exports.DEFAULT_WATCH_CONFIG,
 };
-/**
- * Default ORM configuration values
- */
-exports.DEFAULT_ORM_CONFIG = {
-    output: './generated/orm',
-    useSharedTypes: true,
-};
 /**
  * Helper function to define configuration with type checking
  */
@@ -87,129 +99,22 @@ function isMultiConfig(config) {
     return typeof targets === 'object' && targets !== null;
 }
 /**
- * Merge two target configs (defaults + overrides)
+ * Merge two target configs (defaults + overrides).
+ * Uses deepmerge with array replacement strategy - when a user specifies
+ * an array like include: ['users'], it replaces the default ['*'] entirely.
  */
 function mergeConfig(base, overrides) {
-    const headers = base.headers || overrides.headers
-        ? { ...(base.headers ?? {}), ...(overrides.headers ?? {}) }
-        : undefined;
-    const tables = base.tables || overrides.tables
-        ? { ...(base.tables ?? {}), ...(overrides.tables ?? {}) }
-        : undefined;
-    const queries = base.queries || overrides.queries
-        ? { ...(base.queries ?? {}), ...(overrides.queries ?? {}) }
-        : undefined;
-    const mutations = base.mutations || overrides.mutations
-        ? { ...(base.mutations ?? {}), ...(overrides.mutations ?? {}) }
-        : undefined;
-    const hooks = base.hooks || overrides.hooks
-        ? { ...(base.hooks ?? {}), ...(overrides.hooks ?? {}) }
-        : undefined;
-    const postgraphile = base.postgraphile || overrides.postgraphile
-        ? { ...(base.postgraphile ?? {}), ...(overrides.postgraphile ?? {}) }
-        : undefined;
-    const codegen = base.codegen || overrides.codegen
-        ? { ...(base.codegen ?? {}), ...(overrides.codegen ?? {}) }
-        : undefined;
-    const orm = base.orm || overrides.orm
-        ? { ...(base.orm ?? {}), ...(overrides.orm ?? {}) }
-        : undefined;
-    const reactQuery = base.reactQuery || overrides.reactQuery
-        ? { ...(base.reactQuery ?? {}), ...(overrides.reactQuery ?? {}) }
-        : undefined;
-    const queryKeys = base.queryKeys || overrides.queryKeys
-        ? {
-            ...(base.queryKeys ?? {}),
-            ...(overrides.queryKeys ?? {}),
-            relationships: {
-                ...(base.queryKeys?.relationships ?? {}),
-                ...(overrides.queryKeys?.relationships ?? {}),
-            },
-        }
-        : undefined;
-    const watch = base.watch || overrides.watch
-        ? { ...(base.watch ?? {}), ...(overrides.watch ?? {}) }
-        : undefined;
-    return {
-        ...base,
-        ...overrides,
-        headers,
-        tables,
-        queries,
-        mutations,
-        hooks,
-        postgraphile,
-        codegen,
-        orm,
-        reactQuery,
-        queryKeys,
-        watch,
-    };
+    return (0, deepmerge_1.default)(base, overrides, { arrayMerge: replaceArrays });
 }
 /**
- * Resolve configuration by applying defaults
+ * Resolve configuration by applying defaults.
+ * Uses deepmerge with array replacement strategy.
  */
 function resolveConfig(config) {
     if (isMultiConfig(config)) {
         throw new Error('Multi-target config cannot be resolved with resolveConfig(). Use resolveConfigTargets().');
     }
-    return {
-        endpoint: config.endpoint ?? '',
-        schema: config.schema ?? null,
-        headers: config.headers ?? exports.DEFAULT_CONFIG.headers,
-        output: config.output ?? exports.DEFAULT_CONFIG.output,
-        tables: {
-            include: config.tables?.include ?? exports.DEFAULT_CONFIG.tables.include,
-            exclude: config.tables?.exclude ?? exports.DEFAULT_CONFIG.tables.exclude,
-        },
-        queries: {
-            include: config.queries?.include ?? exports.DEFAULT_CONFIG.queries.include,
-            exclude: config.queries?.exclude ?? exports.DEFAULT_CONFIG.queries.exclude,
-        },
-        mutations: {
-            include: config.mutations?.include ?? exports.DEFAULT_CONFIG.mutations.include,
-            exclude: config.mutations?.exclude ?? exports.DEFAULT_CONFIG.mutations.exclude,
-        },
-        excludeFields: config.excludeFields ?? exports.DEFAULT_CONFIG.excludeFields,
-        hooks: {
-            queries: config.hooks?.queries ?? exports.DEFAULT_CONFIG.hooks.queries,
-            mutations: config.hooks?.mutations ?? exports.DEFAULT_CONFIG.hooks.mutations,
-            queryKeyPrefix: config.hooks?.queryKeyPrefix ?? exports.DEFAULT_CONFIG.hooks.queryKeyPrefix,
-        },
-        postgraphile: {
-            schema: config.postgraphile?.schema ?? exports.DEFAULT_CONFIG.postgraphile.schema,
-        },
-        codegen: {
-            maxFieldDepth: config.codegen?.maxFieldDepth ?? exports.DEFAULT_CONFIG.codegen.maxFieldDepth,
-            skipQueryField: config.codegen?.skipQueryField ?? exports.DEFAULT_CONFIG.codegen.skipQueryField,
-        },
-        orm: config.orm
-            ? {
-                output: config.orm.output ?? exports.DEFAULT_ORM_CONFIG.output,
-                useSharedTypes: config.orm.useSharedTypes ?? exports.DEFAULT_ORM_CONFIG.useSharedTypes,
-            }
-            : null,
-        reactQuery: {
-            enabled: config.reactQuery?.enabled ?? exports.DEFAULT_CONFIG.reactQuery.enabled,
-        },
-        queryKeys: {
-            style: config.queryKeys?.style ?? exports.DEFAULT_QUERY_KEY_CONFIG.style,
-            relationships: config.queryKeys?.relationships ??
-                exports.DEFAULT_QUERY_KEY_CONFIG.relationships,
-            generateScopedKeys: config.queryKeys?.generateScopedKeys ??
-                exports.DEFAULT_QUERY_KEY_CONFIG.generateScopedKeys,
-            generateCascadeHelpers: config.queryKeys?.generateCascadeHelpers ??
-                exports.DEFAULT_QUERY_KEY_CONFIG.generateCascadeHelpers,
-            generateMutationKeys: config.queryKeys?.generateMutationKeys ??
-                exports.DEFAULT_QUERY_KEY_CONFIG.generateMutationKeys,
-        },
-        watch: {
-            pollInterval: config.watch?.pollInterval ?? exports.DEFAULT_WATCH_CONFIG.pollInterval,
-            debounce: config.watch?.debounce ?? exports.DEFAULT_WATCH_CONFIG.debounce,
-            touchFile: config.watch?.touchFile ?? exports.DEFAULT_WATCH_CONFIG.touchFile,
-            clearScreen: config.watch?.clearScreen ?? exports.DEFAULT_WATCH_CONFIG.clearScreen,
-        },
-    };
+    return (0, deepmerge_1.default)(exports.DEFAULT_CONFIG, config, { arrayMerge: replaceArrays });
 }
 /**
  * Resolve all targets in a multi-target config