feat(messageformat): Add internal options object

Author: eemeli

packages/messageformat/src/compiler.js

@@ -1,5 +1,5 @@
 import { parse } from 'messageformat-parser';
-import { bidiMarkText, funcname, propname } from './utils';
+import { biDiMarkText, funcname, propname } from './utils';
 
 /** @private */
 export default class Compiler {
@@ -35,7 +35,7 @@ export default class Compiler {
     if (typeof src != 'object') {
       this.lc = lc;
       const pc = plurals[lc] || { cardinal: [], ordinal: [] };
-      pc.strict = !!this.mf.strictNumberSign;
+      pc.strict = !!this.mf.options.strictNumberSign;
       const r = parse(src, pc).map(token => this.token(token));
       return `function(d) { return ${r.join(' + ') || '""'}; }`;
     } else {
@@ -69,11 +69,13 @@ export default class Compiler {
     let args = [propname(token.arg, 'd')];
     switch (token.type) {
       case 'argument':
-        return this.mf.bidiSupport ? bidiMarkText(args[0], this.lc) : args[0];
+        return this.mf.options.biDiSupport
+          ? biDiMarkText(args[0], this.lc)
+          : args[0];
 
       case 'select':
         fn = 'select';
-        if (plural && this.mf.strictNumberSign) plural = null;
+        if (plural && this.mf.options.strictNumberSign) plural = null;
         args.push(this.cases(token, plural));
         this.runtime.select = true;
         break;
@@ -110,7 +112,7 @@ export default class Compiler {
           );
         args.push(JSON.stringify(this.lc));
         if (token.param) {
-          if (plural && this.mf.strictNumberSign) plural = null;
+          if (plural && this.mf.options.strictNumberSign) plural = null;
           const s = token.param.tokens.map(tok => this.token(tok, plural));
           args.push('(' + (s.join(' + ') || '""') + ').trim()');
         }

packages/messageformat/src/messageformat.js

@@ -61,13 +61,18 @@ export default class MessageFormat {
    * ```
    */
   constructor(locale) {
+    this.options = {
+      biDiSupport: false,
+      pluralKeyChecks: true,
+      strictNumberSign: false
+    };
     this.pluralFuncs = {};
     if (typeof locale === 'string') {
-      this.pluralFuncs[locale] = getPlural(locale);
+      this.pluralFuncs[locale] = getPlural(locale, this.options);
       this.defaultLocale = locale;
     } else if (Array.isArray(locale)) {
       locale.forEach(lc => {
-        this.pluralFuncs[lc] = getPlural(lc);
+        this.pluralFuncs[lc] = getPlural(lc, this.options);
       });
       this.defaultLocale = locale[0];
     } else {
@@ -85,6 +90,7 @@ export default class MessageFormat {
         this.hasCustomPluralFuncs = true;
       } else {
         this.defaultLocale = MessageFormat.defaultLocale;
+        this.hasCustomPluralFuncs = false;
       }
     }
     this.fmt = {};
@@ -160,7 +166,7 @@ export default class MessageFormat {
    * mf.compile(msg)({ X: 0 })  // '0 answers'
    */
   disablePluralKeyChecks() {
-    this.noPluralKeyChecks = true;
+    this.options.pluralKeyChecks = false;
     for (const lc in this.pluralFuncs) {
       const pf = this.pluralFuncs[lc];
       if (pf) {
@@ -194,7 +200,7 @@ export default class MessageFormat {
    *   // 'first >> SECOND >> THIRD'
    */
   setBiDiSupport(enable) {
-    this.bidiSupport = !!enable || typeof enable == 'undefined';
+    this.options.biDiSupport = !!enable || typeof enable == 'undefined';
     return this;
   }
 
@@ -232,8 +238,8 @@ export default class MessageFormat {
    * messages.pastry({ X: 3, P: 'pie' })  // '# pies'
    */
   setStrictNumberSign(enable) {
-    this.strictNumberSign = !!enable || typeof enable == 'undefined';
-    this.runtime.setStrictNumber(this.strictNumberSign);
+    this.options.strictNumberSign = !!enable || typeof enable == 'undefined';
+    this.runtime.setStrictNumber(this.options.strictNumberSign);
     return this;
   }
 
@@ -332,15 +338,15 @@ export default class MessageFormat {
     let pf = {};
     if (Object.keys(this.pluralFuncs).length === 0) {
       if (locale) {
-        const pfn0 = getPlural(locale, this.noPluralKeyChecks);
+        const pfn0 = getPlural(locale, this.options);
         if (!pfn0) {
           const lcs = JSON.stringify(locale);
           throw new Error(`Locale ${lcs} not found!`);
         }
         pf[locale] = pfn0;
       } else {
         locale = this.defaultLocale;
-        pf = getAllPlurals(this.noPluralKeyChecks);
+        pf = getAllPlurals(this.options);
       }
     } else if (locale) {
       const pfn1 = this.pluralFuncs[locale];

packages/messageformat/src/plurals.js

@@ -9,38 +9,38 @@ import plurals from 'make-plural/umd/plurals';
  * {@link http://github.com/eemeli/make-plural.js make-plural}
  */
 
-function wrapPluralFunc(lc, pf, noPluralKeyChecks) {
+function wrapPluralFunc(lc, pf, pluralKeyChecks) {
   var fn = function() {
     return pf.apply(this, arguments);
   };
   fn.toString = () => pf.toString();
-  if (noPluralKeyChecks) {
-    fn.cardinal = [];
-    fn.ordinal = [];
-  } else {
+  if (pluralKeyChecks) {
     const pc = pluralCategories[lc] || {};
     fn.cardinal = pc.cardinal;
     fn.ordinal = pc.ordinal;
+  } else {
+    fn.cardinal = [];
+    fn.ordinal = [];
   }
   return fn;
 }
 
-export function getPlural(locale, noPluralKeyChecks) {
+export function getPlural(locale, { pluralKeyChecks }) {
   for (let lc = String(locale); lc; lc = lc.replace(/[-_]?[^-_]*$/, '')) {
     const pf = plurals[lc];
-    if (pf) return wrapPluralFunc(lc, pf, noPluralKeyChecks);
+    if (pf) return wrapPluralFunc(lc, pf, pluralKeyChecks);
   }
   throw new Error(
     'Localisation function not found for locale ' + JSON.stringify(locale)
   );
 }
 
-export function getAllPlurals(noPluralKeyChecks) {
+export function getAllPlurals({ pluralKeyChecks }) {
   const locales = {};
   const keys = Object.keys(plurals);
   for (let i = 0; i < keys.length; ++i) {
     const lc = keys[i];
-    locales[lc] = wrapPluralFunc(lc, plurals[lc], noPluralKeyChecks);
+    locales[lc] = wrapPluralFunc(lc, plurals[lc], pluralKeyChecks);
   }
   return locales;
 }

packages/messageformat/src/runtime.js

@@ -50,7 +50,7 @@ export default class Runtime {
 
   constructor(mf) {
     this.mf = mf;
-    this.setStrictNumber(mf.strictNumberSign);
+    this.setStrictNumber(mf.options.strictNumberSign);
   }
 
   /** Utility function for `{N, plural|selectordinal, ...}`

packages/messageformat/src/utils.js

@@ -106,7 +106,7 @@ const rtlRegExp = new RegExp('^' + rtlLanguages.join('|^'));
  *
  * @private
  */
-export function bidiMarkText(text, locale) {
+export function biDiMarkText(text, locale) {
   const isLocaleRTL = rtlRegExp.test(locale);
   const mark = JSON.stringify(isLocaleRTL ? '\u200F' : '\u200E');
   return `${mark} + ${text} + ${mark}`;