lookup subdomain with localhost option (#264)

* lookup subdomain with localhost option

* subdomain detection  test and fix

i18nextBrowserLanguageDetector.js

@@ -339,21 +339,16 @@
   var subdomain = {
     name: 'subdomain',
     lookup: function lookup(options) {
-      var found;
+      // If given get the subdomain index else 1
+      var lookupFromSubdomainIndex = typeof options.lookupFromSubdomainIndex === 'number' ? options.lookupFromSubdomainIndex + 1 : 1; // get all matches if window.location. is existing
+      // first item of match is the match itself and the second is the first group macht which sould be the first subdomain match
+      // is the hostname no public domain get the or option of localhost
 
-      if (typeof window !== 'undefined') {
-        var language = window.location.href.match(/(?:http[s]*\:\/\/)*(.*?)\.(?=[^\/]*\..{2,5})/gi);
+      var language = typeof window !== 'undefined' && window.location && window.location.hostname && window.location.hostname.match(/^(\w{2,5})\.(([a-z0-9-]{1,63}\.[a-z]{2,6})|localhost)/i); // if there is no match (null) return undefined
 
-        if (language instanceof Array) {
-          if (typeof options.lookupFromSubdomainIndex === 'number') {
-            found = language[options.lookupFromSubdomainIndex].replace('http://', '').replace('https://', '').replace('.', '');
-          } else {
-            found = language[0].replace('http://', '').replace('https://', '').replace('.', '');
-          }
-        }
-      }
+      if (!language) return undefined; // return the given group match
 
-      return found;
+      return language[lookupFromSubdomainIndex];
     }
   };
 

src/browserLookups/subdomain.js

@@ -2,17 +2,23 @@ export default {
   name: 'subdomain',
 
   lookup(options) {
-    let found;
-    if (typeof window !== 'undefined') {
-      const language = window.location.href.match(/(?:http[s]*\:\/\/)*(.*?)\.(?=[^\/]*\..{2,5})/gi);
-      if (language instanceof Array) {
-        if (typeof options.lookupFromSubdomainIndex === 'number') {
-          found = language[options.lookupFromSubdomainIndex].replace('http://', '').replace('https://', '').replace('.', '');
-        } else {
-          found = language[0].replace('http://', '').replace('https://', '').replace('.', '');
-        }
-      }
-    }
-    return found;
-  }
+    // If given get the subdomain index else 1
+    const lookupFromSubdomainIndex =
+      typeof options.lookupFromSubdomainIndex === 'number'
+        ? options.lookupFromSubdomainIndex + 1
+        : 1;
+    // get all matches if window.location. is existing
+    // first item of match is the match itself and the second is the first group macht which sould be the first subdomain match
+    // is the hostname no public domain get the or option of localhost
+    const language =
+      typeof window !== 'undefined' &&
+      window.location &&
+      window.location.hostname &&
+      window.location.hostname.match(/^(\w{2,5})\.(([a-z0-9-]{1,63}\.[a-z]{2,6})|localhost)/i);
+
+    // if there is no match (null) return undefined
+    if (!language) return undefined;
+    // return the given group match
+    return language[lookupFromSubdomainIndex];
+  },
 };

test/languageDetector.test.js

@@ -1,69 +1,96 @@
-const expect = require('expect.js')
-const i18next = require('i18next')
-const LanguageDetector = require('../dist/cjs/i18nextBrowserLanguageDetector.js')
+const expect = require('expect.js');
+const i18next = require('i18next');
+const LanguageDetector = require('../dist/cjs/i18nextBrowserLanguageDetector.js');
 
-i18next.init()
+i18next.init();
 
 describe('language detector', () => {
-  const ld = new LanguageDetector(i18next.services, { order: ['querystring', 'path', 'cookie', 'sessionStorage', 'localStorage', 'navigator', 'htmlTag'] })
+  const ld = new LanguageDetector(i18next.services, {
+    order: [
+      'subdomain',
+      'querystring',
+      'path',
+      'cookie',
+      'sessionStorage',
+      'localStorage',
+      'navigator',
+      'htmlTag',
+    ],
+  });
 
   describe('cookie', () => {
     it('detect', () => {
       global.document = {
-        cookie: 'i18next=de'
-      }
-      const lng = ld.detect()
-      expect(lng).to.contain('de')
-    })
+        cookie: 'i18next=de',
+      };
+      const lng = ld.detect();
+      expect(lng).to.contain('de');
+    });
 
     it('cacheUserLanguage', () => {
       global.document = {
-        cookie: 'my=cookie'
-      }
-      ld.cacheUserLanguage('it', ['cookie'])
-      expect(global.document.cookie).to.match(/i18next=it/)
-      expect(global.document.cookie).to.match(/Path=\//)
+        cookie: 'my=cookie',
+      };
+      ld.cacheUserLanguage('it', ['cookie']);
+      expect(global.document.cookie).to.match(/i18next=it/);
+      expect(global.document.cookie).to.match(/Path=\//);
       // expect(global.document.cookie).to.match(/my=cookie/)
-    })
-  })
+    });
+  });
 
   describe('path', () => {
     it('detect', () => {
       global.window = {
         location: {
           pathname: '/fr/some/route',
-          search: ''
-        }
-      }
-      const lng = ld.detect()
-      expect(lng).to.contain('fr')
-    })
-  })
+          search: '',
+        },
+      };
+      const lng = ld.detect();
+      expect(lng).to.contain('fr');
+    });
+  });
 
   describe('querystring', () => {
     it('detect', () => {
       global.window = {
         location: {
           pathname: '/fr/some/route',
-          search: '?lng=de'
-        }
-      }
-      const lng = ld.detect()
-      expect(lng).to.contain('de')
-    })
-  })
+          search: '?lng=de',
+        },
+      };
+      const lng = ld.detect();
+      expect(lng).to.contain('de');
+    });
+  });
 
   describe('querystring (fragment)', () => {
     it('detect', () => {
       global.window = {
         location: {
           pathname: '/fr/some/route',
           hash: '#/something?lng=de',
-          search: ''
-        }
-      }
-      const lng = ld.detect()
-      expect(lng).to.contain('de')
-    })
-  })
-})
+          search: '',
+        },
+      };
+      const lng = ld.detect();
+      expect(lng).to.contain('de');
+    });
+  });
+
+  describe('subdomain', () => {
+    it('detect', () => {
+      global.window = {
+        location: {
+          hostname: 'es.foot-print-on-the-moon-1968.org',
+          href: 'http://es.foot-print-on-the-moon-1968.org/fr/some/route',
+          pathname: '/fr/some/route',
+          hash: '#/something?lng=de',
+          search: '?lng=de',
+        },
+      };
+      const lng = ld.detect();
+      expect(lng).to.contain('es');
+    });
+  });
+});