Merge branch 'FME-11223-web-support-polishing' into FME-11223-web-support-js-interop-improvements

Author: EmilianoSanchez

splitio_web/lib/splitio_web.dart

@@ -92,7 +92,7 @@ class SplitioWeb extends SplitioPlatform {
     // Create and inject script tag
     final script = document.createElement('script') as HTMLScriptElement;
     script.type = 'text/javascript';
-    script.src = 'packages/splitio_web/web/split-browser-1.6.0.full.min.js';
+    script.src = 'assets/packages/splitio_web/web/split-browser-1.6.0.full.min.js';
 
     // Wait for script to load
     final completer = Completer<void>();

splitio_web/lib/src/js_interop.dart

@@ -236,40 +236,21 @@ extension type JS_BrowserSDKPackage._(JSObject _) implements JSObject {
 external JSArray<JSString> objectKeys(JSObject obj);
 
 @JS('Reflect.get')
-external JSAny? reflectGet(JSObject target, JSAny propertyKey);
+external JSAny? reflectGet(JSObject target, JSString propertyKey);
 
 @JS('Reflect.set')
-external JSAny? reflectSet(JSObject target, JSAny propertyKey, JSAny? value);
+external JSAny? reflectSet(JSObject target, JSString propertyKey, JSAny? value);
 
 @JS('JSON.parse')
 external JSObject jsonParse(JSString obj);
 
-List<dynamic> jsArrayToList(JSArray obj) {
-  return obj.toDart.map(jsAnyToDart).toList();
-}
-
-Map<String, dynamic> jsObjectToMap(JSObject obj) {
-  return {
-    for (final jsKey in objectKeys(obj).toDart)
-      jsKey.toDart: jsAnyToDart(reflectGet(obj, jsKey)),
-  };
-}
-
-dynamic jsAnyToDart(JSAny? value) {
-  if (value is JSArray) {
-    return jsArrayToList(value);
-  } else if (value is JSObject) {
-    return jsObjectToMap(value);
-  } else if (value is JSString) {
-    return value.toDart;
-  } else if (value is JSNumber) {
-    return value.toDartDouble;
-  } else if (value is JSBoolean) {
-    return value.toDart;
-  } else {
-    return value; // JS null and undefined are null in Dart
-  }
-}
+List<dynamic> jsArrayToList(JSArray<JSAny?> obj) =>
+    (obj.dartify() as List).cast<dynamic>();
+
+Map<String, dynamic> jsObjectToMap(JSObject obj) =>
+    (obj.dartify() as Map).cast<String, dynamic>();
+
+Object? jsAnyToDart(JSAny? value) => value.dartify();
 
 // Conversion utils: JS SDK to Flutter SDK types
 
@@ -283,8 +264,7 @@ Map<String, SplitResult> jsTreatmentsWithConfigToMap(JSObject obj) {
 }
 
 SplitResult jsTreatmentWithConfigToSplitResult(JS_TreatmentWithConfig obj) {
-  return SplitResult(obj.treatment.toDart,
-      (obj.config is JSString) ? obj.config!.toDart : null);
+  return SplitResult(obj.treatment.toDart, obj.config?.toDart);
 }
 
 Prerequisite jsPrerequisiteToPrerequisite(JS_Prerequisite obj) {

splitio_web/pubspec.yaml

@@ -4,8 +4,8 @@ repository: https://github.com/splitio/flutter-sdk-plugin/tree/main/splitio_web
 version: 1.0.0
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
-  flutter: ">=3.16.0"
+  sdk: ">=3.3.0 <4.0.0" # using Dart 3.3+ extension types for JS interop
+  flutter: ">=3.19.0" # lowest Flutter version that includes Dart 3.3+
 
 flutter:
   plugin:

splitio_web/test/splitio_web_test.dart

@@ -5,10 +5,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:splitio_web/splitio_web.dart';
 import 'package:splitio_web/src/js_interop.dart';
 import 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart';
-import 'package:splitio_platform_interface/split_configuration.dart';
-import 'package:splitio_platform_interface/split_evaluation_options.dart';
 import 'package:splitio_platform_interface/split_sync_config.dart';
-import 'package:splitio_platform_interface/split_result.dart';
 import 'package:splitio_platform_interface/split_rollout_cache_configuration.dart';
 import 'utils/js_interop_test_utils.dart';
 
@@ -722,8 +719,10 @@ void main() {
               )));
 
       expect(mock.calls[mock.calls.length - 5].methodName, 'SplitFactory');
+      final actual =
+          jsAnyToDart(mock.calls[mock.calls.length - 5].methodArguments[0]);
       expect(
-          jsAnyToDart(mock.calls[mock.calls.length - 5].methodArguments[0]),
+          actual,
           equals({
             'core': {
               'authorizationKey': 'api-key',
@@ -773,7 +772,10 @@ void main() {
               'expirationDays': 100,
               'clearOnInit': true
             },
-            'impressionListener': {'logImpression': {}}
+            'impressionListener': {
+              'logImpression': (actual as Map)['impressionListener']
+                  ['logImpression']
+            }
           }));
 
       expect(mock.calls[mock.calls.length - 4].methodName, 'warn');