languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-04 16:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[dart2wasm] Disallow use of old interop libraries"

Browse source 
This reverts commit 8c246caa91.

Reason for revert: Need to allowlist benchmarks to use package:js.

Original change's description:
> [dart2wasm] Disallow use of old interop libraries
>
> Closes https://github.com/dart-lang/sdk/issues/54004
>
> Adds an error for imports of old interop libraries. Has an
> allowlist for existing usages/migrated usages that we'll need
> to migrate.
>
> Change-Id: Ie7174ae2a50c2d03a7aa2975e8a1914a4cba8a2c
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/342521
> Reviewed-by: Sigmund Cherem <sigmund@google.com>
> Commit-Queue: Srujan Gaddam <srujzs@google.com>

Change-Id: Id7d3a3063d417830774d7a72eed5185599f9267f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/343685
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
This commit is contained in:
Srujan Gaddam 2023-12-28 16:22:21 +00:00 committed by Commit Queue
parent ff5fd4345d
commit 5f34ac9fa0
8 changed files with 48 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -124,15 +124,6 @@
[lints-3-0]: https://pub.dev/packages/lints/changelog#300
#### Wasm compiler (Dart2Wasm)
- **Breaking Change** [#54004][]: `dart:js_util`, `package:js`, and `dart:js`
are now disallowed from being imported in Dart2Wasm. Prefer using
`dart:js_interop` and `dart:js_interop_unsafe`.
[#54004]: https://github.com/dart-lang/sdk/issues/54004
#### Development JavaScript compiler (DDC)
- Type arguments of `package:js` interop types are now printed as `any` instead

61
pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
View file

@ -8570,38 +8570,6 @@ const MessageCode messageJsInteropDartJsInteropAnnotationForStaticInteropOnly =
correctionMessage:
r"""Try making this class an extension type or marking it as '@staticInterop'.""");
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(String name)>
templateJsInteropDisallowedInteropLibraryInDart2Wasm =
const Template<Message Function(String name)>(
"JsInteropDisallowedInteropLibraryInDart2Wasm",
problemMessageTemplate:
r"""JS interop library '#name' cannot be imported on Dart2Wasm.""",
correctionMessageTemplate:
r"""Try using 'dart:js_interop' or 'dart:js_interop_unsafe' instead.""",
withArguments:
_withArgumentsJsInteropDisallowedInteropLibraryInDart2Wasm);
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Message Function(String name)>
codeJsInteropDisallowedInteropLibraryInDart2Wasm =
const Code<Message Function(String name)>(
"JsInteropDisallowedInteropLibraryInDart2Wasm",
);
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
Message _withArgumentsJsInteropDisallowedInteropLibraryInDart2Wasm(
String name) {
if (name.isEmpty) throw 'No name provided';
name = demangleMixinApplicationName(name);
return new Message(codeJsInteropDisallowedInteropLibraryInDart2Wasm,
problemMessage:
"""JS interop library '${name}' cannot be imported on Dart2Wasm.""",
correctionMessage:
"""Try using 'dart:js_interop' or 'dart:js_interop_unsafe' instead.""",
arguments: {'name': name});
}
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Null> codeJsInteropEnclosingClassJSAnnotation =
messageJsInteropEnclosingClassJSAnnotation;
@ -9361,6 +9329,35 @@ Message _withArgumentsJsInteropStaticInteropWithNonStaticSupertype(
arguments: {'name': name, 'name2': name2});
}
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<Message Function(String name)>
templateJsInteropStrictModeForbiddenLibrary =
const Template<Message Function(String name)>(
"JsInteropStrictModeForbiddenLibrary",
problemMessageTemplate:
r"""Library '#name' is forbidden when strict mode is enabled.""",
correctionMessageTemplate:
r"""Remove the import of a forbidden library.""",
withArguments: _withArgumentsJsInteropStrictModeForbiddenLibrary);
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Code<Message Function(String name)>
codeJsInteropStrictModeForbiddenLibrary =
const Code<Message Function(String name)>(
"JsInteropStrictModeForbiddenLibrary",
);
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
Message _withArgumentsJsInteropStrictModeForbiddenLibrary(String name) {
if (name.isEmpty) throw 'No name provided';
name = demangleMixinApplicationName(name);
return new Message(codeJsInteropStrictModeForbiddenLibrary,
problemMessage:
"""Library '${name}' is forbidden when strict mode is enabled.""",
correctionMessage: """Remove the import of a forbidden library.""",
arguments: {'name': name});
}
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const Template<
Message Function(String name)> templateLabelNotFound = const Template<

63
pkg/_js_interop_checks/lib/js_interop_checks.dart
View file

@ -27,7 +27,6 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart'
messageJsInteropStaticInteropParameterInitializersAreIgnored,
messageJsInteropStaticInteropSyntheticConstructor,
templateJsInteropDartClassExtendsJSClass,
templateJsInteropDisallowedInteropLibraryInDart2Wasm,
templateJsInteropJSClassExtendsDartClass,
templateJsInteropNonStaticWithStaticInteropSupertype,
templateJsInteropStaticInteropNoJSAnnotation,
@ -37,7 +36,8 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart'
templateJsInteropNativeClassInAnnotation,
templateJsInteropStaticInteropTearOffsDisallowed,
templateJsInteropStaticInteropTrustTypesUsageNotAllowed,
templateJsInteropStaticInteropTrustTypesUsedWithoutStaticInterop;
templateJsInteropStaticInteropTrustTypesUsedWithoutStaticInterop,
templateJsInteropStrictModeForbiddenLibrary;
import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity;
import 'package:_js_interop_checks/src/transformations/export_checker.dart';
import 'package:_js_interop_checks/src/transformations/js_util_optimizer.dart';
@ -71,6 +71,7 @@ class JsInteropChecks extends RecursiveVisitor {
bool _classHasJSAnnotation = false;
bool _classHasAnonymousAnnotation = false;
bool _classHasStaticInteropAnnotation = false;
final _checkDisallowedInterop = false;
bool _inTearoff = false;
bool _libraryHasDartJSInteropAnnotation = false;
bool _libraryHasJSAnnotation = false;
@ -91,36 +92,11 @@ class JsInteropChecks extends RecursiveVisitor {
RegExp(r'(?<!generated_)tests/lib/js'),
];
static final List<Pattern>
_allowedUseOfDart2WasmDisallowedInteropLibrariesTestPatterns = [
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'),
];
// 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
'flutter',
'ui',
// Non-SDK packages that have been migrated for the Wasm experiment but
// still have references to older interop libraries.
'package_info_plus',
'test',
'url_launcher_web',
];
/// Interop libraries that cannot be used in dart2wasm.
static const _disallowedInteropLibrariesInDart2Wasm = [
/// Libraries that cannot be used when [_enforceStrictMode] is true.
static const _disallowedLibrariesInStrictMode = [
'package:js/js.dart',
'package:js/js_util.dart',
'dart:html',
'dart:js_util',
'dart:js'
];
@ -309,7 +285,10 @@ class JsInteropChecks extends RecursiveVisitor {
_libraryHasDartJSInteropAnnotation || hasJSInteropAnnotation(node);
_libraryIsGlobalNamespace = _isLibraryGlobalNamespace(node);
if (isDart2Wasm) _checkDisallowedLibrariesForDart2Wasm(node);
// TODO(srujzs): Should we still keep around this check? Currently, it's
// unused since we allow the old interop on dart2wasm, but we should
// disallow them eventually.
if (_checkDisallowedInterop) _checkDisallowedLibrariesForDart2Wasm(node);
super.visitLibrary(node);
exportChecker.visitLibrary(node);
@ -525,28 +504,12 @@ class JsInteropChecks extends RecursiveVisitor {
// JS interop library checks
/// Check that [node] doesn't depend on any disallowed interop libraries in
/// dart2wasm.
///
/// We allowlist `dart:*` libraries, select packages, and test patterns.
void _checkDisallowedLibrariesForDart2Wasm(Library node) {
final uri = node.importUri;
for (final dependency in node.dependencies) {
final dependencyUriString = dependency.targetLibrary.importUri.toString();
if (_disallowedInteropLibrariesInDart2Wasm
.contains(dependencyUriString)) {
// 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));
if (allowedToImport) return;
if (_disallowedLibrariesInStrictMode.contains(dependencyUriString)) {
_reporter.report(
templateJsInteropDisallowedInteropLibraryInDart2Wasm
templateJsInteropStrictModeForbiddenLibrary
.withArguments(dependencyUriString),
dependency.fileOffset,
dependencyUriString.length,
@ -619,7 +582,7 @@ class JsInteropChecks extends RecursiveVisitor {
/// a dart low level library, a foreign helper, a native test,
/// or a from environment constructor.
bool _isAllowedExternalUsage(Member member) {
final uri = member.enclosingLibrary.importUri;
Uri uri = member.enclosingLibrary.importUri;
return uri.isScheme('dart') &&
_pathsWithAllowedDartExternalUsage.contains(uri.path) ||
_allowedNativeTestPatterns.any((pattern) => uri.path.contains(pattern));

4
pkg/front_end/messages.status
View file

@ -601,8 +601,6 @@ JsInteropDartClassExtendsJSClass/analyzerCode: Fail # Web compiler specific
JsInteropDartClassExtendsJSClass/example: Fail # Web compiler specific
JsInteropDartJsInteropAnnotationForStaticInteropOnly/analyzerCode: Fail # Web compiler specific
JsInteropDartJsInteropAnnotationForStaticInteropOnly/example: Fail # Web compiler specific
JsInteropDisallowedInteropLibraryInDart2Wasm/analyzerCode: Fail # Web compiler specific
JsInteropDisallowedInteropLibraryInDart2Wasm/example: Fail # Web compiler specific
JsInteropEnclosingClassJSAnnotation/analyzerCode: Fail # Web compiler specific
JsInteropEnclosingClassJSAnnotation/example: Fail # Web compiler specific
JsInteropExportClassNotMarkedExportable/analyzerCode: Fail # Web compiler specific
@ -683,6 +681,8 @@ JsInteropStaticInteropWithInstanceMembers/analyzerCode: Fail # Web compiler spec
JsInteropStaticInteropWithInstanceMembers/example: Fail # Web compiler specific
JsInteropStaticInteropWithNonStaticSupertype/analyzerCode: Fail # Web compiler specific
JsInteropStaticInteropWithNonStaticSupertype/example: Fail # Web compiler specific
JsInteropStrictModeForbiddenLibrary/analyzerCode: Fail # Web compiler specific
JsInteropStrictModeForbiddenLibrary/example: Fail # Web compiler specific
LanguageVersionInvalidInDotPackages/analyzerCode: Fail
LanguageVersionMismatchInPart/analyzerCode: Fail
LanguageVersionMismatchInPart/part_wrapped_script: Fail # Part in (now) part.

8
pkg/front_end/messages.yaml
View file

@ -5803,10 +5803,6 @@ JsInteropDartJsInteropAnnotationForStaticInteropOnly:
problemMessage: "The '@JS' annotation from 'dart:js_interop' can only be used for static interop, either through extension types or '@staticInterop' classes."
correctionMessage: "Try making this class an extension type or marking it as '@staticInterop'."
JsInteropDisallowedInteropLibraryInDart2Wasm:
problemMessage: "JS interop library '#name' cannot be imported on Dart2Wasm."
correctionMessage: "Try using 'dart:js_interop' or 'dart:js_interop_unsafe' instead."
JsInteropEnclosingClassJSAnnotation:
problemMessage: "Member has a JS interop annotation but the enclosing class does not."
correctionMessage: "Try adding the annotation to the enclosing class."
@ -5972,6 +5968,10 @@ JsInteropStaticInteropWithNonStaticSupertype:
problemMessage: "JS interop class '#name' has an `@staticInterop` annotation, but has supertype '#name2', which does not."
correctionMessage: "Try marking the supertype as a static interop class using `@staticInterop`."
JsInteropStrictModeForbiddenLibrary:
problemMessage: "Library '#name' is forbidden when strict mode is enabled."
correctionMessage: "Remove the import of a forbidden library."
NonNullableInNullAware:
problemMessage: "Operand of null-aware operation '#name' has type '#type' which excludes null."
severity: WARNING

1
pkg/front_end/test/spell_checking_list_messages.txt
View file

@ -42,7 +42,6 @@ dart:_internal
dart:ffi
dart:html
dart:js_interop
dart:js_interop_unsafe
dart_runner
dartbug.com
defaultasset

23
tests/lib/js/static_interop_test/disallowed_interop_libraries_test.dart
View file

@ -1,23 +0,0 @@
// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// Check that dart2wasm disallows these interop libraries from being imported.
/**/ import 'dart:js';
// ^
// [web] JS interop library 'dart:js' cannot be imported on Dart2Wasm.
/**/ import 'dart:js_util';
// ^
// [web] JS interop library 'dart:js_util' cannot be imported on Dart2Wasm.
/**/ import 'package:js/js.dart';
// ^
// [web] JS interop library 'package:js/js.dart' cannot be imported on Dart2Wasm.
/**/ import 'package:js/js_util.dart';
// ^
// [web] JS interop library 'package:js/js_util.dart' cannot be imported on Dart2Wasm.
void main() {}

3
tests/lib/lib.status
View file

@ -21,9 +21,6 @@ js/static_interop_test/top_level_member_annotation_static_test: SkipByDesign # S
mirrors/*: SkipByDesign
web/*: SkipByDesign
[ $compiler != dart2wasm ]
js/static_interop_test/disallowed_interop_libraries_test: SkipByDesign # Only checks on dart2wasm.
[ $mode == product ]
developer/timeline_test: Skip # Not supported
isolate/issue_24243_parent_isolate_test: Skip # Requires checked mode