@gqlkit-ts/cli 0.4.1 → 0.5.1

package/dist/type-extractor/extractor/type-name-collector.js

@@ -1,5 +1,12 @@
 import ts from "typescript";
+import { getSourceLocationFromNode, } from "../../shared/source-location.js";
 import { isExported, resolveOriginalSymbol, } from "../../shared/typescript-utils.js";
+/**
+ * Formats a source location as a human-readable string.
+ */
+function formatLocation(location) {
+    return `${location.file}:${location.line}`;
+}
 /**
  * Collects all declared type names from exported type declarations.
  *
@@ -15,7 +22,42 @@ export function collectDeclaredTypeNames(program, sourceFiles) {
     const typeNames = new Set();
     const typeSymbols = new Map();
     const underlyingSymbolToTypeName = new Map();
+    const diagnostics = [];
     const checker = program.getTypeChecker();
+    const typeLocations = new Map();
+    /**
+     * Registers a type name and checks for duplicates.
+     * Returns true if this is a new type, false if it's a duplicate.
+     */
+    function registerTypeName(name, location, symbol) {
+        const resolvedSymbol = symbol
+            ? resolveOriginalSymbol(symbol, checker)
+            : null;
+        const existing = typeLocations.get(name);
+        if (existing) {
+            // Check if both symbols resolve to the same underlying type
+            // (e.g., re-exports of the same type from different files)
+            if (resolvedSymbol &&
+                existing.symbol &&
+                resolvedSymbol === existing.symbol) {
+                // Same underlying type - not a true duplicate, skip silently
+                return false;
+            }
+            diagnostics.push({
+                code: "DUPLICATE_TYPE_EXPORT",
+                message: `Type '${name}' is exported from multiple files. First defined at ${formatLocation(existing.location)}.`,
+                severity: "error",
+                location,
+            });
+            return false;
+        }
+        typeLocations.set(name, { location, symbol: resolvedSymbol });
+        typeNames.add(name);
+        if (resolvedSymbol) {
+            typeSymbols.set(name, resolvedSymbol);
+        }
+        return true;
+    }
     for (const filePath of sourceFiles) {
         const sourceFile = program.getSourceFile(filePath);
         if (!sourceFile)
@@ -24,10 +66,10 @@ export function collectDeclaredTypeNames(program, sourceFiles) {
             // Direct type declarations
             if (ts.isTypeAliasDeclaration(node) && isExported(node)) {
                 const name = node.name.getText(sourceFile);
-                typeNames.add(name);
+                const location = getSourceLocationFromNode(node);
                 const symbol = checker.getSymbolAtLocation(node.name);
-                if (symbol) {
-                    typeSymbols.set(name, resolveOriginalSymbol(symbol, checker));
+                const isNew = registerTypeName(name, location, symbol);
+                if (isNew && symbol) {
                     // For type aliases like `type User = ExternalUser;`,
                     // also track the underlying type's symbol
                     const type = checker.getTypeAtLocation(node.type);
@@ -39,19 +81,15 @@ export function collectDeclaredTypeNames(program, sourceFiles) {
             }
             if (ts.isInterfaceDeclaration(node) && isExported(node)) {
                 const name = node.name.getText(sourceFile);
-                typeNames.add(name);
+                const location = getSourceLocationFromNode(node);
                 const symbol = checker.getSymbolAtLocation(node.name);
-                if (symbol) {
-                    typeSymbols.set(name, resolveOriginalSymbol(symbol, checker));
-                }
+                registerTypeName(name, location, symbol);
             }
             if (ts.isEnumDeclaration(node) && isExported(node)) {
                 const name = node.name.getText(sourceFile);
-                typeNames.add(name);
+                const location = getSourceLocationFromNode(node);
                 const symbol = checker.getSymbolAtLocation(node.name);
-                if (symbol) {
-                    typeSymbols.set(name, resolveOriginalSymbol(symbol, checker));
-                }
+                registerTypeName(name, location, symbol);
             }
             // Re-exports: `export type { ... } from "..."` or `export type * from "..."`
             if (ts.isExportDeclaration(node) && node.isTypeOnly) {
@@ -61,11 +99,9 @@ export function collectDeclaredTypeNames(program, sourceFiles) {
                         for (const element of node.exportClause.elements) {
                             // Use the exported name (element.name), not the property name
                             const name = element.name.getText(sourceFile);
-                            typeNames.add(name);
+                            const location = getSourceLocationFromNode(element);
                             const symbol = checker.getSymbolAtLocation(element.name);
-                            if (symbol) {
-                                typeSymbols.set(name, resolveOriginalSymbol(symbol, checker));
-                            }
+                            registerTypeName(name, location, symbol);
                         }
                     }
                 }
@@ -78,8 +114,8 @@ export function collectDeclaredTypeNames(program, sourceFiles) {
                             const name = exp.getName();
                             // Check if the export is a type (not a value)
                             if (isTypeExport(exp)) {
-                                typeNames.add(name);
-                                typeSymbols.set(name, resolveOriginalSymbol(exp, checker));
+                                const location = getSourceLocationFromNode(node);
+                                registerTypeName(name, location, exp);
                             }
                         }
                     }
@@ -87,7 +123,7 @@ export function collectDeclaredTypeNames(program, sourceFiles) {
             }
         });
     }
-    return { typeNames, typeSymbols, underlyingSymbolToTypeName };
+    return { typeNames, typeSymbols, underlyingSymbolToTypeName, diagnostics };
 }
 /**
  * Checks if a symbol represents a type export (not a value export).

package/dist/type-extractor/extractor/type-name-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-name-collector.js","sourceRoot":"","sources":["../../../src/type-extractor/extractor/type-name-collector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-name-collector.js","sourceRoot":"","sources":["../../../src/type-extractor/extractor/type-name-collector.ts"],"names":[],"mappings":"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"}

package/dist/type-extractor/types/diagnostics.d.ts

@@ -3,7 +3,7 @@ export interface SourceLocation {
     readonly line: number;
     readonly column: number;
 }
-export type DiagnosticCode = "DIRECTORY_NOT_FOUND" | "PARSE_ERROR" | "UNSUPPORTED_SYNTAX" | "RESERVED_TYPE_NAME" | "UNRESOLVED_REFERENCE" | "NAMING_CONVENTION_MISMATCH" | "INVALID_RESOLVER_SIGNATURE" | "UNSUPPORTED_RETURN_TYPE" | "UNSUPPORTED_ARG_TYPE" | "UNKNOWN_TARGET_TYPE" | "PARENT_TYPE_MISMATCH" | "MISSING_PARENT_TYPE" | "UNSUPPORTED_ENUM_TYPE" | "INVALID_ENUM_MEMBER" | "INVALID_INPUT_TYPE" | "UNKNOWN_ARGUMENT_TYPE" | "OUTPUT_TYPE_IN_INPUT" | "CIRCULAR_INPUT_REFERENCE" | "UNKNOWN_BRANDED_SCALAR" | "INVALID_SCALAR_IMPORT" | "CONFLICTING_SCALAR_TYPE" | "INVALID_DEFINE_CALL" | "CONFIG_SYNTAX_ERROR" | "CONFIG_MISSING_PROPERTY" | "CONFIG_INVALID_TYPE" | "CONFIG_INVALID_PATH" | "CONFIG_BUILTIN_OVERRIDE" | "CONFIG_DUPLICATE_MAPPING" | "CONFIG_DUPLICATE_TYPE" | "CONFIG_INVALID_OUTPUT_TYPE" | "CONFIG_INVALID_OUTPUT_PATH" | "CONFIG_INVALID_SOURCE_DIR" | "CONFIG_INVALID_IGNORE_GLOBS" | "CONFIG_INVALID_HOOK_TYPE" | "CONFIG_INVALID_HOOK_COMMAND" | "CONFIG_INVALID_ONLY_VALUE" | "CONFIG_INVALID_IMPORT_EXTENSION" | "CUSTOM_SCALAR_TYPE_NOT_FOUND" | "TSCONFIG_NOT_FOUND" | "TSCONFIG_PARSE_ERROR" | "TSCONFIG_INVALID" | "ONEOF_FIELD_NAME_CONFLICT" | "ONEOF_MULTIPLE_PROPERTIES" | "ONEOF_EMPTY_OBJECT" | "ONEOF_INVALID_FIELD_TYPE" | "ONEOF_DUPLICATE_PROPERTY" | "ONEOF_MIXED_MEMBERS" | "ONEOF_NAMED_TYPE_UNION" | "MULTIPLE_INPUT_TYPES" | "MISSING_INPUT_TYPE" | "MISSING_OUTPUT_TYPE" | "EMPTY_DIRECTIVE_NAME" | "UNRESOLVABLE_ARGUMENT" | "UNRESOLVABLE_ARG_TYPE" | "INVALID_LOCATION" | "INVALID_DIRECTIVE_LOCATION" | "UNSUPPORTED_DIRECTIVE_LOCATION" | "UNDEFINED_DIRECTIVE" | "INTERFACE_NOT_FOUND" | "INTERFACE_NOT_INTERFACE" | "INTERFACE_MISSING_FIELD" | "INTERFACE_FIELD_TYPE_MISMATCH" | "INTERFACE_CIRCULAR_REFERENCE" | "UNRESOLVABLE_DEFAULT_VALUE" | "AUTO_TYPE_NAME_COLLISION_USER" | "AUTO_TYPE_NAME_COLLISION_AUTO" | "MODULE_RESOLUTION_ERROR" | "SKIPPED_FIELD" | "SKIPPED_ENUM_VALUE" | "INDEX_SIGNATURE_ONLY" | "UNKNOWN_ABSTRACT_TYPE" | "INVALID_ABSTRACT_TYPE_KIND" | "INVALID_OBJECT_TYPE_KIND" | "DUPLICATE_RESOLVE_TYPE" | "DUPLICATE_IS_TYPE_OF" | "MISSING_ABSTRACT_TYPE_RESOLVER" | "DUPLICATE_ENUM_VALUE" | "DUPLICATE_ENUM_VALUE_AFTER_CONVERSION" | "INVALID_ENUM_MEMBER_NAME" | "AMBIGUOUS_SCALAR_BASE_TYPE" | "INLINE_UNION_PRIMITIVE_MEMBER" | "INLINE_UNION_ENUM_MEMBER" | "INLINE_UNION_UNRESOLVABLE_MEMBER" | "MISSING_TYPENAME_PROPERTY" | "INVALID_TYPENAME_TYPE" | "OPTIONAL_TYPENAME_PROPERTY" | "NULLABLE_TYPENAME_PROPERTY" | "TYPENAME_FIELD_STRUCTURE_MISMATCH" | "DUPLICATE_TYPENAME_VALUE" | "IGNORE_FIELD_NOT_FOUND" | "IGNORE_ALL_FIELDS";
+export type DiagnosticCode = "DIRECTORY_NOT_FOUND" | "PARSE_ERROR" | "UNSUPPORTED_SYNTAX" | "RESERVED_TYPE_NAME" | "UNRESOLVED_REFERENCE" | "NAMING_CONVENTION_MISMATCH" | "INVALID_RESOLVER_SIGNATURE" | "UNSUPPORTED_RETURN_TYPE" | "UNSUPPORTED_ARG_TYPE" | "UNKNOWN_TARGET_TYPE" | "PARENT_TYPE_MISMATCH" | "MISSING_PARENT_TYPE" | "UNSUPPORTED_ENUM_TYPE" | "INVALID_ENUM_MEMBER" | "INVALID_INPUT_TYPE" | "UNKNOWN_ARGUMENT_TYPE" | "OUTPUT_TYPE_IN_INPUT" | "CIRCULAR_INPUT_REFERENCE" | "UNKNOWN_BRANDED_SCALAR" | "INVALID_SCALAR_IMPORT" | "CONFLICTING_SCALAR_TYPE" | "INVALID_DEFINE_CALL" | "CONFIG_SYNTAX_ERROR" | "CONFIG_FILE_NOT_FOUND" | "CONFIG_MISSING_PROPERTY" | "CONFIG_INVALID_TYPE" | "CONFIG_INVALID_PATH" | "CONFIG_BUILTIN_OVERRIDE" | "CONFIG_DUPLICATE_MAPPING" | "CONFIG_DUPLICATE_TYPE" | "CONFIG_INVALID_OUTPUT_TYPE" | "CONFIG_INVALID_OUTPUT_PATH" | "CONFIG_INVALID_SOURCE_DIR" | "CONFIG_INVALID_IGNORE_GLOBS" | "CONFIG_INVALID_HOOK_TYPE" | "CONFIG_INVALID_HOOK_COMMAND" | "CONFIG_INVALID_ONLY_VALUE" | "CONFIG_INVALID_IMPORT_EXTENSION" | "CUSTOM_SCALAR_TYPE_NOT_FOUND" | "TSCONFIG_NOT_FOUND" | "TSCONFIG_PARSE_ERROR" | "TSCONFIG_INVALID" | "ONEOF_FIELD_NAME_CONFLICT" | "ONEOF_MULTIPLE_PROPERTIES" | "ONEOF_EMPTY_OBJECT" | "ONEOF_INVALID_FIELD_TYPE" | "ONEOF_DUPLICATE_PROPERTY" | "ONEOF_MIXED_MEMBERS" | "ONEOF_NAMED_TYPE_UNION" | "MULTIPLE_INPUT_TYPES" | "MISSING_INPUT_TYPE" | "MISSING_OUTPUT_TYPE" | "EMPTY_DIRECTIVE_NAME" | "UNRESOLVABLE_ARGUMENT" | "UNRESOLVABLE_ARG_TYPE" | "INVALID_LOCATION" | "INVALID_DIRECTIVE_LOCATION" | "UNSUPPORTED_DIRECTIVE_LOCATION" | "UNDEFINED_DIRECTIVE" | "INTERFACE_NOT_FOUND" | "INTERFACE_NOT_INTERFACE" | "INTERFACE_MISSING_FIELD" | "INTERFACE_FIELD_TYPE_MISMATCH" | "INTERFACE_CIRCULAR_REFERENCE" | "UNRESOLVABLE_DEFAULT_VALUE" | "AUTO_TYPE_NAME_COLLISION_USER" | "AUTO_TYPE_NAME_COLLISION_AUTO" | "MODULE_RESOLUTION_ERROR" | "SKIPPED_FIELD" | "SKIPPED_ENUM_VALUE" | "INDEX_SIGNATURE_ONLY" | "UNKNOWN_ABSTRACT_TYPE" | "INVALID_ABSTRACT_TYPE_KIND" | "INVALID_OBJECT_TYPE_KIND" | "DUPLICATE_RESOLVE_TYPE" | "DUPLICATE_IS_TYPE_OF" | "MISSING_ABSTRACT_TYPE_RESOLVER" | "DUPLICATE_ENUM_VALUE" | "DUPLICATE_ENUM_VALUE_AFTER_CONVERSION" | "INVALID_ENUM_MEMBER_NAME" | "AMBIGUOUS_SCALAR_BASE_TYPE" | "INLINE_UNION_PRIMITIVE_MEMBER" | "INLINE_UNION_ENUM_MEMBER" | "INLINE_UNION_UNRESOLVABLE_MEMBER" | "MISSING_TYPENAME_PROPERTY" | "INVALID_TYPENAME_TYPE" | "OPTIONAL_TYPENAME_PROPERTY" | "NULLABLE_TYPENAME_PROPERTY" | "TYPENAME_FIELD_STRUCTURE_MISMATCH" | "DUPLICATE_TYPENAME_VALUE" | "IGNORE_FIELD_NOT_FOUND" | "IGNORE_ALL_FIELDS" | "DUPLICATE_TYPE_EXPORT";
 export interface Diagnostic {
     readonly code: DiagnosticCode;
     readonly message: string;

package/dist/type-extractor/types/diagnostics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../src/type-extractor/types/diagnostics.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,cAAc,GACtB,qBAAqB,GACrB,aAAa,GACb,oBAAoB,GACpB,oBAAoB,GACpB,sBAAsB,GACtB,4BAA4B,GAC5B,4BAA4B,GAC5B,yBAAyB,GACzB,sBAAsB,GACtB,qBAAqB,GACrB,sBAAsB,GACtB,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,oBAAoB,GACpB,uBAAuB,GACvB,sBAAsB,GACtB,0BAA0B,GAC1B,wBAAwB,GACxB,uBAAuB,GACvB,yBAAyB,GACzB,qBAAqB,GACrB,qBAAqB,GACrB,yBAAyB,GACzB,qBAAqB,GACrB,qBAAqB,GACrB,yBAAyB,GACzB,0BAA0B,GAC1B,uBAAuB,GACvB,4BAA4B,GAC5B,4BAA4B,GAC5B,2BAA2B,GAC3B,6BAA6B,GAC7B,0BAA0B,GAC1B,6BAA6B,GAC7B,2BAA2B,GAC3B,iCAAiC,GACjC,8BAA8B,GAC9B,oBAAoB,GACpB,sBAAsB,GACtB,kBAAkB,GAClB,2BAA2B,GAC3B,2BAA2B,GAC3B,oBAAoB,GACpB,0BAA0B,GAC1B,0BAA0B,GAC1B,qBAAqB,GACrB,wBAAwB,GACxB,sBAAsB,GACtB,oBAAoB,GACpB,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,uBAAuB,GACvB,kBAAkB,GAClB,4BAA4B,GAC5B,gCAAgC,GAChC,qBAAqB,GACrB,qBAAqB,GACrB,yBAAyB,GACzB,yBAAyB,GACzB,+BAA+B,GAC/B,8BAA8B,GAC9B,4BAA4B,GAC5B,+BAA+B,GAC/B,+BAA+B,GAC/B,yBAAyB,GACzB,eAAe,GACf,oBAAoB,GACpB,sBAAsB,GACtB,uBAAuB,GACvB,4BAA4B,GAC5B,0BAA0B,GAC1B,wBAAwB,GACxB,sBAAsB,GACtB,gCAAgC,GAChC,sBAAsB,GACtB,uCAAuC,GACvC,0BAA0B,GAC1B,4BAA4B,GAC5B,+BAA+B,GAC/B,0BAA0B,GAC1B,kCAAkC,GAClC,2BAA2B,GAC3B,uBAAuB,GACvB,4BAA4B,GAC5B,4BAA4B,GAC5B,mCAAmC,GACnC,0BAA0B,GAC1B,wBAAwB,GACxB,mBAAmB,CAAC;AAExB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CAC1C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CAC9C"}
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../src/type-extractor/types/diagnostics.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,cAAc,GACtB,qBAAqB,GACrB,aAAa,GACb,oBAAoB,GACpB,oBAAoB,GACpB,sBAAsB,GACtB,4BAA4B,GAC5B,4BAA4B,GAC5B,yBAAyB,GACzB,sBAAsB,GACtB,qBAAqB,GACrB,sBAAsB,GACtB,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,oBAAoB,GACpB,uBAAuB,GACvB,sBAAsB,GACtB,0BAA0B,GAC1B,wBAAwB,GACxB,uBAAuB,GACvB,yBAAyB,GACzB,qBAAqB,GACrB,qBAAqB,GACrB,uBAAuB,GACvB,yBAAyB,GACzB,qBAAqB,GACrB,qBAAqB,GACrB,yBAAyB,GACzB,0BAA0B,GAC1B,uBAAuB,GACvB,4BAA4B,GAC5B,4BAA4B,GAC5B,2BAA2B,GAC3B,6BAA6B,GAC7B,0BAA0B,GAC1B,6BAA6B,GAC7B,2BAA2B,GAC3B,iCAAiC,GACjC,8BAA8B,GAC9B,oBAAoB,GACpB,sBAAsB,GACtB,kBAAkB,GAClB,2BAA2B,GAC3B,2BAA2B,GAC3B,oBAAoB,GACpB,0BAA0B,GAC1B,0BAA0B,GAC1B,qBAAqB,GACrB,wBAAwB,GACxB,sBAAsB,GACtB,oBAAoB,GACpB,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,uBAAuB,GACvB,kBAAkB,GAClB,4BAA4B,GAC5B,gCAAgC,GAChC,qBAAqB,GACrB,qBAAqB,GACrB,yBAAyB,GACzB,yBAAyB,GACzB,+BAA+B,GAC/B,8BAA8B,GAC9B,4BAA4B,GAC5B,+BAA+B,GAC/B,+BAA+B,GAC/B,yBAAyB,GACzB,eAAe,GACf,oBAAoB,GACpB,sBAAsB,GACtB,uBAAuB,GACvB,4BAA4B,GAC5B,0BAA0B,GAC1B,wBAAwB,GACxB,sBAAsB,GACtB,gCAAgC,GAChC,sBAAsB,GACtB,uCAAuC,GACvC,0BAA0B,GAC1B,4BAA4B,GAC5B,+BAA+B,GAC/B,0BAA0B,GAC1B,kCAAkC,GAClC,2BAA2B,GAC3B,uBAAuB,GACvB,4BAA4B,GAC5B,4BAA4B,GAC5B,mCAAmC,GACnC,0BAA0B,GAC1B,wBAAwB,GACxB,mBAAmB,GACnB,uBAAuB,CAAC;AAE5B,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CAC1C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CAC9C"}

package/docs/configuration.md

@@ -7,6 +7,30 @@ description: Configure gqlkit via gqlkit.config.ts in your project root.
 
 gqlkit can be configured via `gqlkit.config.ts` in your project root.
 
+## CLI Options
+
+The `gqlkit gen` command accepts the following options:
+
+| Option | Short | Description |
+|--------|-------|-------------|
+| `--config <path>` | `-c` | Path to config file (default: `gqlkit.config.ts`) |
+| `--cwd <path>` | | Working directory for code generation |
+
+### Using Multiple Config Files
+
+You can use different config files for different GraphQL schemas:
+
+```sh
+# Generate with default config (gqlkit.config.ts)
+gqlkit gen
+
+# Generate with a specific config file
+gqlkit gen --config gqlkit.public.config.ts
+gqlkit gen -c gqlkit.admin.config.ts
+```
+
+This is useful when you need to generate multiple GraphQL schemas from the same project, such as separate public and internal APIs.
+
 ## Basic Configuration
 
 ```ts

package/docs/index.md

@@ -18,15 +18,10 @@ gqlkit generates GraphQL schema and resolver maps from TypeScript types and func
 
 - [What is gqlkit?](./what-is-gqlkit.md): Just types and functions — write TypeScript, generate GraphQL.
 - [Getting Started](./getting-started.md): Install gqlkit and create your first GraphQL schema from TypeScript.
-- [Coding Agents](./coding-agents.md): Set up AI coding agents like Claude Code and Codex to understand gqlkit conventions. (skip if reading via `gqlkit-guide` skill)
-
-## CLI
-
-- [Configuration](./configuration.md): Configure gqlkit via gqlkit.config.ts in your project root.
 
 ## Schema Definition
 
-- [Schema Definition](./schema.md): gqlkit generates GraphQL schema from your TypeScript types.
+- [Schema Definition](./schema/conventions.md): gqlkit generates GraphQL schema from your TypeScript types.
 - [Defining Object Types](./schema/objects.md): Plain TypeScript type exports become GraphQL Object types.
 - [Defining Input Types](./schema/inputs.md): TypeScript types with Input suffix are treated as GraphQL input types.
 - [Defining Queries and Mutations](./schema/queries-mutations.md): Define Query and Mutation fields using the @gqlkit-ts/runtime API.
@@ -45,3 +40,8 @@ gqlkit generates GraphQL schema and resolver maps from TypeScript types and func
 - [Integration with Apollo Server](./integration/apollo.md): Use gqlkit with Apollo Server, a popular GraphQL server.
 - [Integration with Drizzle ORM](./integration/drizzle.md): Derive GraphQL types from Drizzle table definitions.
 - [Integration with Prisma](./integration/prisma.md): Derive GraphQL types from Prisma model types.
+
+## Guides
+
+- [Configuration](./configuration.md): Configure gqlkit via gqlkit.config.ts in your project root.
+- [Coding Agents](./coding-agents.md): Set up AI coding agents like Claude Code and Codex to understand gqlkit conventions. (skip if reading via `gqlkit-guide` skill)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gqlkit-ts/cli",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "description": "Just types and functions — write TypeScript, generate GraphQL.",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/gen.ts

@@ -12,6 +12,7 @@ import { createProgressReporter } from "../gen-orchestrator/reporter/progress-re
 
 export interface RunGenCommandOptions {
   readonly cwd: string;
+  readonly configPath: string | null;
 }
 
 export interface RunGenCommandResult {
@@ -29,7 +30,10 @@ export async function runGenCommand(
   const progressReporter = createProgressReporter(writer);
   const diagnosticReporter = createDiagnosticReporter(writer);
 
-  const configResult = await loadConfig({ cwd: options.cwd });
+  const configResult = await loadConfig({
+    cwd: options.cwd,
+    configPath: options.configPath,
+  });
 
   if (configResult.diagnostics.length > 0) {
     diagnosticReporter.reportDiagnostics(configResult.diagnostics);
@@ -130,10 +134,16 @@ export const genCommand = define({
       type: "string",
       description: "Working directory for code generation",
     },
+    config: {
+      type: "string",
+      short: "c",
+      description: "Path to config file",
+    },
   },
   run: async (ctx) => {
     const cwd = ctx.values.cwd ?? process.cwd();
-    const result = await runGenCommand({ cwd });
+    const configPath = ctx.values.config ?? null;
+    const result = await runGenCommand({ cwd, configPath });
     if (result.exitCode !== 0) {
       process.exitCode = result.exitCode;
     }

package/src/config-loader/loader.ts

@@ -1,5 +1,5 @@
 import { existsSync } from "node:fs";
-import { join } from "node:path";
+import { isAbsolute, join } from "node:path";
 import { createJiti } from "jiti";
 import type { ImportExtension } from "../config/types.js";
 import type { Diagnostic } from "../type-extractor/types/index.js";
@@ -7,6 +7,7 @@ import { validateConfig } from "./validator.js";
 
 export interface LoadConfigOptions {
   readonly cwd: string;
+  readonly configPath: string | null;
 }
 
 export interface ResolvedScalarMapping {
@@ -86,9 +87,35 @@ const DEFAULT_RESOLVED_CONFIG: ResolvedConfig = {
 export async function loadConfig(
   options: LoadConfigOptions,
 ): Promise<LoadConfigResult> {
-  const configPath = join(options.cwd, CONFIG_FILE_NAME);
+  const configPath = resolveConfigPath(options);
+
+  if (configPath === null) {
+    return {
+      config: DEFAULT_RESOLVED_CONFIG,
+      configPath: undefined,
+      diagnostics: [],
+    };
+  }
 
   if (!existsSync(configPath)) {
+    if (options.configPath !== null) {
+      return {
+        config: DEFAULT_RESOLVED_CONFIG,
+        configPath,
+        diagnostics: [
+          {
+            code: "CONFIG_FILE_NOT_FOUND",
+            message: `Config file not found: ${configPath}`,
+            severity: "error",
+            location: {
+              file: configPath,
+              line: 1,
+              column: 1,
+            },
+          },
+        ],
+      };
+    }
     return {
       config: DEFAULT_RESOLVED_CONFIG,
       configPath: undefined,
@@ -145,3 +172,17 @@ export async function loadConfig(
     };
   }
 }
+
+function resolveConfigPath(options: LoadConfigOptions): string | null {
+  if (options.configPath !== null) {
+    if (isAbsolute(options.configPath)) {
+      return options.configPath;
+    }
+    return join(options.cwd, options.configPath);
+  }
+  const defaultPath = join(options.cwd, CONFIG_FILE_NAME);
+  if (existsSync(defaultPath)) {
+    return defaultPath;
+  }
+  return null;
+}

package/src/gen-orchestrator/orchestrator.ts

@@ -514,11 +514,18 @@ function collectTypeNamesStep(ctx: PipelineContext): PipelineContext {
 
   const result = collectDeclaredTypeNames(ctx.program, ctx.sourceFiles);
 
+  const diagnostics = [...ctx.diagnostics, ...result.diagnostics];
+  const hasDiagnosticErrors = result.diagnostics.some(
+    (d) => d.severity === "error",
+  );
+
   return {
     ...ctx,
     knownTypeNames: result.typeNames,
     knownTypeSymbols: result.typeSymbols,
     underlyingSymbolToTypeName: result.underlyingSymbolToTypeName,
+    diagnostics,
+    aborted: hasDiagnosticErrors,
   };
 }
 

package/src/schema-generator/emitter/code-emitter.ts

@@ -170,31 +170,80 @@ function buildScalarResolverEntries(
   );
 }
 
-function collectResolverImportsByFile(
+/**
+ * Information about a resolver import with a unique alias.
+ */
+interface ResolverImportInfo {
+  /** The original export name from the source file */
+  readonly originalName: string;
+  /** The unique local name using the pattern <Parent>$<field> */
+  readonly localName: string;
+}
+
+/**
+ * Creates a unique local name for a resolver import.
+ * Format: <ParentType>$<FieldName>
+ */
+function makeResolverLocalName(parentType: string, fieldName: string): string {
+  return `${parentType}$${fieldName}`;
+}
+
+/**
+ * Collects resolver imports with unique aliases.
+ * Uses the pattern <Parent>$<field> for alias names.
+ *
+ * Note: Uniqueness assumes no duplicate resolver definitions for the same
+ * (parentType, fieldName) pair. Duplicate field definitions are caught
+ * by GraphQL schema validation at build time.
+ */
+function collectResolverImports(
   resolverInfo: ResolverInfo,
-): Map<string, Set<string>> {
-  const importsByFile = new Map<string, Set<string>>();
+): Map<string, ResolverImportInfo[]> {
+  const importsByFile = new Map<string, ResolverImportInfo[]>();
+  // Track seen localNames per file to avoid duplicate import specifiers
+  const seenByFile = new Map<string, Set<string>>();
 
   for (const type of resolverInfo.types) {
     for (const field of type.fields) {
-      const existing = importsByFile.get(field.sourceFile) ?? new Set<string>();
-      existing.add(field.resolverValueName);
-      importsByFile.set(field.sourceFile, existing);
+      const localName = makeResolverLocalName(type.typeName, field.fieldName);
+
+      const seen = seenByFile.get(field.sourceFile) ?? new Set<string>();
+      if (seen.has(localName)) {
+        continue;
+      }
+      seen.add(localName);
+      seenByFile.set(field.sourceFile, seen);
+
+      const infos = importsByFile.get(field.sourceFile) ?? [];
+      infos.push({ originalName: field.resolverValueName, localName });
+      importsByFile.set(field.sourceFile, infos);
     }
   }
 
   for (const abstractResolver of resolverInfo.abstractTypeResolvers) {
-    const existing =
-      importsByFile.get(abstractResolver.sourceFile) ?? new Set<string>();
-    existing.add(abstractResolver.exportName);
-    importsByFile.set(abstractResolver.sourceFile, existing);
+    const localName = makeResolverLocalName(
+      abstractResolver.typeName,
+      abstractResolver.resolverKey,
+    );
+
+    const seen =
+      seenByFile.get(abstractResolver.sourceFile) ?? new Set<string>();
+    if (seen.has(localName)) {
+      continue;
+    }
+    seen.add(localName);
+    seenByFile.set(abstractResolver.sourceFile, seen);
+
+    const infos = importsByFile.get(abstractResolver.sourceFile) ?? [];
+    infos.push({ originalName: abstractResolver.exportName, localName });
+    importsByFile.set(abstractResolver.sourceFile, infos);
   }
 
   return importsByFile;
 }
 
 function buildResolverImports(
-  importsByFile: Map<string, Set<string>>,
+  importsByFile: Map<string, ResolverImportInfo[]>,
   outputDir: string,
   importExtension: ImportExtension,
 ): string[] {
@@ -202,17 +251,25 @@ function buildResolverImports(
   const sortedFiles = [...importsByFile.keys()].sort();
 
   for (const sourceFile of sortedFiles) {
-    const valueNames = importsByFile.get(sourceFile) ?? new Set<string>();
+    const importInfos = importsByFile.get(sourceFile) ?? [];
     const importPath = computeRelativeImportPath(
       outputDir,
       sourceFile,
       importExtension,
     );
-    const sortedValues = [...valueNames].sort();
 
-    if (sortedValues.length > 0) {
+    // Sort by localName for consistent output
+    const sortedInfos = [...importInfos].sort((a, b) =>
+      a.localName.localeCompare(b.localName),
+    );
+
+    if (sortedInfos.length > 0) {
+      const importSpecifiers = sortedInfos.map(
+        (info) => `${info.originalName} as ${info.localName}`,
+      );
+
       imports.push(
-        `import { ${sortedValues.join(", ")} } from "${importPath}";`,
+        `import { ${importSpecifiers.join(", ")} } from "${importPath}";`,
       );
     }
   }
@@ -223,7 +280,11 @@ function buildResolverImports(
 function buildAbstractOnlyTypeEntry(
   abstractResolver: AbstractTypeResolverInfo,
 ): string {
-  return `    ${abstractResolver.typeName}: {\n      ${abstractResolver.resolverKey}: ${abstractResolver.exportName},\n    },`;
+  const localName = makeResolverLocalName(
+    abstractResolver.typeName,
+    abstractResolver.resolverKey,
+  );
+  return `    ${abstractResolver.typeName}: {\n      ${abstractResolver.resolverKey}: ${localName},\n    },`;
 }
 
 function buildNumericEnumResolver(enumInfo: NumericEnumInfo): string {
@@ -261,19 +322,23 @@ function buildTypeResolverEntry(
   const entries: string[] = [];
 
   for (const field of type.fields) {
+    const localName = makeResolverLocalName(type.typeName, field.fieldName);
+
     if (field.isDirectExport) {
-      entries.push(`      ${field.fieldName}: ${field.resolverValueName},`);
+      entries.push(`      ${field.fieldName}: ${localName},`);
     } else {
       entries.push(
-        `      ${field.fieldName}: ${field.resolverValueName}.${field.fieldName},`,
+        `      ${field.fieldName}: ${localName}.${field.fieldName},`,
       );
     }
   }
 
   if (abstractResolverForType !== null) {
-    entries.push(
-      `      ${abstractResolverForType.resolverKey}: ${abstractResolverForType.exportName},`,
+    const localName = makeResolverLocalName(
+      abstractResolverForType.typeName,
+      abstractResolverForType.resolverKey,
     );
+    entries.push(`      ${abstractResolverForType.resolverKey}: ${localName},`);
   }
 
   return `    ${type.typeName}: {\n${entries.join("\n")}\n    },`;
@@ -379,7 +444,7 @@ export function emitResolversCode(params: EmitResolversCodeParams): string {
     imports.push('import { GraphQLScalarType } from "graphql";');
   }
 
-  const importsByFile = collectResolverImportsByFile(resolverInfo);
+  const importsByFile = collectResolverImports(resolverInfo);
   imports.push(
     ...buildResolverImports(importsByFile, outputDir, importExtension),
   );