@magic-xpa/utils 4.1000.0-dev4100.7 → 4.1000.0-dev4100.71

package/fesm2020/magic-xpa-utils.mjs

@@ -1462,16 +1462,11 @@ class Misc {
 }
 
 class Base64 {
-    static encode(strOrData, encodingOrIsUseEnvCharset, encoding) {
-        if (arguments.length === 2)
-            return Base64.encode_0(strOrData, encodingOrIsUseEnvCharset);
-        else if (arguments.length === 3)
-            return Base64.encode_1(strOrData, encodingOrIsUseEnvCharset, encoding);
+    static encode(str, isUseEnvCharset, encoding) {
+        if (arguments.length === 1)
+            return Base64.encode_1(str, false, null);
         else
-            return Base64.encode_2(strOrData);
-    }
-    static encode_0(str, encoding) {
-        return Base64.encode(str, false, encoding);
+            return Base64.encode_1(str, isUseEnvCharset, encoding);
     }
     static encode_1(str, isUseEnvCharset, encoding) {
         let result;
@@ -1484,10 +1479,15 @@ class Base64 {
             }
             else {
                 try {
-                    let instance = ISO_8859_1_Encoding.ISO_8859_1;
-                    let encoding2 = isUseEnvCharset ? encoding : instance;
-                    let ba = Base64.encode(encoding2.GetBytes(str));
-                    result = instance.GetString(ba, 0, ba.length);
+                    if (isUseEnvCharset === false) {
+                        result = btoa(str);
+                    }
+                    else {
+                        let instance = ISO_8859_1_Encoding.ISO_8859_1;
+                        let encoding2 = isUseEnvCharset ? encoding : instance;
+                        let ba = Base64.encodeBytes(encoding2.GetBytes(str));
+                        result = instance.GetString(ba, 0, ba.length);
+                    }
                 }
                 catch (ex) {
                     throw new ApplicationException(ex.Message);
@@ -1496,7 +1496,7 @@ class Base64 {
         }
         return result;
     }
-    static encode_2(data) {
+    static encodeBytes(data) {
         if (data === null)
             return null;
         let dest = new Uint8Array(Math.floor((data.length + 2) / 3) * 4);
@@ -1525,16 +1525,10 @@ class Base64 {
         }
         return dest;
     }
-    static decode(strOrData, encoding) {
-        if (arguments.length === 1 && (strOrData === null || strOrData.constructor === String))
-            return Base64.decode_0(strOrData);
-        else if (arguments.length === 2)
-            return Base64.decode_1(strOrData, encoding);
-        else
-            return Base64.decode_2(strOrData);
-    }
-    static decode_0(str) {
-        return Base64.decode(str, null);
+    static decode(str, encoding) {
+        if (arguments.length === 1)
+            encoding = null;
+        return Base64.decode_1(str, encoding);
     }
     static decode_1(str, encoding) {
         let result;
@@ -1547,10 +1541,15 @@ class Base64 {
             }
             else {
                 try {
-                    let instance = ISO_8859_1_Encoding.ISO_8859_1;
-                    let array = Base64.decode(instance.GetBytes(str));
-                    let encoding2 = (encoding !== null) ? encoding : instance;
-                    result = encoding2.GetString(array, 0, array.length);
+                    if (encoding === null || encoding === undefined) {
+                        result = atob(str);
+                    }
+                    else {
+                        let instance = ISO_8859_1_Encoding.ISO_8859_1;
+                        let array = Base64.decodeBytes(instance.GetBytes(str));
+                        let encoding2 = (encoding !== null) ? encoding : instance;
+                        result = encoding2.GetString(array, 0, array.length);
+                    }
                 }
                 catch (ex) {
                     throw new ApplicationException(ex.Message);
@@ -1559,7 +1558,7 @@ class Base64 {
         }
         return result;
     }
-    static decode_2(data) {
+    static decodeBytes(data) {
         if (data === null)
             return null;
         let tail = data.length;
@@ -1598,7 +1597,7 @@ class Base64 {
             return new Uint8Array(0);
         try {
             let instance = ISO_8859_1_Encoding.ISO_8859_1;
-            return Base64.decode(instance.GetBytes(str));
+            return Base64.decodeBytes(instance.GetBytes(str));
         }
         catch (ex) {
             throw new ApplicationException(ex.Message);