Merge @fluent/bundle 0.14 release branch

Author: stasm

fluent-dedent/test/blank_test.js

@@ -5,7 +5,7 @@ import ftl from "../src/index";
 
 suite("blank lines", function() {
   test("leading", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
 
         foo
@@ -15,7 +15,7 @@ suite("blank lines", function() {
   });
 
   test("middle", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         foo
 
@@ -26,7 +26,7 @@ suite("blank lines", function() {
   });
 
   test("trailing", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         foo
 
@@ -36,7 +36,7 @@ suite("blank lines", function() {
   });
 
   test("containing the same amount of spaces as the common indent", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
       
       `,
@@ -54,7 +54,7 @@ suite("blank lines", function() {
   });
 
   test("containing too many spaces", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         
       `,

fluent-dedent/test/content_test.js

@@ -5,7 +5,7 @@ import ftl from "../src/index";
 
 suite("content lines", function() {
   test("no indent", function () {
-    assert.equal(
+    assert.strictEqual(
       ftl`
 foo
 bar
@@ -15,7 +15,7 @@ bar
   });
 
   test("zero indent", function () {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         foo
     bar
@@ -25,7 +25,7 @@ bar
   });
 
   test("small indent", function () {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         foo
     bar
@@ -35,7 +35,7 @@ bar
   });
 
   test("same indent", function () {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         foo
         bar

fluent-dedent/test/eol_test.js

@@ -28,7 +28,7 @@ suite("EOL at extremes", function () {
   });
 
   test("two EOLs", function () {
-    assert.equal(
+    assert.strictEqual(
       ftl`
       foo
       `,

fluent-dedent/test/interpolation_test.js

@@ -5,7 +5,7 @@ import ftl from "../src/index";
 
 suite("interpolation", function() {
   test("single", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         foo ${"bar"}
         `,
@@ -14,7 +14,7 @@ suite("interpolation", function() {
   });
 
   test("multiple", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         foo ${"bar"}${"baz"}
         `,
@@ -23,7 +23,7 @@ suite("interpolation", function() {
   });
 
   test("on separate lines", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
         ${"foo"}
           ${"bar"}

fluent-dedent/test/mixed_test.js

@@ -5,7 +5,7 @@ import ftl from "../src/index";
 
 suite("mixed indent", function() {
   test("same amount", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
 \t    foo
 \t    `,
@@ -14,7 +14,7 @@ suite("mixed indent", function() {
   });
 
   test("larger than common", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
 \t        foo
 \t    `,

fluent-dedent/test/tabs_test.js

@@ -5,7 +5,7 @@ import ftl from "../src/index";
 
 suite("tab indent", function() {
   test("same amount", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
 \t\tfoo
 \t\t`,
@@ -14,7 +14,7 @@ suite("tab indent", function() {
   });
 
   test("larger than common", function() {
-    assert.equal(
+    assert.strictEqual(
       ftl`
 \t\t\tfoo
 \t\t`,

fluent-dom/src/localization.js

@@ -71,9 +71,9 @@ export default class Localization {
   /**
    * Format translations into {value, attributes} objects.
    *
-   * The fallback logic is the same as in `formatValues` but the argument type
-   * is stricter (an array of arrays) and it returns {value, attributes}
-   * objects which are suitable for the translation of DOM elements.
+   * The fallback logic is the same as in `formatValues` but it returns {value,
+   * attributes} objects which are suitable for the translation of DOM
+   * elements.
    *
    *     docL10n.formatMessages([
    *       {id: 'hello', args: { who: 'Mary' }},
@@ -101,8 +101,8 @@ export default class Localization {
   /**
    * Retrieve translations corresponding to the passed keys.
    *
-   * A generalized version of `DOMLocalization.formatValue`. Keys can
-   * either be simple string identifiers or `[id, args]` arrays.
+   * A generalized version of `DOMLocalization.formatValue`. Keys must
+   * be `{id, args}` objects.
    *
    *     docL10n.formatValues([
    *       {id: 'hello', args: { who: 'Mary' }},
@@ -164,26 +164,26 @@ export default class Localization {
 }
 
 /**
- * Format the value of a message into a string.
+ * Format the value of a message into a string or `null`.
  *
  * This function is passed as a method to `keysFromBundle` and resolve
  * a value of a single L10n Entity using provided `FluentBundle`.
  *
- * If the function fails to retrieve the entity, it will return an ID of it.
- * If formatting fails, it will return a partially resolved entity.
- *
- * In both cases, an error is being added to the errors array.
+ * If the message doesn't have a value, return `null`.
  *
  * @param   {FluentBundle} bundle
- * @param   {Array<Error>}   errors
- * @param   {string}         id
- * @param   {Object}         args
- * @returns {string}
+ * @param   {Array<Error>} errors
+ * @param   {Object} message
+ * @param   {Object} args
+ * @returns {string|null}
  * @private
  */
-function valueFromBundle(bundle, errors, id, args) {
-  const msg = bundle.getMessage(id);
-  return bundle.format(msg, args, errors);
+function valueFromBundle(bundle, errors, message, args) {
+  if (message.value) {
+    return bundle.formatPattern(message.value, args, errors);
+  }
+
+  return null;
 }
 
 /**
@@ -195,34 +195,29 @@ function valueFromBundle(bundle, errors, id, args) {
  * The function will return an object with a value and attributes of the
  * entity.
  *
- * If the function fails to retrieve the entity, the value is set to the ID of
- * an entity, and attributes to `null`. If formatting fails, it will return
- * a partially resolved value and attributes.
- *
- * In both cases, an error is being added to the errors array.
- *
  * @param   {FluentBundle} bundle
- * @param   {Array<Error>}   errors
- * @param   {String}         id
- * @param   {Object}         args
+ * @param   {Array<Error>} errors
+ * @param   {Object} message
+ * @param   {Object} args
  * @returns {Object}
  * @private
  */
-function messageFromBundle(bundle, errors, id, args) {
-  const msg = bundle.getMessage(id);
-
+function messageFromBundle(bundle, errors, message, args) {
   const formatted = {
-    value: bundle.format(msg, args, errors),
+    value: null,
     attributes: null,
   };
 
-  if (msg.attrs) {
-    formatted.attributes = [];
-    for (const [name, attr] of Object.entries(msg.attrs)) {
-      const value = bundle.format(attr, args, errors);
-      if (value !== null) {
-        formatted.attributes.push({name, value});
-      }
+  if (message.value) {
+    formatted.value = bundle.formatPattern(message.value, args, errors);
+  }
+
+  let attrNames = Object.keys(message.attributes);
+  if (attrNames.length > 0) {
+    formatted.attributes = new Array(attrNames.length);
+    for (let [i, name] of attrNames.entries()) {
+      let value = bundle.formatPattern(message.attributes[name], args, errors);
+      formatted.attributes[i] = {name, value};
     }
   }
 
@@ -270,9 +265,10 @@ function keysFromBundle(method, bundle, keys, translations) {
       return;
     }
 
-    if (bundle.hasMessage(id)) {
+    let message = bundle.getMessage(id);
+    if (message) {
       messageErrors.length = 0;
-      translations[i] = method(bundle, messageErrors, id, args);
+      translations[i] = method(bundle, messageErrors, message, args);
       // XXX: Report resolver errors
     } else {
       missingIds.add(id);

fluent-dom/test/dom_localization_test.js

@@ -1,10 +1,11 @@
 import assert from "assert";
-import { FluentBundle } from "../../fluent/src/index";
+import { FluentBundle, FluentResource } from "../../fluent/src/index";
 import DOMLocalization from "../src/dom_localization";
 
 async function* mockGenerateMessages(resourceIds) {
   const bundle = new FluentBundle(["en-US"]);
-  bundle.addMessages("key1 = Key 1");
+  const resource = new FluentResource("key1 = Key 1");
+  bundle.addResource(resource);
   yield bundle;
 }
 
@@ -19,7 +20,7 @@ suite("translateFragment", function() {
 
     await domLoc.translateFragment(frag);
 
-    assert.equal(elem.textContent, "Key 1");
+    assert.strictEqual(elem.textContent, "Key 1");
   });
 
   test("does not inject content into a node with missing translation", async function() {
@@ -33,7 +34,7 @@ suite("translateFragment", function() {
 
     await domLoc.translateFragment(frag);
 
-    assert.equal(elem.textContent, "Original Value");
+    assert.strictEqual(elem.textContent, "Original Value");
   });
 
 });

fluent-dom/test/extra_text_markup_test.js

@@ -11,7 +11,7 @@ suite('Localized text markup', function() {
     };
 
     translateElement(element, translation);
-    assert.equal(element.innerHTML, 'FOO <em>BAR</em> BAZ');
+    assert.strictEqual(element.innerHTML, 'FOO <em>BAR</em> BAZ');
   });
 
   test('forbidden element', function() {
@@ -22,7 +22,7 @@ suite('Localized text markup', function() {
     };
 
     translateElement(element, translation);
-    assert.equal(element.innerHTML, 'FOO ');
+    assert.strictEqual(element.innerHTML, 'FOO ');
   });
 
   test('forbidden element with text', function() {
@@ -33,7 +33,7 @@ suite('Localized text markup', function() {
     };
 
     translateElement(element, translation);
-    assert.equal(element.innerHTML, 'FOO BUTTON');
+    assert.strictEqual(element.innerHTML, 'FOO BUTTON');
   });
 
   test('nested HTML is forbidden', function() {
@@ -44,7 +44,7 @@ suite('Localized text markup', function() {
     };
 
     translateElement(element, translation);
-    assert.equal(element.innerHTML, 'FOO <em>BAR</em> BAZ');
+    assert.strictEqual(element.innerHTML, 'FOO <em>BAR</em> BAZ');
   });
 });
 
@@ -57,7 +57,7 @@ suite('Attributes of localized text markup', function() {
     };
 
     translateElement(element, translation);
-    assert.equal(element.innerHTML,
+    assert.strictEqual(element.innerHTML,
       'FOO <em title="BAR">BAR</em>');
   });
 
@@ -69,7 +69,7 @@ suite('Attributes of localized text markup', function() {
     };
 
     translateElement(element, translation);
-    assert.equal(element.innerHTML,
+    assert.strictEqual(element.innerHTML,
       'FOO <em title="BAR">BAR</em>');
   });
 
@@ -82,7 +82,7 @@ suite('Attributes of localized text markup', function() {
     };
 
     translateElement(element, translation);
-    assert.equal(element.innerHTML,
+    assert.strictEqual(element.innerHTML,
       '<em>FOO</em>');
   });
 
@@ -98,10 +98,10 @@ suite('Attributes of localized text markup', function() {
     };
 
     translateElement(element, translationA);
-    assert.equal(element.innerHTML,
+    assert.strictEqual(element.innerHTML,
       '<em title="FOO A">FOO A</em>');
     translateElement(element, translationB);
-    assert.equal(element.innerHTML,
+    assert.strictEqual(element.innerHTML,
       '<em>FOO B</em>');
   });
 });