Merge pull request #375 from stasm/remove-ftl-from-fluent-bundle

Remove the ftl helper from fluent, fluent-syntax

Author: stasm

fluent-syntax/package.json

@@ -44,5 +44,8 @@
   ],
   "engines": {
     "node": ">=8.9.0"
+  },
+  "devDependencies": {
+    "@fluent/dedent": "^0.1.0"
   }
 }

fluent-syntax/test/ast_test.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import assert from "assert";
-import { ftl } from "./util";
+import ftl from "@fluent/dedent";
 import { FluentParser } from "../src";
 import * as AST from "../src/ast";
 
@@ -42,14 +42,14 @@ suite("BaseNode.equals", function() {
               [1] one
              *[other] default
             }
-      `);
+          `);
       const otherRes = this.parser.parse(ftl`
           msg = { $val ->
               [few] things
              *[other] default
               [1] one
             }
-      `);
+          `);
       const thisNode = thisRes.body[0];
       const otherNode = otherRes.body[0];
       assert.strictEqual(thisNode.equals(otherNode), false);
@@ -61,12 +61,12 @@ suite("BaseNode.equals", function() {
           msg =
             .attr1 = one
             .attr2 = two
-      `);
+          `);
       const otherRes = this.parser.parse(ftl`
           msg =
             .attr2 = two
             .attr1 = one
-      `);
+          `);
       const thisNode = thisRes.body[0];
       const otherNode = otherRes.body[0];
       assert.strictEqual(thisNode.equals(otherNode), false);

fluent-syntax/test/entry_test.js

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { ftl } from "./util";
+import ftl from "@fluent/dedent";
 
 import { FluentParser, FluentSerializer } from "../src";
 
@@ -11,7 +11,7 @@ suite("Parse entry", function() {
   test("simple message", function() {
     const input = ftl`
       foo = Foo
-    `;
+      `;
     const output = {
       "comment": null,
       "value": {
@@ -39,7 +39,7 @@ suite("Parse entry", function() {
     const input = ftl`
       # Attached Comment
       foo = Foo
-    `;
+      `;
     const output = {
       "comment": null,
       "value": {
@@ -67,9 +67,9 @@ suite("Parse entry", function() {
     const input = ftl`
       # Attached Comment
       junk
-    `;
+      `;
     const output = {
-      "content": "junk\n",
+      "content": "junk",
       "annotations": [
         {
           "arguments": ["="],
@@ -96,7 +96,7 @@ suite("Parse entry", function() {
       ## Group Comment
       ### Resource Comment
       foo = Foo
-    `;
+      `;
     const output = {
       "comment": null,
       "value": {
@@ -124,9 +124,9 @@ suite("Parse entry", function() {
     const input = ftl`
       # Attached Comment
       ##Invalid Comment
-    `;
+      `;
     const output = {
-      "content": "##Invalid Comment\n",
+      "content": "##Invalid Comment",
       "annotations": [
         {
           "arguments": [" "],
@@ -175,7 +175,8 @@ suite("Serialize entry", function() {
     };
     const output = ftl`
       foo = Foo
-    `;
+
+      `;
 
     const message = this.serializer.serializeEntry(input)
     assert.deepEqual(message, output)