Move to Chrome's fork of Hunspell

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
-build/
+/build/
 node_modules/
 npm-debug.log

binding.gyp

@@ -38,24 +38,30 @@
           'sources': [
             'src/spellchecker_hunspell.cc',
           ],
+          'include_dirs': [
+            'vendor/hunspell/src',
+          ],
         }],
         ['OS=="win"', {
           'sources': [
              'src/spellchecker_win.cc',
              'src/transcoder_win.cc',
           ],
+          'defines': [ 'WCHAR_T_IS_UTF16' ],
         }],
         ['OS=="linux"', {
           'sources': [
              'src/spellchecker_linux.cc',
              'src/transcoder_posix.cc',
           ],
+          'defines': [ 'WCHAR_T_IS_UTF32' ],
         }],
         ['OS=="mac"', {
           'sources': [
             'src/spellchecker_mac.mm',
             'src/transcoder_posix.cc',
           ],
+          'defines': [ 'WCHAR_T_IS_UTF32' ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
@@ -74,8 +80,43 @@
           'msvs_guid': 'D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E',
           'defines': [
             'HUNSPELL_STATIC',
+            'HUNSPELL_CHROME_CLIENT',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'defines': [ 'WCHAR_T_IS_UTF16', ],
+            }],
+            ['OS=="linux"', {
+              'defines': [ 'WCHAR_T_IS_UTF32', ],
+              'sources': [
+                'vendor/hunspell/src/base/strings/string16.cc',
+              ]
+            }],
+            ['OS=="mac"', {
+              'defines': [ 'WCHAR_T_IS_UTF32', ],
+              'sources': [
+                'vendor/hunspell/src/base/strings/string16.cc',
+              ]
+            }],
+          ],
+          'include_dirs': [
+            'vendor/hunspell/src',
           ],
           'sources': [
+            'vendor/hunspell/src/base/base_export.h',
+            'vendor/hunspell/src/base/logging.h',
+            'vendor/hunspell/src/base/macros.h',
+            'vendor/hunspell/src/base/md5.cc',
+            'vendor/hunspell/src/base/md5.h',
+            'vendor/hunspell/src/base/stl_util.h',
+            'vendor/hunspell/src/base/strings/string_piece.cc',
+            'vendor/hunspell/src/base/strings/string_piece.h',
+            'vendor/hunspell/src/base/strings/string16.h',
+            'vendor/hunspell/src/build/build.h',
+            'vendor/hunspell/src/google/bdict_reader.cc',
+            'vendor/hunspell/src/google/bdict_reader.h',
+            'vendor/hunspell/src/google/bdict.cc',
+            'vendor/hunspell/src/google/bdict.h',
             'vendor/hunspell/src/hunspell/affentry.cxx',
             'vendor/hunspell/src/hunspell/affentry.hxx',
             'vendor/hunspell/src/hunspell/affixmgr.cxx',
@@ -107,11 +148,13 @@
             'vendor/hunspell/src/hunspell/w_char.hxx',
             'vendor/hunspell/src/parsers/textparser.cxx',
             'vendor/hunspell/src/parsers/textparser.hxx',
+
           ],
           'direct_dependent_settings': {
             'defines': [
               'HUNSPELL_STATIC',
               'USE_HUNSPELL',
+              'HUNSPELL_CHROME_CLIENT'
             ],
           },
         }

lib/spellchecker.js

@@ -1,4 +1,5 @@
 var path = require('path');
+var fs = require('fs');
 var bindings = require('../build/Release/spellchecker.node');
 
 var Spellchecker = bindings.Spellchecker;
@@ -19,7 +20,17 @@ var ensureDefaultSpellCheck = function() {
 
 var setDictionary = function(lang, dictPath) {
   ensureDefaultSpellCheck();
-  return defaultSpellcheck.setDictionary(lang, dictPath);
+
+  var filePath = path.join(dictPath, lang.replace(/_/g, '-') + '.bdic');
+  var contents = null;
+
+  try {
+    contents = fs.readFileSync(filePath);
+  } catch (e) {
+    return false;
+  }
+
+  return defaultSpellcheck.setDictionary(lang, contents);
 };
 
 var isMisspelled = function() {
@@ -60,15 +71,34 @@ var getAvailableDictionaries = function() {
 
 var getDictionaryPath = function() {
   var dict = path.join(__dirname, '..', 'vendor', 'hunspell_dictionaries');
-  try {
-    // HACK: Special case being in an asar archive
-    var unpacked = dict.replace('.asar' + path.sep, '.asar.unpacked' + path.sep);
-    if (require('fs').statSyncNoException(unpacked)) {
-      dict = unpacked;
+  return dict;
+}
+
+var getURLForHunspellDictionary = function(lang) {
+  // NB: This is derived from https://code.google.com/p/chromium/codesearch#chromium/src/chrome/common/spellcheck_common.cc&sq=package:chromium&type=cs&rcl=1464736770&l=107
+  var defaultVersion = '-3-0';
+  var specialVersions = {
+    'tr-tr': '-4-0',
+    'tg-tg': '-5-0',
+    'en-ca': '-7-1',
+    'en-gb': '-7-1',
+    'en-us': '-7-1',
+    'fa-ir': '-7-0',
+  };
+
+  var nonFormedLangCode = ['ko', 'sh', 'sq', 'sr'];
+  var langCode = lang.replace(/_/g, '-').toLowerCase();
+
+  //some bdict in choromium does not follow form of language code with locale,
+  //formed as language only (i.e, https://src.chromium.org/viewvc/chrome/trunk/deps/third_party/hunspell_dictionaries/ko-3-0.bdic)
+  var language = langCode.split('-')[0];
+  for (var idx = 0; idx < nonFormedLangCode.length; idx++) {
+    if (language === nonFormedLangCode[idx]) {
+      langCode = nonFormedLangCode[idx];
     }
-  } catch (error) {
   }
-  return dict;
+
+  return "https://redirector.gvt1.com/edgedl/chrome/dict/" + langCode + (specialVersions[langCode] || defaultVersion) + ".bdic";
 }
 
 module.exports = {
@@ -79,5 +109,6 @@ module.exports = {
   checkSpelling: checkSpelling,
   getAvailableDictionaries: getAvailableDictionaries,
   getCorrectionsForMisspelling: getCorrectionsForMisspelling,
+  getURLForHunspellDictionary: getURLForHunspellDictionary,
   Spellchecker: Spellchecker
 };

package.json

@@ -2,7 +2,7 @@
   "main": "./lib/spellchecker.js",
   "name": "spellchecker",
   "description": "Bindings to native spellchecker",
-  "version": "3.3.1",
+  "version": "4.0.0",
   "licenses": [
     {
       "type": "MIT",