Merge pull request #415 from stasm/fluent-bundle

Rename fluent/ to fluent-bundle/

Author: stasm

README.md

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { FluentBundle, FluentResource } from "../../fluent/src/index";
+import { FluentBundle, FluentResource } from "../../fluent-bundle/src/index";
 import DOMLocalization from "../src/dom_localization";
 
 async function* mockGenerateMessages(resourceIds) {

fluent/.esdoc.json renamed to fluent-bundle/.esdoc.json

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { FluentBundle, FluentResource } from "../../fluent/src/index";
+import { FluentBundle, FluentResource } from "../../fluent-bundle/src/index";
 import Localization from "../src/localization";
 
 async function* mockGenerateMessages(resourceIds) {

fluent/.gitignore renamed to fluent-bundle/.gitignore

@@ -11,7 +11,7 @@ build: Fluent.jsm FluentSyntax.jsm Localization.jsm DOMLocalization.jsm l10n.js
 Fluent.jsm: $(SOURCES)
 	@rollup $(CURDIR)/src/fluent.js \
 	    --config ./xpcom_config.js \
-	    --output.intro "/* $(call version,fluent) */" \
+	    --output.intro "/* $(call version,fluent-bundle) */" \
 	    --output.file ./dist/$@
 	@echo -e " $(OK) $@ built"
 

fluent/.npmignore renamed to fluent-bundle/.npmignore

@@ -5,7 +5,7 @@ import {
   FluentType,
   FluentNumber,
   FluentDateTime,
-} from "../../fluent/src/index";
+} from "../../fluent-bundle/src/index";
 
 this.EXPORTED_SYMBOLS = [
   ...Object.keys({

fluent/CHANGELOG.md renamed to fluent-bundle/CHANGELOG.md

@@ -1,7 +1,7 @@
 import React from 'react';
 import assert from 'assert';
 import { shallow } from 'enzyme';
-import { FluentBundle, FluentResource } from '../../fluent/src';
+import { FluentBundle, FluentResource } from '../../fluent-bundle/src';
 import ReactLocalization from '../src/localization';
 import { Localized } from '../src/index';
 

fluent/README.md renamed to fluent-bundle/README.md

@@ -1,7 +1,7 @@
 import React from 'react';
 import assert from 'assert';
 import { shallow } from 'enzyme';
-import { FluentBundle, FluentResource } from '../../fluent/src';
+import { FluentBundle, FluentResource } from '../../fluent-bundle/src';
 import ReactLocalization from '../src/localization';
 import { Localized } from '../src/index';
 

fluent/makefile renamed to fluent-bundle/makefile

@@ -1,7 +1,7 @@
 import React from 'react';
 import assert from 'assert';
 import { shallow } from 'enzyme';
-import { FluentBundle, FluentResource } from '../../fluent/src';
+import { FluentBundle, FluentResource } from '../../fluent-bundle/src';
 import ReactLocalization from '../src/localization';
 import createParseMarkup from '../src/markup';
 import { Localized } from '../src/index';

fluent/package.json renamed to fluent-bundle/package.json

@@ -2,7 +2,7 @@ import React from 'react';
 import assert from 'assert';
 import sinon from 'sinon';
 import { shallow } from 'enzyme';
-import { FluentBundle, FluentResource } from '../../fluent/src';
+import { FluentBundle, FluentResource } from '../../fluent-bundle/src';
 import ReactLocalization from '../src/localization';
 import { Localized } from '../src/index';
 

fluent/src/builtins.js renamed to fluent-bundle/src/builtins.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import assert from 'assert';
 import { shallow } from 'enzyme';
-import { FluentBundle, FluentResource } from '../../fluent/src';
+import { FluentBundle, FluentResource } from '../../fluent-bundle/src';
 import ReactLocalization from '../src/localization';
 import { Localized } from '../src/index';
 

fluent/src/bundle.js renamed to fluent-bundle/src/bundle.js

@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import PropTypes from "prop-types";
 import assert from 'assert';
 import { render } from 'enzyme';
-import { FluentBundle, FluentResource } from '../../fluent/src';
+import { FluentBundle, FluentResource } from '../../fluent-bundle/src';
 import { LocalizationProvider, isReactLocalization } from '../src/index';
 
 

fluent/src/error.js renamed to fluent-bundle/src/error.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import assert from 'assert';
 import { mount, shallow } from 'enzyme';
-import { FluentBundle, FluentResource } from '../../fluent/src';
+import { FluentBundle, FluentResource } from '../../fluent-bundle/src';
 import ReactLocalization from '../src/localization';
 import { withLocalization, LocalizationProvider } from '../src';
 

fluent/src/index.js renamed to fluent-bundle/src/index.js

@@ -2,7 +2,7 @@ export SHELL := /bin/bash
 export PATH  := $(CURDIR)/node_modules/.bin:$(PATH)
 
 TARGETS  := all dist lint test build html deps depsclean
-PACKAGES := $(wildcard fluent*)
+PACKAGES := $(wildcard fluent-*)
 
 $(TARGETS): $(PACKAGES)
 

fluent/src/resolver.js renamed to fluent-bundle/src/resolver.js

@@ -26,14 +26,15 @@ function print(err, data) {
     return console.error('File not found: ' + err.path);
   }
 
-  const res = FluentSyntax.parse(data.toString());
+  const source = data.toString();
+  const res = FluentSyntax.parse(source, {withSpans: true});
   const pretty = FluentSyntax.serialize(res);
   console.log(pretty);
 
   if (!program.silent) {
     res.body
       .filter(entry => entry.type === "Junk")
-      .map(entry => printAnnotations(res.source, entry));
+      .map(entry => printAnnotations(source, entry));
   }
 }
 
@@ -45,17 +46,17 @@ function printAnnotations(source, junk) {
 }
 
 function printAnnotation(source, span, annot) {
-  const { name, message, pos } = annot;
+  const { code, message, span: { start } } = annot;
   const slice = source.substring(span.start, span.end);
-  const lineNumber = FluentSyntax.lineOffset(source, pos) + 1;
-  const columnOffset = FluentSyntax.columnOffset(source, pos);
+  const lineNumber = FluentSyntax.lineOffset(source, start) + 1;
+  const columnOffset = FluentSyntax.columnOffset(source, start);
   const showLines = lineNumber - FluentSyntax.lineOffset(source, span.start);
   const lines = slice.split('\n');
   const head = lines.slice(0, showLines);
   const tail = lines.slice(showLines);
 
   console.log();
-  console.log(`! ${name} on line ${lineNumber}:`);
+  console.log(`! ${code} on line ${lineNumber}:`);
   console.log(head.map(line => `  | ${line}`).join('\n'));
   console.log(`  … ${indent(columnOffset)}^----- ${message}`);
   console.log(tail.map(line => `  | ${line}`).join('\n'));

fluent/src/resource.js renamed to fluent-bundle/src/resource.js

@@ -8,7 +8,7 @@ const program = require('commander');
 
 require = require('esm')(module);
 require('intl-pluralrules');
-const Fluent = require('../fluent/src');
+const Fluent = require('../fluent-bundle/src');
 
 program
   .version('0.0.1')

fluent/src/scope.js renamed to fluent-bundle/src/scope.js

@@ -30,9 +30,13 @@ function fuzz(err, data) {
     return console.error('File not found: ' + err.path);
   }
 
-  const parse = program.runtime
-    ? require('../fluent/src/parser').default
-    : require('../fluent-syntax/src').parse;
+  let parse;
+  if (program.runtime) {
+    let {FluentResource} = require('../fluent-bundle/src');
+    parse = source => new FluentResource(source);
+  } else {
+    parse = require('../fluent-syntax/src').parse;
+  }
 
   const source = data.toString();
   const mutations = new Set();

fluent/src/types.js renamed to fluent-bundle/src/types.js

@@ -35,7 +35,7 @@ function print(err, data) {
 }
 
 function printRuntime(data) {
-  const FluentResource = require('../fluent/src/resource').default;
+  const FluentResource = require('../fluent-bundle/src/resource').default;
   const res = new FluentResource(data.toString());
   console.log(JSON.stringify(res, null, 4));
 }

fluent/test/arguments_test.js renamed to fluent-bundle/test/arguments_test.js

@@ -1,4 +1,4 @@
-load('../../fluent/index.js');
+load('../../fluent-bundle/index.js');
 load('../../fluent-syntax/index.js');
 load('./benchmark.common.js');
 

fluent/test/attributes_test.js renamed to fluent-bundle/test/attributes_test.js

@@ -1,4 +1,4 @@
-load('../../fluent/index.js');
+load('../../fluent-bundle/index.js');
 load('../../fluent-syntax/index.js');
 load('./benchmark.common.js');
 

fluent/test/bomb_test.js renamed to fluent-bundle/test/bomb_test.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 
-const FluentBundle = require('../../fluent');
+const FluentBundle = require('../../fluent-bundle');
 const FluentSyntax = require('../../fluent-syntax');
 const { runTest } = require('./benchmark.common');
 require('intl-pluralrules');