Fix some problems with dart_web lang_names (unicode-org#179)

* Fix some problems with dart_web lang_names * Update Dart versions and change locale string format slightly * Some code in lang_names.dart * Following PR#177 * Remove errant commas * Revert data generator fix --------- Co-authored-by: Elango Cheran <[email protected]>
sven-oly · Feb 21, 2024 · 2e78ad0 · 2e78ad0
1 parent 1802965
commit 2e78ad0
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 22 deletions.
diff --git a/executors/dart_web/bin/lang_names.dart b/executors/dart_web/bin/lang_names.dart
@@ -6,18 +6,32 @@ import 'package:intl4x/intl4x.dart';
 String testLangNames(String jsonEncoded) {
   final json = jsonDecode(jsonEncoded) as Map<String, dynamic>;
 
+  final outputLine = <String, dynamic>{};
+
   final Locale locale;
-  if (json['locale_label'] != null) {
-    // Fix to use dash, not underscore.
-    final localeJson = json['locale_label'] as String;
-    locale = Locale.parse(localeJson.replaceAll('/_/g', '-'));
-  } else {
-    locale = Locale(language: 'en');
+  try {
+    if (json['locale_label'] != null) {
+      // Fix to use dash, not underscore.
+      final localeJson = json['locale_label'] as String;
+      locale = Locale.parse(localeJson.replaceAll('_', '-'));
+    } else {
+      locale = Locale(language: 'en');
+    }
+  } catch(error) {
+    outputLine.addAll({
+        'error': 'locale_label: ' + error.toString(),
+        'label': json['label'],
+        'test_type': 'display_names',
+        'error_type': 'unsupported',
+        'error_detail': 'locale_label',
+        'error_retry': false // Do not repeat
+    });
+    return jsonEncode(outputLine);
   }
+
   final languageLabel =
-      (json['language_label'] as String).replaceAll('/_/g', '-');
+  (json['language_label'] as String).replaceAll('_', '-');
 
-  final outputLine = <String, dynamic>{};
   try {
     final options = DisplayNamesOptions(
       languageDisplay: LanguageDisplay.standard,
@@ -29,13 +43,15 @@ String testLangNames(String jsonEncoded) {
     outputLine['result'] = resultLocale;
   } catch (error) {
     outputLine.addAll({
-      'error': error.toString(),
-      'label': json['label'],
-      'locale_label': locale.toLanguageTag(),
-      'language_label': languageLabel,
-      'test_type': 'display_names',
-      'error_type': 'unsupported',
-      'error_retry': false // Do not repeat
+        //      'error': error.toString() + " language_label:" + languageLabel,
+        'error': 'something went wrong: ' + error.toString(),
+        'label': json['label'],
+        'locale_label': locale.toLanguageTag(),
+        'language_label': languageLabel,
+        'test_type': 'display_names',
+        'error_type': 'unsupported',
+        'error_detail': languageLabel,
+        'error_retry': false // Do not repeat
     });
   }
   return jsonEncode(outputLine);

diff --git a/executors/dart_web/bin/make_runnable_by_node.dart b/executors/dart_web/bin/make_runnable_by_node.dart
@@ -23,9 +23,13 @@ Future<void> main(List<String> args) async {
       name: 'testLikelySubtags',
       argNames: ['encoded'],
     ),
-  };
-  for (var name in names.entries) {
-    await prepare(name.key, name.value);
+    'lang_names': ExportFunction(
+      name: 'testLangNames',
+      argNames: ['encoded'],
+    ),
+ };
+  for (final MapEntry(key: name, value: function) in names.entries) {
+    await prepare(name, function);
   }
 
   setVersionFile();

diff --git a/executors/dart_web/out/version.js b/executors/dart_web/out/version.js
@@ -1,2 +1,2 @@
-const dartVersion = "0.7.0";
+const dartVersion = "0.7.1";
 module.exports = { dartVersion };
diff --git a/executors/dart_web/pubspec.yaml b/executors/dart_web/pubspec.yaml
@@ -6,9 +6,9 @@ environment:
 
 # Add regular dependencies here.
 dependencies:
-  intl4x: ^0.7.0
+  intl4x: ^0.7.1
   pubspec_lock_parse: ^2.2.0
 
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.21.0
+  test: ^1.25.2
diff --git a/schema/language_names/result_schema.json b/schema/language_names/result_schema.json
@@ -69,7 +69,7 @@
      "type": "array",
      "items": {
        "type": "object",
-       "additionalProperties": false,
+       "additionalProperties": true,
        "properties": {
          "label": {
            "description": "A numeric ID, unique for the set of tests",
@@ -99,6 +99,10 @@
            "type": "string",
            "description": "additional error info"
          },
+         "error_retry": {
+           "type": "boolean",
+           "description": "additional error info"
+         },
          "test_type": {
            "description": "the type of this test",
            "type": "string",