[browser][non-icu] HybridGlobalization change case

docs/workflow/trimming/feature-switches.md

@@ -13,7 +13,6 @@ configurations but their defaults might vary as any SDK can set the defaults dif
 | EnableUnsafeBinaryFormatterSerialization | System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization | BinaryFormatter serialization support is trimmed when set to false |
 | EventSourceSupport | System.Diagnostics.Tracing.EventSource.IsSupported | Any EventSource related code or logic is trimmed when set to false |
 | InvariantGlobalization | System.Globalization.Invariant | All globalization specific code and data is trimmed when set to true |
-| HybridGlobalization | System.Globalization.Hybrid |  Loading ICU + native implementations |
 | PredefinedCulturesOnly | System.Globalization.PredefinedCulturesOnly |  Don't allow creating a culture for which the platform does not have data |
 | UseSystemResourceKeys | System.Resources.UseSystemResourceKeys |  Any localizable resources for system assemblies is trimmed when set to true |
 | HttpActivityPropagationSupport | System.Net.Http.EnableActivityPropagation | Any dependency related to diagnostics support for System.Net.Http is trimmed when set to false |

eng/testing/tests.browser.targets

@@ -205,6 +205,7 @@
       <_WasmPropertyNames Include="EmccLinkOptimizationFlag" />
       <_WasmPropertyNames Include="WasmIncludeFullIcuData" />
       <_WasmPropertyNames Include="WasmIcuDataFileName" />
+      <_WasmPropertyNames Include="HybridGlobalization" />
     </ItemGroup>
   </Target>
 

src/libraries/System.Globalization/System.Globalization.sln

@@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A93AFF96-DB2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0378EF1C-9838-4AD0-867D-506FB02F8BBB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hybrid.Tests", "tests\Hybrid\Hybrid.Tests.csproj", "{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -244,6 +246,24 @@ Global
 		{41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
 		{41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x86.ActiveCfg = Debug|Any CPU
+        {4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Debug|x64.Build.0 = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Debug|x86.Build.0 = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Release|x64.ActiveCfg = Release|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Release|x64.Build.0 = Release|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Release|x86.ActiveCfg = Release|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Release|x86.Build.0 = Release|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Checked|x64.Build.0 = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4134CD4D-1E8F-45D4-883C-B08A1DB5B274}.Checked|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -262,6 +282,7 @@ Global
 		{74CAB3C9-1AE1-467E-B139-35E7113F4660} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB}
 		{12E788BB-7E58-4780-B52E-DB5A91A49DFF} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB}
 		{F4A35959-8F1B-4CA9-B672-3ACFBDD54174} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB}
+        {4134CD4D-1E8F-45D4-883C-B08A1DB5B274} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {33E0B3D0-C6E1-4B75-A025-AE012AD424F7}

src/libraries/System.Globalization/tests/System.HybridGlobalization.Tests.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TestRuntime>true</TestRuntime>
+    <HybridGlobalization>true</HybridGlobalization>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="System\Globalization\TextInfoTests.cs" />
+  </ItemGroup>
+</Project>

src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

@@ -400,6 +400,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanParse.cs" />
@@ -2596,4 +2597,4 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
   </ItemGroup>
-</Project>
+</Project>

src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs

@@ -13,19 +13,15 @@ internal static partial class GlobalizationMode
         private static partial class Settings
         {
             internal static bool Invariant { get; } = AppContextConfigHelper.GetBooleanConfig("System.Globalization.Invariant", "DOTNET_SYSTEM_GLOBALIZATION_INVARIANT");
-#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
             internal static bool Hybrid { get; } = AppContextConfigHelper.GetBooleanConfig("System.Globalization.Hybrid", "DOTNET_SYSTEM_GLOBALIZATION_HYBRID");
-#endif
             internal static bool PredefinedCulturesOnly { get; } = AppContextConfigHelper.GetBooleanConfig("System.Globalization.PredefinedCulturesOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY", GlobalizationMode.Invariant);
         }
 
         // Note: Invariant=true and Invariant=false are substituted at different levels in the ILLink.Substitutions file.
         // This allows for the whole Settings nested class to be trimmed when Invariant=true, and allows for the Settings
         // static cctor (on Unix) to be preserved when Invariant=false.
         internal static bool Invariant => Settings.Invariant;
-#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
         internal static bool Hybrid => Settings.Hybrid;
-#endif
         internal static bool PredefinedCulturesOnly => Settings.PredefinedCulturesOnly;
 
         private static bool TryGetAppLocalIcuSwitchValue([NotNullWhen(true)] out string? value) =>

src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs

@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+namespace System.Globalization
+{
+    internal static unsafe class TextInfoInterop
+    {
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern unsafe void ChangeCaseInvariantJS(out string exceptionMessage, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper);
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern unsafe void ChangeCaseJS(out string exceptionMessage, in string culture, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper);
+    }
+
+    public partial class TextInfo
+    {
+        internal unsafe void JsChangeCase(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool toUpper)
+        {
+            Debug.Assert(!GlobalizationMode.Invariant);
+            Debug.Assert(!GlobalizationMode.UseNls);
+            Debug.Assert(GlobalizationMode.Hybrid);
+
+            string exceptionMessage;
+            if (IsInvariant)
+            {
+                TextInfoInterop.ChangeCaseInvariantJS(out exceptionMessage, src, srcLen, dstBuffer, dstBufferCapacity, toUpper);
+            }
+            else
+            {
+                TextInfoInterop.ChangeCaseJS(out exceptionMessage, _cultureName, src, srcLen, dstBuffer, dstBufferCapacity, toUpper);
+            }
+            if (!string.IsNullOrEmpty(exceptionMessage))
+                throw new Exception(exceptionMessage);
+        }
+
+    }
+}

src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs

@@ -682,11 +682,14 @@ private unsafe void ChangeCaseCore(char* src, int srcLen, char* dstBuffer, int d
             if (GlobalizationMode.UseNls)
             {
                 NlsChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper);
+                return;
             }
-            else
+            if (GlobalizationMode.Hybrid)
             {
-                IcuChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper);
+                JsChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper);
+                return;
             }
+            IcuChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper);
         }
 
         // Used in ToTitleCase():

src/mono/wasm/build/WasmApp.targets

@@ -28,6 +28,7 @@
       - $(WasmProfilers)     - Profilers to use
       - $(AOTProfilePath)    - profile data file to be used for profile-guided optimization
       - $(InvariantGlobalization)       - Whenever to disable ICU. Defaults to false.
+      - $(HybridGlobalization)          - Whenever to enable reduced ICU + native platform functions. Defaults to false and can be set only for InvariantGlobalization=false, WasmIncludeFullIcuData=false and empty WasmIcuDataFileName.
 
       - $(WasmResolveAssembliesBeforeBuild) - Resolve the assembly dependencies. Defaults to false
       - $(WasmAssemblySearchPaths)          - used for resolving assembly dependencies
@@ -71,7 +72,7 @@
       - $(WasmEnableExceptionHandling)      - Enable support for the WASM Exception Handling feature.
       - $(WasmEnableSIMD)                   - Enable support for the WASM SIMD feature.
       - $(WasmEnableWebcil)                 - Enable conversion of assembly .dlls to .webcil
-      - $(WasmIncludeFullIcuData)           - Loads full ICU data (icudt.dat). Defaults to false. Only applicable when InvariantGlobalization=false. 
+      - $(WasmIncludeFullIcuData)           - Loads full ICU data (icudt.dat). Defaults to false. Only applicable when InvariantGlobalization=false.
       - $(WasmIcuDataFileName)              - Name/path of ICU globalization file loaded to app. Only when InvariantGloblization=false and WasmIncludeFullIcuData=false.
       - $(WasmAllowUndefinedSymbols)        - Controls whether undefined symbols are allowed or not,
                                               if true, appends 'allow-undefined' and sets 'ERROR_ON_UNDEFINED_SYMBOLS=0' as arguments for wasm-ld,
@@ -327,6 +328,7 @@
 
   <Target Name="_GetWasmGenerateAppBundleDependencies">
     <PropertyGroup>
+      <HybridGlobalization Condition="'$(InvariantGlobalization)' == 'true'">false</HybridGlobalization>
       <_HasDotnetWasm Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.wasm'">true</_HasDotnetWasm>
       <_HasDotnetJsWorker Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.worker.js'">true</_HasDotnetJsWorker>
       <_HasDotnetJsSymbols Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.js.symbols'">true</_HasDotnetJsSymbols>
@@ -335,6 +337,11 @@
       <_WasmIcuDataFileName Condition="'$(WasmIcuDataFileName)' != '' and !Exists('$(WasmIcuDataFileName)')">$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(WasmIcuDataFileName)</_WasmIcuDataFileName>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(HybridGlobalization)' == 'true' and '$(WasmIcuDataFileName)' == ''">
+      <!-- to be renamed to icudt_wasm.dat when the contents of the file get defined and it gets added to repo -->
+      <_WasmIcuDataFileName>$(MicrosoftNetCoreAppRuntimePackRidNativeDir)icudt.dat</_WasmIcuDataFileName>
+    </PropertyGroup>
+
     <ItemGroup>
       <!-- If dotnet.{wasm,js} weren't added already (eg. AOT can add them), then add the default ones -->
       <WasmNativeAsset Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)dotnet.wasm" Condition="'$(_HasDotnetWasm)' != 'true'" />
@@ -383,6 +390,7 @@
       RuntimeArgsForHost="@(WasmMonoRuntimeArgs)"
       DefaultHostConfig="$(DefaultWasmHostConfig)"
       InvariantGlobalization="$(InvariantGlobalization)"
+      HybridGlobalization="$(HybridGlobalization)"
       SatelliteAssemblies="@(_WasmSatelliteAssemblies)"
       FilesToIncludeInFileSystem="@(WasmFilesToIncludeInFileSystem)"
       IcuDataFileNames="@(WasmIcuDataFileNames)"

src/mono/wasm/runtime/corebindings.c

@@ -42,6 +42,10 @@ extern void mono_wasm_typed_array_from_ref (int ptr, int begin, int end, int byt
 extern void* mono_wasm_invoke_js_blazor (MonoString **exceptionMessage, void *callInfo, void* arg0, void* arg1, void* arg2);
 #endif /* ENABLE_LEGACY_JS_INTEROP */
 
+// HybridGlobalization
+extern void mono_wasm_change_case_invariant(MonoString **exceptionMessage, const uint16_t* src, int32_t srcLength, uint16_t* dst, int32_t dstLength, mono_bool bToUpper);
+extern void mono_wasm_change_case(MonoString **exceptionMessage, MonoString **culture, const uint16_t* src, int32_t srcLength, uint16_t* dst, int32_t dstLength, mono_bool bToUpper);
+
 void bindings_initialize_internals (void)
 {
 	mono_add_internal_call ("System.Runtime.InteropServices.JavaScript.JSSynchronizationContext::ScheduleBackgroundJob", mono_threads_schedule_background_job);
@@ -69,4 +73,6 @@ void bindings_initialize_internals (void)
 	// Blazor specific custom routines - see dotnet_support.js for backing code
 	mono_add_internal_call ("WebAssembly.JSInterop.InternalCalls::InvokeJS", mono_wasm_invoke_js_blazor);
 #endif /* ENABLE_LEGACY_JS_INTEROP */
+	mono_add_internal_call ("System.Globalization.TextInfoInterop::ChangeCaseInvariantJS", mono_wasm_change_case_invariant);
+	mono_add_internal_call ("System.Globalization.TextInfoInterop::ChangeCaseJS", mono_wasm_change_case);
 }

src/mono/wasm/runtime/dotnet.d.ts

@@ -180,6 +180,7 @@ interface AssetEntry extends ResourceRequest {
 type AssetBehaviours = "resource" | "assembly" | "pdb" | "heap" | "icu" | "vfs" | "dotnetwasm" | "js-module-threads" | "symbols";
 type GlobalizationMode = "icu" | // load ICU globalization data from any runtime assets with behavior "icu".
 "invariant" | //  operate in invariant globalization mode.
+"hybrid" | // operate in hybrid globalization mode with small ICU files, using native platform functions
 "auto";
 type DotnetModuleConfig = {
     disableDotnet6Compatibility?: boolean;

src/mono/wasm/runtime/es6/dotnet.es6.lib.js

@@ -97,7 +97,9 @@ let linked_functions = [
     "mono_wasm_invoke_import",
     "mono_wasm_bind_cs_function",
     "mono_wasm_marshal_promise",
-
+    "mono_wasm_change_case_invariant",
+    "mono_wasm_change_case",
+
     "icudt68_dat",
 ];
 

src/mono/wasm/runtime/exports-linker.ts

@@ -24,7 +24,7 @@ import { mono_wasm_typed_array_to_array_ref } from "./net6-legacy/js-to-cs";
 import { mono_wasm_typed_array_from_ref } from "./net6-legacy/buffers";
 import {
     mono_wasm_invoke_js_blazor, mono_wasm_invoke_js_with_args_ref, mono_wasm_get_object_property_ref, mono_wasm_set_object_property_ref,
-    mono_wasm_get_by_index_ref, mono_wasm_set_by_index_ref, mono_wasm_get_global_object_ref
+    mono_wasm_get_by_index_ref, mono_wasm_set_by_index_ref, mono_wasm_get_global_object_ref, mono_wasm_change_case_invariant, mono_wasm_change_case
 } from "./net6-legacy/method-calls";
 
 // the methods would be visible to EMCC linker
@@ -93,6 +93,8 @@ export function export_linker(): any {
         mono_wasm_invoke_import,
         mono_wasm_bind_cs_function,
         mono_wasm_marshal_promise,
+        mono_wasm_change_case_invariant,
+        mono_wasm_change_case,
 
         // threading exports, if threading is enabled
         ...mono_wasm_threads_exports,

src/mono/wasm/runtime/icu.ts

@@ -30,8 +30,12 @@ export function init_globalization() {
     }
 
     const invariantEnv = "DOTNET_SYSTEM_GLOBALIZATION_INVARIANT";
+    const hybridEnv = "DOTNET_SYSTEM_GLOBALIZATION_HYBRID";
     const env_variables = runtimeHelpers.config.environmentVariables!;
-    if (env_variables[invariantEnv] === undefined && runtimeHelpers.invariantMode) {
+    if (env_variables[hybridEnv] === undefined && runtimeHelpers.config.globalizationMode === "hybrid") {
+        env_variables[hybridEnv] = "1";
+    }
+    else if (env_variables[invariantEnv] === undefined && runtimeHelpers.invariantMode) {
         env_variables[invariantEnv] = "1";
     }
     if (env_variables["TZ"] === undefined) {

src/mono/wasm/runtime/net6-legacy/method-calls.ts

@@ -4,7 +4,7 @@
 import { get_js_obj, mono_wasm_get_jsobj_from_js_handle } from "../gc-handles";
 import { Module, runtimeHelpers, INTERNAL } from "../imports";
 import { wrap_error_root, wrap_no_error_root } from "../invoke-js";
-import { _release_temp_frame } from "../memory";
+import { setU16, _release_temp_frame } from "../memory";
 import { mono_wasm_new_external_root, mono_wasm_new_root } from "../roots";
 import { find_entry_point } from "../run";
 import { conv_string_root, js_string_to_mono_string_root } from "../strings";
@@ -296,4 +296,59 @@ export function mono_wasm_invoke_js_blazor(exceptionMessage: Int32Ptr, callInfo:
         exceptionRoot.release();
         return 0;
     }
-}
+}
+
+export function mono_wasm_change_case_invariant(exceptionMessage: Int32Ptr, src: number, srcLength: number, dst: number, dstLength: number, toUpper: boolean) : void{
+    try{
+        const input = get_uft16_string(src, srcLength);
+        let result = toUpper ? input.toUpperCase() : input.toLowerCase();
+        // Unicode defines some codepoints which expand into multiple codepoints,
+        // originally we do not support this expansion
+        if (result.length > dstLength)
+            result = input;
+
+        for (let i = 0; i < result.length; i++)
+            setU16(dst + i*2, result.charCodeAt(i));
+    }
+    catch (ex: any) {
+        pass_exception_details(ex, exceptionMessage);
+    }
+}
+
+export function mono_wasm_change_case(exceptionMessage: Int32Ptr, culture: MonoStringRef, src: number, srcLength: number, dst: number, destLength: number, toUpper: boolean) : void{
+    const cultureRoot = mono_wasm_new_external_root<MonoString>(culture);
+    try{
+        const cultureName = conv_string_root(cultureRoot);
+        if (!cultureName)
+            throw new Error("Cannot change case, the culture name is null.");
+        const input = get_uft16_string(src, srcLength);
+        let result = toUpper ? input.toLocaleUpperCase(cultureName) : input.toLocaleLowerCase(cultureName);
+        if (result.length > destLength)
+            result = input;
+
+        for (let i = 0; i < destLength; i++)
+            setU16(dst + i*2, result.charCodeAt(i));
+    }
+    catch (ex: any) {
+        pass_exception_details(ex, exceptionMessage);
+    }
+    finally {
+        cultureRoot.release();
+    }
+}
+
+function get_uft16_string(ptr: number, length: number): string{
+    const view = new Uint16Array(Module.HEAPU16.buffer, ptr, length);
+    let string = "";
+    for (let i = 0; i < length; i++)
+        string += String.fromCharCode(view[i]);
+    return string;
+}
+
+function pass_exception_details(ex: any, exceptionMessage: Int32Ptr){
+    const exceptionJsString = ex.message + "\n" + ex.stack;
+    const exceptionRoot = mono_wasm_new_root<MonoString>();
+    js_string_to_mono_string_root(exceptionJsString, exceptionRoot);
+    exceptionRoot.copy_to_address(<any>exceptionMessage);
+    exceptionRoot.release();
+}