Instantiate FluentResource via a constructor

fluent/src/bundle.js

@@ -121,25 +121,24 @@ export default class FluentBundle {
    * @returns {Array<Error>}
    */
   addMessages(source, options) {
-    const res = FluentResource.fromString(source);
+    const res = new FluentResource(source);
     return this.addResource(res, options);
   }
 
   /**
    * Add a translation resource to the bundle.
    *
-   * The translation resource must be an instance of FluentResource,
-   * e.g. parsed by `FluentResource.fromString`.
+   * The translation resource must be an instance of `FluentResource`.
    *
-   *     let res = FluentResource.fromString("foo = Foo");
+   *     let res = new FluentResource("foo = Foo");
    *     bundle.addResource(res);
    *     bundle.getMessage('foo');
    *
    *     // Returns a raw representation of the 'foo' message.
    *
-   *     let res = FluentResource.fromString("bar = Bar");
+   *     let res = new FluentResource("bar = Bar");
    *     bundle.addResource(res);
-   *     res = FluentResource.fromString("bar = Newbar");
+   *     res = new FluentResource("bar = Newbar");
    *     bundle.addResource(res, { allowOverrides: true });
    *     bundle.getMessage('bar');
    *
@@ -163,8 +162,8 @@ export default class FluentBundle {
   } = {}) {
     const errors = [];
 
-    for (let i = 0; i < res.length; i++) {
-      let entry = res[i];
+    for (let i = 0; i < res.body.length; i++) {
+      let entry = res.body[i];
       if (entry.id.startsWith("-")) {
         // Identifiers starting with a dash (-) define terms. Terms are private
         // and cannot be retrieved from FluentBundle.

fluent/src/resource.js

@@ -53,16 +53,17 @@ const TOKEN_BLANK = /\s+/y;
 const MAX_PLACEABLES = 100;
 
 /**
- * Fluent Resource is a structure storing a map of parsed localization entries.
+ * Fluent Resource is a structure storing parsed localization entries.
  */
-export default class FluentResource extends Array {
-  /**
-   * Create a new FluentResource from Fluent code.
-   */
-  static fromString(source) {
+export default class FluentResource {
+  constructor(source) {
+    this.body = this.parse(source);
+  }
+
+  parse(source) {
     RE_MESSAGE_START.lastIndex = 0;
 
-    let resource = new this();
+    let resource = [];
     let cursor = 0;
 
     // Iterate over the beginnings of messages and terms to efficiently skip
@@ -88,7 +89,8 @@ export default class FluentResource extends Array {
 
     return resource;
 
-    // The parser implementation is inlined below for performance reasons.
+    // The parser implementation is inlined below for performance reasons,
+    // as well as for convenience of accessing `source` and `cursor`.
 
     // The parser focuses on minimizing the number of false negatives at the
     // expense of increasing the risk of false positives. In other words, it

fluent/test/context_test.js

@@ -90,7 +90,7 @@ suite('Bundle', function() {
   suite('addResource', function(){
     suiteSetup(function() {
       bundle = new FluentBundle('en-US', { useIsolating: false });
-      let resource = FluentResource.fromString(ftl`
+      let resource = new FluentResource(ftl`
         foo = Foo
         -bar = Bar
         `);
@@ -108,20 +108,20 @@ suite('Bundle', function() {
   suite('allowOverrides', function(){
     suiteSetup(function() {
       bundle = new FluentBundle('en-US', { useIsolating: false });
-      let resource1 = FluentResource.fromString('key = Foo');
+      let resource1 = new FluentResource('key = Foo');
       bundle.addResource(resource1);
     });
 
     test('addResource allowOverrides is false', function() {
-      let resource2 = FluentResource.fromString('key = Bar');
+      let resource2 = new FluentResource('key = Bar');
       let errors = bundle.addResource(resource2);
       assert.strictEqual(errors.length, 1);
       let msg = bundle.getMessage('key');
       assert.strictEqual(bundle.formatPattern(msg.value), 'Foo');
     });
 
     test('addResource allowOverrides is true', function() {
-      let resource2 = FluentResource.fromString('key = Bar');
+      let resource2 = new FluentResource('key = Bar');
       let errors = bundle.addResource(resource2, { allowOverrides: true });
       assert.strictEqual(errors.length, 0);
       let msg = bundle.getMessage('key');

fluent/test/fixtures_reference/any_char.json

@@ -1,17 +1,19 @@
-[
-    {
-        "id": "control0",
-        "value": "abc\u0007def",
-        "attributes": {}
-    },
-    {
-        "id": "delete",
-        "value": "abcdef",
-        "attributes": {}
-    },
-    {
-        "id": "control1",
-        "value": "abc‚def",
-        "attributes": {}
-    }
-]
+{
+    "body": [
+        {
+            "id": "control0",
+            "value": "abc\u0007def",
+            "attributes": {}
+        },
+        {
+            "id": "delete",
+            "value": "abcdef",
+            "attributes": {}
+        },
+        {
+            "id": "control1",
+            "value": "abc‚def",
+            "attributes": {}
+        }
+    ]
+}

fluent/test/fixtures_reference/astral.json

@@ -1,56 +1,58 @@
-[
-    {
-        "id": "face-with-tears-of-joy",
-        "value": "😂",
-        "attributes": {}
-    },
-    {
-        "id": "tetragram-for-centre",
-        "value": "𝌆",
-        "attributes": {}
-    },
-    {
-        "id": "surrogates-in-text",
-        "value": "\\uD83D\\uDE02",
-        "attributes": {}
-    },
-    {
-        "id": "surrogates-in-string",
-        "value": [
-            {
-                "type": "str",
-                "value": "��"
-            }
-        ],
-        "attributes": {}
-    },
-    {
-        "id": "surrogates-in-adjacent-strings",
-        "value": [
-            {
-                "type": "str",
-                "value": "�"
-            },
-            {
-                "type": "str",
-                "value": "�"
-            }
-        ],
-        "attributes": {}
-    },
-    {
-        "id": "emoji-in-text",
-        "value": "A face 😂 with tears of joy.",
-        "attributes": {}
-    },
-    {
-        "id": "emoji-in-string",
-        "value": [
-            {
-                "type": "str",
-                "value": "A face 😂 with tears of joy."
-            }
-        ],
-        "attributes": {}
-    }
-]
+{
+    "body": [
+        {
+            "id": "face-with-tears-of-joy",
+            "value": "😂",
+            "attributes": {}
+        },
+        {
+            "id": "tetragram-for-centre",
+            "value": "𝌆",
+            "attributes": {}
+        },
+        {
+            "id": "surrogates-in-text",
+            "value": "\\uD83D\\uDE02",
+            "attributes": {}
+        },
+        {
+            "id": "surrogates-in-string",
+            "value": [
+                {
+                    "type": "str",
+                    "value": "��"
+                }
+            ],
+            "attributes": {}
+        },
+        {
+            "id": "surrogates-in-adjacent-strings",
+            "value": [
+                {
+                    "type": "str",
+                    "value": "�"
+                },
+                {
+                    "type": "str",
+                    "value": "�"
+                }
+            ],
+            "attributes": {}
+        },
+        {
+            "id": "emoji-in-text",
+            "value": "A face 😂 with tears of joy.",
+            "attributes": {}
+        },
+        {
+            "id": "emoji-in-string",
+            "value": [
+                {
+                    "type": "str",
+                    "value": "A face 😂 with tears of joy."
+                }
+            ],
+            "attributes": {}
+        }
+    ]
+}