reduce size of diff by continuing to gen mixed types, for now

Author: ianhoffman

src/Codegen/Constraints/NumberBuilder.php

@@ -128,7 +128,7 @@ public function getTypeInfo(): Typing\Type {
       return Typing\TypeSystem::num();
     } else {
       // TODO: Handle hackEnum
-      return Typing\TypeSystem::mixed();
+      return Typing\TypeSystem::nonnull();
     }
   }
 }

src/Codegen/Constraints/UntypedBuilder.php

@@ -497,10 +497,17 @@ private function generateGenericAnyOfChecks(vec<SchemaBuilder> $schema_builders,
       }
     }
 
-    $this->type_info = Typing\TypeSystem::union($present_types);
-    if ($this->type_info->isOptional()) {
-      // If the type is optional, don't bother building null builders
-      // and instead just short-circuit.
+    $type_info = Typing\TypeSystem::union($present_types);
+    // For now, keep upcasting nonnull to mixed.
+    // This is a temporary cludge to reduce the amount of code changed by generating unions.
+    // TODO: Stop doing the above.
+    if ($type_info is Typing\ConcreteType && $type_info->getConcreteTypeName() === Typing\ConcreteTypeName::NONNULL) {
+      $type_info = Typing\TypeSystem::mixed();
+    }
+    $this->type_info = $type_info;
+    if (C\count($nonnull_builders) < C\count($schema_builders)) {
+      // If we filtered out a null builder above, handle it here.
+      // TODO: Once we remove the above cludge, we can do `if ($this->type_info->isOptional()) {`
       $hb
         ->startIfBlock('$input === null')
         ->addReturn(null, HackBuilderValues::export())

tests/BaseCodegenTestCase.php

@@ -122,7 +122,7 @@ private static function getConfig(string $name, this::TOptions $options): Codege
     $codegen_config = shape(
       'generatedFrom' => '`make test`',
       'validator' => $validator_config,
-      'discardChanges' => true
+      'discardChanges' => true,
     );
 
     $json_schema_codegen_config = $options['json_schema_codegen_config'] ?? null;

tests/examples/codegen/AnyOfValidator2.php

@@ -5,13 +5,13 @@
  * To re-generate this file run `make test`
  *
  *
- * @generated SignedSource<<99b51d66245aaffdf4a13563142ea5f5>>
+ * @generated SignedSource<<72449b6279d0ca5b12355b69be8582b1>>
  */
 namespace Slack\Hack\JsonSchema\Tests\Generated;
 use namespace Slack\Hack\JsonSchema;
 use namespace Slack\Hack\JsonSchema\Constraints;
 
-type TAnyOfValidator2 = nonnull;
+type TAnyOfValidator2 = mixed;
 
 final class AnyOfValidator2AnyOf0 {
 

tests/examples/codegen/AnyOfValidatorNestedNullableAnyOf.php

@@ -5,7 +5,7 @@
  * To re-generate this file run `make test`
  *
  *
- * @generated SignedSource<<c1940fa688271ce27b41f85f8b502a40>>
+ * @generated SignedSource<<caed5ad653fe7f7d3dfe0516296d4e6b>>
  */
 namespace Slack\Hack\JsonSchema\Tests\Generated;
 use namespace Slack\Hack\JsonSchema;
@@ -84,10 +84,6 @@ public static function check(
     mixed $input,
     string $pointer,
   ): TAnyOfValidatorNestedNullableAnyOf {
-    if ($input === null) {
-      return null;
-    }
-
     $constraints = vec[
       AnyOfValidatorNestedNullableAnyOfAnyOf0::check<>,
       AnyOfValidatorNestedNullableAnyOfAnyOf1::check<>,

tests/examples/codegen/AnyOfValidatorShapes.php

@@ -5,7 +5,7 @@
  * To re-generate this file run `make test`
  *
  *
- * @generated SignedSource<<0a79c5a2b4cdbd407b5c69fb9125b3ed>>
+ * @generated SignedSource<<fa85e2dfb2ba253b0d8d4d4bf3885c14>>
  */
 namespace Slack\Hack\JsonSchema\Tests\Generated;
 use namespace Slack\Hack\JsonSchema;
@@ -20,7 +20,7 @@
   ?'foo' => string,
 );
 
-type TAnyOfValidatorShapes = nonnull;
+type TAnyOfValidatorShapes = mixed;
 
 final class AnyOfValidatorShapesAnyOf0PropertiesFoo {