@gqlkit-ts/cli 0.5.1 → 0.7.0

package/src/auto-type-generator/inline-object-converter.ts

@@ -0,0 +1,100 @@
+import { PRIMITIVE_TYPE_MAP } from "../shared/constants.js";
+import type {
+  InlineObjectMember,
+  InlineObjectProperty,
+} from "../type-extractor/types/index.js";
+import type {
+  AutoGeneratedField,
+  AutoGeneratedType,
+} from "./auto-type-generator.js";
+
+function primitiveToGraphQLScalar(primitive: string): string {
+  return PRIMITIVE_TYPE_MAP[primitive] ?? "String";
+}
+
+function convertInlineObjectPropertyToField(
+  property: InlineObjectProperty,
+): AutoGeneratedField {
+  const tsType = property.propertyType;
+  let typeName: string;
+  const nullable = tsType.nullable;
+  let list = false;
+  let listItemNullable: boolean | null = null;
+
+  if (tsType.kind === "array" && tsType.elementType) {
+    list = true;
+    listItemNullable = tsType.elementType.nullable;
+    const elementName = tsType.elementType.name ?? "String";
+    typeName =
+      tsType.elementType.kind === "primitive"
+        ? primitiveToGraphQLScalar(elementName)
+        : elementName;
+  } else if (tsType.kind === "reference" && tsType.name) {
+    typeName = tsType.name;
+  } else if (tsType.kind === "primitive" && tsType.name) {
+    typeName = primitiveToGraphQLScalar(tsType.name);
+  } else if (tsType.kind === "scalar" && tsType.scalarInfo) {
+    typeName = tsType.scalarInfo.scalarName;
+  } else {
+    typeName = "String";
+  }
+
+  return {
+    name: property.propertyName,
+    type: {
+      typeName,
+      nullable,
+      list,
+      listItemNullable,
+    },
+    description: property.description,
+    deprecated: property.deprecated,
+    directives: null,
+    defaultValue: null,
+  };
+}
+
+interface GenerateObjectTypeFromInlineObjectParams {
+  readonly inlineObjectMember: InlineObjectMember;
+  readonly typeName: string;
+  readonly abstractTypeName: string;
+  readonly sourceFile: string;
+  readonly skipPropertyNames: ReadonlySet<string>;
+}
+
+export function generateObjectTypeFromInlineObject(
+  params: GenerateObjectTypeFromInlineObjectParams,
+): AutoGeneratedType {
+  const {
+    inlineObjectMember,
+    typeName,
+    abstractTypeName,
+    sourceFile,
+    skipPropertyNames,
+  } = params;
+  const fields: AutoGeneratedField[] = [];
+
+  for (const property of inlineObjectMember.properties) {
+    if (skipPropertyNames.has(property.propertyName)) {
+      continue;
+    }
+    fields.push(convertInlineObjectPropertyToField(property));
+  }
+
+  return {
+    name: typeName,
+    kind: "Object",
+    fields,
+    enumValues: null,
+    unionMembers: null,
+    needsStringEnumMapping: false,
+    sourceLocation: { file: sourceFile, line: 1, column: 1 },
+    generatedFrom: {
+      parentTypeName: abstractTypeName,
+      fieldPath: [],
+      context: "typeField",
+    },
+    description: null,
+    resolveTypeFieldPattern: null,
+  };
+}

package/src/auto-type-generator/inline-object-traverser.ts

@@ -1,4 +1,8 @@
-import type { InlineObjectPropertyDef } from "../type-extractor/types/index.js";
+import type {
+  InlineObjectPropertyDef,
+  TSTypeReference,
+} from "../type-extractor/types/index.js";
+import { appendFieldPath } from "./naming-convention.js";
 
 /**
  * Visitor callback for each property in an inline object hierarchy.
@@ -15,6 +19,24 @@ export interface TraverseInlineObjectPropertiesParams {
   readonly parentPath: ReadonlyArray<string>;
 }
 
+export function getInlineObjectPropertiesFromType(
+  tsType: TSTypeReference,
+): ReadonlyArray<InlineObjectPropertyDef> | null {
+  if (tsType.kind === "inlineObject" && tsType.inlineObjectProperties) {
+    return tsType.inlineObjectProperties;
+  }
+
+  if (
+    tsType.kind === "array" &&
+    tsType.elementType?.kind === "inlineObject" &&
+    tsType.elementType.inlineObjectProperties
+  ) {
+    return tsType.elementType.inlineObjectProperties;
+  }
+
+  return null;
+}
+
 /**
  * Traverses inline object properties recursively, calling the visitor for each property.
  * Handles nested inlineObject properties automatically.
@@ -27,19 +49,23 @@ export function traverseInlineObjectProperties(
   visitor: PropertyVisitor,
 ): void {
   const { properties, parentPath } = params;
+  const siblingFieldNames = new Set(properties.map((prop) => prop.name));
 
   for (const prop of properties) {
-    const propPath = [...parentPath, prop.name];
+    const propPath = appendFieldPath({
+      parentPath,
+      fieldName: prop.name,
+      singularize: prop.tsType.kind === "array",
+      siblingFieldNames,
+    });
 
     visitor(prop, propPath);
 
-    if (
-      prop.tsType.kind === "inlineObject" &&
-      prop.tsType.inlineObjectProperties
-    ) {
+    const nestedProperties = getInlineObjectPropertiesFromType(prop.tsType);
+    if (nestedProperties) {
       traverseInlineObjectProperties(
         {
-          properties: prop.tsType.inlineObjectProperties,
+          properties: nestedProperties,
           parentPath: propPath,
         },
         visitor,

package/src/auto-type-generator/inline-union-collector.ts

@@ -7,13 +7,17 @@ import type {
   SourceLocation,
   TSTypeReference,
 } from "../type-extractor/types/index.js";
-import { traverseInlineObjectProperties } from "./inline-object-traverser.js";
+import {
+  getInlineObjectPropertiesFromType,
+  traverseInlineObjectProperties,
+} from "./inline-object-traverser.js";
 import type {
   InlineUnionMemberInfo,
   InlineUnionWithContext,
 } from "./inline-union-types.js";
 import {
   type AutoTypeNameContext,
+  appendFieldPath,
   buildFieldContext,
   isInputTypeName,
 } from "./naming-convention.js";
@@ -59,6 +63,9 @@ export function collectInlineUnionsFromTypes(
 
   for (const typeInfo of extractedTypes) {
     const isInput = isInputTypeName(typeInfo.metadata.name);
+    const siblingFieldNames = new Set(
+      typeInfo.fields.map((field) => field.name),
+    );
 
     for (const field of typeInfo.fields) {
       collectInlineUnionsFromField({
@@ -68,6 +75,7 @@ export function collectInlineUnionsFromTypes(
         isInput,
         sourceFile: typeInfo.metadata.sourceFile,
         knownTypeNames,
+        siblingFieldNames,
         results,
       });
     }
@@ -82,6 +90,7 @@ interface CollectInlineUnionBaseParams {
   readonly isInput: boolean;
   readonly sourceFile: string;
   readonly knownTypeNames: ReadonlySet<string>;
+  readonly siblingFieldNames: ReadonlySet<string>;
   readonly results: InlineUnionWithContext[];
 }
 
@@ -97,10 +106,16 @@ function collectInlineUnionsFromField(params: CollectFromFieldParams): void {
     isInput,
     sourceFile,
     knownTypeNames,
+    siblingFieldNames,
     results,
   } = params;
   const tsType = field.tsType;
-  const fieldPath = [...parentPath, field.name];
+  const fieldPath = appendFieldPath({
+    parentPath,
+    fieldName: field.name,
+    singularize: tsType.kind === "array",
+    siblingFieldNames,
+  });
 
   if (tsType.kind === "union" && tsType.members) {
     const members = tsType.members.map((m) =>
@@ -116,6 +131,7 @@ function collectInlineUnionsFromField(params: CollectFromFieldParams): void {
       ),
       nullable: tsType.nullable,
       isInputContext: isInput,
+      unionAliasName: tsType.name,
     });
   }
 
@@ -137,12 +153,14 @@ function collectInlineUnionsFromField(params: CollectFromFieldParams): void {
       ),
       nullable: tsType.elementType.nullable,
       isInputContext: isInput,
+      unionAliasName: tsType.elementType.name,
     });
   }
 
-  if (tsType.kind === "inlineObject" && tsType.inlineObjectProperties) {
+  const inlineObjectProperties = getInlineObjectPropertiesFromType(tsType);
+  if (inlineObjectProperties) {
     traverseInlineObjectProperties(
-      { properties: tsType.inlineObjectProperties, parentPath: fieldPath },
+      { properties: inlineObjectProperties, parentPath: fieldPath },
       (prop, propPath) => {
         const propTsType = prop.tsType;
         if (propTsType.kind === "union" && propTsType.members) {
@@ -159,6 +177,7 @@ function collectInlineUnionsFromField(params: CollectFromFieldParams): void {
             ),
             nullable: propTsType.nullable,
             isInputContext: isInput,
+            unionAliasName: propTsType.name,
           });
         }
       },
@@ -224,6 +243,7 @@ function collectInlineUnionsFromResolverArgs(
         sourceLocation: field.sourceLocation,
         nullable: arg.type.nullable,
         isInputContext: true,
+        unionAliasName: null,
       });
     }
 
@@ -322,6 +342,7 @@ function collectInlineUnionsFromResolverProperties(
           sourceLocation: prop.sourceLocation ?? sourceLocation,
           nullable: tsType.nullable,
           isInputContext: params.contextKind === "resolverArg",
+          unionAliasName: tsType.name,
         });
       }
     },
@@ -383,6 +404,7 @@ function collectInlineUnionsFromPayloadReturnType(
       sourceLocation: field.sourceLocation,
       nullable: field.type.nullable,
       isInputContext: false,
+      unionAliasName: null,
     });
   }
 

package/src/auto-type-generator/inline-union-types.ts

@@ -30,4 +30,6 @@ export interface InlineUnionWithContext {
   readonly nullable: boolean;
   /** True if this union is in input context (should become @oneOf Input Object) */
   readonly isInputContext: boolean;
+  /** The TypeScript type alias name for this union (for mapping to auto-generated names) */
+  readonly unionAliasName: string | null;
 }

package/src/auto-type-generator/inline-union-validator.ts

@@ -90,7 +90,7 @@ function validateUnionMemberType(
     };
   }
 
-  if (memberType.kind === "literal") {
+  if (memberType.kind === "stringLiteral") {
     return {
       code: "INLINE_UNION_ENUM_MEMBER",
       message: `Inline union '${typeName}' contains a literal type '${memberType.name}'. GraphQL unions can only contain object types.`,
@@ -338,7 +338,7 @@ function extractTypenameFromNamedType(
   if (
     field.optional ||
     tsType.nullable ||
-    tsType.kind !== "literal" ||
+    tsType.kind !== "stringLiteral" ||
     tsType.name === null
   ) {
     return null;
@@ -445,7 +445,7 @@ export function validateUnionMemberTypenames(
       });
     }
 
-    if (typenameType.kind !== "literal" || typenameType.name === null) {
+    if (typenameType.kind !== "stringLiteral" || typenameType.name === null) {
       diagnostics.push({
         code: "INVALID_TYPENAME_TYPE",
         message: `Union '${unionTypeName}' member at index ${i} has '${selectedFieldName}' that is not a string literal type. Expected a string literal like '${selectedFieldName}: "TypeName"'.`,