refactor: typealias PurchaseInput to Purchase and enh dart inputs

Author: hyochan

scripts/fix-generated-types.mjs

@@ -46,6 +46,12 @@ for (const [from, to] of scalarReplacements) {
   content = content.replace(pattern, to);
 }
 
+// Create simple type alias for PurchaseInput
+const purchaseInputPattern = /export interface PurchaseInput \{[\s\S]*?\}\n+/;
+if (purchaseInputPattern.test(content)) {
+  content = content.replace(purchaseInputPattern, 'export type PurchaseInput = Purchase;\n\n');
+}
+
 const iosTypeMap = new Map();
 const enumValueOrder = new Map();
 for (const schemaPath of schemaDefinitionFiles) {

scripts/generate-dart-types.mjs

@@ -541,96 +541,85 @@ const printObject = (objectType) => {
 };
 
 const printInput = (inputType) => {
+  // Alias PurchaseInput to Purchase for cleaner API
+  if (inputType.name === 'PurchaseInput') {
+    lines.push('typedef PurchaseInput = Purchase;');
+    lines.push('');
+    return;
+  }
+
+  // TypeScript-style discriminated union with compile-time safety
   if (inputType.name === 'RequestPurchaseProps') {
     addDocComment(lines, inputType.description);
-    lines.push('class RequestPurchaseProps {');
-    lines.push('  RequestPurchaseProps({');
-    lines.push('    required this.request,');
-    lines.push('    ProductQueryType? type,');
-    lines.push('    this.useAlternativeBilling,');
-    lines.push('  }) : type = type ?? (request is RequestPurchasePropsRequestPurchase');
-    lines.push('          ? ProductQueryType.InApp');
-    lines.push('          : ProductQueryType.Subs) {');
-    lines.push('    if (request is RequestPurchasePropsRequestPurchase && this.type != ProductQueryType.InApp) {');
-    lines.push("      throw ArgumentError('type must be IN_APP when requestPurchase is provided');");
-    lines.push('    }');
-    lines.push('    if (request is RequestPurchasePropsRequestSubscription && this.type != ProductQueryType.Subs) {');
-    lines.push("      throw ArgumentError('type must be SUBS when requestSubscription is provided');");
-    lines.push('    }');
-    lines.push('  }');
+
+    // Sealed class for compile-time type safety
+    lines.push('sealed class RequestPurchaseProps {');
+    lines.push('  const RequestPurchaseProps._();');
     lines.push('');
-    lines.push('  final RequestPurchasePropsRequest request;');
-    lines.push('  final ProductQueryType type;');
-    lines.push('  final bool? useAlternativeBilling;');
+    lines.push('  const factory RequestPurchaseProps.inApp(({');
+    lines.push('    RequestPurchaseIosProps? ios,');
+    lines.push('    RequestPurchaseAndroidProps? android,');
+    lines.push('    bool? useAlternativeBilling,');
+    lines.push('  }) props) = _InAppPurchase;');
     lines.push('');
-    lines.push('  factory RequestPurchaseProps.fromJson(Map<String, dynamic> json) {');
-    lines.push("    final typeValue = json['type'] as String?;");
-    lines.push('    final parsedType = typeValue != null ? ProductQueryType.fromJson(typeValue) : null;');
-    lines.push("    final useAlternativeBilling = json['useAlternativeBilling'] as bool?;");
-    lines.push("    final purchaseJson = json['requestPurchase'] as Map<String, dynamic>?;");
-    lines.push('    if (purchaseJson != null) {');
-    lines.push('      final request = RequestPurchasePropsRequestPurchase(RequestPurchasePropsByPlatforms.fromJson(purchaseJson));');
-    lines.push('      final finalType = parsedType ?? ProductQueryType.InApp;');
-    lines.push('      if (finalType != ProductQueryType.InApp) {');
-    lines.push("        throw ArgumentError('type must be IN_APP when requestPurchase is provided');");
-    lines.push('      }');
-    lines.push('      return RequestPurchaseProps(request: request, type: finalType, useAlternativeBilling: useAlternativeBilling);');
-    lines.push('    }');
-    lines.push("    final subscriptionJson = json['requestSubscription'] as Map<String, dynamic>?;");
-    lines.push('    if (subscriptionJson != null) {');
-    lines.push('      final request = RequestPurchasePropsRequestSubscription(RequestSubscriptionPropsByPlatforms.fromJson(subscriptionJson));');
-    lines.push('      final finalType = parsedType ?? ProductQueryType.Subs;');
-    lines.push('      if (finalType != ProductQueryType.Subs) {');
-    lines.push("        throw ArgumentError('type must be SUBS when requestSubscription is provided');");
-    lines.push('      }');
-    lines.push('      return RequestPurchaseProps(request: request, type: finalType, useAlternativeBilling: useAlternativeBilling);');
-    lines.push('    }');
-    lines.push("    throw ArgumentError('RequestPurchaseProps requires requestPurchase or requestSubscription');");
-    lines.push('  }');
+    lines.push('  const factory RequestPurchaseProps.subs(({');
+    lines.push('    RequestSubscriptionIosProps? ios,');
+    lines.push('    RequestSubscriptionAndroidProps? android,');
+    lines.push('    bool? useAlternativeBilling,');
+    lines.push('  }) props) = _SubsPurchase;');
     lines.push('');
-    lines.push('  Map<String, dynamic> toJson() {');
-    lines.push('    if (request is RequestPurchasePropsRequestPurchase) {');
-    lines.push('      return {');
-    lines.push("        'requestPurchase': (request as RequestPurchasePropsRequestPurchase).value.toJson(),");
-    lines.push("        'type': type.toJson(),");
-    lines.push("        'useAlternativeBilling': useAlternativeBilling,");
-    lines.push('      };');
-    lines.push('    }');
-    lines.push('    if (request is RequestPurchasePropsRequestSubscription) {');
-    lines.push('      return {');
-    lines.push("        'requestSubscription': (request as RequestPurchasePropsRequestSubscription).value.toJson(),");
-    lines.push("        'type': type.toJson(),");
-    lines.push("        'useAlternativeBilling': useAlternativeBilling,");
-    lines.push('      };');
-    lines.push('    }');
-    lines.push("    throw StateError('Unsupported RequestPurchaseProps request variant');");
-    lines.push('  }');
+    lines.push('  Map<String, dynamic> toJson();');
+    lines.push('}');
     lines.push('');
-    lines.push('  static RequestPurchaseProps inApp({required RequestPurchasePropsByPlatforms request, bool? useAlternativeBilling}) {');
-    lines.push('    return RequestPurchaseProps(request: RequestPurchasePropsRequestPurchase(request), type: ProductQueryType.InApp, useAlternativeBilling: useAlternativeBilling);');
-    lines.push('  }');
+
+    // Purchase implementation
+    lines.push('class _InAppPurchase extends RequestPurchaseProps {');
+    lines.push('  const _InAppPurchase(this.props) : super._();');
+    lines.push('  final ({');
+    lines.push('    RequestPurchaseIosProps? ios,');
+    lines.push('    RequestPurchaseAndroidProps? android,');
+    lines.push('    bool? useAlternativeBilling,');
+    lines.push('  }) props;');
     lines.push('');
-    lines.push('  static RequestPurchaseProps subs({required RequestSubscriptionPropsByPlatforms request, bool? useAlternativeBilling}) {');
-    lines.push('    return RequestPurchaseProps(request: RequestPurchasePropsRequestSubscription(request), type: ProductQueryType.Subs, useAlternativeBilling: useAlternativeBilling);');
+    lines.push('  @override');
+    lines.push('  Map<String, dynamic> toJson() {');
+    lines.push('    return {');
+    lines.push("      'requestPurchase': {");
+    lines.push("        if (props.ios != null) 'ios': props.ios!.toJson(),");
+    lines.push("        if (props.android != null) 'android': props.android!.toJson(),");
+    lines.push('      },');
+    lines.push("      'type': ProductQueryType.InApp.toJson(),");
+    lines.push("      if (props.useAlternativeBilling != null) 'useAlternativeBilling': props.useAlternativeBilling,");
+    lines.push('    };');
     lines.push('  }');
     lines.push('}');
     lines.push('');
-    lines.push('sealed class RequestPurchasePropsRequest {');
-    lines.push('  const RequestPurchasePropsRequest();');
-    lines.push('}');
-    lines.push('');
-    lines.push('class RequestPurchasePropsRequestPurchase extends RequestPurchasePropsRequest {');
-    lines.push('  const RequestPurchasePropsRequestPurchase(this.value);');
-    lines.push('  final RequestPurchasePropsByPlatforms value;');
-    lines.push('}');
+
+    // Subscription implementation
+    lines.push('class _SubsPurchase extends RequestPurchaseProps {');
+    lines.push('  const _SubsPurchase(this.props) : super._();');
+    lines.push('  final ({');
+    lines.push('    RequestSubscriptionIosProps? ios,');
+    lines.push('    RequestSubscriptionAndroidProps? android,');
+    lines.push('    bool? useAlternativeBilling,');
+    lines.push('  }) props;');
     lines.push('');
-    lines.push('class RequestPurchasePropsRequestSubscription extends RequestPurchasePropsRequest {');
-    lines.push('  const RequestPurchasePropsRequestSubscription(this.value);');
-    lines.push('  final RequestSubscriptionPropsByPlatforms value;');
+    lines.push('  @override');
+    lines.push('  Map<String, dynamic> toJson() {');
+    lines.push('    return {');
+    lines.push("      'requestSubscription': {");
+    lines.push("        if (props.ios != null) 'ios': props.ios!.toJson(),");
+    lines.push("        if (props.android != null) 'android': props.android!.toJson(),");
+    lines.push('      },');
+    lines.push("      'type': ProductQueryType.Subs.toJson(),");
+    lines.push("      if (props.useAlternativeBilling != null) 'useAlternativeBilling': props.useAlternativeBilling,");
+    lines.push('    };');
+    lines.push('  }');
     lines.push('}');
     lines.push('');
     return;
   }
+
   addDocComment(lines, inputType.description);
   lines.push(`class ${inputType.name} {`);
   lines.push(`  const ${inputType.name}({`);
@@ -735,6 +724,19 @@ const printUnion = (unionType) => {
   lines.push('}', '');
 };
 
+const expandInputToParams = (inputTypeName) => {
+  const inputType = typeMap[inputTypeName];
+  if (!inputType || !isInputObjectType(inputType)) return [];
+
+  // Don't expand RequestPurchaseProps - it's now a sealed class union type
+  if (inputTypeName === 'RequestPurchaseProps') {
+    return [];
+  }
+
+  const fields = Object.values(inputType.getFields()).sort((a, b) => a.name.localeCompare(b.name));
+  return fields;
+};
+
 const printOperationInterface = (operationType) => {
   const interfaceName = `${operationType.name}Resolver`;
   addDocComment(lines, operationType.description ?? `GraphQL root ${operationType.name.toLowerCase()} operations.`);
@@ -750,6 +752,49 @@ const printOperationInterface = (operationType) => {
       lines.push(`  Future<${returnType}> ${escapeDartName(field.name)}();`);
       continue;
     }
+
+    // Special handling for v5.x style APIs - expand input objects
+    // Don't expand 'purchase' - keep it as an object
+    const expandableParams = ['params', 'options', 'config', 'props'];
+    const expandableArg = field.args.find(arg => expandableParams.includes(arg.name));
+
+    if (expandableArg) {
+      const namedType = getNamedGraphQLType(expandableArg.type);
+      if (namedType && isInputObjectType(namedType)) {
+        const expandedFields = expandInputToParams(namedType.name);
+        const otherArgs = field.args.filter(arg => arg !== expandableArg);
+
+        if (expandedFields.length > 0) {
+          // Always use named params when expanding
+          lines.push(`  Future<${returnType}> ${escapeDartName(field.name)}({`);
+
+          // Add expanded fields first
+          expandedFields.forEach((f) => {
+            // Handle synthetic fields (e.g., 'request' field in RequestPurchaseProps)
+            if (f.isSynthetic) {
+              lines.push(`    required RequestPurchaseRequest ${escapeDartName(f.name)},`);
+            } else {
+              const { type: argType, nullable: argNullable } = getDartType(f.type);
+              const finalType = `${argType}${argNullable ? '?' : ''}`;
+              const prefix = argNullable ? '' : 'required ';
+              lines.push(`    ${prefix}${finalType} ${escapeDartName(f.name)},`);
+            }
+          });
+
+          // Add other args
+          otherArgs.forEach((arg) => {
+            const { type: argType, nullable: argNullable } = getDartType(arg.type);
+            const finalType = `${argType}${argNullable ? '?' : ''}`;
+            const prefix = argNullable ? '' : 'required ';
+            lines.push(`    ${prefix}${finalType} ${escapeDartName(arg.name)},`);
+          });
+
+          lines.push('  });');
+          continue;
+        }
+      }
+    }
+
     if (field.args.length === 1) {
       const arg = field.args[0];
       const { type: argType, nullable: argNullable } = getDartType(arg.type);
@@ -791,6 +836,49 @@ const printOperationHelpers = (operationType) => {
       lines.push(`typedef ${aliasName} = Future<${returnType}> Function();`);
       return;
     }
+
+    // Special handling for v5.x style APIs - expand input objects
+    // Don't expand 'purchase' - keep it as an object
+    const expandableParams = ['params', 'options', 'config', 'props'];
+    const expandableArg = field.args.find(arg => expandableParams.includes(arg.name));
+
+    if (expandableArg) {
+      const namedType = getNamedGraphQLType(expandableArg.type);
+      if (namedType && isInputObjectType(namedType)) {
+        const expandedFields = expandInputToParams(namedType.name);
+        const otherArgs = field.args.filter(arg => arg !== expandableArg);
+
+        if (expandedFields.length > 0) {
+          // Always use named params when expanding
+          lines.push(`typedef ${aliasName} = Future<${returnType}> Function({`);
+
+          // Add expanded fields first
+          expandedFields.forEach((f) => {
+            // Handle synthetic fields (e.g., 'request' field in RequestPurchaseProps)
+            if (f.isSynthetic) {
+              lines.push(`  required RequestPurchaseRequest ${escapeDartName(f.name)},`);
+            } else {
+              const { type: argType, nullable: argNullable } = getDartType(f.type);
+              const finalType = `${argType}${argNullable ? '?' : ''}`;
+              const prefix = argNullable ? '' : 'required ';
+              lines.push(`  ${prefix}${finalType} ${escapeDartName(f.name)},`);
+            }
+          });
+
+          // Add other args
+          otherArgs.forEach((arg) => {
+            const { type: argType, nullable: argNullable } = getDartType(arg.type);
+            const finalType = `${argType}${argNullable ? '?' : ''}`;
+            const prefix = argNullable ? '' : 'required ';
+            lines.push(`  ${prefix}${finalType} ${escapeDartName(arg.name)},`);
+          });
+
+          lines.push('});');
+          return;
+        }
+      }
+    }
+
     if (field.args.length === 1) {
       const arg = field.args[0];
       const { type: argType, nullable: argNullable } = getDartType(arg.type);

scripts/generate-kotlin-types.mjs

@@ -517,6 +517,12 @@ const printDataClass = (objectType) => {
 };
 
 const printInput = (inputType) => {
+  // Alias PurchaseInput to Purchase for cleaner API
+  if (inputType.name === 'PurchaseInput') {
+    lines.push('public typealias PurchaseInput = Purchase');
+    lines.push('');
+    return;
+  }
   if (inputType.name === 'RequestPurchaseProps') {
     addDocComment(lines, inputType.description);
     lines.push('public data class RequestPurchaseProps(');

scripts/generate-swift-types.mjs

@@ -360,6 +360,12 @@ const printObject = (objectType) => {
 };
 
 const printInput = (inputType) => {
+  // Alias PurchaseInput to Purchase for cleaner API
+  if (inputType.name === 'PurchaseInput') {
+    lines.push('public typealias PurchaseInput = Purchase');
+    lines.push('');
+    return;
+  }
   if (inputType.name === 'RequestPurchaseProps') {
     addDocComment(lines, inputType.description);
     lines.push('public struct RequestPurchaseProps: Codable {');

src/generated/Types.kt

@@ -1641,45 +1641,7 @@ public data class ProductRequest(
     )
 }
 
-public data class PurchaseInput(
-    val id: String,
-    val ids: List<String>? = null,
-    val isAutoRenewing: Boolean,
-    val platform: IapPlatform,
-    val productId: String,
-    val purchaseState: PurchaseState,
-    val purchaseToken: String? = null,
-    val quantity: Int,
-    val transactionDate: Double
-) {
-    companion object {
-        fun fromJson(json: Map<String, Any?>): PurchaseInput {
-            return PurchaseInput(
-                id = json["id"] as String,
-                ids = (json["ids"] as List<*>?)?.map { it as String },
-                isAutoRenewing = json["isAutoRenewing"] as Boolean,
-                platform = IapPlatform.fromJson(json["platform"] as String),
-                productId = json["productId"] as String,
-                purchaseState = PurchaseState.fromJson(json["purchaseState"] as String),
-                purchaseToken = json["purchaseToken"] as String?,
-                quantity = (json["quantity"] as Number).toInt(),
-                transactionDate = (json["transactionDate"] as Number).toDouble(),
-            )
-        }
-    }
-
-    fun toJson(): Map<String, Any?> = mapOf(
-        "id" to id,
-        "ids" to ids?.map { it },
-        "isAutoRenewing" to isAutoRenewing,
-        "platform" to platform.toJson(),
-        "productId" to productId,
-        "purchaseState" to purchaseState.toJson(),
-        "purchaseToken" to purchaseToken,
-        "quantity" to quantity,
-        "transactionDate" to transactionDate,
-    )
-}
+public typealias PurchaseInput = Purchase
 
 public data class PurchaseOptions(
     /**

src/generated/Types.swift

@@ -497,17 +497,7 @@ public struct ProductRequest: Codable {
     public var type: ProductQueryType?
 }
 
-public struct PurchaseInput: Codable {
-    public var id: String
-    public var ids: [String]?
-    public var isAutoRenewing: Bool
-    public var platform: IapPlatform
-    public var productId: String
-    public var purchaseState: PurchaseState
-    public var purchaseToken: String?
-    public var quantity: Int
-    public var transactionDate: Double
-}
+public typealias PurchaseInput = Purchase
 
 public struct PurchaseOptions: Codable {
     /// Also emit results through the iOS event listeners