diff --git a/codegen/inferred_relationships.hack b/codegen/inferred_relationships.hack
index 6e93cb415..92a70f113 100644
--- a/codegen/inferred_relationships.hack
+++ b/codegen/inferred_relationships.hack
@@ -1,7 +1,7 @@
 /**
  * This file is generated. Do not modify it manually!
  *
- * @generated SignedSource<<b7f15e9844555dfe94934c5cb8da5190>>
+ * @generated SignedSource<<ae2776003406840fbb8d957fba3d62da>>
  */
 namespace Facebook\HHAST\__Private;
 
@@ -29,6 +29,9 @@ const dict<string, keyset<string>> INFERRED_RELATIONSHIPS = dict[
     'list<token:public>',
     'missing',
   ],
+  'alias_declaration.alias_module_kw_opt' => keyset[
+    'missing',
+  ],
   'alias_declaration.alias_name' => keyset[
     'token:name',
   ],
@@ -910,6 +913,7 @@ const dict<string, keyset<string>> INFERRED_RELATIONSHIPS = dict[
     'list<list_item<decorated_expression>|list_item<variable>>',
     'list<list_item<dictionary_intrinsic_expression>>',
     'list<list_item<dictionary_intrinsic_expression>|list_item<literal>>',
+    'list<list_item<enum_class_label>>',
     'list<list_item<function_call_expression>>',
     'list<list_item<function_call_expression>|list_item<literal>>',
     'list<list_item<function_call_expression>|list_item<literal>|list_item<prefix_unary_expression>>',
diff --git a/codegen/schema.json b/codegen/schema.json
index 16073e288..86f224f75 100644
--- a/codegen/schema.json
+++ b/codegen/schema.json
@@ -1,6 +1,6 @@
 { "description" :
   "@generated JSON schema of the Hack Full Fidelity Parser AST",
-  "version" : "2022-05-16-0000",
+  "version" : "2022-07-05-0000",
   "trivia" : [
     { "trivia_kind_name" : "WhiteSpace",
       "trivia_type_name" : "whitespace" },
@@ -588,6 +588,7 @@
       "fields" : [
         { "field_name" : "attribute_spec" },
         { "field_name" : "modifiers" },
+        { "field_name" : "module_kw_opt" },
         { "field_name" : "keyword" },
         { "field_name" : "name" },
         { "field_name" : "generic_parameter" },
diff --git a/codegen/syntax/AliasDeclaration.hack b/codegen/syntax/AliasDeclaration.hack
index fbe4011cc..e9afaf4f1 100644
--- a/codegen/syntax/AliasDeclaration.hack
+++ b/codegen/syntax/AliasDeclaration.hack
@@ -1,7 +1,7 @@
 /**
  * This file is generated. Do not modify it manually!
  *
- * @generated SignedSource<<2f4f00c2152c863caf9083133d1f626f>>
+ * @generated SignedSource<<0f37f11e3bf8cf6a19dc182f96f174f2>>
  */
 namespace Facebook\HHAST;
 use namespace Facebook\TypeAssert;
@@ -16,6 +16,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
 
   private ?OldAttributeSpecification $_attribute_spec;
   private ?NodeList<PublicToken> $_modifiers;
+  private ?Node $_module_kw_opt;
   private Token $_keyword;
   private NameToken $_name;
   private ?TypeParameters $_generic_parameter;
@@ -27,6 +28,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
   public function __construct(
     ?OldAttributeSpecification $attribute_spec,
     ?NodeList<PublicToken> $modifiers,
+    ?Node $module_kw_opt,
     Token $keyword,
     NameToken $name,
     ?TypeParameters $generic_parameter,
@@ -38,6 +40,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
   ) {
     $this->_attribute_spec = $attribute_spec;
     $this->_modifiers = $modifiers;
+    $this->_module_kw_opt = $module_kw_opt;
     $this->_keyword = $keyword;
     $this->_name = $name;
     $this->_generic_parameter = $generic_parameter;
@@ -74,6 +77,14 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
       'NodeList<PublicToken>',
     );
     $offset += $modifiers?->getWidth() ?? 0;
+    $module_kw_opt = Node::fromJSON(
+      ($json['alias_module_kw_opt'] ?? dict['kind' => 'missing']) as dict<_, _>,
+      $file,
+      $offset,
+      $source,
+      'Node',
+    );
+    $offset += $module_kw_opt?->getWidth() ?? 0;
     $keyword = Node::fromJSON(
       ($json['alias_keyword']) as dict<_, _>,
       $file,
@@ -145,6 +156,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       /* HH_IGNORE_ERROR[4110] */ $attribute_spec,
       /* HH_IGNORE_ERROR[4110] */ $modifiers,
+      /* HH_IGNORE_ERROR[4110] */ $module_kw_opt,
       /* HH_IGNORE_ERROR[4110] */ $keyword,
       /* HH_IGNORE_ERROR[4110] */ $name,
       /* HH_IGNORE_ERROR[4110] */ $generic_parameter,
@@ -161,6 +173,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return dict[
       'attribute_spec' => $this->_attribute_spec,
       'modifiers' => $this->_modifiers,
+      'module_kw_opt' => $this->_module_kw_opt,
       'keyword' => $this->_keyword,
       'name' => $this->_name,
       'generic_parameter' => $this->_generic_parameter,
@@ -184,6 +197,9 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     $modifiers = $this->_modifiers === null
       ? null
       : $rewriter($this->_modifiers, $parents);
+    $module_kw_opt = $this->_module_kw_opt === null
+      ? null
+      : $rewriter($this->_module_kw_opt, $parents);
     $keyword = $rewriter($this->_keyword, $parents);
     $name = $rewriter($this->_name, $parents);
     $generic_parameter = $this->_generic_parameter === null
@@ -198,6 +214,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     if (
       $attribute_spec === $this->_attribute_spec &&
       $modifiers === $this->_modifiers &&
+      $module_kw_opt === $this->_module_kw_opt &&
       $keyword === $this->_keyword &&
       $name === $this->_name &&
       $generic_parameter === $this->_generic_parameter &&
@@ -211,6 +228,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $attribute_spec as ?OldAttributeSpecification,
       /* HH_FIXME[4110] ?NodeList<PublicToken> may not be enforceable */ $modifiers,
+      $module_kw_opt as ?Node,
       $keyword as Token,
       $name as NameToken,
       $generic_parameter as ?TypeParameters,
@@ -232,6 +250,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $value,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $this->_keyword,
       $this->_name,
       $this->_generic_parameter,
@@ -271,6 +290,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $value,
+      $this->_module_kw_opt,
       $this->_keyword,
       $this->_name,
       $this->_generic_parameter,
@@ -299,6 +319,46 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return TypeAssert\not_null($this->getModifiers());
   }
 
+  public function getModuleKwOptUNTYPED(): ?Node {
+    return $this->_module_kw_opt;
+  }
+
+  public function withModuleKwOpt(?Node $value): this {
+    if ($value === $this->_module_kw_opt) {
+      return $this;
+    }
+    return new static(
+      $this->_attribute_spec,
+      $this->_modifiers,
+      $value,
+      $this->_keyword,
+      $this->_name,
+      $this->_generic_parameter,
+      $this->_constraint,
+      $this->_equal,
+      $this->_type,
+      $this->_semicolon,
+    );
+  }
+
+  public function hasModuleKwOpt(): bool {
+    return $this->_module_kw_opt !== null;
+  }
+
+  /**
+   * @return null
+   */
+  public function getModuleKwOpt(): ?Node {
+    return $this->_module_kw_opt;
+  }
+
+  /**
+   * @return
+   */
+  public function getModuleKwOptx(): Node {
+    return TypeAssert\not_null($this->getModuleKwOpt());
+  }
+
   public function getKeywordUNTYPED(): ?Node {
     return $this->_keyword;
   }
@@ -310,6 +370,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $value,
       $this->_name,
       $this->_generic_parameter,
@@ -349,6 +410,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $this->_keyword,
       $value,
       $this->_generic_parameter,
@@ -388,6 +450,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $this->_keyword,
       $this->_name,
       $value,
@@ -427,6 +490,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $this->_keyword,
       $this->_name,
       $this->_generic_parameter,
@@ -466,6 +530,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $this->_keyword,
       $this->_name,
       $this->_generic_parameter,
@@ -505,6 +570,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $this->_keyword,
       $this->_name,
       $this->_generic_parameter,
@@ -550,6 +616,7 @@ final class AliasDeclaration extends Node implements IHasAttributeSpec {
     return new static(
       $this->_attribute_spec,
       $this->_modifiers,
+      $this->_module_kw_opt,
       $this->_keyword,
       $this->_name,
       $this->_generic_parameter,
diff --git a/codegen/syntax/ConstructorCall.hack b/codegen/syntax/ConstructorCall.hack
index dfed48072..43fec52e6 100644
--- a/codegen/syntax/ConstructorCall.hack
+++ b/codegen/syntax/ConstructorCall.hack
@@ -1,7 +1,7 @@
 /**
  * This file is generated. Do not modify it manually!
  *
- * @generated SignedSource<<d57c0dbadbe30c6c33ac09bf339b665f>>
+ * @generated SignedSource<<d85dbea9b42c0f5b6f4269b792e3e767>>
  */
 namespace Facebook\HHAST;
 use namespace Facebook\TypeAssert;
@@ -235,6 +235,7 @@ final class ConstructorCall extends Node {
    * NodeList<ListItem<DarrayIntrinsicExpression>> |
    * NodeList<ListItem<DecoratedExpression>> |
    * NodeList<ListItem<DictionaryIntrinsicExpression>> |
+   * NodeList<ListItem<EnumClassLabelExpression>> |
    * NodeList<ListItem<FunctionCallExpression>> |
    * NodeList<ListItem<FunctionPointerExpression>> |
    * NodeList<ListItem<KeysetIntrinsicExpression>> |
@@ -265,6 +266,7 @@ final class ConstructorCall extends Node {
    * NodeList<ListItem<DarrayIntrinsicExpression>> |
    * NodeList<ListItem<DecoratedExpression>> |
    * NodeList<ListItem<DictionaryIntrinsicExpression>> |
+   * NodeList<ListItem<EnumClassLabelExpression>> |
    * NodeList<ListItem<FunctionCallExpression>> |
    * NodeList<ListItem<FunctionPointerExpression>> |
    * NodeList<ListItem<KeysetIntrinsicExpression>> |
diff --git a/codegen/version.hack b/codegen/version.hack
index deb334c75..d6e997601 100644
--- a/codegen/version.hack
+++ b/codegen/version.hack
@@ -1,12 +1,12 @@
 /**
  * This file is generated. Do not modify it manually!
  *
- * @generated SignedSource<<0a14dbb5e6a18259e6f111c151fc1e94>>
+ * @generated SignedSource<<5f9fb0788dc6333b676513ad75774a61>>
  */
 namespace Facebook\HHAST;
 
-const string SCHEMA_VERSION = '2022-05-16-0000';
+const string SCHEMA_VERSION = '2022-07-05-0000';
 
-const int HHVM_VERSION_ID = 416300;
+const int HHVM_VERSION_ID = 416500;
 
-const string HHVM_VERSION = '4.163.0-dev';
+const string HHVM_VERSION = '4.165.0-dev';