@constructive-io/graphql-codegen 4.0.1 → 4.0.2

package/cli/index.js

@@ -11,6 +11,7 @@ exports.options = exports.commands = void 0;
 const inquirerer_1 = require("inquirerer");
 const config_1 = require("../core/config");
 const generate_1 = require("../core/generate");
+const config_2 = require("../types/config");
 const shared_1 = require("./shared");
 const usage = `
 graphql-codegen - GraphQL SDK generator for Constructive databases
@@ -80,11 +81,7 @@ const commands = async (argv, prompter, _options) => {
             let hasError = false;
             for (const name of names) {
                 console.log(`\n[${name}]`);
-                const targetConfig = { ...targets[name], ...cliOptions };
-                if (targets[name].db && targetConfig.db) {
-                    targetConfig.db = { ...targets[name].db, ...targetConfig.db };
-                }
-                const result = await (0, generate_1.generate)(targetConfig);
+                const result = await (0, generate_1.generate)((0, config_2.mergeConfig)(targets[name], cliOptions));
                 (0, shared_1.printResult)(result);
                 if (!result.success)
                     hasError = true;

package/cli/shared.d.ts

@@ -1,6 +1,6 @@
 import type { Question } from 'inquirerer';
 import type { GenerateResult } from '../core/generate';
-import type { GraphQLSDKConfigTarget } from '../types/config';
+import { type GraphQLSDKConfigTarget } from '../types/config';
 export declare const splitCommas: (input: string | undefined) => string[] | undefined;
 export interface CodegenAnswers {
     endpoint?: string;

package/cli/shared.js

@@ -17,6 +17,7 @@ exports.buildGenerateOptions = buildGenerateOptions;
  */
 const inflekt_1 = require("inflekt");
 const transform_keys_1 = require("inflekt/transform-keys");
+const config_1 = require("../types/config");
 const splitCommas = (input) => {
     if (!input)
         return undefined;
@@ -205,9 +206,5 @@ function buildGenerateOptions(answers, fileConfig = {}) {
     const camelized = (0, exports.camelizeArgv)(answers);
     const normalized = normalizeCodegenListOptions(camelized);
     const withDb = buildDbConfig(normalized);
-    const merged = { ...fileConfig, ...withDb };
-    if (fileConfig.db && merged.db) {
-        merged.db = { ...fileConfig.db, ...merged.db };
-    }
-    return merged;
+    return (0, config_1.mergeConfig)(fileConfig, withDb);
 }

package/esm/cli/index.js

@@ -8,6 +8,7 @@
 import { CLI, getPackageJson } from 'inquirerer';
 import { findConfigFile, loadConfigFile } from '../core/config';
 import { generate } from '../core/generate';
+import { mergeConfig } from '../types/config';
 import { buildDbConfig, buildGenerateOptions, camelizeArgv, codegenQuestions, hasResolvedCodegenSource, normalizeCodegenListOptions, printResult, seedArgvFromConfig, } from './shared';
 const usage = `
 graphql-codegen - GraphQL SDK generator for Constructive databases
@@ -77,11 +78,7 @@ export const commands = async (argv, prompter, _options) => {
             let hasError = false;
             for (const name of names) {
                 console.log(`\n[${name}]`);
-                const targetConfig = { ...targets[name], ...cliOptions };
-                if (targets[name].db && targetConfig.db) {
-                    targetConfig.db = { ...targets[name].db, ...targetConfig.db };
-                }
-                const result = await generate(targetConfig);
+                const result = await generate(mergeConfig(targets[name], cliOptions));
                 printResult(result);
                 if (!result.success)
                     hasError = true;

package/esm/cli/shared.d.ts

@@ -1,6 +1,6 @@
 import type { Question } from 'inquirerer';
 import type { GenerateResult } from '../core/generate';
-import type { GraphQLSDKConfigTarget } from '../types/config';
+import { type GraphQLSDKConfigTarget } from '../types/config';
 export declare const splitCommas: (input: string | undefined) => string[] | undefined;
 export interface CodegenAnswers {
     endpoint?: string;

package/esm/cli/shared.js

@@ -6,6 +6,7 @@
  */
 import { camelize } from 'inflekt';
 import { inflektTree } from 'inflekt/transform-keys';
+import { mergeConfig } from '../types/config';
 export const splitCommas = (input) => {
     if (!input)
         return undefined;
@@ -191,9 +192,5 @@ export function buildGenerateOptions(answers, fileConfig = {}) {
     const camelized = camelizeArgv(answers);
     const normalized = normalizeCodegenListOptions(camelized);
     const withDb = buildDbConfig(normalized);
-    const merged = { ...fileConfig, ...withDb };
-    if (fileConfig.db && merged.db) {
-        merged.db = { ...fileConfig.db, ...merged.db };
-    }
-    return merged;
+    return mergeConfig(fileConfig, withDb);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.0.1",
+  "version": "4.0.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": "c05d6bd3dfa36690aefe21079042666dfae801a1"
+  "gitHead": "02b0cf9bbb95891237f250e032df15d59beabde6"
 }