Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Report errors from Functions and Intl objects #398

Merged
merged 4 commits into from
Jul 23, 2019
Merged

Report errors from Functions and Intl objects #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48a11f8
Report errors from Functions
stasm Jul 19, 2019
c9b38d3
Report errors from instantiating Intl objects
stasm Jul 19, 2019
055b222
Check if arguments to builtins are FluentNone
stasm Jul 22, 2019
33f6cb2
Use NUMBER() as the placeable fallback
stasm Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions fluent/src/builtins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,25 @@ function values(opts) {
export
function NUMBER([arg], opts) {
if (arg instanceof FluentNone) {
return arg;
return new FluentNone(`NUMBER(${arg.valueOf()})`);
}

if (arg instanceof FluentNumber) {
return new FluentNumber(arg.valueOf(), merge(arg.opts, opts));
}
return new FluentNone("NUMBER()");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was introduced in April in 24355cf to provide better fallback values. Today we can simply throw :)


throw new TypeError("Invalid argument type to NUMBER");
}

export
function DATETIME([arg], opts) {
if (arg instanceof FluentNone) {
return arg;
return new FluentNone(`DATETIME(${arg.valueOf()})`);
}

if (arg instanceof FluentDateTime) {
return new FluentDateTime(arg.valueOf(), merge(arg.opts, opts));
}
return new FluentNone("DATETIME()");

throw new TypeError("Invalid argument type to DATETIME");
}
8 changes: 4 additions & 4 deletions fluent/src/resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function resolveExpression(scope, expr) {
function VariableReference(scope, {name}) {
if (!scope.args || !scope.args.hasOwnProperty(name)) {
if (scope.insideTermReference === false) {
scope.reportError(new ReferenceError(`Unknown variable: ${name}`));
scope.reportError(new ReferenceError(`Unknown variable: $${name}`));
}
return new FluentNone(`$${name}`);
}
Expand All @@ -151,7 +151,7 @@ function VariableReference(scope, {name}) {
}
default:
scope.reportError(
new TypeError(`Unsupported variable type: ${name}, ${typeof arg}`)
new TypeError(`Variable type not supported: $${name}, ${typeof arg}`)
);
return new FluentNone(`$${name}`);
}
Expand Down Expand Up @@ -224,8 +224,8 @@ function FunctionReference(scope, {name, args}) {

try {
return func(...getArguments(scope, args));
} catch (e) {
// XXX Report errors.
} catch (err) {
scope.reportError(err);
return new FluentNone(`${name}()`);
}
}
Expand Down
14 changes: 7 additions & 7 deletions fluent/src/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ export class FluentType {
}

export class FluentNone extends FluentType {
valueOf() {
return null;
constructor(value = "???") {
super(value);
}

toString() {
return `{${this.value || "???"}}`;
return `{${this.value}}`;
}
}

Expand All @@ -65,8 +65,8 @@ export class FluentNumber extends FluentType {
Intl.NumberFormat, this.opts
);
return nf.format(this.value);
} catch (e) {
// XXX Report the error.
} catch (err) {
scope.reportError(err);
return this.value;
}
}
Expand All @@ -83,8 +83,8 @@ export class FluentDateTime extends FluentType {
Intl.DateTimeFormat, this.opts
);
return dtf.format(this.value);
} catch (e) {
// XXX Report the error.
} catch (err) {
scope.reportError(err);
return this.value;
}
}
Expand Down
146 changes: 100 additions & 46 deletions fluent/test/functions_builtin_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,26 @@ suite('Built-in functions', function() {
test('missing argument', function() {
let msg;

errors = [];
msg = bundle.getMessage('num-decimal');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{NUMBER($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof ReferenceError);
assert.ok(errors[0] instanceof ReferenceError);
assert.strictEqual(errors[0].message, "Unknown variable: $arg");

errors = [];
msg = bundle.getMessage('num-percent');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{NUMBER($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof ReferenceError);
assert.ok(errors[0] instanceof ReferenceError);
assert.strictEqual(errors[0].message, "Unknown variable: $arg");

errors = [];
msg = bundle.getMessage('num-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{NUMBER($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof ReferenceError);
assert.ok(errors[0] instanceof ReferenceError);
assert.strictEqual(errors[0].message, "Unknown variable: $arg");
});

test('number argument', function() {
Expand All @@ -55,66 +61,87 @@ suite('Built-in functions', function() {

msg = bundle.getMessage('num-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '1');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof RangeError); // Invalid option value
});

// XXX Functions should report errors.
// https://github.com/projectfluent/fluent.js/issues/106
test('string argument', function() {
const args = {arg: "Foo"};
let msg;

errors = [];
msg = bundle.getMessage('num-decimal');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to NUMBER");

errors = [];
msg = bundle.getMessage('num-percent');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to NUMBER");

errors = [];
msg = bundle.getMessage('num-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to NUMBER");
});

// XXX Functions should report errors.
// https://github.com/projectfluent/fluent.js/issues/106
test('date argument', function() {
const date = new Date('2016-09-29');
const args = {arg: date};
let msg;

errors = [];
msg = bundle.getMessage('num-decimal');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to NUMBER");

errors = [];
msg = bundle.getMessage('num-percent');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to NUMBER");

errors = [];
msg = bundle.getMessage('num-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to NUMBER");
});

test('invalid argument', function() {
const args = {arg: []};
let msg;

errors = [];
msg = bundle.getMessage('num-decimal');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof TypeError);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Variable type not supported: $arg, object");

errors = [];
msg = bundle.getMessage('num-percent');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof TypeError);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Variable type not supported: $arg, object");

errors = [];
msg = bundle.getMessage('num-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{NUMBER($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof TypeError);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Variable type not supported: $arg, object");
});
});

Expand All @@ -131,20 +158,26 @@ suite('Built-in functions', function() {
test('missing argument', function() {
let msg;

errors = [];
msg = bundle.getMessage('dt-default');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{DATETIME($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof ReferenceError);
assert.ok(errors[0] instanceof ReferenceError);
assert.strictEqual(errors[0].message, "Unknown variable: $arg");

errors = [];
msg = bundle.getMessage('dt-month');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{DATETIME($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof ReferenceError);
assert.ok(errors[0] instanceof ReferenceError);
assert.strictEqual(errors[0].message, "Unknown variable: $arg");

errors = [];
msg = bundle.getMessage('dt-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, {}, errors), '{DATETIME($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof ReferenceError);
assert.ok(errors[0] instanceof ReferenceError);
assert.strictEqual(errors[0].message, "Unknown variable: $arg");
});

test('Date argument', function () {
Expand Down Expand Up @@ -172,65 +205,86 @@ suite('Built-in functions', function() {
// may vary depending on the TZ:
// Thu Sep 29 2016 02:00:00 GMT+0200 (CEST)
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), date.toString());
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof RangeError); // Invalid option value
});

// XXX Functions should report errors.
// https://github.com/projectfluent/fluent.js/issues/106
test('number argument', function() {
let args = {arg: 1};
let msg;

errors = [];
msg = bundle.getMessage('dt-default');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to DATETIME");

errors = [];
msg = bundle.getMessage('dt-month');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to DATETIME");

errors = [];
msg = bundle.getMessage('dt-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to DATETIME");
});

// XXX Functions should report errors.
// https://github.com/projectfluent/fluent.js/issues/106
test('string argument', function() {
let args = {arg: 'Foo'};
let msg;

errors = [];
msg = bundle.getMessage('dt-default');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to DATETIME");

errors = [];
msg = bundle.getMessage('dt-month');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to DATETIME");

errors = [];
msg = bundle.getMessage('dt-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME()}');
assert.strictEqual(errors.length, 0);
assert.strictEqual(errors.length, 1);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Invalid argument type to DATETIME");
});

test('invalid argument', function() {
let args = {arg: []};
let msg;

errors = [];
msg = bundle.getMessage('dt-default');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof TypeError);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Variable type not supported: $arg, object");

errors = [];
msg = bundle.getMessage('dt-month');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof TypeError);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Variable type not supported: $arg, object");

errors = [];
msg = bundle.getMessage('dt-bad-opt');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{$arg}');
assert.strictEqual(bundle.formatPattern(msg.value, args, errors), '{DATETIME($arg)}');
assert.strictEqual(errors.length, 1);
assert.ok(errors.pop() instanceof TypeError);
assert.ok(errors[0] instanceof TypeError);
assert.strictEqual(errors[0].message, "Variable type not supported: $arg, object");
});
});
});