well-formedness checks on if package expressions

Summary: Analogously to `__RequirePackage('xxx')`, `package xxx` should only be allowed if `xxx` includes the package the current file belongs to.

Reviewed By: mheiber

Differential Revision: D94566454

fbshipit-source-id: bf19fd0b775d50dc6db2dc03d86f85e281a72e4e

Author: vassilmladenov

hphp/hack/src/diagnostics/error_codes.ml

@@ -285,6 +285,7 @@ module NastCheck = struct
     | NamedInTransformedPseudofunction [@value 3106]
     | RequirePackageStrictInclusion [@value 3107]
     | ClassSealedWithTrait [@value 3108]
+    | PackageExpressionStrictInclusion [@value 3109]
   (* Add new NastCheck codes here! Comment out when deprecating. *)
   [@@deriving enum, show { with_path = false }]
 

hphp/hack/src/hackc/compile/compile.rs

@@ -564,6 +564,7 @@ fn emit_fatal_nast_check_error(err: &NastCheckError) -> Result<Unit, Error> {
         NastCheckError::AttributeImplementedByRestriction { .. } => todo!(),
         NastCheckError::RequirePackageStrictInclusion { .. } => todo!(),
         NastCheckError::ClassSealedWithTrait { .. } => todo!(),
+        NastCheckError::PackageExpressionStrictInclusion { .. } => todo!(),
     }
 }
 

hphp/hack/src/oxidized/gen/error_codes.rs

@@ -3,7 +3,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 //
-// @generated SignedSource<<e8f3018ac482cee215fbdf70aca4ce8e>>
+// @generated SignedSource<<afdd1e05969146f6f213408ba49a6645>>
 //
 // To regenerate this file, run:
 //   buck run @fbcode//mode/dev-nosan-lg fbcode//hphp/hack/src:oxidized_regen
@@ -226,6 +226,7 @@ pub enum NastCheck {
     NamedInTransformedPseudofunction = 3106,
     RequirePackageStrictInclusion = 3107,
     ClassSealedWithTrait = 3108,
+    PackageExpressionStrictInclusion = 3109,
 }
 impl TrivialDrop for NastCheck {}
 arena_deserializer::impl_deserialize_in_arena!(NastCheck);

hphp/hack/src/oxidized/gen/nast_check_error.rs

@@ -3,7 +3,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 //
-// @generated SignedSource<<88a1d0face0230950853fb28a36ecce6>>
+// @generated SignedSource<<66b597028816448e23941b4407e36a65>>
 //
 // To regenerate this file, run:
 //   buck run @fbcode//mode/dev-nosan-lg fbcode//hphp/hack/src:oxidized_regen
@@ -330,4 +330,38 @@ pub enum NastCheckError {
         soft_included: bool,
         current_package_assignment_kind: String,
     },
+    #[rust_to_ocaml(name = "Package_expression_strict_inclusion")]
+    PackageExpressionStrictInclusion {
+        pkg_pos: pos::Pos,
+        pkg: String,
+        def_pos: pos_or_decl::PosOrDecl,
+        current: String,
+        current_pos: pos::Pos,
+        soft_included: bool,
+        current_package_assignment_kind: String,
+    },
+}
+
+/// Context for package strict inclusion errors
+#[derive(
+    Clone,
+    Debug,
+    Deserialize,
+    Eq,
+    EqModuloPos,
+    FromOcamlRep,
+    Hash,
+    NoPosHash,
+    Ord,
+    PartialEq,
+    PartialOrd,
+    Serialize,
+    ToOcamlRep
+)]
+#[repr(C, u8)]
+pub enum PackageStrictInclusionContext {
+    #[rust_to_ocaml(name = "Ctx_require_package")]
+    CtxRequirePackage(String),
+    #[rust_to_ocaml(name = "Ctx_package_expression")]
+    CtxPackageExpression,
 }

hphp/hack/src/typing/nast_check/nast_check_error.ml

@@ -209,6 +209,20 @@ type t =
       soft_included: bool;
       current_package_assignment_kind: string;
     }
+  | Package_expression_strict_inclusion of {
+      pkg_pos: Pos.t;
+      pkg: string;
+      def_pos: Pos_or_decl.t;
+      current: string;
+      current_pos: Pos.t;
+      soft_included: bool;
+      current_package_assignment_kind: string;
+    }
+
+(** Context for package strict inclusion errors *)
+type package_strict_inclusion_context =
+  | Ctx_require_package of string (* attribute name *)
+  | Ctx_package_expression
 
 let repeated_record_field_name pos name prev_pos =
   User_diagnostic.make_err
@@ -873,40 +887,62 @@ let class_sealed_with_trait pos class_name trait_name =
           (Markdown_lite.md_codify @@ Render.strip_ns trait_name) );
     ]
 
-let require_package_strict_inclusion
-    required_pos
-    required
-    def_pos
-    current
-    current_pos
-    attribute_name
-    soft_included
-    current_package_assignment_kind =
+(** Unified function for package strict inclusion errors.
+    [ctx] determines whether this is a __RequirePackage attribute or a package expression check. *)
+let package_strict_inclusion
+    ~pos
+    ~pkg
+    ~def_pos
+    ~current
+    ~current_pos
+    ~soft_included
+    ~current_package_assignment_kind
+    ~(ctx : package_strict_inclusion_context) =
+  let (error_code, primary_msg, location_msg) =
+    match ctx with
+    | Ctx_require_package attribute_name ->
+      ( Error_code.(to_enum RequirePackageStrictInclusion),
+        Printf.sprintf "Invalid %s" attribute_name,
+        Printf.sprintf
+          "This function is defined in package `%s` by this %s"
+          current
+          current_package_assignment_kind )
+    | Ctx_package_expression ->
+      ( Error_code.(to_enum PackageExpressionStrictInclusion),
+        "Invalid package expression",
+        Printf.sprintf
+          "This code is in package `%s` by %s"
+          current
+          current_package_assignment_kind )
+  in
+  let (pkg_label, soft_includes_label) =
+    match ctx with
+    | Ctx_require_package _ -> ("required", "required")
+    | Ctx_package_expression -> ("checked", "checked")
+  in
   let last_reason =
     if soft_included then
       ( def_pos,
         Printf.sprintf
-          "`%s` soft-includes the required package `%s`, so this requirement is not allowed"
+          "`%s` soft-includes the %s package `%s`, so this %s is not allowed"
           current
-          required )
+          pkg_label
+          pkg
+          (match ctx with
+          | Ctx_require_package _ -> "requirement"
+          | Ctx_package_expression -> "check") )
     else
       ( def_pos,
         Printf.sprintf
-          "The required package `%s` must strictly include (i.e. cannot equal) `%s`"
-          required
+          "The %s package `%s` must strictly include (i.e. cannot equal) `%s`"
+          soft_includes_label
+          pkg
           current )
   in
   User_diagnostic.make_err
-    Error_code.(to_enum RequirePackageStrictInclusion)
-    (required_pos, Printf.sprintf "Invalid %s" attribute_name)
-    [
-      ( Pos_or_decl.of_raw_pos current_pos,
-        Printf.sprintf
-          "This function is defined in package `%s` by this %s"
-          current
-          current_package_assignment_kind );
-      last_reason;
-    ]
+    error_code
+    (pos, primary_msg)
+    [(Pos_or_decl.of_raw_pos current_pos, location_msg); last_reason]
 
 (* --------------------------------------------- *)
 let to_user_diagnostic t =
@@ -1025,14 +1061,33 @@ let to_user_diagnostic t =
           soft_included;
           current_package_assignment_kind;
         } ->
-      require_package_strict_inclusion
-        required_pos
-        required
-        def_pos
-        current
-        current_pos
-        attribute_name
-        soft_included
-        current_package_assignment_kind
+      package_strict_inclusion
+        ~pos:required_pos
+        ~pkg:required
+        ~def_pos
+        ~current
+        ~current_pos
+        ~soft_included
+        ~current_package_assignment_kind
+        ~ctx:(Ctx_require_package attribute_name)
+    | Package_expression_strict_inclusion
+        {
+          pkg_pos;
+          pkg;
+          def_pos;
+          current;
+          current_pos;
+          soft_included;
+          current_package_assignment_kind;
+        } ->
+      package_strict_inclusion
+        ~pos:pkg_pos
+        ~pkg
+        ~def_pos
+        ~current
+        ~current_pos
+        ~soft_included
+        ~current_package_assignment_kind
+        ~ctx:Ctx_package_expression
   in
   f Explanation.empty

hphp/hack/src/typing/nast_check/nast_check_error.mli

@@ -208,5 +208,14 @@ type t =
       soft_included: bool;
       current_package_assignment_kind: string;
     }
+  | Package_expression_strict_inclusion of {
+      pkg_pos: Pos.t;
+      pkg: string;
+      def_pos: Pos_or_decl.t;
+      current: string;
+      current_pos: Pos.t;
+      soft_included: bool;
+      current_package_assignment_kind: string;
+    }
 
 val to_user_diagnostic : t -> (Pos.t, Pos_or_decl.t) User_diagnostic.t