Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle Dart SDK change to extension types #116

Merged
merged 3 commits into from
Dec 7, 2023
Merged

Handle Dart SDK change to extension types #116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5678f5
Handle Dart SDK change to extension types
srujzs Dec 5, 2023
769fad1
Move function to top-level
srujzs Dec 5, 2023
00d7e78
Remove unnecessary comment in _isInJsTypesOrJsInterop
srujzs Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:
sdk: ^3.2.0

dev_dependencies:
analyzer: ^6.2.0
analyzer: ^6.3.0
args: ^2.4.0
build_runner: ^2.4.0
build_web_compilers: ^4.0.7
Expand Down
30 changes: 15 additions & 15 deletions tool/bindings_generator/js_type_supertypes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@

const Map<String, String?> jsTypeSupertypes = {
'JSAny': null,
'JSObject': 'JSAny',
'JSFunction': 'JSObject',
'JSExportedDartFunction': 'JSFunction',
'JSPromise': 'JSObject',
'JSArray': 'JSObject',
'JSBoxedDartObject': 'JSObject',
'JSArrayBuffer': 'JSObject',
'JSBigInt': 'JSAny',
'JSBoolean': 'JSAny',
'JSBoxedDartObject': 'JSObject',
'JSDataView': 'JSObject',
'JSTypedArray': 'JSObject',
'JSInt8Array': 'JSTypedArray',
'JSUint8Array': 'JSTypedArray',
'JSUint8ClampedArray': 'JSTypedArray',
'JSInt16Array': 'JSTypedArray',
'JSUint16Array': 'JSTypedArray',
'JSInt32Array': 'JSTypedArray',
'JSUint32Array': 'JSTypedArray',
'JSExportedDartFunction': 'JSFunction',
'JSFloat32Array': 'JSTypedArray',
'JSFloat64Array': 'JSTypedArray',
'JSFunction': 'JSObject',
'JSInt16Array': 'JSTypedArray',
'JSInt32Array': 'JSTypedArray',
'JSInt8Array': 'JSTypedArray',
'JSNumber': 'JSAny',
'JSBoolean': 'JSAny',
'JSObject': 'JSAny',
'JSPromise': 'JSObject',
'JSString': 'JSAny',
'JSSymbol': 'JSAny',
'JSBigInt': 'JSAny'
'JSTypedArray': 'JSObject',
'JSUint16Array': 'JSTypedArray',
'JSUint32Array': 'JSTypedArray',
'JSUint8Array': 'JSTypedArray',
'JSUint8ClampedArray': 'JSTypedArray'
};
26 changes: 17 additions & 9 deletions tool/update_bindings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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.

import 'dart:collection';
import 'dart:convert';
import 'dart:io';

Expand Down Expand Up @@ -175,28 +176,35 @@ Future<void> _generateJsTypeSupertypes() async {
final dartJsInterop = await contextCollection.contexts.single.currentSession
.getLibraryByUri('dart:js_interop') as LibraryElementResult;
final definedNames = dartJsInterop.element.exportNamespace.definedNames;
final jsTypeSupertypes = <String, String?>{};
// `SplayTreeMap` to avoid moving types around in `dart:js_interop` affecting
// the code generation.
final jsTypeSupertypes = SplayTreeMap<String, String?>();
for (final name in definedNames.keys) {
final element = definedNames[name];
if (element is TypeDefiningElement) {
// TODO(srujzs): This contains code that handles the SDK before and after
// the migration of JS types to extension types. Once the changes to
// migrate to extension types hit the dev branch, we should remove some of
// the old code.
void storeSupertypes(InterfaceElement element) {
bool isInJsTypes(InterfaceElement element) =>
bool isInJsTypesOrJsInterop(InterfaceElement element) =>
srujzs marked this conversation as resolved.
Show resolved Hide resolved
// We only care about JS types for this calculation.
// TODO(srujzs): We'll likely need to change this once JS types move
// to extension types.
element.library.isInSdk && element.library.name == '_js_types';
element.library.isInSdk &&
(element.library.name == '_js_types' ||
element is ExtensionTypeElement &&
element.library.name == 'dart.js_interop');

if (!isInJsTypes(element)) return;
if (!isInJsTypesOrJsInterop(element)) return;
String? parentJsType;
final supertype = element.supertype;
final immediateSupertypes = <InterfaceType>[
if (supertype != null && !supertype.isDartCoreObject) supertype,
if (supertype != null) supertype,
...element.interfaces,
];
]..removeWhere((supertype) => supertype.isDartCoreObject);
// We should have at most one non-trivial supertype.
assert(immediateSupertypes.length <= 1);
for (final supertype in immediateSupertypes) {
if (isInJsTypes(supertype.element)) {
if (isInJsTypesOrJsInterop(supertype.element)) {
parentJsType = "'${supertype.element.name}'";
}
}
Expand Down