perf: use Array.isArray()

i18next · May 20, 2024 · c4b4d50 · c4b4d50
1 parent 20011af
commit c4b4d50
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/LanguageUtils.js b/src/LanguageUtils.js
@@ -118,7 +118,7 @@ class LanguageUtil {
     if (!fallbacks) return [];
     if (typeof fallbacks === 'function') fallbacks = fallbacks(code);
     if (typeof fallbacks === 'string') fallbacks = [fallbacks];
-    if (Object.prototype.toString.apply(fallbacks) === '[object Array]') return fallbacks;
+    if (Array.isArray(fallbacks)) return fallbacks;
 
     if (!code) return fallbacks.default || [];
 

diff --git a/src/ResourceStore.js b/src/ResourceStore.js
@@ -87,10 +87,7 @@ class ResourceStore extends EventEmitter {
   addResources(lng, ns, resources, options = { silent: false }) {
     /* eslint no-restricted-syntax: 0 */
     for (const m in resources) {
-      if (
-        typeof resources[m] === 'string' ||
-        Object.prototype.toString.apply(resources[m]) === '[object Array]'
-      )
+      if (typeof resources[m] === 'string' || Array.isArray(resources[m]))
         this.addResource(lng, ns, m, resources[m], { silent: true });
     }
     if (!options.silent) this.emit('added', lng, ns, resources);

diff --git a/src/Translator.js b/src/Translator.js
@@ -160,7 +160,7 @@ class Translator extends EventEmitter {
       res &&
       handleAsObject &&
       noObject.indexOf(resType) < 0 &&
-      !(typeof joinArrays === 'string' && resType === '[object Array]')
+      !(typeof joinArrays === 'string' && Array.isArray(res))
     ) {
       if (!options.returnObjects && !this.options.returnObjects) {
         if (!this.options.returnedObjectHandler) {
@@ -180,7 +180,7 @@ class Translator extends EventEmitter {
       // if we got a separator we loop over children - else we just return object as is
       // as having it set to false means no hierarchy so no lookup for nested values
       if (keySeparator) {
-        const resTypeIsArray = resType === '[object Array]';
+        const resTypeIsArray = Array.isArray(res);
         const copy = resTypeIsArray ? [] : {}; // apply child translation on a copy
 
         /* eslint no-restricted-syntax: 0 */
@@ -197,11 +197,7 @@ class Translator extends EventEmitter {
         }
         res = copy;
       }
-    } else if (
-      handleAsObjectInI18nFormat &&
-      typeof joinArrays === 'string' &&
-      resType === '[object Array]'
-    ) {
+    } else if (handleAsObjectInI18nFormat && typeof joinArrays === 'string' && Array.isArray(res)) {
       // array special treatment
       res = res.join(joinArrays);
       if (res) res = this.extendTranslation(res, keys, options, lastKey);