Merge branch 'master' into make-examples

Author: Michael Hahn

src/Codegen/Constraints/Factory.php

@@ -2,6 +2,8 @@
 
 namespace Slack\Hack\JsonSchema\Codegen;
 
+use namespace HH\Lib\Str;
+
 trait Factory {
   protected Context $ctx;
 
@@ -13,7 +15,7 @@ protected function generateClassName(string ...$parts): string {
   protected function generateTypeName(string $input): string {
     $config = $this->ctx->getJsonSchemaCodegenConfig();
     $processed = $config->getTypeNameFormatFunction()($input);
-    return \HH\Lib\Str\format(
+    return Str\format(
       '%s%s%s',
       $config->getTypeNamePrefix(),
       $processed,

src/Codegen/Constraints/ObjectBuilder.php

@@ -529,7 +529,7 @@ private function codegenType(
       $members = vec[];
       foreach ($property_classes as $property => $builder) {
         $member = new CodegenShapeMember($property, $builder->getType());
-        if (!\HH\Lib\C\contains($required, $property)) {
+        if (!C\contains($required, $property)) {
           $member->setIsOptional();
         }
 

src/Codegen/Constraints/RefResolver.php

@@ -2,7 +2,7 @@
 
 namespace Slack\Hack\JsonSchema\Codegen;
 
-use namespace HH\Lib\{C, Str};
+use namespace HH\Lib\{C, Str, Vec};
 
 use namespace Slack\Hack\JsonSchema;
 
@@ -57,12 +57,12 @@ protected function resolveRef(string $ref, Context $ctx): (TSchema, ?string) {
 
     // Find the schema the `ref` is pointing to
 
-    $ref = \substr($ref, 1);
-    $pointers = \HH\Lib\Str\split($ref, '/') |> \HH\Lib\Vec\filter($$);
+    $ref = Str\slice($ref, 1);
+    $pointers = Str\split($ref, '/') |> Vec\filter($$, $str ==> $str !== '');
 
     while (C\count($pointers)) {
       $pointer = $pointers[0];
-      $pointers = \HH\Lib\Vec\drop($pointers, 1);
+      $pointers = Vec\drop($pointers, 1);
       $array_schema = Shapes::toArray($current_schema);
       $next_schema = $array_schema[$pointer] ?? null;
 
@@ -97,7 +97,7 @@ protected function getRefFilePath(string $ref): string {
   */
   protected function getRefSchemaPath(string $ref): string {
     if ($ref[0] === '#') {
-      return \substr($ref, 1);
+      return Str\slice($ref, 1);
     }
 
     $paths = $this->splitRefPaths($ref);
@@ -112,9 +112,9 @@ protected function getRefSchemaPath(string $ref): string {
   * { "$ref": "../../common/defs.json#/devices/tablet" }
   */
   protected function splitRefPaths(string $ref): vec<string> {
-    $paths = \HH\Lib\Vec\filter(\HH\Lib\Str\split($ref, '#'));
+    $paths = Vec\filter(Str\split($ref, '#'), $str ==> $str !== '');
     if ($paths[0][0] === "/") {
-      $paths[0] = \substr($paths[0], 1);
+      $paths[0] = Str\slice($paths[0], 1);
     }
 
     return $paths;

src/Codegen/Constraints/UntypedBuilder.php

@@ -343,12 +343,12 @@ private function generateGenericAnyOfChecks(vec<SchemaBuilder> $schema_builders,
     // schemas. This lets us adjust the current type to be nullable
     // (`?<whatever>`)
     $non_null_schema_builder = null;
-    if (\count($schema_builders) === 1) {
+    if (C\count($schema_builders) === 1) {
       $this->current_type = $schema_builders[0]->getType();
-    } else if (\count($schema_builders) === 2) {
+    } else if (C\count($schema_builders) === 2) {
       $without_null = Vec\filter($schema_builders, $sb ==> !($sb->getBuilder() is NullBuilder));
 
-      if (\count($without_null) === 1) {
+      if (C\count($without_null) === 1) {
         $non_null_schema_builder = $without_null[0];
 
         $constraints = vec["class_meth({$non_null_schema_builder

src/Codegen/Utils.php

@@ -2,6 +2,7 @@
 
 namespace Slack\Hack\JsonSchema\Codegen;
 
+use namespace HH\Lib\{Str, Vec};
 use namespace Facebook\TypeAssert;
 
 <<__Memoize>>
@@ -19,17 +20,15 @@ function type_assert_shape<T>(mixed $var, string $shape): T {
 
 function sanitize(string $input): string {
   return $input
-    |> \str_replace('_', ' ', $$)
-    |> \str_replace('-', ' ', $$)
-    |> \str_replace('.', ' ', $$)
+    |> Str\replace_every($$, dict['_' => ' ', '-' => ' ', '.' => ' '])
     |> \preg_replace("/[^A-Za-z0-9 ]/", '_nan_', $$)
-    |> \ucwords($$)
-    |> \str_replace(' ', '', $$);
+    |> Str\capitalize_words($$)
+    |> Str\replace($$, ' ', '');
 }
 
 function format(string ...$parts): string {
-  return \HH\Lib\Vec\map($parts, fun('\Slack\Hack\JsonSchema\Codegen\sanitize'))
-    |> \HH\Lib\Str\join($$, '');
+  return Vec\map($parts, fun('\Slack\Hack\JsonSchema\Codegen\sanitize'))
+    |> Str\join($$, '');
 }
 
 /**

src/Constraints/EnumConstraint.php

@@ -2,6 +2,7 @@
 
 namespace Slack\Hack\JsonSchema\Constraints;
 
+use namespace HH\Lib\C;
 use namespace Slack\Hack\JsonSchema;
 
 class EnumConstraint {
@@ -10,7 +11,7 @@ public static function check(
     vec<mixed> $enum,
     string $pointer,
   ): void {
-    if (!\HH\Lib\C\contains($enum, $input)) {
+    if (!C\contains($enum, $input)) {
       $error = shape(
         'code' => JsonSchema\FieldErrorCode::FAILED_CONSTRAINT,
         'constraint' => shape(

src/Exceptions.php

@@ -2,6 +2,8 @@
 
 namespace Slack\Hack\JsonSchema;
 
+use namespace HH\Lib\{Str, Vec};
+
 enum FieldErrorCode: string {
   MISSING_FIELD = 'missing_field';
   INVALID_TYPE = 'invalid_type';
@@ -52,7 +54,7 @@ public function __construct(
     // NB: If we haven't set `pointer` for the errors, set it now. If it is already
     // set it means we're bubbling the errors up and don't want to override the
     // more specific pointer for nested items.
-    $errors = \HH\Lib\Vec\map(
+    $errors = Vec\map(
       $errors,
       $error ==> {
         $error_pointer = $error['pointer'] ?? null;
@@ -64,8 +66,8 @@ public function __construct(
     );
     $this->errors = $errors;
 
-    $formatted_errors = \HH\Lib\Vec\map($errors, $error ==> $error['message'])
-      |> \HH\Lib\Str\join($$, '');
+    $formatted_errors = Vec\map($errors, $error ==> $error['message'])
+      |> Str\join($$, '');
     $message = "Error validating field '{$pointer}': {$formatted_errors}";
     parent::__construct($message, $code, $previous);
   }

src/Utils.php

@@ -2,11 +2,11 @@
 
 namespace Slack\Hack\JsonSchema;
 
-use namespace HH\Lib\Str;
+use namespace HH\Lib\{Str, Vec};
 
 function get_pointer(string $current, string ...$parts): string {
-  $encoded = \HH\Lib\Vec\map($parts, $path ==> encode_path($path))
-    |> \HH\Lib\Str\join($$, '/');
+  $encoded = Vec\map($parts, $path ==> encode_path($path))
+    |> Str\join($$, '/');
 
   return !Str\is_empty($current) ? "{$current}/{$encoded}" : "/{$encoded}";
 }

tests/AddressSchemaValidatorTest.php

@@ -51,7 +51,7 @@ public function testNonStringInputs(): void {
     ]);
     $validator->validate();
     expect($validator->isValid())->toBeFalse('non string inputs are invalid');
-    expect(\count($validator->getErrors()))->toBeSame(2);
+    expect(C\count($validator->getErrors()))->toBeSame(2);
   }
 
   public function testAddressWithNumericPostalCode(): void {
@@ -191,7 +191,7 @@ public function testAddressWithFailedFileRef(): void {
     expect($validator->isValid())->toBeFalse(
       'file reference to phone type should be invalid',
     );
-    expect(\count($validator->getErrors()))->toBeSame(3);
+    expect(C\count($validator->getErrors()))->toBeSame(3);
   }
 
   public function testAddressWithDifferentFileRef(): void {

tests/BaseCodegenTestCase.php

@@ -2,7 +2,7 @@
 
 namespace Slack\Hack\JsonSchema\Tests;
 
-use namespace HH\Lib\{C, Str};
+use namespace HH\Lib\{C, Math, Str};
 use function Facebook\FBExpect\expect;
 use type Slack\Hack\JsonSchema\Validator;
 use type Slack\Hack\JsonSchema\Codegen\{Codegen, IJsonSchemaCodegenConfig};
@@ -121,7 +121,7 @@ public static function benchmark(string $label, (function(): void) $callback): v
       $benchmarks[] = $end - $start;
     }
 
-    $average = \HH\Lib\Math\sum($benchmarks) / C\count($benchmarks);
+    $average = Math\sum($benchmarks) / C\count($benchmarks);
     \print_r("{$label} took: {$average}\n");
   }