@gqlkit-ts/cli 0.5.1 → 0.7.0

package/dist/auto-type-generator/auto-type-generator.d.ts

@@ -1,7 +1,9 @@
+import type { ResolvedDiscriminatorFieldsMap } from "../config-loader/index.js";
 import type { ExtractResolversResult } from "../resolver-extractor/index.js";
 import type { DirectiveArgumentValue, DirectiveInfo } from "../shared/directive-detector.js";
 import type { DeprecationInfo } from "../shared/tsdoc-parser.js";
 import { type Diagnostic, type ExtractedTypeInfo, type GraphQLFieldType, type SourceLocation } from "../type-extractor/types/index.js";
+import { type InlineDiscriminatorResolveType } from "./intersection-flattener.js";
 import type { ResolveTypeFieldPattern } from "./resolve-type-generator.js";
 /**
  * Information about where an auto-generated type was generated from.
@@ -57,12 +59,17 @@ export interface AutoTypeGeneratorInput {
     readonly extractedTypes: ReadonlyArray<ExtractedTypeInfo>;
     readonly resolversResult: ExtractResolversResult;
     readonly knownTypeNames: ReadonlySet<string>;
+    readonly discriminatorFields: ResolvedDiscriminatorFieldsMap;
 }
 export interface AutoTypeGeneratorResult {
     readonly autoGeneratedTypes: ReadonlyArray<AutoGeneratedType>;
     readonly updatedExtractedTypes: ReadonlyArray<ExtractedTypeInfo>;
     readonly updatedResolversResult: ExtractResolversResult;
     readonly diagnostics: ReadonlyArray<Diagnostic>;
+    /** Mapping from TypeScript type alias names to auto-generated GraphQL union names */
+    readonly tsAliasToGraphQLNameMap: ReadonlyMap<string, string>;
+    /** Discriminator resolveType info for inline unions that were flattened by discriminator fields */
+    readonly inlineDiscriminatorResolveTypes: ReadonlyArray<InlineDiscriminatorResolveType>;
 }
 export declare function generateAutoTypes(input: AutoTypeGeneratorInput): AutoTypeGeneratorResult;
 //# sourceMappingURL=auto-type-generator.d.ts.map

package/dist/auto-type-generator/auto-type-generator.d.ts.map

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

package/dist/auto-type-generator/auto-type-generator.js

@@ -7,32 +7,60 @@ import { createReferenceType, } from "../type-extractor/types/index.js";
 import { collectInlineEnumsFromPayloads, collectInlineEnumsFromResolvers, collectInlineEnumsFromTypes, } from "./inline-enum-collector.js";
 import { collectInlineUnionsFromPayloads, collectInlineUnionsFromResolvers, collectInlineUnionsFromTypes, } from "./inline-union-collector.js";
 import { validateOneOfMembers, validateUnionMembers, validateUnionMemberTypenames, } from "./inline-union-validator.js";
-import { buildFieldContext, generateAutoTypeName, isInputTypeName, } from "./naming-convention.js";
-import { forEachResolverField } from "./resolver-field-iterator.js";
-import { createFieldNameSet, findTypenameProperty, } from "./typename-types.js";
+import { flattenInlineUnionMembers, } from "./intersection-flattener.js";
+import { appendFieldPath, buildFieldContext, generateAutoTypeName, isInputTypeName, } from "./naming-convention.js";
+import { forEachResolverField, } from "./resolver-field-iterator.js";
+import { createFieldNameSet, findTypenameProperty, isTypenameFieldName, } from "./typename-types.js";
+function getInlineObjectTypeInfo(tsType) {
+    if (tsType.kind === "inlineObject" && tsType.inlineObjectProperties) {
+        return {
+            properties: tsType.inlineObjectProperties,
+            nullable: tsType.nullable,
+            description: tsType.inlineObjectDescription,
+            deprecated: tsType.inlineObjectDeprecated,
+        };
+    }
+    if (tsType.kind === "array" &&
+        tsType.elementType?.kind === "inlineObject" &&
+        tsType.elementType.inlineObjectProperties) {
+        return {
+            properties: tsType.elementType.inlineObjectProperties,
+            nullable: tsType.elementType.nullable,
+            description: tsType.elementType.inlineObjectDescription,
+            deprecated: tsType.elementType.inlineObjectDeprecated,
+        };
+    }
+    return null;
+}
 function extractNestedInlineObjectsRecursively(params) {
     const { properties, currentPath, sourceLocation, buildContext, preserveDocumentation, results, } = params;
+    const siblingFieldNames = new Set(properties.map((prop) => prop.name));
     for (const prop of properties) {
-        if (prop.tsType.kind === "inlineObject" &&
-            prop.tsType.inlineObjectProperties) {
-            const nestedPath = [...currentPath, prop.name];
+        const inlineObjectTypeInfo = getInlineObjectTypeInfo(prop.tsType);
+        if (inlineObjectTypeInfo) {
+            const nestedPath = appendFieldPath({
+                parentPath: currentPath,
+                fieldName: prop.name,
+                singularize: prop.tsType.kind === "array",
+                siblingFieldNames,
+            });
             const nestedContext = buildContext(nestedPath);
             // Use property's source location if available for more accurate diagnostics
             const nestedSourceLocation = prop.sourceLocation ?? sourceLocation;
             results.push({
-                properties: prop.tsType.inlineObjectProperties,
+                properties: inlineObjectTypeInfo.properties,
                 context: nestedContext,
                 sourceLocation: nestedSourceLocation,
-                nullable: prop.tsType.nullable,
+                nullable: inlineObjectTypeInfo.nullable,
                 description: preserveDocumentation
-                    ? prop.tsType.inlineObjectDescription
+                    ? inlineObjectTypeInfo.description
                     : null,
                 deprecated: preserveDocumentation
-                    ? prop.tsType.inlineObjectDeprecated
+                    ? inlineObjectTypeInfo.deprecated
                     : null,
             });
             extractNestedInlineObjectsRecursively({
-                properties: prop.tsType.inlineObjectProperties,
+                properties: inlineObjectTypeInfo.properties,
                 currentPath: nestedPath,
                 sourceLocation: nestedSourceLocation,
                 buildContext,
@@ -79,6 +107,7 @@ function buildGeneratedFromInfo(context) {
 function collectInlineObjectsFromType(typeInfo) {
     const results = [];
     const isInput = isInputTypeName(typeInfo.metadata.name);
+    const siblingFieldNames = new Set(typeInfo.fields.map((field) => field.name));
     for (const field of typeInfo.fields) {
         collectInlineObjectsFromField({
             field,
@@ -86,18 +115,24 @@ function collectInlineObjectsFromType(typeInfo) {
             parentPath: [],
             isInput,
             sourceFile: typeInfo.metadata.sourceFile,
+            siblingFieldNames,
             results,
         });
     }
     return results;
 }
 function collectInlineObjectsFromField(params) {
-    const { field, parentTypeName, parentPath, isInput, sourceFile, results } = params;
-    const tsType = field.tsType;
-    if (tsType.kind !== "inlineObject" || !tsType.inlineObjectProperties) {
+    const { field, parentTypeName, parentPath, isInput, sourceFile, siblingFieldNames, results, } = params;
+    const inlineObjectTypeInfo = getInlineObjectTypeInfo(field.tsType);
+    if (!inlineObjectTypeInfo) {
         return;
     }
-    const fieldPath = [...parentPath, field.name];
+    const fieldPath = appendFieldPath({
+        parentPath,
+        fieldName: field.name,
+        singularize: field.tsType.kind === "array",
+        siblingFieldNames,
+    });
     const context = isInput
         ? {
             kind: "inputField",
@@ -111,15 +146,15 @@ function collectInlineObjectsFromField(params) {
         };
     const sourceLocation = getSourceLocationOrDefault(field.sourceLocation, sourceFile);
     results.push({
-        properties: tsType.inlineObjectProperties,
+        properties: inlineObjectTypeInfo.properties,
         context,
         sourceLocation,
-        nullable: tsType.nullable,
-        description: tsType.inlineObjectDescription,
-        deprecated: tsType.inlineObjectDeprecated,
+        nullable: inlineObjectTypeInfo.nullable,
+        description: inlineObjectTypeInfo.description,
+        deprecated: inlineObjectTypeInfo.deprecated,
     });
     extractNestedInlineObjectsRecursively({
-        properties: tsType.inlineObjectProperties,
+        properties: inlineObjectTypeInfo.properties,
         currentPath: fieldPath,
         sourceLocation,
         buildContext: (nestedPath) => isInput
@@ -222,7 +257,12 @@ function generateAutoType(params) {
         inlineObj.context.kind === "resolverArg";
     const fields = [];
     const diagnostics = [];
+    const siblingFieldNames = new Set(inlineObj.properties.map((prop) => prop.name));
     for (const prop of inlineObj.properties) {
+        // Typename discrimination fields are silently excluded from the schema
+        if (isTypenameFieldName(prop.name)) {
+            continue;
+        }
         const eligibility = isEligibleField({
             fieldName: prop.name,
             kind: isInput ? "input" : "object",
@@ -242,7 +282,12 @@ function generateAutoType(params) {
             enumTypeNames,
             unionTypeNames,
             parentContext: inlineObj.context,
+            siblingFieldNames,
         });
+        // Skip fields with never type — they represent impossible values
+        if (fieldType.typeName === "__NEVER__") {
+            continue;
+        }
         fields.push({
             name: prop.name,
             type: fieldType,
@@ -268,8 +313,13 @@ function generateAutoType(params) {
         diagnostics,
     };
 }
-function tryResolveNestedType(prop, parentContext, typeNamesMap) {
-    const nestedPath = [...parentContext.fieldPath, prop.name];
+function tryResolveNestedType(prop, parentContext, typeNamesMap, siblingFieldNames) {
+    const nestedPath = appendFieldPath({
+        parentPath: parentContext.fieldPath,
+        fieldName: prop.name,
+        singularize: prop.tsType.kind === "array",
+        siblingFieldNames,
+    });
     const nestedContext = {
         ...parentContext,
         fieldPath: nestedPath,
@@ -278,29 +328,36 @@ function tryResolveNestedType(prop, parentContext, typeNamesMap) {
     const resolvedTypeName = typeNamesMap.get(contextKey);
     if (resolvedTypeName) {
         return {
+            ...convertTsTypeToGraphQLType(prop.tsType, prop.optional),
             typeName: resolvedTypeName,
-            nullable: prop.tsType.nullable || prop.optional,
-            list: false,
-            listItemNullable: null,
         };
     }
     return null;
 }
 function resolveFieldType(params) {
-    const { prop, generatedTypeNames, enumTypeNames, unionTypeNames, parentContext, } = params;
-    if (prop.tsType.kind === "inlineObject" &&
-        prop.tsType.inlineObjectProperties) {
-        const result = tryResolveNestedType(prop, parentContext, generatedTypeNames);
+    const { prop, generatedTypeNames, enumTypeNames, unionTypeNames, parentContext, siblingFieldNames, } = params;
+    if ((prop.tsType.kind === "inlineObject" &&
+        prop.tsType.inlineObjectProperties) ||
+        (prop.tsType.kind === "array" &&
+            prop.tsType.elementType?.kind === "inlineObject" &&
+            prop.tsType.elementType.inlineObjectProperties)) {
+        const result = tryResolveNestedType(prop, parentContext, generatedTypeNames, siblingFieldNames);
         if (result)
             return result;
     }
-    if (prop.tsType.kind === "inlineEnum" && prop.tsType.inlineEnumMembers) {
-        const result = tryResolveNestedType(prop, parentContext, enumTypeNames);
+    if ((prop.tsType.kind === "inlineEnum" && prop.tsType.inlineEnumMembers) ||
+        (prop.tsType.kind === "array" &&
+            prop.tsType.elementType?.kind === "inlineEnum" &&
+            prop.tsType.elementType.inlineEnumMembers)) {
+        const result = tryResolveNestedType(prop, parentContext, enumTypeNames, siblingFieldNames);
         if (result)
             return result;
     }
-    if (prop.tsType.kind === "union" && prop.tsType.members) {
-        const result = tryResolveNestedType(prop, parentContext, unionTypeNames);
+    if ((prop.tsType.kind === "union" && prop.tsType.members) ||
+        (prop.tsType.kind === "array" &&
+            prop.tsType.elementType?.kind === "union" &&
+            prop.tsType.elementType.members)) {
+        const result = tryResolveNestedType(prop, parentContext, unionTypeNames, siblingFieldNames);
         if (result)
             return result;
     }
@@ -309,15 +366,21 @@ function resolveFieldType(params) {
 function updateExtractedTypes(extractedTypes, params) {
     return extractedTypes.map((typeInfo) => {
         const isInput = isInputTypeName(typeInfo.metadata.name);
+        const siblingFieldNames = new Set(typeInfo.fields.map((field) => field.name));
         return {
             ...typeInfo,
-            fields: typeInfo.fields.map((field) => updateField(field, params, typeInfo.metadata.name, isInput)),
+            fields: typeInfo.fields.map((field) => updateField(field, params, typeInfo.metadata.name, isInput, siblingFieldNames)),
         };
     });
 }
-function updateField(field, params, parentTypeName, isInput) {
+function updateField(field, params, parentTypeName, isInput, siblingFieldNames) {
     const { generatedTypeNames, enumTypeNames, unionTypeNames } = params;
-    const context = buildFieldContext(parentTypeName, [field.name], isInput);
+    const context = buildFieldContext(parentTypeName, appendFieldPath({
+        parentPath: [],
+        fieldName: field.name,
+        singularize: field.tsType.kind === "array",
+        siblingFieldNames,
+    }), isInput);
     const contextKey = getContextKey(context);
     // Handle inline objects
     if (field.tsType.kind === "inlineObject" &&
@@ -333,6 +396,24 @@ function updateField(field, params, parentTypeName, isInput) {
             };
         }
     }
+    // Handle array of inline objects
+    if (field.tsType.kind === "array" &&
+        field.tsType.elementType?.kind === "inlineObject" &&
+        field.tsType.elementType.inlineObjectProperties) {
+        const resolvedTypeName = generatedTypeNames.get(contextKey);
+        if (resolvedTypeName) {
+            return {
+                ...field,
+                tsType: {
+                    ...field.tsType,
+                    elementType: createReferenceType({
+                        name: resolvedTypeName,
+                        nullable: field.tsType.elementType.nullable,
+                    }),
+                },
+            };
+        }
+    }
     // Handle inline enums
     if (field.tsType.kind === "inlineEnum" && field.tsType.inlineEnumMembers) {
         const resolvedTypeName = enumTypeNames.get(contextKey);
@@ -377,6 +458,24 @@ function updateField(field, params, parentTypeName, isInput) {
             };
         }
     }
+    // Handle array of inline union types
+    if (field.tsType.kind === "array" &&
+        field.tsType.elementType?.kind === "union" &&
+        field.tsType.elementType.members) {
+        const resolvedTypeName = unionTypeNames.get(contextKey);
+        if (resolvedTypeName) {
+            return {
+                ...field,
+                tsType: {
+                    ...field.tsType,
+                    elementType: createReferenceType({
+                        name: resolvedTypeName,
+                        nullable: field.tsType.elementType.nullable,
+                    }),
+                },
+            };
+        }
+    }
     return field;
 }
 function updateResolversResult(resolversResult, params) {
@@ -388,6 +487,9 @@ function updateResolversResult(resolversResult, params) {
         mutationFields: {
             fields: resolversResult.mutationFields.fields.map((field) => updateResolverField(field, params, "mutation", null)),
         },
+        subscriptionFields: {
+            fields: resolversResult.subscriptionFields.fields.map((field) => updateResolverField(field, params, "subscription", null)),
+        },
         typeExtensions: resolversResult.typeExtensions.map((ext) => ({
             ...ext,
             fields: ext.fields.map((field) => updateResolverField(field, params, "field", ext.targetTypeName)),
@@ -762,6 +864,9 @@ function generateOneOfFields(params) {
             memberType.inlineObjectProperties) {
             for (const prop of memberType.inlineObjectProperties) {
                 const fieldType = convertTsTypeToGraphQLType(prop.tsType, prop.optional);
+                if (fieldType.typeName === "__NEVER__") {
+                    continue;
+                }
                 fields.push({
                     name: prop.name,
                     type: {
@@ -808,11 +913,195 @@ function extractTypenameFromInlineObject(properties) {
     }
     const { property, fieldName } = found;
     const { tsType } = property;
-    if (tsType.kind === "literal" && tsType.name !== null) {
+    if (tsType.kind === "stringLiteral" && tsType.name !== null) {
         return { typeName: tsType.name, fieldName };
     }
     return null;
 }
+/**
+ * Convert inline object/enum/union properties within a union member to AutoGeneratedFields.
+ * Handles __INLINE_OBJECT__, __INLINE_ENUM__, and inline union (kind: "union") sentinels
+ * by generating appropriate auto types and replacing sentinel type names.
+ */
+function convertMemberPropertiesToFields(properties, parentTypeName, ctx) {
+    const siblingFieldNames = new Set(properties.map((prop) => prop.name));
+    return properties.flatMap((prop) => {
+        const fieldType = convertTsTypeToGraphQLType(prop.tsType, prop.optional);
+        if (fieldType.typeName === "__NEVER__") {
+            return [];
+        }
+        const resolvedTypeName = resolveInlineTypeInMember(prop, fieldType, parentTypeName, siblingFieldNames, ctx);
+        return {
+            name: prop.name,
+            type: resolvedTypeName
+                ? { ...fieldType, typeName: resolvedTypeName }
+                : fieldType,
+            description: prop.description,
+            deprecated: prop.deprecated,
+            directives: prop.directives,
+            defaultValue: prop.defaultValue,
+        };
+    });
+}
+/**
+ * Resolve an inline type (object, enum, or union) within a union member property.
+ * Returns the generated type name if resolved, or null if no resolution is needed.
+ */
+function resolveInlineTypeInMember(prop, fieldType, parentTypeName, siblingFieldNames, ctx) {
+    // Determine the inline TS type (direct or array element)
+    const inlineTsType = prop.tsType.kind === "array" ? prop.tsType.elementType : prop.tsType;
+    const singularizeArrayFieldName = prop.tsType.kind === "array";
+    if (!inlineTsType)
+        return null;
+    // Resolve nested inline objects
+    if (fieldType.typeName === "__INLINE_OBJECT__" &&
+        inlineTsType.kind === "inlineObject" &&
+        inlineTsType.inlineObjectProperties) {
+        return resolveNestedInlineObjectInMember(inlineTsType.inlineObjectProperties, prop.name, singularizeArrayFieldName, parentTypeName, siblingFieldNames, ctx, inlineTsType.inlineObjectDescription);
+    }
+    // Resolve inline enums (string literal unions)
+    if (fieldType.typeName === "__INLINE_ENUM__" &&
+        inlineTsType.kind === "inlineEnum" &&
+        inlineTsType.inlineEnumMembers) {
+        return resolveInlineEnumInMember(inlineTsType.inlineEnumMembers, prop.name, singularizeArrayFieldName, parentTypeName, siblingFieldNames, ctx, inlineTsType.externalEnumDescription);
+    }
+    // Resolve inline unions (reference type unions like User | Bot)
+    if (inlineTsType.kind === "union" && inlineTsType.members) {
+        return resolveInlineUnionInMember(inlineTsType.members, prop.name, singularizeArrayFieldName, parentTypeName, siblingFieldNames, ctx);
+    }
+    return null;
+}
+/**
+ * Resolve a nested inline object within an inline union member.
+ * Generates an AutoGeneratedType using objectField context and recurses
+ * into deeper nesting levels.
+ */
+function resolveNestedInlineObjectInMember(properties, fieldName, singularizeArrayFieldName, parentTypeName, siblingFieldNames, ctx, description) {
+    const context = {
+        kind: "objectField",
+        parentTypeName,
+        fieldPath: appendFieldPath({
+            parentPath: [],
+            fieldName,
+            singularize: singularizeArrayFieldName,
+            siblingFieldNames,
+        }),
+    };
+    const typeName = generateAutoTypeName(context);
+    const contextKey = getContextKey(context);
+    if (ctx.generatedTypeNames.has(contextKey)) {
+        return ctx.generatedTypeNames.get(contextKey);
+    }
+    const fields = convertMemberPropertiesToFields(properties, typeName, ctx);
+    ctx.types.push({
+        name: typeName,
+        kind: "Object",
+        fields,
+        enumValues: null,
+        unionMembers: null,
+        needsStringEnumMapping: false,
+        sourceLocation: ctx.sourceLocation,
+        generatedFrom: buildGeneratedFromInfo(context),
+        description,
+        resolveTypeFieldPattern: null,
+    });
+    ctx.generatedTypeNames.set(contextKey, typeName);
+    return typeName;
+}
+/**
+ * Resolve an inline enum (string literal union) within an inline union member.
+ */
+function resolveInlineEnumInMember(members, fieldName, singularizeArrayFieldName, parentTypeName, siblingFieldNames, ctx, description) {
+    const context = {
+        kind: "objectField",
+        parentTypeName,
+        fieldPath: appendFieldPath({
+            parentPath: [],
+            fieldName,
+            singularize: singularizeArrayFieldName,
+            siblingFieldNames,
+        }),
+    };
+    const typeName = generateAutoTypeName(context);
+    const contextKey = getContextKey(context);
+    if (ctx.generatedTypeNames.has(contextKey)) {
+        return ctx.generatedTypeNames.get(contextKey);
+    }
+    const { enumValues, needsStringEnumMapping, diagnostics: enumDiagnostics, } = convertInlineEnumMembers({
+        members,
+        enumName: typeName,
+        sourceLocation: ctx.sourceLocation,
+    });
+    ctx.diagnostics.push(...enumDiagnostics);
+    ctx.types.push({
+        name: typeName,
+        kind: "Enum",
+        fields: null,
+        enumValues,
+        unionMembers: null,
+        needsStringEnumMapping,
+        sourceLocation: ctx.sourceLocation,
+        generatedFrom: buildGeneratedFromInfo(context),
+        description,
+        resolveTypeFieldPattern: null,
+    });
+    ctx.generatedTypeNames.set(contextKey, typeName);
+    return typeName;
+}
+/**
+ * Resolve an inline union of reference types within an inline union member.
+ */
+function resolveInlineUnionInMember(members, fieldName, singularizeArrayFieldName, parentTypeName, siblingFieldNames, ctx) {
+    const context = {
+        kind: "objectField",
+        parentTypeName,
+        fieldPath: appendFieldPath({
+            parentPath: [],
+            fieldName,
+            singularize: singularizeArrayFieldName,
+            siblingFieldNames,
+        }),
+    };
+    const typeName = generateAutoTypeName(context);
+    const contextKey = getContextKey(context);
+    if (ctx.generatedTypeNames.has(contextKey)) {
+        return ctx.generatedTypeNames.get(contextKey);
+    }
+    const memberNames = [];
+    for (const member of members) {
+        if (member.kind === "reference" && member.name) {
+            if (ctx.knownTypeNames.has(member.name)) {
+                memberNames.push(member.name);
+            }
+        }
+    }
+    if (memberNames.length === 0) {
+        const memberDescriptions = members
+            .map((m) => m.name ?? "(anonymous)")
+            .join(", ");
+        ctx.diagnostics.push({
+            code: "INLINE_UNION_UNRESOLVABLE_MEMBER",
+            message: `Could not resolve any members of inline union '${typeName}' in '${parentTypeName}.${fieldName}'. None of the member types [${memberDescriptions}] are known schema types.`,
+            severity: "error",
+            location: ctx.sourceLocation,
+        });
+        return typeName;
+    }
+    ctx.types.push({
+        name: typeName,
+        kind: "Union",
+        fields: null,
+        enumValues: null,
+        unionMembers: memberNames,
+        needsStringEnumMapping: false,
+        sourceLocation: ctx.sourceLocation,
+        generatedFrom: buildGeneratedFromInfo(context),
+        description: null,
+        resolveTypeFieldPattern: null,
+    });
+    ctx.generatedTypeNames.set(contextKey, typeName);
+    return typeName;
+}
 function resolveMemberNames(params) {
     const { members, generatedTypeNames, parentContext, types, generatedTypenameTypes, diagnostics, sourceLocation, } = params;
     const memberNames = [];
@@ -840,31 +1129,39 @@ function resolveMemberNames(params) {
                 };
                 contextKey = getContextKey(nestedContext);
             }
-            else {
+            else if (memberType.inlineObjectHintName !== null) {
                 const nestedContext = {
                     ...parentContext,
-                    fieldPath: [...parentContext.fieldPath, `member${i}`],
+                    fieldPath: [
+                        ...parentContext.fieldPath,
+                        memberType.inlineObjectHintName,
+                    ],
                 };
-                memberTypeName = generateAutoTypeName(nestedContext);
+                memberTypeName = memberType.inlineObjectHintName;
                 contextKey = getContextKey(nestedContext);
             }
+            else {
+                diagnostics.push({
+                    code: "UNNAMEABLE_UNION_MEMBER",
+                    message: `Inline object union member at index ${i} cannot be named. Use a named type (type alias or interface) for each union member, or add a '__typename' property with a string literal type.`,
+                    severity: "error",
+                    location: sourceLocation,
+                });
+                continue;
+            }
             // Only filter out __typename or $typeName for resolverPayload context
             // For other contexts, these are regular fields that should be preserved
             const typenameFieldToFilter = extractedInfo?.fieldName ?? null;
-            const fields = memberType.inlineObjectProperties
-                .filter((prop) => parentContext.kind !== "resolverPayload" ||
-                prop.name !== typenameFieldToFilter)
-                .map((prop) => {
-                const fieldType = convertTsTypeToGraphQLType(prop.tsType, prop.optional);
-                return {
-                    name: prop.name,
-                    type: fieldType,
-                    description: prop.description,
-                    deprecated: prop.deprecated,
-                    directives: prop.directives,
-                    defaultValue: prop.defaultValue,
-                };
-            });
+            const filteredProperties = memberType.inlineObjectProperties.filter((prop) => parentContext.kind !== "resolverPayload" ||
+                prop.name !== typenameFieldToFilter);
+            const fieldCtx = {
+                types,
+                generatedTypeNames,
+                diagnostics,
+                sourceLocation,
+                knownTypeNames: params.knownTypeNames,
+            };
+            const fields = convertMemberPropertiesToFields(filteredProperties, memberTypeName, fieldCtx);
             // Check if this typename was already seen with a different field structure
             if (extractedInfo !== null) {
                 const existingFields = generatedTypenameTypes.get(extractedInfo.typeName);
@@ -889,7 +1186,7 @@ function resolveMemberNames(params) {
                 ...parentContext,
                 fieldPath: [
                     ...parentContext.fieldPath,
-                    extractedInfo?.typeName ?? `member${i}`,
+                    extractedInfo?.typeName ?? memberType.inlineObjectHintName,
                 ],
             };
             types.push({
@@ -996,11 +1293,19 @@ export function generateAutoTypes(input) {
         resolversResult: input.resolversResult,
         knownTypeNames: input.knownTypeNames,
     });
-    const allInlineUnions = [
+    const allInlineUnionsRaw = [
         ...inlineUnionsFromTypes,
         ...inlineUnionsFromResolvers,
         ...inlineUnionsFromPayloads,
     ];
+    // Apply discriminator-aware flattening to inline unions before processing.
+    // This resolves the case where TypeScript distributes intersections over unions
+    // within field types, creating many anonymous inline objects.
+    const flattenResult = flattenInlineUnionMembers({
+        inlineUnions: allInlineUnionsRaw,
+        discriminatorFields: input.discriminatorFields,
+    });
+    const allInlineUnions = [...flattenResult.inlineUnions];
     // Build union type names map before generating auto types
     const unionTypeNames = buildUnionTypeNamesMap(allInlineUnions);
     const autoGeneratedTypes = [];
@@ -1040,11 +1345,29 @@ export function generateAutoTypes(input) {
     };
     const updatedExtractedTypes = updateExtractedTypes(input.extractedTypes, updateParams);
     const updatedResolversResult = updateResolversResult(input.resolversResult, updateParams);
+    // Build mapping from TS type alias names to auto-generated GraphQL union names
+    const tsAliasToGraphQLNameMap = buildTsAliasToGraphQLNameMap(allInlineUnions, unionTypeNames);
     return {
         autoGeneratedTypes,
         updatedExtractedTypes,
         updatedResolversResult,
         diagnostics,
+        tsAliasToGraphQLNameMap,
+        inlineDiscriminatorResolveTypes: flattenResult.inlineDiscriminatorResolveTypes,
     };
 }
+function buildTsAliasToGraphQLNameMap(inlineUnions, unionTypeNames) {
+    const result = new Map();
+    for (const inlineUnion of inlineUnions) {
+        if (inlineUnion.unionAliasName === null) {
+            continue;
+        }
+        const contextKey = getContextKey(inlineUnion.context);
+        const generatedName = unionTypeNames.get(contextKey);
+        if (generatedName !== undefined) {
+            result.set(inlineUnion.unionAliasName, generatedName);
+        }
+    }
+    return result;
+}
 //# sourceMappingURL=auto-type-generator.js.map