New folder structure, part 2

Author: stasm

resolver/src/bin/format.ts bin/format.tsresolver/src/bin/format.ts renamed to bin/format.ts

@@ -1,10 +1,10 @@
 import parseArgs from "minimist";
-import { fromStdin, fromFile } from "../../../lib/input";
-import { Resource as ResourceParser } from "../../../syntax/grammar";
-import { Resource, NodeType, GroupComment } from "../ast";
-import { Bundle } from "../bundle";
-import { ErrorKind } from "../error";
-import { Value, StringValue, NumberValue } from "../value";
+import {fromStdin, fromFile} from "../lib/input";
+import {Resource as ResourceParser} from "../syntax/grammar";
+import {Resource, NodeType, GroupComment} from "../resolver/ast";
+import {Bundle} from "../resolver/bundle";
+import {ErrorKind} from "../resolver/error";
+import {Value, StringValue, NumberValue} from "../resolver/value";
 
 const argv = parseArgs(process.argv.slice(2), {
     boolean: ["help", "group"],
@@ -77,7 +77,7 @@ function formatResource(resource: Resource, variables: Variables) {
         }
         let message = bundle.getMessage(entry.id.name);
         if (message) {
-            let { value, errors } = bundle.formatValue(message, variables);
+            let {value, errors} = bundle.formatValue(message, variables);
             results.push({
                 value,
                 errors: errors.map(error => ({

package.json

@@ -1,56 +1,56 @@
 {
-  "name": "fluent-spec",
-  "description": "Specification and documentation for Fluent",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "bench": "node -r esm --harmony-async-iteration ./test/bench.js ./test/benchmarks/gecko_strings.ftl",
-    "build:guide": "gitbook build guide build/guide",
-    "build": "npm run --silent build:guide",
-    "ci": "npm run --silent lint && npm test && npm run --silent test:ebnf",
-    "clean": "rm -rf build",
-    "deploy": "gh-pages -d build",
-    "generate:ebnf": "node -r esm bin/ebnf.js ./syntax/grammar.js > ./spec/fluent.ebnf",
-    "generate:fixtures": "make -sC test/fixtures",
-    "generate": "npm run --silent generate:ebnf && npm run --silent generate:fixtures",
-    "lint": "prettier --check **/*.js",
-    "pretty": "prettier --write **/*.js",
-    "test:ebnf": "node -r esm test/ebnf.js ./syntax/grammar.js ./spec/fluent.ebnf",
-    "test:fixtures": "node -r esm test/parser.js ./test/fixtures",
-    "test:unit": "node -r esm test/literals.js",
-    "test:resolver": "mocha -u tdd -r ts-node/register ./resolver/test/**/*_test.ts",
-    "test": "npm run --silent test:fixtures && npm run --silent test:unit",
-    "watch": "tsc --watch"
-  },
-  "homepage": "https://projectfluent.org",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/projectfluent/fluent.git"
-  },
-  "author": "Mozilla <l10n-drivers@mozilla.org>",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/projectfluent/fluent/issues"
-  },
-  "devDependencies": {
-    "@types/minimist": "^1.2.0",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.0.4",
-    "babylon": "^6.18.0",
-    "cli-color": "^1.2.0",
-    "difflib": "^0.2.4",
-    "fluent": "^0.6.4",
-    "fluent-syntax": "^0.7.0",
-    "gh-pages": "^1.1.0",
-    "gitbook-cli": "^2.3.0",
-    "json-diff": "^0.5.2",
-    "prettier": "^1.17.1",
-    "mocha": "^6.1.4",
-    "ts-node": "^8.2.0",
-    "typescript": "^3.5.1"
-  },
-  "dependencies": {
-    "esm": "^3.2.25",
-    "minimist": "^1.2.0"
-  }
+    "name": "fluent-spec",
+    "description": "Specification and documentation for Fluent",
+    "version": "1.0.0",
+    "private": true,
+    "scripts": {
+        "bench": "node -r esm --harmony-async-iteration ./test/bench.js ./test/benchmarks/gecko_strings.ftl",
+        "build:guide": "gitbook build guide build/guide",
+        "build": "npm run --silent build:guide",
+        "ci": "npm run --silent lint && npm test && npm run --silent test:ebnf",
+        "clean": "rm -rf build",
+        "deploy": "gh-pages -d build",
+        "generate:ebnf": "node -r esm bin/ebnf.js ./syntax/grammar.js > ./spec/fluent.ebnf",
+        "generate:fixtures": "make -sC test/fixtures",
+        "generate": "npm run --silent generate:ebnf && npm run --silent generate:fixtures",
+        "lint": "prettier --check **/*.js",
+        "pretty": "prettier --write **/*.js",
+        "test:ebnf": "node -r esm test/ebnf.js ./syntax/grammar.js ./spec/fluent.ebnf",
+        "test:fixtures": "node -r esm test/parser.js ./test/fixtures",
+        "test:unit": "node -r esm test/literals.js",
+        "test:resolver": "mocha -u tdd -r ts-node/register ./test/resolver/**/*_test.ts",
+        "test": "npm run --silent test:fixtures && npm run --silent test:unit",
+        "watch": "tsc --watch"
+    },
+    "homepage": "https://projectfluent.org",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/projectfluent/fluent.git"
+    },
+    "author": "Mozilla <l10n-drivers@mozilla.org>",
+    "license": "Apache-2.0",
+    "bugs": {
+        "url": "https://github.com/projectfluent/fluent/issues"
+    },
+    "devDependencies": {
+        "@types/minimist": "^1.2.0",
+        "@types/mocha": "^5.2.7",
+        "@types/node": "^12.0.4",
+        "babylon": "^6.18.0",
+        "cli-color": "^1.2.0",
+        "difflib": "^0.2.4",
+        "fluent": "^0.6.4",
+        "fluent-syntax": "^0.7.0",
+        "gh-pages": "^1.1.0",
+        "gitbook-cli": "^2.3.0",
+        "json-diff": "^0.5.2",
+        "prettier": "^1.17.1",
+        "mocha": "^6.1.4",
+        "ts-node": "^8.2.0",
+        "typescript": "^3.5.1"
+    },
+    "dependencies": {
+        "esm": "^3.2.25",
+        "minimist": "^1.2.0"
+    }
 }