updates to move away from dart:js_util (#148)

- updates to move away from dart:js_util
- run npm update to get the latest versions of node packages

Author: devoncarew

dist/index.mjs

@@ -2,8 +2,8 @@
 // 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:convert';
 import 'dart:js_interop';
-import 'dart:js_util';
 
 import 'package:path/path.dart' as path;
 import 'package:pub_semver/pub_semver.dart';
@@ -112,13 +112,15 @@ Future<void> _impl(List<String> args) async {
       process.env('RUNNER_TEMP')!,
       path.url.basename(url),
     );
-    await promiseToFuture<String>(toolCache.downloadTool(url, archivePath));
+    await toolCache.downloadTool(url, archivePath).toDart;
     var extractedFolder =
-        await promiseToFuture<String>(toolCache.extractZip(archivePath));
+        (await toolCache.extractZip(archivePath).toDart).toDart;
     extractedFolder = path.join(extractedFolder, 'dart-sdk');
 
-    sdkPath = await promiseToFuture<String>(
-        toolCache.cacheDir(extractedFolder, toolName, version, architecture));
+    sdkPath = (await toolCache
+            .cacheDir(extractedFolder, toolName, version, architecture)
+            .toDart)
+        .toDart;
   }
 
   final pubCache = path.join(
@@ -136,10 +138,7 @@ Future<void> _impl(List<String> args) async {
   core.setOutput('dart-version', getVersionFromSdk(sdkPath));
 
   // Report success; print version.
-  await promiseToFuture<void>(exec.exec(
-    'dart',
-    ['--version'.toJS].toJS,
-  ));
+  await exec.exec('dart', ['--version'.toJS].toJS).toDart;
 }
 
 String getVersionFromSdk(String sdkPath) {
@@ -172,22 +171,22 @@ Future<void> createPubOIDCToken() async {
     return;
   }
 
-  final token =
-      await promiseToFuture<String>(core.getIDToken('https://pub.dev'));
+  final token = (await core.getIDToken('https://pub.dev').toDart).toDart;
 
   core.exportVariable('PUB_TOKEN', token);
 
-  await promiseToFuture<void>(exec.exec(
-    'dart',
-    [
-      'pub'.toJS,
-      'token'.toJS,
-      'add'.toJS,
-      'https://pub.dev'.toJS,
-      '--env-var'.toJS,
-      'PUB_TOKEN'.toJS,
-    ].toJS,
-  ));
+  await exec
+      .exec(
+          'dart',
+          [
+            'pub'.toJS,
+            'token'.toJS,
+            'add'.toJS,
+            'https://pub.dev'.toJS,
+            '--env-var'.toJS,
+            'PUB_TOKEN'.toJS,
+          ].toJS)
+      .toDart;
 }
 
 // https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION
@@ -206,17 +205,18 @@ Future<String> latestPublishedVersion(String channel, String flavor) async {
   final http = HttpClient(
     'setup-dart',
     <JSAny>[].toJS,
-    jsify({
+    {
       'allowRedirects': true,
       'maxRedirects': 3,
       'allowRetries': true,
       'maxRetries': 3,
-    }) as JSObject?,
+    }.jsify() as JSObject?,
   );
 
-  var response = await promiseToFuture<JSObject>(http.getJson(url));
-  var result = getProperty<JSObject>(response, 'result');
-  return getProperty(result, 'version');
+  var response = (await http.get(url).toDart) as HttpClientResponse;
+  var data = (await response.readBody().toDart).toDart;
+  var json = (jsonDecode(data) as Map).cast<String, Object?>();
+  return json['version'] as String;
 }
 
 /// Find the latest SDK patch version for the given SDK release.
@@ -230,12 +230,12 @@ Future<String> findLatestSdkForRelease(String sdkRelease) async {
   final http = HttpClient(
     'setup-dart',
     <JSAny>[].toJS,
-    jsify({
+    {
       'allowRedirects': true,
       'maxRedirects': 3,
       'allowRetries': true,
       'maxRetries': 3,
-    }) as JSObject?,
+    }.jsify() as JSObject?,
   );
 
   // {
@@ -247,10 +247,11 @@ Future<String> findLatestSdkForRelease(String sdkRelease) async {
   //     "channels/stable/release/2.19.6/"
   //   ]
   // }
-  var response = await promiseToFuture<JSObject>(http.getJson(url));
-  var result = getProperty<JSObject>(response, 'result');
+  var response = (await http.get(url).toDart) as HttpClientResponse;
+  var data = (await response.readBody().toDart).toDart;
+  var json = (jsonDecode(data) as Map).cast<String, Object?>();
 
-  final paths = (getProperty(result, 'prefixes') as List).cast<String>();
+  final paths = (json['prefixes'] as List).cast<String>();
   final versions = paths.map((p) => (p.split('/')..removeLast()).last).toList();
 
   // Sort versions by semver and return the highest version.

dist/main.cjs

@@ -21,6 +21,5 @@ extension type Core(JSObject obj) {
 
   external void exportVariable(String name, String value);
 
-  // JSPromise<String>
-  external JSPromise getIDToken(String audience);
+  external JSPromise<JSString> getIDToken(String audience);
 }

dist/sig.txt

@@ -12,6 +12,12 @@ extension type HttpClient._(JSObject obj) {
     JSObject? requestOptions,
   ]);
 
-  // JSPromise<JSObject>
-  external JSPromise getJson(String requestUrl);
+  // JSPromise<HttpClientResponse>
+  external JSPromise<JSObject> get(String requestUrl);
+  external JSPromise<JSObject?> getJson(String requestUrl);
+}
+
+@JS()
+extension type HttpClientResponse._(JSObject obj) {
+  external JSPromise<JSString> readBody();
 }

lib/main.dart

@@ -25,14 +25,13 @@ extension type ToolCache(JSObject obj) {
   /// @param url       url of tool to download
   /// @param dest      path to download tool
   /// @returns         path to downloaded tool
-  // JSPromise<String>
-  external JSPromise downloadTool(String url, [String? dest]);
+  external JSPromise<JSString> downloadTool(String url, [String? dest]);
 
   /// Extract a zip.
   ///
   /// @param file     path to the zip
   /// @returns        path to the destination directory
-  external JSPromise extractZip(String file);
+  external JSPromise<JSString> extractZip(String file);
 
   /// Caches a directory and installs it into the tool cacheDir
   ///
@@ -41,7 +40,7 @@ extension type ToolCache(JSObject obj) {
   /// @param version       version of the tool.  semver format
   /// @param arch          architecture of the tool.  Optional.
   ///                      Defaults to machine architecture
-  external JSPromise cacheDir(
+  external JSPromise<JSString> cacheDir(
     String sourceDir,
     String tool,
     String version, [

lib/node/actions/core.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:js_interop';
-import 'dart:js_util';
+import 'dart:js_interop_unsafe';
 
 /// Provides information about, and control over, the current Node.js process.
 /// Wraps https://nodejs.org/api/process.html
@@ -17,7 +17,9 @@ extension type Process(JSObject obj) {
   external JSObject get _env;
 
   /// Read the environment variable [variable].
-  String? env(String variable) => getProperty<String?>(_env, variable);
+  String? env(String variable) {
+    return _env.getProperty<JSString?>(variable.toJS)?.toDart;
+  }
 
   external int exitCode;
 }

lib/node/actions/http_client.dart

@@ -13,4 +13,4 @@ dependencies:
 dev_dependencies:
   args: ^2.4.0
   crypto: ^3.0.0
-  dart_flutter_team_lints: ^2.0.0
+  dart_flutter_team_lints: ^3.0.0