From 656ff46efd721436d7a35d900216ccbb2985a9ff Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Wed, 27 May 2026 03:16:22 -0700 Subject: [PATCH] [dart2wasm] Restructure patches and internal libraries The dart2wasm compiler can use three different SDK platforms depending on compiler options: The default one, a JS compatibility target and a standalone target. Code for these platforms used to be in `_internal/` subdirectories, but parts of `_internal/wasm/lib` were also used by the other targets. To make it clearer which patches/internal libraries belong to which target, this restructures `_internal/wasm` as follows: Files only relevant for one target are in `js`, `js_compatibility` and `standalone`. Files used by all targets are in `common`, files used in the default and the JS compatibility target are in `js_common`. TEST=Refactor, covered by existing tests Change-Id: I2c63c04a5fd5ca88cd640889aa295bd1fb8cfc95 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/505441 Reviewed-by: Slava Egorov Reviewed-by: Martin Kustermann Commit-Queue: Martin Kustermann SLSA-Policy-Verified: SLSA Policy Verification Service --- .../wasm/{lib => common}/array_patch.dart | 0 .../wasm/{lib => common}/async_patch.dart | 0 .../{lib => common}/bigint_patch_patch.dart | 0 .../wasm/{lib => common}/boxed_bool.dart | 0 .../wasm/{lib => common}/boxed_double.dart | 0 .../wasm/{lib => common}/boxed_int.dart | 0 .../wasm/{lib => common}/class_id.dart | 0 .../wasm/{lib => common}/closure.dart | 0 .../wasm/{lib => common}/compact_hash.dart | 0 .../wasm/{lib => common}/convert_patch.dart | 7 +- .../wasm/{lib => common}/core_patch.dart | 0 .../wasm/{lib => common}/error_utils.dart | 0 .../wasm/{lib => common}/errors_patch.dart | 0 .../wasm/{lib => common}/ffi_patch.dart | 0 .../wasm/{lib => common}/function_patch.dart | 0 .../wasm/{lib => common}/hash_factories.dart | 0 .../wasm/{lib => common}/identical_patch.dart | 0 .../{lib => common}/int_common_patch.dart | 0 .../wasm/{lib => common}/int_patch.dart | 0 .../wasm/{lib => common}/internal_patch.dart | 0 .../wasm/{lib => common}/io_patch.dart | 0 .../wasm/{lib => common}/isolate_patch.dart | 0 .../_internal/wasm/{lib => common}/list.dart | 0 .../wasm/{lib => common}/math_patch.dart | 0 .../{lib => common}/named_parameters.dart | 0 .../wasm/{lib => common}/object_helper.dart | 0 .../wasm/{lib => common}/object_patch.dart | 0 .../wasm/{lib => common}/record_patch.dart | 0 .../_internal/wasm/{lib => common}/simd.dart | 0 .../wasm/{lib => common}/simd_patch.dart | 0 .../wasm/{lib => common}/string_helper.dart | 0 .../wasm/{lib => common}/symbol_patch.dart | 0 .../wasm/{lib => common}/sync_star_patch.dart | 0 .../_internal/wasm/{lib => common}/type.dart | 0 .../wasm/{lib => common}/typed_data.dart | 0 .../{lib => common}/typed_data_patch.dart | 0 .../wasm/{lib => js}/boxed_int_patch.dart | 0 .../wasm/{lib => js}/js_helper_patch.dart | 0 .../wasm/{lib => js}/string_patch.dart | 0 .../boxed_double_patch.dart | 0 .../{lib => js_common}/convert_js_patch.dart | 0 .../{lib => js_common}/date_patch_patch.dart | 0 .../{lib => js_common}/deferred_patch.dart | 0 .../wasm/{lib => js_common}/double_patch.dart | 0 .../internal_json_encode_patch.dart | 0 .../{lib => js_common}/invoke_main_patch.dart | 0 .../wasm/{lib => js_common}/js_array.dart | 0 .../wasm/{lib => js_common}/js_helper.dart | 27 +- .../{lib => js_common}/js_interop_patch.dart | 32 +-- .../js_interop_unsafe_patch.dart | 0 .../js_interop_wasm_patch.dart | 0 .../wasm/{lib => js_common}/js_string.dart | 0 .../{lib => js_common}/js_string_convert.dart | 0 .../{lib => js_common}/js_typed_array.dart | 0 .../wasm/{lib => js_common}/js_types.dart | 3 +- .../math_externs_patch.dart | 0 .../wasm/{lib => js_common}/print_patch.dart | 0 .../{lib => js_common}/regexp_helper.dart | 0 .../wasm/{lib => js_common}/regexp_patch.dart | 0 .../{lib => js_common}/stack_trace_patch.dart | 0 .../{lib => js_common}/stopwatch_patch.dart | 0 .../string_buffer_patch.dart | 0 .../wasm/{lib => js_common}/timer_patch.dart | 0 .../typed_data_copy_from_js.dart | 0 .../wasm/{lib => js_common}/uri_patch.dart | 0 .../wasm/{lib => js_common}/weak_patch.dart | 0 .../js_compatibility}/boxed_int_patch.dart | 0 .../js_compatibility}/convert_patch.dart | 0 .../js_compatibility}/js_helper_patch.dart | 0 .../string_buffer_patch.dart | 0 .../js_compatibility}/string_patch.dart | 0 .../js_compatibility}/typed_data_patch.dart | 0 .../standalone}/boxed_double_patch.dart | 0 .../standalone}/boxed_int_patch.dart | 0 .../standalone}/convert_standalone_patch.dart | 0 .../standalone}/date_patch_patch.dart | 0 .../standalone}/deferred_patch.dart | 0 .../standalone}/developer_patch.dart | 0 .../lib => wasm/standalone}/double_patch.dart | 0 .../lib => wasm/standalone}/embedder.dart | 0 .../standalone}/embedder_string.dart | 0 .../internal_json_encode_patch.dart | 0 .../standalone}/invoke_main_patch.dart | 0 .../lib => wasm/standalone}/js_interop.dart | 0 .../standalone}/js_interop_wasm_patch.dart | 0 .../standalone}/math_externs_patch.dart | 0 .../lib => wasm/standalone}/print_patch.dart | 0 .../lib => wasm/standalone}/regexp.dart | 0 .../lib => wasm/standalone}/regexp_patch.dart | 0 .../standalone}/stack_trace_patch.dart | 0 .../standalone}/stopwatch_patch.dart | 0 .../standalone}/string_buffer_patch.dart | 0 .../lib => wasm/standalone}/string_patch.dart | 0 .../lib => wasm/standalone}/timer_patch.dart | 0 .../standalone}/typed_data_copy_from_js.dart | 0 .../lib => wasm/standalone}/uri_patch.dart | 0 .../lib => wasm/standalone}/weak_patch.dart | 0 sdk/lib/_internal/wasm_standalone/OWNERS | 1 - sdk/lib/libraries.json | 240 +++++++++--------- sdk/lib/libraries.yaml | 236 ++++++++--------- 100 files changed, 266 insertions(+), 280 deletions(-) rename sdk/lib/_internal/wasm/{lib => common}/array_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/async_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/bigint_patch_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/boxed_bool.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/boxed_double.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/boxed_int.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/class_id.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/closure.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/compact_hash.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/convert_patch.dart (99%) rename sdk/lib/_internal/wasm/{lib => common}/core_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/error_utils.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/errors_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/ffi_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/function_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/hash_factories.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/identical_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/int_common_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/int_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/internal_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/io_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/isolate_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/list.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/math_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/named_parameters.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/object_helper.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/object_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/record_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/simd.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/simd_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/string_helper.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/symbol_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/sync_star_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/type.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/typed_data.dart (100%) rename sdk/lib/_internal/wasm/{lib => common}/typed_data_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js}/boxed_int_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js}/js_helper_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js}/string_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/boxed_double_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/convert_js_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/date_patch_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/deferred_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/double_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/internal_json_encode_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/invoke_main_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_array.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_helper.dart (98%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_interop_patch.dart (98%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_interop_unsafe_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_interop_wasm_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_string.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_string_convert.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_typed_array.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/js_types.dart (99%) rename sdk/lib/_internal/wasm/{lib => js_common}/math_externs_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/print_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/regexp_helper.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/regexp_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/stack_trace_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/stopwatch_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/string_buffer_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/timer_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/typed_data_copy_from_js.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/uri_patch.dart (100%) rename sdk/lib/_internal/wasm/{lib => js_common}/weak_patch.dart (100%) rename sdk/lib/_internal/{wasm_js_compatibility/lib => wasm/js_compatibility}/boxed_int_patch.dart (100%) rename sdk/lib/_internal/{wasm_js_compatibility/lib => wasm/js_compatibility}/convert_patch.dart (100%) rename sdk/lib/_internal/{wasm_js_compatibility/lib => wasm/js_compatibility}/js_helper_patch.dart (100%) rename sdk/lib/_internal/{wasm_js_compatibility/lib => wasm/js_compatibility}/string_buffer_patch.dart (100%) rename sdk/lib/_internal/{wasm_js_compatibility/lib => wasm/js_compatibility}/string_patch.dart (100%) rename sdk/lib/_internal/{wasm_js_compatibility/lib => wasm/js_compatibility}/typed_data_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/boxed_double_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/boxed_int_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/convert_standalone_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/date_patch_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/deferred_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/developer_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/double_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/embedder.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/embedder_string.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/internal_json_encode_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/invoke_main_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/js_interop.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/js_interop_wasm_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/math_externs_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/print_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/regexp.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/regexp_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/stack_trace_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/stopwatch_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/string_buffer_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/string_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/timer_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/typed_data_copy_from_js.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/uri_patch.dart (100%) rename sdk/lib/_internal/{wasm_standalone/lib => wasm/standalone}/weak_patch.dart (100%) delete mode 100644 sdk/lib/_internal/wasm_standalone/OWNERS diff --git a/sdk/lib/_internal/wasm/lib/array_patch.dart b/sdk/lib/_internal/wasm/common/array_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/array_patch.dart rename to sdk/lib/_internal/wasm/common/array_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/async_patch.dart b/sdk/lib/_internal/wasm/common/async_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/async_patch.dart rename to sdk/lib/_internal/wasm/common/async_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/bigint_patch_patch.dart b/sdk/lib/_internal/wasm/common/bigint_patch_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/bigint_patch_patch.dart rename to sdk/lib/_internal/wasm/common/bigint_patch_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/boxed_bool.dart b/sdk/lib/_internal/wasm/common/boxed_bool.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/boxed_bool.dart rename to sdk/lib/_internal/wasm/common/boxed_bool.dart diff --git a/sdk/lib/_internal/wasm/lib/boxed_double.dart b/sdk/lib/_internal/wasm/common/boxed_double.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/boxed_double.dart rename to sdk/lib/_internal/wasm/common/boxed_double.dart diff --git a/sdk/lib/_internal/wasm/lib/boxed_int.dart b/sdk/lib/_internal/wasm/common/boxed_int.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/boxed_int.dart rename to sdk/lib/_internal/wasm/common/boxed_int.dart diff --git a/sdk/lib/_internal/wasm/lib/class_id.dart b/sdk/lib/_internal/wasm/common/class_id.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/class_id.dart rename to sdk/lib/_internal/wasm/common/class_id.dart diff --git a/sdk/lib/_internal/wasm/lib/closure.dart b/sdk/lib/_internal/wasm/common/closure.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/closure.dart rename to sdk/lib/_internal/wasm/common/closure.dart diff --git a/sdk/lib/_internal/wasm/lib/compact_hash.dart b/sdk/lib/_internal/wasm/common/compact_hash.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/compact_hash.dart rename to sdk/lib/_internal/wasm/common/compact_hash.dart diff --git a/sdk/lib/_internal/wasm/lib/convert_patch.dart b/sdk/lib/_internal/wasm/common/convert_patch.dart similarity index 99% rename from sdk/lib/_internal/wasm/lib/convert_patch.dart rename to sdk/lib/_internal/wasm/common/convert_patch.dart index 5681afa6c20..5e0ca41feba 100644 --- a/sdk/lib/_internal/wasm/lib/convert_patch.dart +++ b/sdk/lib/_internal/wasm/common/convert_patch.dart @@ -35,10 +35,9 @@ class Utf8Decoder { Converter, T> fuse(Converter next) { if (next is JsonDecoder) { return _JsonUtf8Decoder( - (next as JsonDecoder)._reviver, - this._allowMalformed, - ) - as dynamic /*=Converter, T>*/; + (next as JsonDecoder)._reviver, + this._allowMalformed, + ) as dynamic /*=Converter, T>*/; } return super.fuse(next); } diff --git a/sdk/lib/_internal/wasm/lib/core_patch.dart b/sdk/lib/_internal/wasm/common/core_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/core_patch.dart rename to sdk/lib/_internal/wasm/common/core_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/error_utils.dart b/sdk/lib/_internal/wasm/common/error_utils.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/error_utils.dart rename to sdk/lib/_internal/wasm/common/error_utils.dart diff --git a/sdk/lib/_internal/wasm/lib/errors_patch.dart b/sdk/lib/_internal/wasm/common/errors_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/errors_patch.dart rename to sdk/lib/_internal/wasm/common/errors_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/ffi_patch.dart b/sdk/lib/_internal/wasm/common/ffi_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/ffi_patch.dart rename to sdk/lib/_internal/wasm/common/ffi_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/function_patch.dart b/sdk/lib/_internal/wasm/common/function_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/function_patch.dart rename to sdk/lib/_internal/wasm/common/function_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/hash_factories.dart b/sdk/lib/_internal/wasm/common/hash_factories.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/hash_factories.dart rename to sdk/lib/_internal/wasm/common/hash_factories.dart diff --git a/sdk/lib/_internal/wasm/lib/identical_patch.dart b/sdk/lib/_internal/wasm/common/identical_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/identical_patch.dart rename to sdk/lib/_internal/wasm/common/identical_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/int_common_patch.dart b/sdk/lib/_internal/wasm/common/int_common_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/int_common_patch.dart rename to sdk/lib/_internal/wasm/common/int_common_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/int_patch.dart b/sdk/lib/_internal/wasm/common/int_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/int_patch.dart rename to sdk/lib/_internal/wasm/common/int_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/internal_patch.dart b/sdk/lib/_internal/wasm/common/internal_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/internal_patch.dart rename to sdk/lib/_internal/wasm/common/internal_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/io_patch.dart b/sdk/lib/_internal/wasm/common/io_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/io_patch.dart rename to sdk/lib/_internal/wasm/common/io_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/isolate_patch.dart b/sdk/lib/_internal/wasm/common/isolate_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/isolate_patch.dart rename to sdk/lib/_internal/wasm/common/isolate_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/list.dart b/sdk/lib/_internal/wasm/common/list.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/list.dart rename to sdk/lib/_internal/wasm/common/list.dart diff --git a/sdk/lib/_internal/wasm/lib/math_patch.dart b/sdk/lib/_internal/wasm/common/math_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/math_patch.dart rename to sdk/lib/_internal/wasm/common/math_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/named_parameters.dart b/sdk/lib/_internal/wasm/common/named_parameters.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/named_parameters.dart rename to sdk/lib/_internal/wasm/common/named_parameters.dart diff --git a/sdk/lib/_internal/wasm/lib/object_helper.dart b/sdk/lib/_internal/wasm/common/object_helper.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/object_helper.dart rename to sdk/lib/_internal/wasm/common/object_helper.dart diff --git a/sdk/lib/_internal/wasm/lib/object_patch.dart b/sdk/lib/_internal/wasm/common/object_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/object_patch.dart rename to sdk/lib/_internal/wasm/common/object_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/record_patch.dart b/sdk/lib/_internal/wasm/common/record_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/record_patch.dart rename to sdk/lib/_internal/wasm/common/record_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/simd.dart b/sdk/lib/_internal/wasm/common/simd.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/simd.dart rename to sdk/lib/_internal/wasm/common/simd.dart diff --git a/sdk/lib/_internal/wasm/lib/simd_patch.dart b/sdk/lib/_internal/wasm/common/simd_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/simd_patch.dart rename to sdk/lib/_internal/wasm/common/simd_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/string_helper.dart b/sdk/lib/_internal/wasm/common/string_helper.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/string_helper.dart rename to sdk/lib/_internal/wasm/common/string_helper.dart diff --git a/sdk/lib/_internal/wasm/lib/symbol_patch.dart b/sdk/lib/_internal/wasm/common/symbol_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/symbol_patch.dart rename to sdk/lib/_internal/wasm/common/symbol_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/sync_star_patch.dart b/sdk/lib/_internal/wasm/common/sync_star_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/sync_star_patch.dart rename to sdk/lib/_internal/wasm/common/sync_star_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/type.dart b/sdk/lib/_internal/wasm/common/type.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/type.dart rename to sdk/lib/_internal/wasm/common/type.dart diff --git a/sdk/lib/_internal/wasm/lib/typed_data.dart b/sdk/lib/_internal/wasm/common/typed_data.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/typed_data.dart rename to sdk/lib/_internal/wasm/common/typed_data.dart diff --git a/sdk/lib/_internal/wasm/lib/typed_data_patch.dart b/sdk/lib/_internal/wasm/common/typed_data_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/typed_data_patch.dart rename to sdk/lib/_internal/wasm/common/typed_data_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/boxed_int_patch.dart b/sdk/lib/_internal/wasm/js/boxed_int_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/boxed_int_patch.dart rename to sdk/lib/_internal/wasm/js/boxed_int_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/js_helper_patch.dart b/sdk/lib/_internal/wasm/js/js_helper_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/js_helper_patch.dart rename to sdk/lib/_internal/wasm/js/js_helper_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/string_patch.dart b/sdk/lib/_internal/wasm/js/string_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/string_patch.dart rename to sdk/lib/_internal/wasm/js/string_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/boxed_double_patch.dart b/sdk/lib/_internal/wasm/js_common/boxed_double_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/boxed_double_patch.dart rename to sdk/lib/_internal/wasm/js_common/boxed_double_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/convert_js_patch.dart b/sdk/lib/_internal/wasm/js_common/convert_js_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/convert_js_patch.dart rename to sdk/lib/_internal/wasm/js_common/convert_js_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/date_patch_patch.dart b/sdk/lib/_internal/wasm/js_common/date_patch_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/date_patch_patch.dart rename to sdk/lib/_internal/wasm/js_common/date_patch_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/deferred_patch.dart b/sdk/lib/_internal/wasm/js_common/deferred_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/deferred_patch.dart rename to sdk/lib/_internal/wasm/js_common/deferred_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/double_patch.dart b/sdk/lib/_internal/wasm/js_common/double_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/double_patch.dart rename to sdk/lib/_internal/wasm/js_common/double_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/internal_json_encode_patch.dart b/sdk/lib/_internal/wasm/js_common/internal_json_encode_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/internal_json_encode_patch.dart rename to sdk/lib/_internal/wasm/js_common/internal_json_encode_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/invoke_main_patch.dart b/sdk/lib/_internal/wasm/js_common/invoke_main_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/invoke_main_patch.dart rename to sdk/lib/_internal/wasm/js_common/invoke_main_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/js_array.dart b/sdk/lib/_internal/wasm/js_common/js_array.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/js_array.dart rename to sdk/lib/_internal/wasm/js_common/js_array.dart diff --git a/sdk/lib/_internal/wasm/lib/js_helper.dart b/sdk/lib/_internal/wasm/js_common/js_helper.dart similarity index 98% rename from sdk/lib/_internal/wasm/lib/js_helper.dart rename to sdk/lib/_internal/wasm/js_common/js_helper.dart index 542eb55e2b6..b8052609a1c 100644 --- a/sdk/lib/_internal/wasm/lib/js_helper.dart +++ b/sdk/lib/_internal/wasm/js_common/js_helper.dart @@ -686,27 +686,20 @@ JSArray toJSArray(List list) { final list2 = list[2].toExternRef; if (length == 3) { return JSValue( - JS( - "(o0, o1, o2) => [o0, o1, o2]", - list0, - list1, - list2, - ), - ) - as JSArray; + JS("(o0, o1, o2) => [o0, o1, o2]", list0, list1, list2), + ) as JSArray; } final list3 = list[3].toExternRef; if (length == 4) { return JSValue( - JS( - "(o0, o1, o2, o3) => [o0, o1, o2, o3]", - list0, - list1, - list2, - list3, - ), - ) - as JSArray; + JS( + "(o0, o1, o2, o3) => [o0, o1, o2, o3]", + list0, + list1, + list2, + list3, + ), + ) as JSArray; } } diff --git a/sdk/lib/_internal/wasm/lib/js_interop_patch.dart b/sdk/lib/_internal/wasm/js_common/js_interop_patch.dart similarity index 98% rename from sdk/lib/_internal/wasm/lib/js_interop_patch.dart rename to sdk/lib/_internal/wasm/js_common/js_interop_patch.dart index 3b8761ed059..27760876edd 100644 --- a/sdk/lib/_internal/wasm/lib/js_interop_patch.dart +++ b/sdk/lib/_internal/wasm/js_common/js_interop_patch.dart @@ -927,26 +927,22 @@ extension JSAnyOperatorExtension on JSAny? { ); @patch - JSAny? and(JSAny? any) => - JSValue.box( - js_helper.JS( - '(o, a) => o && a', - this.toExternRef, - any.toExternRef, - ), - ) - as JSAny?; + JSAny? and(JSAny? any) => JSValue.box( + js_helper.JS( + '(o, a) => o && a', + this.toExternRef, + any.toExternRef, + ), + ) as JSAny?; @patch - JSAny? or(JSAny? any) => - JSValue.box( - js_helper.JS( - '(o, a) => o || a', - this.toExternRef, - any.toExternRef, - ), - ) - as JSAny?; + JSAny? or(JSAny? any) => JSValue.box( + js_helper.JS( + '(o, a) => o || a', + this.toExternRef, + any.toExternRef, + ), + ) as JSAny?; @patch JSBoolean get not => JSBoolean._( diff --git a/sdk/lib/_internal/wasm/lib/js_interop_unsafe_patch.dart b/sdk/lib/_internal/wasm/js_common/js_interop_unsafe_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/js_interop_unsafe_patch.dart rename to sdk/lib/_internal/wasm/js_common/js_interop_unsafe_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/js_interop_wasm_patch.dart b/sdk/lib/_internal/wasm/js_common/js_interop_wasm_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/js_interop_wasm_patch.dart rename to sdk/lib/_internal/wasm/js_common/js_interop_wasm_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/js_string.dart b/sdk/lib/_internal/wasm/js_common/js_string.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/js_string.dart rename to sdk/lib/_internal/wasm/js_common/js_string.dart diff --git a/sdk/lib/_internal/wasm/lib/js_string_convert.dart b/sdk/lib/_internal/wasm/js_common/js_string_convert.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/js_string_convert.dart rename to sdk/lib/_internal/wasm/js_common/js_string_convert.dart diff --git a/sdk/lib/_internal/wasm/lib/js_typed_array.dart b/sdk/lib/_internal/wasm/js_common/js_typed_array.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/js_typed_array.dart rename to sdk/lib/_internal/wasm/js_common/js_typed_array.dart diff --git a/sdk/lib/_internal/wasm/lib/js_types.dart b/sdk/lib/_internal/wasm/js_common/js_types.dart similarity index 99% rename from sdk/lib/_internal/wasm/lib/js_types.dart rename to sdk/lib/_internal/wasm/js_common/js_types.dart index 5c4c85bc541..89ae8483fd9 100644 --- a/sdk/lib/_internal/wasm/lib/js_types.dart +++ b/sdk/lib/_internal/wasm/js_common/js_types.dart @@ -49,8 +49,7 @@ extension type JSFunctionType(js.JSValue _jsFunctionType) extension type JSExportedDartFunctionType( js.JSValue _jsExportedDartFunctionType -) - implements JSFunctionType {} +) implements JSFunctionType {} extension type JSArrayType(js.JSValue _jsArrayType) implements JSObjectType {} diff --git a/sdk/lib/_internal/wasm/lib/math_externs_patch.dart b/sdk/lib/_internal/wasm/js_common/math_externs_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/math_externs_patch.dart rename to sdk/lib/_internal/wasm/js_common/math_externs_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/print_patch.dart b/sdk/lib/_internal/wasm/js_common/print_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/print_patch.dart rename to sdk/lib/_internal/wasm/js_common/print_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/regexp_helper.dart b/sdk/lib/_internal/wasm/js_common/regexp_helper.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/regexp_helper.dart rename to sdk/lib/_internal/wasm/js_common/regexp_helper.dart diff --git a/sdk/lib/_internal/wasm/lib/regexp_patch.dart b/sdk/lib/_internal/wasm/js_common/regexp_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/regexp_patch.dart rename to sdk/lib/_internal/wasm/js_common/regexp_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart b/sdk/lib/_internal/wasm/js_common/stack_trace_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/stack_trace_patch.dart rename to sdk/lib/_internal/wasm/js_common/stack_trace_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart b/sdk/lib/_internal/wasm/js_common/stopwatch_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/stopwatch_patch.dart rename to sdk/lib/_internal/wasm/js_common/stopwatch_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart b/sdk/lib/_internal/wasm/js_common/string_buffer_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/string_buffer_patch.dart rename to sdk/lib/_internal/wasm/js_common/string_buffer_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/timer_patch.dart b/sdk/lib/_internal/wasm/js_common/timer_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/timer_patch.dart rename to sdk/lib/_internal/wasm/js_common/timer_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/typed_data_copy_from_js.dart b/sdk/lib/_internal/wasm/js_common/typed_data_copy_from_js.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/typed_data_copy_from_js.dart rename to sdk/lib/_internal/wasm/js_common/typed_data_copy_from_js.dart diff --git a/sdk/lib/_internal/wasm/lib/uri_patch.dart b/sdk/lib/_internal/wasm/js_common/uri_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/uri_patch.dart rename to sdk/lib/_internal/wasm/js_common/uri_patch.dart diff --git a/sdk/lib/_internal/wasm/lib/weak_patch.dart b/sdk/lib/_internal/wasm/js_common/weak_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm/lib/weak_patch.dart rename to sdk/lib/_internal/wasm/js_common/weak_patch.dart diff --git a/sdk/lib/_internal/wasm_js_compatibility/lib/boxed_int_patch.dart b/sdk/lib/_internal/wasm/js_compatibility/boxed_int_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_js_compatibility/lib/boxed_int_patch.dart rename to sdk/lib/_internal/wasm/js_compatibility/boxed_int_patch.dart diff --git a/sdk/lib/_internal/wasm_js_compatibility/lib/convert_patch.dart b/sdk/lib/_internal/wasm/js_compatibility/convert_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_js_compatibility/lib/convert_patch.dart rename to sdk/lib/_internal/wasm/js_compatibility/convert_patch.dart diff --git a/sdk/lib/_internal/wasm_js_compatibility/lib/js_helper_patch.dart b/sdk/lib/_internal/wasm/js_compatibility/js_helper_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_js_compatibility/lib/js_helper_patch.dart rename to sdk/lib/_internal/wasm/js_compatibility/js_helper_patch.dart diff --git a/sdk/lib/_internal/wasm_js_compatibility/lib/string_buffer_patch.dart b/sdk/lib/_internal/wasm/js_compatibility/string_buffer_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_js_compatibility/lib/string_buffer_patch.dart rename to sdk/lib/_internal/wasm/js_compatibility/string_buffer_patch.dart diff --git a/sdk/lib/_internal/wasm_js_compatibility/lib/string_patch.dart b/sdk/lib/_internal/wasm/js_compatibility/string_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_js_compatibility/lib/string_patch.dart rename to sdk/lib/_internal/wasm/js_compatibility/string_patch.dart diff --git a/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data_patch.dart b/sdk/lib/_internal/wasm/js_compatibility/typed_data_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_js_compatibility/lib/typed_data_patch.dart rename to sdk/lib/_internal/wasm/js_compatibility/typed_data_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/boxed_double_patch.dart b/sdk/lib/_internal/wasm/standalone/boxed_double_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/boxed_double_patch.dart rename to sdk/lib/_internal/wasm/standalone/boxed_double_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/boxed_int_patch.dart b/sdk/lib/_internal/wasm/standalone/boxed_int_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/boxed_int_patch.dart rename to sdk/lib/_internal/wasm/standalone/boxed_int_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/convert_standalone_patch.dart b/sdk/lib/_internal/wasm/standalone/convert_standalone_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/convert_standalone_patch.dart rename to sdk/lib/_internal/wasm/standalone/convert_standalone_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/date_patch_patch.dart b/sdk/lib/_internal/wasm/standalone/date_patch_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/date_patch_patch.dart rename to sdk/lib/_internal/wasm/standalone/date_patch_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/deferred_patch.dart b/sdk/lib/_internal/wasm/standalone/deferred_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/deferred_patch.dart rename to sdk/lib/_internal/wasm/standalone/deferred_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/developer_patch.dart b/sdk/lib/_internal/wasm/standalone/developer_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/developer_patch.dart rename to sdk/lib/_internal/wasm/standalone/developer_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/double_patch.dart b/sdk/lib/_internal/wasm/standalone/double_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/double_patch.dart rename to sdk/lib/_internal/wasm/standalone/double_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/embedder.dart b/sdk/lib/_internal/wasm/standalone/embedder.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/embedder.dart rename to sdk/lib/_internal/wasm/standalone/embedder.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/embedder_string.dart b/sdk/lib/_internal/wasm/standalone/embedder_string.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/embedder_string.dart rename to sdk/lib/_internal/wasm/standalone/embedder_string.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/internal_json_encode_patch.dart b/sdk/lib/_internal/wasm/standalone/internal_json_encode_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/internal_json_encode_patch.dart rename to sdk/lib/_internal/wasm/standalone/internal_json_encode_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/invoke_main_patch.dart b/sdk/lib/_internal/wasm/standalone/invoke_main_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/invoke_main_patch.dart rename to sdk/lib/_internal/wasm/standalone/invoke_main_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/js_interop.dart b/sdk/lib/_internal/wasm/standalone/js_interop.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/js_interop.dart rename to sdk/lib/_internal/wasm/standalone/js_interop.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/js_interop_wasm_patch.dart b/sdk/lib/_internal/wasm/standalone/js_interop_wasm_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/js_interop_wasm_patch.dart rename to sdk/lib/_internal/wasm/standalone/js_interop_wasm_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/math_externs_patch.dart b/sdk/lib/_internal/wasm/standalone/math_externs_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/math_externs_patch.dart rename to sdk/lib/_internal/wasm/standalone/math_externs_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/print_patch.dart b/sdk/lib/_internal/wasm/standalone/print_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/print_patch.dart rename to sdk/lib/_internal/wasm/standalone/print_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/regexp.dart b/sdk/lib/_internal/wasm/standalone/regexp.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/regexp.dart rename to sdk/lib/_internal/wasm/standalone/regexp.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/regexp_patch.dart b/sdk/lib/_internal/wasm/standalone/regexp_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/regexp_patch.dart rename to sdk/lib/_internal/wasm/standalone/regexp_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/stack_trace_patch.dart b/sdk/lib/_internal/wasm/standalone/stack_trace_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/stack_trace_patch.dart rename to sdk/lib/_internal/wasm/standalone/stack_trace_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/stopwatch_patch.dart b/sdk/lib/_internal/wasm/standalone/stopwatch_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/stopwatch_patch.dart rename to sdk/lib/_internal/wasm/standalone/stopwatch_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/string_buffer_patch.dart b/sdk/lib/_internal/wasm/standalone/string_buffer_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/string_buffer_patch.dart rename to sdk/lib/_internal/wasm/standalone/string_buffer_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/string_patch.dart b/sdk/lib/_internal/wasm/standalone/string_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/string_patch.dart rename to sdk/lib/_internal/wasm/standalone/string_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/timer_patch.dart b/sdk/lib/_internal/wasm/standalone/timer_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/timer_patch.dart rename to sdk/lib/_internal/wasm/standalone/timer_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/typed_data_copy_from_js.dart b/sdk/lib/_internal/wasm/standalone/typed_data_copy_from_js.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/typed_data_copy_from_js.dart rename to sdk/lib/_internal/wasm/standalone/typed_data_copy_from_js.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/uri_patch.dart b/sdk/lib/_internal/wasm/standalone/uri_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/uri_patch.dart rename to sdk/lib/_internal/wasm/standalone/uri_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/lib/weak_patch.dart b/sdk/lib/_internal/wasm/standalone/weak_patch.dart similarity index 100% rename from sdk/lib/_internal/wasm_standalone/lib/weak_patch.dart rename to sdk/lib/_internal/wasm/standalone/weak_patch.dart diff --git a/sdk/lib/_internal/wasm_standalone/OWNERS b/sdk/lib/_internal/wasm_standalone/OWNERS deleted file mode 100644 index 2e908ab61d2..00000000000 --- a/sdk/lib/_internal/wasm_standalone/OWNERS +++ /dev/null @@ -1 +0,0 @@ -file:/tools/OWNERS_WASM diff --git a/sdk/lib/libraries.json b/sdk/lib/libraries.json index 35236170604..65138c1846e 100644 --- a/sdk/lib/libraries.json +++ b/sdk/lib/libraries.json @@ -146,56 +146,56 @@ "_internal/vm_shared/lib/bigint_patch.dart", "_internal/vm_shared/lib/bool_patch.dart", "_internal/vm_shared/lib/date_patch.dart", - "_internal/wasm/lib/double_patch.dart", "_internal/vm_shared/lib/map_patch.dart", "_internal/vm_shared/lib/null_patch.dart", - "_internal/wasm/lib/array_patch.dart", - "_internal/wasm/lib/bigint_patch_patch.dart", - "_internal/wasm/lib/core_patch.dart", - "_internal/wasm/lib/date_patch_patch.dart", - "_internal/wasm/lib/int_common_patch.dart", - "_internal/wasm/lib/int_patch.dart", - "_internal/wasm/lib/regexp_patch.dart", - "_internal/wasm/lib/stack_trace_patch.dart", - "_internal/wasm/lib/string_buffer_patch.dart", - "_internal/wasm/lib/string_patch.dart", - "_internal/wasm/lib/stopwatch_patch.dart", - "_internal/wasm/lib/sync_star_patch.dart", - "_internal/wasm/lib/uri_patch.dart", - "_internal/wasm/lib/weak_patch.dart" + "_internal/wasm/common/array_patch.dart", + "_internal/wasm/common/bigint_patch_patch.dart", + "_internal/wasm/common/core_patch.dart", + "_internal/wasm/common/int_common_patch.dart", + "_internal/wasm/common/int_patch.dart", + "_internal/wasm/common/sync_star_patch.dart", + "_internal/wasm/js/string_patch.dart", + "_internal/wasm/js_common/date_patch_patch.dart", + "_internal/wasm/js_common/double_patch.dart", + "_internal/wasm/js_common/regexp_patch.dart", + "_internal/wasm/js_common/stack_trace_patch.dart", + "_internal/wasm/js_common/stopwatch_patch.dart", + "_internal/wasm/js_common/string_buffer_patch.dart", + "_internal/wasm/js_common/uri_patch.dart", + "_internal/wasm/js_common/weak_patch.dart" ] }, "convert": { "uri": "convert/convert.dart", "patches": [ - "_internal/wasm/lib/convert_patch.dart", - "_internal/wasm/lib/convert_js_patch.dart" + "_internal/wasm/common/convert_patch.dart", + "_internal/wasm/js_common/convert_js_patch.dart" ] }, "typed_data": { "uri": "typed_data/typed_data.dart", "patches": [ - "_internal/wasm/lib/simd_patch.dart", - "_internal/wasm/lib/typed_data_patch.dart" + "_internal/wasm/common/simd_patch.dart", + "_internal/wasm/common/typed_data_patch.dart" ] }, "_boxed_int": { - "uri": "_internal/wasm/lib/boxed_int.dart", - "patches": "_internal/wasm/lib/boxed_int_patch.dart" + "uri": "_internal/wasm/common/boxed_int.dart", + "patches": "_internal/wasm/js/boxed_int_patch.dart" }, "_string": { - "uri": "_internal/wasm/lib/js_string.dart" + "uri": "_internal/wasm/js_common/js_string.dart" }, "_typed_data": { - "uri": "_internal/wasm/lib/typed_data.dart", + "uri": "_internal/wasm/common/typed_data.dart", "patches": [ - "_internal/wasm/lib/typed_data_copy_from_js.dart" + "_internal/wasm/js_common/typed_data_copy_from_js.dart" ] }, "_js_helper": { - "uri": "_internal/wasm/lib/js_helper.dart", + "uri": "_internal/wasm/js_common/js_helper.dart", "patches": [ - "_internal/wasm/lib/js_helper_patch.dart" + "_internal/wasm/js/js_helper_patch.dart" ] } } @@ -210,7 +210,7 @@ "convert": { "uri": "convert/convert.dart", "patches": [ - "_internal/wasm_js_compatibility/lib/convert_patch.dart" + "_internal/wasm/js_compatibility/convert_patch.dart" ] }, "core": { @@ -219,43 +219,43 @@ "_internal/vm_shared/lib/bigint_patch.dart", "_internal/vm_shared/lib/bool_patch.dart", "_internal/vm_shared/lib/date_patch.dart", - "_internal/wasm/lib/double_patch.dart", "_internal/vm_shared/lib/map_patch.dart", "_internal/vm_shared/lib/null_patch.dart", - "_internal/wasm/lib/array_patch.dart", - "_internal/wasm/lib/bigint_patch_patch.dart", - "_internal/wasm/lib/core_patch.dart", - "_internal/wasm/lib/date_patch_patch.dart", - "_internal/wasm/lib/int_common_patch.dart", - "_internal/wasm/lib/int_patch.dart", - "_internal/wasm/lib/regexp_patch.dart", - "_internal/wasm/lib/stack_trace_patch.dart", - "_internal/wasm/lib/stopwatch_patch.dart", - "_internal/wasm/lib/sync_star_patch.dart", - "_internal/wasm/lib/uri_patch.dart", - "_internal/wasm/lib/weak_patch.dart", - "_internal/wasm_js_compatibility/lib/string_buffer_patch.dart", - "_internal/wasm_js_compatibility/lib/string_patch.dart" + "_internal/wasm/common/array_patch.dart", + "_internal/wasm/common/bigint_patch_patch.dart", + "_internal/wasm/common/core_patch.dart", + "_internal/wasm/common/int_common_patch.dart", + "_internal/wasm/common/int_patch.dart", + "_internal/wasm/common/sync_star_patch.dart", + "_internal/wasm/js_common/date_patch_patch.dart", + "_internal/wasm/js_common/double_patch.dart", + "_internal/wasm/js_common/regexp_patch.dart", + "_internal/wasm/js_common/stack_trace_patch.dart", + "_internal/wasm/js_common/stopwatch_patch.dart", + "_internal/wasm/js_common/uri_patch.dart", + "_internal/wasm/js_common/weak_patch.dart", + "_internal/wasm/js_compatibility/string_buffer_patch.dart", + "_internal/wasm/js_compatibility/string_patch.dart" ] }, "typed_data": { "uri": "typed_data/typed_data.dart", "patches": [ - "_internal/wasm/lib/simd_patch.dart", - "_internal/wasm_js_compatibility/lib/typed_data_patch.dart" + "_internal/wasm/common/simd_patch.dart", + "_internal/wasm/js_compatibility/typed_data_patch.dart" ] }, "_boxed_int": { - "uri": "_internal/wasm/lib/boxed_int.dart", - "patches": "_internal/wasm_js_compatibility/lib/boxed_int_patch.dart" + "uri": "_internal/wasm/common/boxed_int.dart", + "patches": "_internal/wasm/js_compatibility/boxed_int_patch.dart" }, "_string": { - "uri": "_internal/wasm/lib/js_string.dart" + "uri": "_internal/wasm/js_common/js_string.dart" }, "_js_helper": { - "uri": "_internal/wasm/lib/js_helper.dart", + "uri": "_internal/wasm/js_common/js_helper.dart", "patches": [ - "_internal/wasm_js_compatibility/lib/js_helper_patch.dart" + "_internal/wasm/js_compatibility/js_helper_patch.dart" ] } } @@ -268,13 +268,13 @@ ], "libraries": { "_embedder": { - "uri": "_internal/wasm_standalone/lib/embedder.dart" + "uri": "_internal/wasm/standalone/embedder.dart" }, "async": { "uri": "async/async.dart", "patches": [ - "_internal/wasm/lib/async_patch.dart", - "_internal/wasm_standalone/lib/timer_patch.dart" + "_internal/wasm/common/async_patch.dart", + "_internal/wasm/standalone/timer_patch.dart" ] }, "core": { @@ -285,72 +285,72 @@ "_internal/vm_shared/lib/date_patch.dart", "_internal/vm_shared/lib/map_patch.dart", "_internal/vm_shared/lib/null_patch.dart", - "_internal/wasm/lib/array_patch.dart", - "_internal/wasm/lib/bigint_patch_patch.dart", - "_internal/wasm/lib/core_patch.dart", - "_internal/wasm_standalone/lib/double_patch.dart", - "_internal/wasm_standalone/lib/date_patch_patch.dart", - "_internal/wasm/lib/int_common_patch.dart", - "_internal/wasm/lib/int_patch.dart", - "_internal/wasm_standalone/lib/regexp_patch.dart", - "_internal/wasm_standalone/lib/stack_trace_patch.dart", - "_internal/wasm_standalone/lib/string_buffer_patch.dart", - "_internal/wasm_standalone/lib/string_patch.dart", - "_internal/wasm_standalone/lib/stopwatch_patch.dart", - "_internal/wasm/lib/sync_star_patch.dart", - "_internal/wasm_standalone/lib/uri_patch.dart", "_internal/vm_shared/lib/uri_encode_patch.dart", - "_internal/wasm_standalone/lib/weak_patch.dart" + "_internal/wasm/common/array_patch.dart", + "_internal/wasm/common/bigint_patch_patch.dart", + "_internal/wasm/common/core_patch.dart", + "_internal/wasm/common/int_common_patch.dart", + "_internal/wasm/common/int_patch.dart", + "_internal/wasm/common/sync_star_patch.dart", + "_internal/wasm/standalone/date_patch_patch.dart", + "_internal/wasm/standalone/double_patch.dart", + "_internal/wasm/standalone/regexp_patch.dart", + "_internal/wasm/standalone/stack_trace_patch.dart", + "_internal/wasm/standalone/stopwatch_patch.dart", + "_internal/wasm/standalone/string_buffer_patch.dart", + "_internal/wasm/standalone/string_patch.dart", + "_internal/wasm/standalone/uri_patch.dart", + "_internal/wasm/standalone/weak_patch.dart" ] }, "convert": { "uri": "convert/convert.dart", "patches": [ - "_internal/wasm/lib/convert_patch.dart", - "_internal/wasm_standalone/lib/convert_standalone_patch.dart" + "_internal/wasm/common/convert_patch.dart", + "_internal/wasm/standalone/convert_standalone_patch.dart" ] }, "developer": { "uri": "developer/developer.dart", "patches": [ - "_internal/wasm_standalone/lib/developer_patch.dart" + "_internal/wasm/standalone/developer_patch.dart" ] }, "typed_data": { "uri": "typed_data/typed_data.dart", "patches": [ - "_internal/wasm/lib/simd_patch.dart", - "_internal/wasm/lib/typed_data_patch.dart" + "_internal/wasm/common/simd_patch.dart", + "_internal/wasm/common/typed_data_patch.dart" ] }, "_boxed_int": { - "uri": "_internal/wasm/lib/boxed_int.dart", - "patches": "_internal/wasm_standalone/lib/boxed_int_patch.dart" + "uri": "_internal/wasm/common/boxed_int.dart", + "patches": "_internal/wasm/standalone/boxed_int_patch.dart" }, "_boxed_double": { - "uri": "_internal/wasm/lib/boxed_double.dart", + "uri": "_internal/wasm/common/boxed_double.dart", "patches": [ - "_internal/wasm_standalone/lib/boxed_double_patch.dart" + "_internal/wasm/standalone/boxed_double_patch.dart" ] }, "_string": { - "uri": "_internal/wasm_standalone/lib/embedder_string.dart" + "uri": "_internal/wasm/standalone/embedder_string.dart" }, "_typed_data": { - "uri": "_internal/wasm/lib/typed_data.dart", + "uri": "_internal/wasm/common/typed_data.dart", "patches": [ - "_internal/wasm_standalone/lib/typed_data_copy_from_js.dart" + "_internal/wasm/standalone/typed_data_copy_from_js.dart" ] }, "_internal": { "uri": "internal/internal.dart", "patches": [ - "_internal/wasm/lib/internal_patch.dart", - "_internal/wasm_standalone/lib/deferred_patch.dart", - "_internal/wasm_standalone/lib/internal_json_encode_patch.dart", - "_internal/wasm_standalone/lib/invoke_main_patch.dart", - "_internal/wasm_standalone/lib/print_patch.dart", - "_internal/vm_shared/lib/check_valid_weak_target_patch.dart" + "_internal/vm_shared/lib/check_valid_weak_target_patch.dart", + "_internal/wasm/common/internal_patch.dart", + "_internal/wasm/standalone/deferred_patch.dart", + "_internal/wasm/standalone/internal_json_encode_patch.dart", + "_internal/wasm/standalone/invoke_main_patch.dart", + "_internal/wasm/standalone/print_patch.dart" ] }, "_wasm": { @@ -359,18 +359,18 @@ "math": { "uri": "math/math.dart", "patches": [ - "_internal/wasm/lib/math_patch.dart", - "_internal/wasm_standalone/lib/math_externs_patch.dart" + "_internal/wasm/common/math_patch.dart", + "_internal/wasm/standalone/math_externs_patch.dart" ] }, "js_interop": { - "uri": "_internal/wasm_standalone/lib/js_interop.dart", + "uri": "_internal/wasm/standalone/js_interop.dart", "support_conditional_import": false }, "_js_interop_wasm": { "uri": "_js_interop_wasm/js_interop_wasm.dart", "patches": [ - "_internal/wasm_standalone/lib/js_interop_wasm_patch.dart" + "_internal/wasm/standalone/js_interop_wasm_patch.dart" ] } } @@ -383,20 +383,20 @@ ], "libraries": { "_boxed_double": { - "uri": "_internal/wasm/lib/boxed_double.dart", + "uri": "_internal/wasm/common/boxed_double.dart", "patches": [ - "_internal/wasm/lib/boxed_double_patch.dart" + "_internal/wasm/js_common/boxed_double_patch.dart" ] }, "_internal": { "uri": "internal/internal.dart", "patches": [ - "_internal/wasm/lib/internal_patch.dart", - "_internal/wasm/lib/deferred_patch.dart", - "_internal/wasm/lib/internal_json_encode_patch.dart", - "_internal/wasm/lib/invoke_main_patch.dart", - "_internal/wasm/lib/print_patch.dart", - "_internal/vm_shared/lib/check_valid_weak_target_patch.dart" + "_internal/vm_shared/lib/check_valid_weak_target_patch.dart", + "_internal/wasm/common/internal_patch.dart", + "_internal/wasm/js_common/deferred_patch.dart", + "_internal/wasm/js_common/internal_json_encode_patch.dart", + "_internal/wasm/js_common/invoke_main_patch.dart", + "_internal/wasm/js_common/print_patch.dart" ] }, "_wasm": { @@ -405,8 +405,8 @@ "async": { "uri": "async/async.dart", "patches": [ - "_internal/wasm/lib/async_patch.dart", - "_internal/wasm/lib/timer_patch.dart" + "_internal/wasm/common/async_patch.dart", + "_internal/wasm/js_common/timer_patch.dart" ] }, "developer": { @@ -418,28 +418,28 @@ "math": { "uri": "math/math.dart", "patches": [ - "_internal/wasm/lib/math_patch.dart", - "_internal/wasm/lib/math_externs_patch.dart" + "_internal/wasm/common/math_patch.dart", + "_internal/wasm/js_common/math_externs_patch.dart" ] }, "_js_string_convert": { - "uri": "_internal/wasm/lib/js_string_convert.dart" + "uri": "_internal/wasm/js_common/js_string_convert.dart" }, "_js_types": { - "uri": "_internal/wasm/lib/js_types.dart" + "uri": "_internal/wasm/js_common/js_types.dart" }, "js_interop": { "uri": "js_interop/js_interop.dart", - "patches": "_internal/wasm/lib/js_interop_patch.dart" + "patches": "_internal/wasm/js_common/js_interop_patch.dart" }, "js_interop_unsafe": { "uri": "js_interop_unsafe/js_interop_unsafe.dart", - "patches": "_internal/wasm/lib/js_interop_unsafe_patch.dart" + "patches": "_internal/wasm/js_common/js_interop_unsafe_patch.dart" }, "_js_interop_wasm": { "uri": "_js_interop_wasm/js_interop_wasm.dart", "patches": [ - "_internal/wasm/lib/js_interop_wasm_patch.dart" + "_internal/wasm/js_common/js_interop_wasm_patch.dart" ] } } @@ -449,20 +449,20 @@ "core": { "uri": "core/core.dart", "patches": [ - "_internal/wasm/lib/int_common_patch.dart" + "_internal/wasm/common/int_common_patch.dart" ] }, "_boxed_bool": { - "uri": "_internal/wasm/lib/boxed_bool.dart" + "uri": "_internal/wasm/common/boxed_bool.dart" }, "_boxed_int": { - "uri": "_internal/wasm/lib/boxed_int.dart" + "uri": "_internal/wasm/common/boxed_int.dart" }, "_compact_hash": { - "uri": "_internal/wasm/lib/compact_hash.dart" + "uri": "_internal/wasm/common/compact_hash.dart" }, "_error_utils": { - "uri": "_internal/wasm/lib/error_utils.dart" + "uri": "_internal/wasm/common/error_utils.dart" }, "_http": { "uri": "_http/http.dart", @@ -471,33 +471,33 @@ ] }, "_list": { - "uri": "_internal/wasm/lib/list.dart" + "uri": "_internal/wasm/common/list.dart" }, "_object_helper": { - "uri": "_internal/wasm/lib/object_helper.dart" + "uri": "_internal/wasm/common/object_helper.dart" }, "_simd": { - "uri": "_internal/wasm/lib/simd.dart" + "uri": "_internal/wasm/common/simd.dart" }, "_string_helper": { - "uri": "_internal/wasm/lib/string_helper.dart" + "uri": "_internal/wasm/common/string_helper.dart" }, "collection": { "uri": "collection/collection.dart", "patches": [ "_internal/vm_shared/lib/collection_patch.dart", - "_internal/wasm/lib/hash_factories.dart" + "_internal/wasm/common/hash_factories.dart" ] }, "ffi": { "uri": "ffi/ffi.dart", "patches": [ - "_internal/vm/lib/ffi_patch.dart", "_internal/vm/lib/ffi_allocation_patch.dart", "_internal/vm/lib/ffi_dynamic_library_patch.dart", "_internal/vm/lib/ffi_native_type_patch.dart", + "_internal/vm/lib/ffi_patch.dart", "_internal/vm/lib/ffi_struct_patch.dart", - "_internal/wasm/lib/ffi_patch.dart" + "_internal/wasm/common/ffi_patch.dart" ] }, "nativewrappers": { @@ -505,13 +505,13 @@ }, "io": { "uri": "io/io.dart", - "patches": "_internal/wasm/lib/io_patch.dart", + "patches": "_internal/wasm/common/io_patch.dart", "support_conditional_import": false }, "isolate": { "uri": "isolate/isolate.dart", "patches": [ - "_internal/wasm/lib/isolate_patch.dart" + "_internal/wasm/common/isolate_patch.dart" ] } } diff --git a/sdk/lib/libraries.yaml b/sdk/lib/libraries.yaml index 39c7cac6406..056b061ef38 100644 --- a/sdk/lib/libraries.yaml +++ b/sdk/lib/libraries.yaml @@ -135,47 +135,47 @@ wasm: - _internal/vm_shared/lib/bigint_patch.dart - _internal/vm_shared/lib/bool_patch.dart - _internal/vm_shared/lib/date_patch.dart - - _internal/wasm/lib/double_patch.dart - _internal/vm_shared/lib/map_patch.dart - _internal/vm_shared/lib/null_patch.dart - - _internal/wasm/lib/array_patch.dart - - _internal/wasm/lib/bigint_patch_patch.dart - - _internal/wasm/lib/core_patch.dart - - _internal/wasm/lib/date_patch_patch.dart - - _internal/wasm/lib/int_common_patch.dart - - _internal/wasm/lib/int_patch.dart - - _internal/wasm/lib/regexp_patch.dart - - _internal/wasm/lib/stack_trace_patch.dart - - _internal/wasm/lib/string_buffer_patch.dart - - _internal/wasm/lib/string_patch.dart - - _internal/wasm/lib/stopwatch_patch.dart - - _internal/wasm/lib/sync_star_patch.dart - - _internal/wasm/lib/uri_patch.dart - - _internal/wasm/lib/weak_patch.dart + - _internal/wasm/common/array_patch.dart + - _internal/wasm/common/bigint_patch_patch.dart + - _internal/wasm/common/core_patch.dart + - _internal/wasm/common/int_common_patch.dart + - _internal/wasm/common/int_patch.dart + - _internal/wasm/common/sync_star_patch.dart + - _internal/wasm/js/string_patch.dart + - _internal/wasm/js_common/date_patch_patch.dart + - _internal/wasm/js_common/double_patch.dart + - _internal/wasm/js_common/regexp_patch.dart + - _internal/wasm/js_common/stack_trace_patch.dart + - _internal/wasm/js_common/stopwatch_patch.dart + - _internal/wasm/js_common/string_buffer_patch.dart + - _internal/wasm/js_common/uri_patch.dart + - _internal/wasm/js_common/weak_patch.dart convert: uri: convert/convert.dart patches: - - _internal/wasm/lib/convert_patch.dart - - _internal/wasm/lib/convert_js_patch.dart + - _internal/wasm/common/convert_patch.dart + - _internal/wasm/js_common/convert_js_patch.dart typed_data: uri: typed_data/typed_data.dart patches: - - _internal/wasm/lib/simd_patch.dart - - _internal/wasm/lib/typed_data_patch.dart + - _internal/wasm/common/simd_patch.dart + - _internal/wasm/common/typed_data_patch.dart _boxed_int: - uri: _internal/wasm/lib/boxed_int.dart + uri: _internal/wasm/common/boxed_int.dart patches: - _internal/wasm/lib/boxed_int_patch.dart + _internal/wasm/js/boxed_int_patch.dart _string: - uri: _internal/wasm/lib/js_string.dart + uri: _internal/wasm/js_common/js_string.dart _typed_data: - uri: _internal/wasm/lib/typed_data.dart + uri: _internal/wasm/common/typed_data.dart patches: - - _internal/wasm/lib/typed_data_copy_from_js.dart + - _internal/wasm/js_common/typed_data_copy_from_js.dart _js_helper: - uri: _internal/wasm/lib/js_helper.dart + uri: _internal/wasm/js_common/js_helper.dart patches: - - _internal/wasm/lib/js_helper_patch.dart + - _internal/wasm/js/js_helper_patch.dart wasm_js_compatibility: include: @@ -184,57 +184,57 @@ wasm_js_compatibility: convert: uri: convert/convert.dart patches: - - _internal/wasm_js_compatibility/lib/convert_patch.dart + - _internal/wasm/js_compatibility/convert_patch.dart core: uri: core/core.dart patches: - _internal/vm_shared/lib/bigint_patch.dart - _internal/vm_shared/lib/bool_patch.dart - _internal/vm_shared/lib/date_patch.dart - - _internal/wasm/lib/double_patch.dart - _internal/vm_shared/lib/map_patch.dart - _internal/vm_shared/lib/null_patch.dart - - _internal/wasm/lib/array_patch.dart - - _internal/wasm/lib/bigint_patch_patch.dart - - _internal/wasm/lib/core_patch.dart - - _internal/wasm/lib/date_patch_patch.dart - - _internal/wasm/lib/int_common_patch.dart - - _internal/wasm/lib/int_patch.dart - - _internal/wasm/lib/regexp_patch.dart - - _internal/wasm/lib/stack_trace_patch.dart - - _internal/wasm/lib/stopwatch_patch.dart - - _internal/wasm/lib/sync_star_patch.dart - - _internal/wasm/lib/uri_patch.dart - - _internal/wasm/lib/weak_patch.dart - - _internal/wasm_js_compatibility/lib/string_buffer_patch.dart - - _internal/wasm_js_compatibility/lib/string_patch.dart + - _internal/wasm/common/array_patch.dart + - _internal/wasm/common/bigint_patch_patch.dart + - _internal/wasm/common/core_patch.dart + - _internal/wasm/common/int_common_patch.dart + - _internal/wasm/common/int_patch.dart + - _internal/wasm/common/sync_star_patch.dart + - _internal/wasm/js_common/date_patch_patch.dart + - _internal/wasm/js_common/double_patch.dart + - _internal/wasm/js_common/regexp_patch.dart + - _internal/wasm/js_common/stack_trace_patch.dart + - _internal/wasm/js_common/stopwatch_patch.dart + - _internal/wasm/js_common/uri_patch.dart + - _internal/wasm/js_common/weak_patch.dart + - _internal/wasm/js_compatibility/string_buffer_patch.dart + - _internal/wasm/js_compatibility/string_patch.dart typed_data: uri: typed_data/typed_data.dart patches: - - _internal/wasm/lib/simd_patch.dart - - _internal/wasm_js_compatibility/lib/typed_data_patch.dart + - _internal/wasm/common/simd_patch.dart + - _internal/wasm/js_compatibility/typed_data_patch.dart _boxed_int: - uri: _internal/wasm/lib/boxed_int.dart + uri: _internal/wasm/common/boxed_int.dart patches: - _internal/wasm_js_compatibility/lib/boxed_int_patch.dart + _internal/wasm/js_compatibility/boxed_int_patch.dart _string: - uri: _internal/wasm/lib/js_string.dart + uri: _internal/wasm/js_common/js_string.dart _js_helper: - uri: _internal/wasm/lib/js_helper.dart + uri: _internal/wasm/js_common/js_helper.dart patches: - - _internal/wasm_js_compatibility/lib/js_helper_patch.dart + - _internal/wasm/js_compatibility/js_helper_patch.dart wasm_standalone: include: - target: "wasm_common" libraries: _embedder: - uri: _internal/wasm_standalone/lib/embedder.dart + uri: _internal/wasm/standalone/embedder.dart async: uri: async/async.dart patches: - - _internal/wasm/lib/async_patch.dart - - _internal/wasm_standalone/lib/timer_patch.dart + - _internal/wasm/common/async_patch.dart + - _internal/wasm/standalone/timer_patch.dart core: uri: core/core.dart patches: @@ -243,100 +243,100 @@ wasm_standalone: - _internal/vm_shared/lib/date_patch.dart - _internal/vm_shared/lib/map_patch.dart - _internal/vm_shared/lib/null_patch.dart - - _internal/wasm/lib/array_patch.dart - - _internal/wasm/lib/bigint_patch_patch.dart - - _internal/wasm/lib/core_patch.dart - - _internal/wasm_standalone/lib/double_patch.dart - - _internal/wasm_standalone/lib/date_patch_patch.dart - - _internal/wasm/lib/int_common_patch.dart - - _internal/wasm/lib/int_patch.dart - - _internal/wasm_standalone/lib/regexp_patch.dart - - _internal/wasm_standalone/lib/stack_trace_patch.dart - - _internal/wasm_standalone/lib/string_buffer_patch.dart - - _internal/wasm_standalone/lib/string_patch.dart - - _internal/wasm_standalone/lib/stopwatch_patch.dart - - _internal/wasm/lib/sync_star_patch.dart - - _internal/wasm_standalone/lib/uri_patch.dart - _internal/vm_shared/lib/uri_encode_patch.dart - - _internal/wasm_standalone/lib/weak_patch.dart + - _internal/wasm/common/array_patch.dart + - _internal/wasm/common/bigint_patch_patch.dart + - _internal/wasm/common/core_patch.dart + - _internal/wasm/common/int_common_patch.dart + - _internal/wasm/common/int_patch.dart + - _internal/wasm/common/sync_star_patch.dart + - _internal/wasm/standalone/date_patch_patch.dart + - _internal/wasm/standalone/double_patch.dart + - _internal/wasm/standalone/regexp_patch.dart + - _internal/wasm/standalone/stack_trace_patch.dart + - _internal/wasm/standalone/stopwatch_patch.dart + - _internal/wasm/standalone/string_buffer_patch.dart + - _internal/wasm/standalone/string_patch.dart + - _internal/wasm/standalone/uri_patch.dart + - _internal/wasm/standalone/weak_patch.dart convert: uri: convert/convert.dart patches: - - _internal/wasm/lib/convert_patch.dart - - _internal/wasm_standalone/lib/convert_standalone_patch.dart + - _internal/wasm/common/convert_patch.dart + - _internal/wasm/standalone/convert_standalone_patch.dart developer: uri: developer/developer.dart patches: - - _internal/wasm_standalone/lib/developer_patch.dart + - _internal/wasm/standalone/developer_patch.dart typed_data: uri: typed_data/typed_data.dart patches: - - _internal/wasm/lib/simd_patch.dart - - _internal/wasm/lib/typed_data_patch.dart + - _internal/wasm/common/simd_patch.dart + - _internal/wasm/common/typed_data_patch.dart _boxed_int: - uri: _internal/wasm/lib/boxed_int.dart + uri: _internal/wasm/common/boxed_int.dart patches: - _internal/wasm_standalone/lib/boxed_int_patch.dart + _internal/wasm/standalone/boxed_int_patch.dart _boxed_double: - uri: _internal/wasm/lib/boxed_double.dart + uri: _internal/wasm/common/boxed_double.dart patches: - - _internal/wasm_standalone/lib/boxed_double_patch.dart + - _internal/wasm/standalone/boxed_double_patch.dart _string: - uri: _internal/wasm_standalone/lib/embedder_string.dart + uri: _internal/wasm/standalone/embedder_string.dart _typed_data: - uri: _internal/wasm/lib/typed_data.dart + uri: _internal/wasm/common/typed_data.dart patches: - - _internal/wasm_standalone/lib/typed_data_copy_from_js.dart + - _internal/wasm/standalone/typed_data_copy_from_js.dart _internal: uri: internal/internal.dart patches: - - _internal/wasm/lib/internal_patch.dart - - _internal/wasm_standalone/lib/deferred_patch.dart - - _internal/wasm_standalone/lib/internal_json_encode_patch.dart - - _internal/wasm_standalone/lib/invoke_main_patch.dart - - _internal/wasm_standalone/lib/print_patch.dart - _internal/vm_shared/lib/check_valid_weak_target_patch.dart + - _internal/wasm/common/internal_patch.dart + - _internal/wasm/standalone/deferred_patch.dart + - _internal/wasm/standalone/internal_json_encode_patch.dart + - _internal/wasm/standalone/invoke_main_patch.dart + - _internal/wasm/standalone/print_patch.dart _wasm: uri: _wasm/wasm_types.dart math: uri: math/math.dart patches: - - _internal/wasm/lib/math_patch.dart - - _internal/wasm_standalone/lib/math_externs_patch.dart + - _internal/wasm/common/math_patch.dart + - _internal/wasm/standalone/math_externs_patch.dart js_interop: # TODO(63166): Remove js_interop from wasm_standalone. It's fundamentally unsupported, but # currently added as a stub because APIs in dart:_wasm reference it. - uri: _internal/wasm_standalone/lib/js_interop.dart + uri: _internal/wasm/standalone/js_interop.dart support_conditional_import: false _js_interop_wasm: uri: _js_interop_wasm/js_interop_wasm.dart patches: - - _internal/wasm_standalone/lib/js_interop_wasm_patch.dart + - _internal/wasm/standalone/js_interop_wasm_patch.dart wasm_js_common: include: - target: "wasm_common" libraries: _boxed_double: - uri: _internal/wasm/lib/boxed_double.dart + uri: _internal/wasm/common/boxed_double.dart patches: - - _internal/wasm/lib/boxed_double_patch.dart + - _internal/wasm/js_common/boxed_double_patch.dart _internal: uri: internal/internal.dart patches: - - _internal/wasm/lib/internal_patch.dart - - _internal/wasm/lib/deferred_patch.dart - - _internal/wasm/lib/internal_json_encode_patch.dart - - _internal/wasm/lib/invoke_main_patch.dart - - _internal/wasm/lib/print_patch.dart - _internal/vm_shared/lib/check_valid_weak_target_patch.dart + - _internal/wasm/common/internal_patch.dart + - _internal/wasm/js_common/deferred_patch.dart + - _internal/wasm/js_common/internal_json_encode_patch.dart + - _internal/wasm/js_common/invoke_main_patch.dart + - _internal/wasm/js_common/print_patch.dart _wasm: uri: _wasm/wasm_types.dart async: uri: async/async.dart patches: - - _internal/wasm/lib/async_patch.dart - - _internal/wasm/lib/timer_patch.dart + - _internal/wasm/common/async_patch.dart + - _internal/wasm/js_common/timer_patch.dart developer: uri: developer/developer.dart patches: @@ -344,73 +344,73 @@ wasm_js_common: math: uri: math/math.dart patches: - - _internal/wasm/lib/math_patch.dart - - _internal/wasm/lib/math_externs_patch.dart + - _internal/wasm/common/math_patch.dart + - _internal/wasm/js_common/math_externs_patch.dart _js_string_convert: - uri: _internal/wasm/lib/js_string_convert.dart + uri: _internal/wasm/js_common/js_string_convert.dart _js_types: - uri: _internal/wasm/lib/js_types.dart + uri: _internal/wasm/js_common/js_types.dart js_interop: uri: js_interop/js_interop.dart - patches: _internal/wasm/lib/js_interop_patch.dart + patches: _internal/wasm/js_common/js_interop_patch.dart js_interop_unsafe: uri: js_interop_unsafe/js_interop_unsafe.dart - patches: _internal/wasm/lib/js_interop_unsafe_patch.dart + patches: _internal/wasm/js_common/js_interop_unsafe_patch.dart _js_interop_wasm: uri: _js_interop_wasm/js_interop_wasm.dart patches: - - _internal/wasm/lib/js_interop_wasm_patch.dart + - _internal/wasm/js_common/js_interop_wasm_patch.dart wasm_common: libraries: core: uri: core/core.dart patches: - - _internal/wasm/lib/int_common_patch.dart + - _internal/wasm/common/int_common_patch.dart _boxed_bool: - uri: _internal/wasm/lib/boxed_bool.dart + uri: _internal/wasm/common/boxed_bool.dart _boxed_int: - uri: _internal/wasm/lib/boxed_int.dart + uri: _internal/wasm/common/boxed_int.dart _compact_hash: - uri: _internal/wasm/lib/compact_hash.dart + uri: _internal/wasm/common/compact_hash.dart _error_utils: - uri: _internal/wasm/lib/error_utils.dart + uri: _internal/wasm/common/error_utils.dart _http: uri: _http/http.dart patches: - _internal/js_shared/lib/http_patch.dart _list: - uri: _internal/wasm/lib/list.dart + uri: _internal/wasm/common/list.dart _object_helper: - uri: _internal/wasm/lib/object_helper.dart + uri: _internal/wasm/common/object_helper.dart _simd: - uri: _internal/wasm/lib/simd.dart + uri: _internal/wasm/common/simd.dart _string_helper: - uri: _internal/wasm/lib/string_helper.dart + uri: _internal/wasm/common/string_helper.dart collection: uri: collection/collection.dart patches: - _internal/vm_shared/lib/collection_patch.dart - - _internal/wasm/lib/hash_factories.dart + - _internal/wasm/common/hash_factories.dart ffi: uri: "ffi/ffi.dart" patches: - - "_internal/vm/lib/ffi_patch.dart" - "_internal/vm/lib/ffi_allocation_patch.dart" - "_internal/vm/lib/ffi_dynamic_library_patch.dart" - "_internal/vm/lib/ffi_native_type_patch.dart" + - "_internal/vm/lib/ffi_patch.dart" - "_internal/vm/lib/ffi_struct_patch.dart" - - "_internal/wasm/lib/ffi_patch.dart" + - "_internal/wasm/common/ffi_patch.dart" nativewrappers: uri: "html/dartium/nativewrappers.dart" io: uri: io/io.dart - patches: _internal/wasm/lib/io_patch.dart + patches: _internal/wasm/common/io_patch.dart support_conditional_import: false isolate: uri: isolate/isolate.dart patches: - - "_internal/wasm/lib/isolate_patch.dart" + - "_internal/wasm/common/isolate_patch.dart" dart2js: include: