fix support for Imm(Map|Set|Vector)

Author: fredemmott

src/HackBuilder.php

@@ -18,11 +18,11 @@ enum ContainerType: string {
   VEC = 'vec';
   KEYSET = 'keyset';
   MAP = 'Map';
-  IMMU_MAP = 'ImmuMap';
+  IMM_MAP = 'ImmMap';
   VECTOR = 'Vector';
-  IMMU_VECTOR = 'ImmuVector';
+  IMM_VECTOR = 'ImmVector';
   SET = 'Set';
-  IMMU_SET = 'ImmuSet';
+  IMM_SET = 'ImmSet';
   SHAPE_TYPE = 'shape';
 }
 
@@ -200,9 +200,9 @@ public function openContainer(ContainerType $type): this {
       case ContainerType::VEC:
         $container_sign = "[";
         break;
-      case ContainerType::IMMU_MAP:
-      case ContainerType::IMMU_SET:
-      case ContainerType::IMMU_VECTOR:
+      case ContainerType::IMM_MAP:
+      case ContainerType::IMM_SET:
+      case ContainerType::IMM_VECTOR:
       case ContainerType::MAP:
       case ContainerType::SET:
       case ContainerType::VECTOR:
@@ -230,9 +230,9 @@ public function closeContainer(ContainerType $type): this {
       case ContainerType::VEC:
         $container_sign = "]";
         break;
-      case ContainerType::IMMU_MAP:
-      case ContainerType::IMMU_SET:
-      case ContainerType::IMMU_VECTOR:
+      case ContainerType::IMM_MAP:
+      case ContainerType::IMM_SET:
+      case ContainerType::IMM_VECTOR:
       case ContainerType::MAP:
       case ContainerType::SET:
       case ContainerType::VECTOR:

src/key-value-render/HackBuilderValues.php

@@ -54,7 +54,7 @@ public static function immVector<Tv>(
     IHackBuilderValueRenderer<Tv> $vr,
   ): IHackBuilderValueRenderer<ImmVector<Tv>> {
     return new HackBuilderNativeValueCollectionRenderer(
-      ContainerType::IMMU_VECTOR,
+      ContainerType::IMM_VECTOR,
       $vr,
     );
   }
@@ -77,7 +77,7 @@ public static function immSet<Tv>(
     IHackBuilderValueRenderer<Tv> $vr,
   ): IHackBuilderValueRenderer<ImmSet<Tv>> {
     return new HackBuilderNativeValueCollectionRenderer(
-      ContainerType::IMMU_SET,
+      ContainerType::IMM_SET,
       $vr,
     );
   }
@@ -105,7 +105,7 @@ public static function immMap<Tk as arraykey, Tv>(
     IHackBuilderValueRenderer<Tv> $vr,
   ): IHackBuilderValueRenderer<ImmMap<Tk, Tv>> {
     return new HackBuilderNativeKeyValueCollectionRenderer(
-      ContainerType::MAP,
+      ContainerType::IMM_MAP,
       $kr,
       $vr,
     );

test/HackBuilderTest.codegen

@@ -69,6 +69,35 @@ if ($value <= 0) {
   return 2;
 }
 
+!@#$%codegentest:testImmMapOfImmMaps
+$foo = ImmMap {
+  'foo' => ImmMap {
+    'a' => 12,
+    'b' => 34,
+  },
+  'bar' => ImmMap {
+    'c' => 45,
+  },
+};
+
+!@#$%codegentest:testImmSet
+$foo = ImmSet {
+  'abc',
+  'def',
+};
+
+!@#$%codegentest:testImmVectorOfImmVectors
+$foo = ImmVector {
+  ImmVector {
+    'abc',
+    'def',
+  },
+  ImmVector {
+    'ghi',
+    'jkl',
+  },
+};
+
 !@#$%codegentest:testKeyset
 $foo = keyset[
   'foo',

test/HackBuilderTest.php

@@ -379,6 +379,50 @@ public function testVectorOfMaps(): void {
     $this->assertUnchanged($body->getCode());
   }
 
+  public function testImmVectorOfImmVectors(): void {
+    $body = $this
+      ->getHackBuilder()
+      ->addAssignment(
+        '$foo',
+        ImmVector { ImmVector { 'abc', 'def' }, ImmVector { 'ghi', 'jkl' } },
+        HackBuilderValues::immVector(
+          HackBuilderValues::immVector(HackBuilderValues::export())
+        ),
+      );
+    $this->assertUnchanged($body->getCode());
+  }
+
+  public function testImmMapOfImmMaps(): void {
+    $body = $this
+      ->getHackBuilder()
+      ->addAssignment(
+        '$foo',
+        ImmMap {
+          'foo' => ImmMap { 'a' => 12, 'b' => 34 },
+          'bar' => ImmMap { 'c' => 45 },
+        },
+        HackBuilderValues::immMap(
+          HackBuilderKeys::export(),
+          HackBuilderValues::immMap(
+            HackBuilderKeys::export(),
+            HackBuilderValues::export(),
+          ),
+        ),
+      );
+    $this->assertUnchanged($body->getCode());
+  }
+
+  public function testImmSet(): void {
+    $body = $this
+      ->getHackBuilder()
+      ->addAssignment(
+        '$foo',
+        ImmSet { 'abc', 'def' },
+        HackBuilderValues::immSet(HackBuilderValues::export()),
+      );
+    $this->assertUnchanged($body->getCode());
+  }
+
   public function testVec(): void {
     $body = $this
       ->getHackBuilder()