[js_interop] Move annotations from _js_annotations to js_interop

We'd like to remove `dart:js_util` support from dart2wasm. However,
`dart:js_interop` re-exports some annotation classes from
`dart:_js_annotations`, which exports some members from `dart:js_util`.

To break the dependency chain, we can instead move those classes into
`dart:js_interop` and re-export them from `dart:_js_annotations`.

Bug: #61550
CoreLibraryReviewExempt: code motion, no semantic/API change
Change-Id: I6a6a696451cc1b968062317957fc7883b2242c4a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/453647
Reviewed-by: Srujan Gaddam <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: fishythefish

pkg/_js_interop_checks/lib/src/js_interop.dart

@@ -23,12 +23,12 @@ bool hasDartJSInteropAnnotation(Annotatable a) =>
     a.annotations.any(_isDartJSInteropAnnotation);
 
 /// Returns true iff the node has an `@anonymous` annotation from `package:js`
-/// or `dart:_js_annotations`.
+/// or `dart:js_interop`.
 bool hasAnonymousAnnotation(Annotatable a) =>
     a.annotations.any(_isAnonymousAnnotation);
 
 /// Returns true iff the node has an `@staticInterop` annotation from
-/// `package:js` or `dart:_js_annotations`.
+/// `package:js` or `dart:js_interop`.
 bool hasStaticInteropAnnotation(Annotatable a) =>
     a.annotations.any(_isStaticInteropAnnotation);
 
@@ -38,7 +38,7 @@ bool hasTrustTypesAnnotation(Annotatable a) =>
     a.annotations.any(_isTrustTypesAnnotation);
 
 /// Returns true iff the node has an `@JSExport(...)` annotation from
-/// `package:js` or `dart:_js_annotations`.
+/// `package:js` or `dart:js_interop`.
 bool hasJSExportAnnotation(Annotatable a) =>
     a.annotations.any(_isJSExportAnnotation);
 
@@ -191,9 +191,9 @@ bool _isPatchAnnotation(Expression value) {
 ///
 /// - `@JS()` would return the "JS" class in "dart:_js_annotations".
 /// - `@anonymous` would return the "_Anonymous" class in
-/// "dart:_js_annotations".
+/// "dart:js_interop".
 /// - `@staticInterop` would return the "_StaticInterop" class in
-/// "dart:_js_annotations".
+/// "dart:js_interop".
 /// - `@Native` would return the "Native" class in "dart:_js_helper".
 ///
 /// This function works regardless of whether the CFE is evaluating constants,

pkg/compiler/lib/src/common/elements.dart

@@ -1228,34 +1228,34 @@ abstract class CommonElements {
 class KCommonElements extends CommonElements {
   KCommonElements(super.dartTypes, super.env);
 
-  // From package:js
+  // From dart:js_interop
 
   late final ClassEntity? jsAnnotationClass1 = _findClassOrNull(
-    packageJsLibrary,
+    dartJsInteropLibrary,
     'JS',
   );
 
   late final ClassEntity? jsAnonymousClass1 = _findClassOrNull(
-    packageJsLibrary,
+    dartJsInteropLibrary,
     '_Anonymous',
   );
 
-  // From dart:_js_annotations
+  // From package:js
 
   late final ClassEntity? jsAnnotationClass2 = _findClassOrNull(
-    dartJsAnnotationsLibrary,
+    packageJsLibrary,
     'JS',
   );
 
   late final ClassEntity? jsAnonymousClass2 = _findClassOrNull(
-    dartJsAnnotationsLibrary,
+    packageJsLibrary,
     '_Anonymous',
   );
 
-  // From dart:js_interop
+  // From dart:_js_annotations
 
   late final ClassEntity? jsAnnotationClass3 = _findClassOrNull(
-    dartJsInteropLibrary,
+    dartJsAnnotationsLibrary,
     'JS',
   );
 

pkg/compiler/lib/src/ir/annotations.dart

@@ -340,19 +340,21 @@ String? _getJsInteropName(ir.Constant constant) {
 }
 
 bool _isAnonymousJsInterop(ir.Constant constant) {
-  return constant is ir.InstanceConstant &&
-      constant.classNode.name == '_Anonymous' &&
-      (constant.classNode.enclosingLibrary.importUri == Uris.packageJS ||
-          constant.classNode.enclosingLibrary.importUri ==
-              Uris.dartJSAnnotations);
+  if (constant is ir.InstanceConstant &&
+      constant.classNode.name == '_Anonymous') {
+    final importUri = constant.classNode.enclosingLibrary.importUri;
+    return importUri == Uris.packageJS || importUri == Uris.dartJSInterop;
+  }
+  return false;
 }
 
 bool _isStaticInterop(ir.Constant constant) {
-  return constant is ir.InstanceConstant &&
-      constant.classNode.name == '_StaticInterop' &&
-      (constant.classNode.enclosingLibrary.importUri == Uris.packageJS ||
-          constant.classNode.enclosingLibrary.importUri ==
-              Uris.dartJSAnnotations);
+  if (constant is ir.InstanceConstant &&
+      constant.classNode.name == '_StaticInterop') {
+    final importUri = constant.classNode.enclosingLibrary.importUri;
+    return (importUri == Uris.packageJS || importUri == Uris.dartJSInterop);
+  }
+  return false;
 }
 
 class PragmaAnnotationData {

pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.expect

@@ -13,8 +13,9 @@ static method main() → void {
 library static_interop;
 import self as sta;
 import "dart:_js_annotations" as _js;
+import "dart:js_interop" as js_;
 import "dart:core" as core;
-import "dart:js_util" as js_;
+import "dart:js_util" as js_2;
 import "dart:_js_helper" as _js2;
 
 import "package:js/js.dart";
@@ -24,9 +25,9 @@ import "package:js/js.dart";
 class StaticJSClass extends core::Object {
   external static factory •() → sta::StaticJSClass;
   static synthetic method _#new#tearOff() → sta::StaticJSClass
-    return js_::_callConstructorUnchecked0<sta::StaticJSClass>(js_::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
+    return js_2::_callConstructorUnchecked0<sta::StaticJSClass>(js_2::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
   static factory factory() → sta::StaticJSClass {
-    return js_::_callConstructorUnchecked0<sta::StaticJSClass>(js_::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
+    return js_2::_callConstructorUnchecked0<sta::StaticJSClass>(js_2::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
   }
   static synthetic method _#factory#tearOff() → sta::StaticJSClass
     return sta::StaticJSClass::factory();
@@ -42,7 +43,7 @@ constants  {
   #C2 = _js::JS {name:#C1}
   #C3 = "JSClass"
   #C4 = _js::JS {name:#C3}
-  #C5 = _js::_StaticInterop {}
+  #C5 = js_::_StaticInterop {}
 }
 
 

pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.outline.expect

@@ -10,12 +10,13 @@ static method main() → void
 library static_interop;
 import self as self2;
 import "dart:_js_annotations" as _js;
+import "dart:js_interop" as js_;
 import "dart:core" as core;
 
 import "package:js/js.dart";
 
 @_js::JS::•("JSClass")
-@_js::staticInterop
+@js_::staticInterop
 class StaticJSClass extends core::Object {
   external static factory •() → self2::StaticJSClass;
   static synthetic method _#new#tearOff() → self2::StaticJSClass

pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.transformed.expect

@@ -13,8 +13,9 @@ static method main() → void {
 library static_interop;
 import self as sta;
 import "dart:_js_annotations" as _js;
+import "dart:js_interop" as js_;
 import "dart:core" as core;
-import "dart:js_util" as js_;
+import "dart:js_util" as js_2;
 import "dart:_js_helper" as _js2;
 
 import "package:js/js.dart";
@@ -24,9 +25,9 @@ import "package:js/js.dart";
 class StaticJSClass extends core::Object {
   external static factory •() → sta::StaticJSClass;
   static synthetic method _#new#tearOff() → sta::StaticJSClass
-    return js_::_callConstructorUnchecked0<sta::StaticJSClass>(js_::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
+    return js_2::_callConstructorUnchecked0<sta::StaticJSClass>(js_2::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
   static factory factory() → sta::StaticJSClass {
-    return js_::_callConstructorUnchecked0<sta::StaticJSClass>(js_::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
+    return js_2::_callConstructorUnchecked0<sta::StaticJSClass>(js_2::_getPropertyTrustType<core::Object>(_js2::staticInteropGlobalContext, "JSClass"));
   }
   static synthetic method _#factory#tearOff() → sta::StaticJSClass
     return sta::StaticJSClass::factory();
@@ -42,7 +43,7 @@ constants  {
   #C2 = _js::JS {name:#C1}
   #C3 = "JSClass"
   #C4 = _js::JS {name:#C3}
-  #C5 = _js::_StaticInterop {}
+  #C5 = js_::_StaticInterop {}
 }
 
 

pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.strong.expect

@@ -11,6 +11,7 @@ library;
 //
 import self as self;
 import "dart:_js_annotations" as _js;
+import "dart:js_interop" as js_;
 import "dart:core" as core;
 
 import "package:js/js.dart";
@@ -29,7 +30,7 @@ static method main() → dynamic {}
 constants  {
   #C1 = null
   #C2 = _js::JS {name:#C1}
-  #C3 = _js::_Anonymous {}
+  #C3 = js_::_Anonymous {}
 }
 
 

pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.strong.modular.expect

@@ -11,6 +11,7 @@ library;
 //
 import self as self;
 import "dart:_js_annotations" as _js;
+import "dart:js_interop" as js_;
 import "dart:core" as core;
 
 import "package:js/js.dart";
@@ -29,7 +30,7 @@ static method main() → dynamic {}
 constants  {
   #C1 = null
   #C2 = _js::JS {name:#C1}
-  #C3 = _js::_Anonymous {}
+  #C3 = js_::_Anonymous {}
 }
 
 

pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.strong.outline.expect

@@ -1,12 +1,13 @@
 library;
 import self as self;
 import "dart:_js_annotations" as _js;
+import "dart:js_interop" as js_;
 import "dart:core" as core;
 
 import "package:js/js.dart";
 
 @_js::JS::•()
-@_js::anonymous
+@js_::anonymous
 class ParallaxOptions extends core::Object {
   external static factory •() → self::ParallaxOptions;
   static synthetic method _#new#tearOff() → self::ParallaxOptions

pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.strong.transformed.expect

@@ -11,6 +11,7 @@ library;
 //
 import self as self;
 import "dart:_js_annotations" as _js;
+import "dart:js_interop" as js_;
 import "dart:core" as core;
 
 import "package:js/js.dart";
@@ -29,7 +30,7 @@ static method main() → dynamic {}
 constants  {
   #C1 = null
   #C2 = _js::JS {name:#C1}
-  #C3 = _js::_Anonymous {}
+  #C3 = js_::_Anonymous {}
 }