Merge pull request #73 from slackhq/ih_fix_discard_additional_properties

Make discardAdditionalProperties an object-level option

Author: ianhoffman

src/Codegen/Codegen.php

@@ -58,7 +58,6 @@ final class Codegen implements IBuilder {
       ?'root_schema' => TSchema,
       ?'root_schema_path' => string,
     ),
-    ?'discard_additional_properties' => bool,
   );
 
   const type TSanitizeStringConfig = shape(

src/Codegen/Constraints/Context.php

@@ -130,8 +130,4 @@ public function acknowledgeRef(string $ref): void {
   public function hasSeenRef(string $ref): bool {
     return C\contains($this->seen_refs, $ref);
   }
-
-  public function shouldDiscardAdditionalProperties(): bool {
-    return $this->validatorConfig['discard_additional_properties'] ?? false;
-  }
 }

src/Codegen/Constraints/ObjectBuilder.php

@@ -22,6 +22,7 @@
   ?'coerce' => bool,
   ?'minProperties' => int,
   ?'maxProperties' => int,
+  ?'discardAdditionalProperties' => bool,
   ...
 );
 
@@ -143,7 +144,7 @@ protected function getCheckMethodCode(
     $allow_any_additional_properties =
       $additional_properties is nonnull && $is_additional_properties_boolean && $additional_properties;
     $discard_additional_properties =
-      $additional_properties === false && $this->ctx->shouldDiscardAdditionalProperties();
+      $additional_properties === false && Shapes::idx($this->typed_schema, 'discardAdditionalProperties', false);
 
     $discard_all = $discard_additional_properties &&
       ($properties is null || C\count($properties) == 0) &&
@@ -328,9 +329,8 @@ protected function getCheckMethodCode(
     // `properties` key will be run through that JSON schema. These values will
     // also be included in the output and will be typed to the specific schema.
     //
-    // If the 'discard_aditional_properties' validator configuration is set to
-    // true, we will just ignore and discard the additional values instead of
-    // throwing a validation error.
+    // If 'discard_aditional_properties' is set to true, we will just ignore
+    // and discard the additional values instead of throwing a validation error.
     //
 
     if (

tests/BaseCodegenTestCase.php

@@ -18,7 +18,6 @@ abstract class BaseCodegenTestCase extends HackTest {
     ?'json_schema_codegen_config' => IJsonSchemaCodegenConfig,
     ?'refs' => Codegen::TValidatorRefsConfig,
     ?'defaults' => Codegen::TValidatorDefaultsConfig,
-    ?'discard_additional_properties' => bool,
   );
 
   public function assertUnchanged(string $_value, ?string $_token = null): void {
@@ -100,10 +99,6 @@ private static function getConfig(string $name, this::TOptions $options): Codege
       'class' => $name,
     );
 
-    if (Shapes::keyExists($options, 'discard_additional_properties')) {
-      $validator_config['discard_additional_properties'] = $options['discard_additional_properties'];
-    }
-
     $defaults = $options['defaults'] ?? null;
     if ($defaults is nonnull) {
       $validator_config['defaults'] = $defaults;

tests/DiscardAddititionalPropertiesValidatorTest.php

@@ -11,9 +11,8 @@ final class DiscardAddititionalPropertiesValidatorTest extends BaseCodegenTestCa
   <<__Override>>
   public static async function beforeFirstTestAsync(): Awaitable<void> {
     $ret = self::getBuilder(
-      'object-schema.json',
+      'discard-additional-properties-schema.json',
       'DiscardAddititionalPropertiesValidator',
-      shape('discard_additional_properties' => true),
     );
     $ret['codegen']->build();
     require_once($ret['path']);