Skip to content

Commit

Permalink
Bugfix: Interpreter conversion of string to number should throw on NaN
Browse files Browse the repository at this point in the history
  • Loading branch information
Dosant authored and chrisronline committed Nov 14, 2019
1 parent 15ceb4b commit d007405
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
16 changes: 15 additions & 1 deletion src/plugins/expressions/public/expression_types/number.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* under the License.
*/

import { i18n } from '@kbn/i18n';
import { ExpressionType } from '../types';
import { Datatable } from './datatable';
import { Render } from './render';
Expand All @@ -28,7 +29,20 @@ export const number = (): ExpressionType<typeof name, number> => ({
from: {
null: () => 0,
boolean: b => Number(b),
string: n => Number(n),
string: n => {
const value = Number(n);
if (Number.isNaN(value)) {
throw new Error(
i18n.translate('expressions_np.types.number.fromStringConversionErrorMessage', {
defaultMessage: 'Can\'t typecast "{string}" string to number',
values: {
string: n,
},
})
);
}
return value;
},
},
to: {
render: (value: number): Render<{ text: string }> => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import { number } from '../number';

describe('number', () => {
it('should fail when typecasting not numeric string to number', () => {
expect(() => number().from!.string('123test', {})).toThrowErrorMatchingInlineSnapshot(
`"Can't typecast \\"123test\\" string to number"`
);
});
});

0 comments on commit d007405

Please sign in to comment.