[dart2wasm] Remove dart:js_util from supported libraries

Since that stops `dart:_js_annotations` from building on dart2wasm,
let's stop supporting that, too.

This causes `package:js` to no longer work on dart2wasm, but none of the
allowlisted packages use it any longer, so we can simply migrate tests
off of it.

Fixes: #56502
Fixes: #61550
Change-Id: I6a6a696438255ebf25a5a17131cdbd327ba81581
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/453645
Commit-Queue: Mayank Patke <[email protected]>
Reviewed-by: Srujan Gaddam <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
Reviewed-by: Nate Biggs <[email protected]>

Author: fishythefish

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 **Released on:** Unreleased
 
+### Libraries
+
+#### `dart:js_util`
+
+- dart2wasm no longer supports `dart:js_util`. Any code that imports
+  `dart:js_util` will no longer compile with dart2wasm. Consequently, code that
+  depends on `package:js` will no longer compile with dart2wasm either.
+  See [#61550][] for more details.
+
+[#61550]: https://github.com/dart-lang/sdk/issues/61550
+
 ## 3.10.0
 
 **Released on:** Unreleased

pkg/_js_interop_checks/lib/js_interop_checks.dart

@@ -15,7 +15,6 @@ import 'package:front_end/src/api_prototype/codes.dart'
         codeDartFfiLibraryInDart2Wasm,
         codeJsInteropDartClassExtendsJSClass,
         codeJsInteropDartJsInteropAnnotationForStaticInteropOnly,
-        codeJsInteropDisallowedInteropLibraryInDart2Wasm,
         codeJsInteropEnclosingClassJSAnnotation,
         codeJsInteropEnclosingClassJSAnnotationContext,
         codeJsInteropExtensionTypeMemberNotInterop,
@@ -88,8 +87,7 @@ class JsInteropChecks extends RecursiveVisitor {
 
   final ExportChecker exportChecker;
   final bool isDart2Wasm;
-
-  final List<String> _disallowedInteropLibrariesInDart2Wasm;
+  final bool enableExperimentalFfi;
 
   /// Native tests to exclude from checks on external.
   // TODO(rileyporter): Use ExternalName from CFE to exclude native tests.
@@ -103,29 +101,7 @@ class JsInteropChecks extends RecursiveVisitor {
     RegExp(r'(?<!generated_)tests/lib/js'),
   ];
 
-  static final List<Pattern>
-  _allowedUseOfDart2WasmDisallowedInteropLibrariesTestPatterns = [
-    // Benchmarks.
-    RegExp(r'BigIntParsePrint/dart/native_version_javascript.dart'),
-    RegExp(r'JSInterop/dart/jsinterop_lib.dart'),
-    // Tests.
-    RegExp(r'(?<!generated_)tests/lib/js/export'),
-    // Negative lookahead to test the violation.
-    RegExp(
-      r'(?<!generated_)tests/lib/js/static_interop_test(?!/disallowed_interop_libraries_test.dart)',
-    ),
-    RegExp(r'(?<!generated_)tests/web/wasm/(?!ffi/).*'),
-    // Flutter tests.
-    RegExp(r'flutter/lib/web_ui/test'),
-  ];
-
-  // TODO(srujzs): Help migrate some of these away. Once we're done, we can
-  // remove `dart:*` interop libraries from the check as they can be moved out
-  // of `libraries.json`.
   static const allowedInteropLibrariesInDart2WasmPackages = [
-    // Both these packages re-export other interop libraries
-    'js',
-    'js_util',
     // Flutter/benchmarks.
     'flutter',
     'engine',
@@ -137,14 +113,6 @@ class JsInteropChecks extends RecursiveVisitor {
     'url_launcher_web',
   ];
 
-  /// Interop libraries that cannot be used in dart2wasm.
-  static const _disallowedInteropLibrariesInDart2WasmByDefault = [
-    'package:js/js.dart',
-    'package:js/js_util.dart',
-    'dart:js_util',
-    'dart:ffi',
-  ];
-
   /// Libraries that use `external` to exclude from checks on external.
   static const Iterable<String> _pathsWithAllowedDartExternalUsage = <String>[
     '_foreign_helper', // for foreign helpers
@@ -173,7 +141,7 @@ class JsInteropChecks extends RecursiveVisitor {
     this._reporter,
     this._nativeClasses, {
     this.isDart2Wasm = false,
-    bool enableExperimentalFfi = false,
+    this.enableExperimentalFfi = false,
   }) : exportChecker = ExportChecker(_reporter, _coreTypes.objectClass),
        _functionToJSTarget = _coreTypes.index.getTopLevelProcedure(
          'dart:js_interop',
@@ -185,11 +153,7 @@ class JsInteropChecks extends RecursiveVisitor {
        ),
        _staticTypeContext = StatefulStaticTypeContext.stacked(
          TypeEnvironment(_coreTypes, hierarchy),
-       ),
-       _disallowedInteropLibrariesInDart2Wasm = [
-         for (final entry in _disallowedInteropLibrariesInDart2WasmByDefault)
-           if (!(entry == 'dart:ffi' && enableExperimentalFfi)) entry,
-       ] {
+       ) {
     extensionIndex = ExtensionIndex(
       _coreTypes,
       _staticTypeContext.typeEnvironment,
@@ -625,34 +589,24 @@ class JsInteropChecks extends RecursiveVisitor {
   /// Check that [node] doesn't depend on any disallowed interop libraries in
   /// dart2wasm.
   ///
-  /// We allowlist `dart:*` libraries, select packages, and test patterns.
+  /// We allowlist `dart:*` libraries and select packages.
   void _checkDisallowedLibrariesForDart2Wasm(Library node) {
     final uri = node.importUri;
     for (final dependency in node.dependencies) {
       final dependencyUriString = dependency.targetLibrary.importUri.toString();
-      if (_disallowedInteropLibrariesInDart2Wasm.contains(
-        dependencyUriString,
-      )) {
+      if (!enableExperimentalFfi && dependencyUriString == 'dart:ffi') {
         // TODO(srujzs): While we allow these imports for all `dart:*`
         // libraries, we may want to restrict this further, as it may include
         // `dart:ui`.
         final allowedToImport =
             uri.isScheme('dart') ||
-            (uri.isScheme('package') &&
-                allowedInteropLibrariesInDart2WasmPackages.any(
-                  (pkg) => uri.pathSegments.first == pkg,
-                )) ||
-            _allowedUseOfDart2WasmDisallowedInteropLibrariesTestPatterns.any(
-              (pattern) => uri.path.contains(pattern),
-            );
+            uri.isScheme('package') &&
+                allowedInteropLibrariesInDart2WasmPackages.contains(
+                  uri.pathSegments.first,
+                );
         if (allowedToImport) return;
-        final message = dependencyUriString == 'dart:ffi'
-            ? codeDartFfiLibraryInDart2Wasm
-            : codeJsInteropDisallowedInteropLibraryInDart2Wasm.withArgumentsOld(
-                dependencyUriString,
-              );
         _reporter.report(
-          message,
+          codeDartFfiLibraryInDart2Wasm,
           dependency.fileOffset,
           dependencyUriString.length,
           node.fileUri,
@@ -683,9 +637,7 @@ class JsInteropChecks extends RecursiveVisitor {
   bool _isAllowedTrustTypesUsage(Class cls) {
     final uri = cls.enclosingLibrary.importUri;
     return uri.isScheme('dart') && uri.path == 'ui' ||
-        _allowedTrustTypesTestPatterns.any(
-          (pattern) => uri.path.contains(pattern),
-        );
+        _allowedTrustTypesTestPatterns.any(uri.path.contains);
   }
 
   /// Check that JS interop class [node], that only has an @JS annotation, is
@@ -731,7 +683,7 @@ class JsInteropChecks extends RecursiveVisitor {
     final uri = member.enclosingLibrary.importUri;
     return uri.isScheme('dart') &&
             _pathsWithAllowedDartExternalUsage.contains(uri.path) ||
-        _allowedNativeTestPatterns.any((pattern) => uri.path.contains(pattern));
+        _allowedNativeTestPatterns.any(uri.path.contains);
   }
 
   /// Assumes given [member] is not JS interop, and reports an error if

pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart

@@ -25,10 +25,10 @@ import 'js_util_optimizer.dart';
 import 'static_interop_mock_validator.dart';
 
 class SharedInteropTransformer extends Transformer {
+  final bool _supportsJsUtil;
+
   final Procedure _callMethodVarArgs;
-  final Procedure _createDartExport;
   final Procedure _createJSInteropWrapper;
-  final Procedure _createStaticInteropMock;
   final JsInteropDiagnosticReporter _diagnosticReporter;
   final ExportChecker _exportChecker;
   final ExtensionIndex _extensionIndex;
@@ -60,19 +60,16 @@ class SharedInteropTransformer extends Transformer {
     this._diagnosticReporter,
     this._exportChecker,
     this._extensionIndex,
-  ) : _callMethodVarArgs = _typeEnvironment.coreTypes.index
+  ) : _supportsJsUtil = _typeEnvironment.coreTypes.index.containsLibrary(
+        'dart:js_util',
+      ),
+      _callMethodVarArgs = _typeEnvironment.coreTypes.index
           .getTopLevelProcedure(
             'dart:js_interop_unsafe',
             'JSObjectUnsafeUtilExtension|callMethodVarArgs',
           ),
-      _createDartExport = _typeEnvironment.coreTypes.index.getTopLevelProcedure(
-        'dart:js_util',
-        'createDartExport',
-      ),
       _createJSInteropWrapper = _typeEnvironment.coreTypes.index
           .getTopLevelProcedure('dart:js_interop', 'createJSInteropWrapper'),
-      _createStaticInteropMock = _typeEnvironment.coreTypes.index
-          .getTopLevelProcedure('dart:js_util', 'createStaticInteropMock'),
       _functionToJS = _typeEnvironment.coreTypes.index.getTopLevelProcedure(
         'dart:js_interop',
         'FunctionToJSExportedDartFunction|get#toJS',
@@ -133,12 +130,19 @@ class SharedInteropTransformer extends Transformer {
         'JSAnyUtilityExtension|typeofEquals',
       );
 
+  late final Procedure _createDartExport = _typeEnvironment.coreTypes.index
+      .getTopLevelProcedure('dart:js_util', 'createDartExport');
+  late final Procedure _createStaticInteropMock = _typeEnvironment
+      .coreTypes
+      .index
+      .getTopLevelProcedure('dart:js_util', 'createStaticInteropMock');
+
   @override
   TreeNode visitStaticInvocation(StaticInvocation node) {
     _invocation = node;
     TreeNode replacement = invocation;
     final target = invocation.target;
-    if (target == _createDartExport) {
+    if (_supportsJsUtil && target == _createDartExport) {
       final typeArguments = invocation.arguments.types;
       assert(typeArguments.length == 1);
       if (_verifyExportable(typeArguments[0])) {
@@ -158,7 +162,7 @@ class SharedInteropTransformer extends Transformer {
           arguments.length == 2 ? arguments[1] : null,
         );
       }
-    } else if (target == _createStaticInteropMock) {
+    } else if (_supportsJsUtil && target == _createStaticInteropMock) {
       final typeArguments = invocation.arguments.types;
       assert(typeArguments.length == 2);
       final staticInteropType = typeArguments[0];

pkg/dart2wasm/lib/js/callback_specializer.dart

@@ -277,65 +277,6 @@ class CallbackSpecializer {
     return (dartProcedure, functionTrampoline);
   }
 
-  /// Lowers an invocation of `allowInterop<type>(foo)` to:
-  ///
-  ///     let #var = foo in
-  ///       _isDartFunctionWrapped<type>(#var) ?
-  ///         #var :
-  ///         _wrapDartFunction<type>(#var, jsWrapperFunction(#var));
-  ///
-  /// The use of two functions here is necessary because we do not allow
-  /// `WasmExternRef` to be an argument or return type for a tear off.
-  ///
-  /// Note: _wrapDartFunction tracks wrapped Dart functions in a map.  When
-  /// these Dart functions flow to JS, they are replaced by their wrappers.  If
-  /// the wrapper should ever flow back into Dart then it will be replaced by
-  /// the original Dart function.
-  // TODO(srujzs): It looks like there's no more code that references this
-  // function anymore in dart2wasm. Should we delete this lowering and related
-  // code?
-  Expression allowInterop(StaticInvocation staticInvocation) {
-    final argument = staticInvocation.arguments.positional.single;
-    final type = argument.getStaticType(_staticTypeContext) as FunctionType;
-    final (jsWrapperFunction, exportedFunction) = _getJSWrapperFunction(
-        staticInvocation.target, type,
-        boxExternRef: false, needsCastClosure: false, captureThis: false);
-    final v = VariableDeclaration('#var',
-        initializer: argument, type: type, isSynthesized: true);
-    return Let(
-        v,
-        ConditionalExpression(
-            StaticInvocation(_util.isDartFunctionWrappedTarget,
-                Arguments([VariableGet(v)], types: [type])),
-            VariableGet(v),
-            StaticInvocation(
-                _util.wrapDartFunctionTarget,
-                Arguments([
-                  VariableGet(v),
-                  BlockExpression(
-                      Block([
-                        // This ensures TFA will retain the function which the
-                        // JS code will call. The backend in return will export
-                        // the function due to `@pragma('wasm:weak-export', ...)`
-                        ExpressionStatement(StaticInvocation(
-                            _util.exportWasmFunctionTarget,
-                            Arguments([
-                              ConstantExpression(
-                                  StaticTearOffConstant(exportedFunction))
-                            ])))
-                      ]),
-                      StaticInvocation(
-                          jsWrapperFunction,
-                          Arguments([
-                            StaticInvocation(_util.jsObjectFromDartObjectTarget,
-                                Arguments([VariableGet(v)]))
-                          ]))),
-                ], types: [
-                  type
-                ])),
-            type));
-  }
-
   Expression _createJSValue(Expression value) =>
       StaticInvocation(_util.jsValueBoxTarget, Arguments([value]));
 

pkg/dart2wasm/lib/js/interop_transformer.dart

@@ -75,9 +75,7 @@ class InteropTransformer extends Transformer {
   Expression visitStaticInvocation(StaticInvocation node) {
     node = super.visitStaticInvocation(node) as StaticInvocation;
     Procedure target = node.target;
-    if (target == _util.allowInteropTarget) {
-      return _callbackSpecializer.allowInterop(node);
-    } else if (target == _util.functionToJSTarget) {
+    if (target == _util.functionToJSTarget) {
       return _callbackSpecializer.functionToJS(node);
     } else if (target == _util.functionToJSCaptureThisTarget) {
       return _callbackSpecializer.functionToJS(node, captureThis: true);

pkg/dart2wasm/lib/js/runtime_generator.dart

@@ -161,10 +161,6 @@ class RuntimeFinalizer {
 JSMethods performJSInteropTransformations(List<Library> libraries,
     CoreTypes coreTypes, ClassHierarchy classHierarchy) {
   Set<Library> transitiveImportingJSInterop = {
-    ...calculateTransitiveImportsOfJsInteropIfUsed(
-        libraries, Uri.parse("package:js/js.dart")),
-    ...calculateTransitiveImportsOfJsInteropIfUsed(
-        libraries, Uri.parse("dart:_js_annotations")),
     ...calculateTransitiveImportsOfJsInteropIfUsed(
         libraries, Uri.parse("dart:_js_helper")),
     ...calculateTransitiveImportsOfJsInteropIfUsed(

pkg/dart2wasm/lib/js/util.dart

@@ -14,7 +14,6 @@ enum AnnotationType { import, export, weakExport }
 class CoreTypesUtil {
   final ExtensionIndex extensionIndex;
   final CoreTypes coreTypes;
-  final Procedure allowInteropTarget;
   final Procedure dartifyRawTarget;
   final Procedure functionToJSTarget;
   final Procedure functionToJSCaptureThisTarget;
@@ -168,9 +167,7 @@ class CoreTypesUtil {
   };
 
   CoreTypesUtil(this.coreTypes, this.extensionIndex)
-      : allowInteropTarget = coreTypes.index
-            .getTopLevelProcedure('dart:js_util', 'allowInterop'),
-        dartifyRawTarget = coreTypes.index
+      : dartifyRawTarget = coreTypes.index
             .getTopLevelProcedure('dart:_js_helper', 'dartifyRaw'),
         functionToJSTarget = coreTypes.index.getTopLevelProcedure(
             'dart:js_interop', 'FunctionToJSExportedDartFunction|get#toJS'),

pkg/dart2wasm/lib/target.dart

@@ -160,7 +160,6 @@ class WasmTarget extends Target {
         'dart:io',
         'dart:js_interop',
         'dart:js_interop_unsafe',
-        'dart:js_util',
         'dart:nativewrappers',
         'dart:typed_data',
       ];
@@ -180,7 +179,6 @@ class WasmTarget extends Target {
         'dart:collection',
         'dart:js_interop',
         'dart:js_interop_unsafe',
-        'dart:js_util',
         'dart:typed_data',
       ];
 
@@ -205,9 +203,6 @@ class WasmTarget extends Target {
     // Flutter's dart:ui is also package:ui (in test mode)
     if (importerString.startsWith('package:ui/')) return true;
 
-    // package:js can import dart:js_util & dart:_js_*
-    if (importerString.startsWith('package:js/')) return true;
-
     return false;
   }
 
@@ -283,10 +278,6 @@ class WasmTarget extends Target {
     }
 
     Set<Library> transitiveImportingJSInterop = {
-      ...jsInteropHelper.calculateTransitiveImportsOfJsInteropIfUsed(
-          component.libraries, Uri.parse("package:js/js.dart")),
-      ...jsInteropHelper.calculateTransitiveImportsOfJsInteropIfUsed(
-          component.libraries, Uri.parse("dart:_js_annotations")),
       ...jsInteropHelper.calculateTransitiveImportsOfJsInteropIfUsed(
           component.libraries, Uri.parse("dart:js_interop")),
       ...jsInteropHelper.calculateTransitiveImportsOfJsInteropIfUsed(
@@ -589,7 +580,7 @@ void _checkWasmImportExportPragmas(List<Library> libraries, CoreTypes coreTypes,
     if (importUri.isScheme('dart') ||
         (importUri.isScheme('package') &&
             JsInteropChecks.allowedInteropLibrariesInDart2WasmPackages
-                .any((pkg) => importUri.pathSegments.first == pkg))) {
+                .contains(importUri.pathSegments.first))) {
       continue;
     }
 

pkg/dart2wasm/pubspec.yaml

@@ -24,5 +24,4 @@ dependencies:
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
   expect: any
-  js: any
   lints: any