Permalink
Browse files

querystring: convert to using internal/errors

PR-URL: #15565
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
  • Loading branch information...
ramimoshe authored and refack committed Sep 23, 2017
1 parent 1c07724 commit 9788e96836243e2439867b81c6d6bf522115a0f5
View
@@ -1116,6 +1116,11 @@ API] [`URLSearchParams` constructor][`new URLSearchParams(iterable)`] does not
represent a `[name, value]` tuple – that is, if an element is not iterable, or
does not consist of exactly two elements.
<a id="ERR_INVALID_URI"></a>
### ERR_INVALID_URI
Used when an invalid URI is passed.
<a id="ERR_INVALID_URL"></a>
### ERR_INVALID_URL
View
@@ -126,6 +126,7 @@ module.exports = exports = {
Error: makeNodeError(Error),
TypeError: makeNodeError(TypeError),
RangeError: makeNodeError(RangeError),
URIError: makeNodeError(URIError),
AssertionError,
E // This is exported only to facilitate testing.
};
@@ -287,6 +288,7 @@ E('ERR_INVALID_SYNC_FORK_INPUT',
'Asynchronous forks do not support Buffer, Uint8Array or string input: %s');
E('ERR_INVALID_THIS', 'Value of "this" must be of type %s');
E('ERR_INVALID_TUPLE', '%s must be an iterable %s tuple');
E('ERR_INVALID_URI', 'URI malformed');
E('ERR_INVALID_URL', 'Invalid URL: %s');
E('ERR_INVALID_URL_SCHEME',
(expected) => `The URL must be ${oneOf(expected, 'scheme')}`);
View
@@ -24,6 +24,7 @@
'use strict';
const { Buffer } = require('buffer');
const errors = require('internal/errors');
const {
hexTable,
isHexTable
@@ -174,11 +175,12 @@ function qsEscape(str) {
}
// Surrogate pair
++i;
var c2;
if (i < str.length)
c2 = str.charCodeAt(i) & 0x3FF;
else
throw new URIError('URI malformed');
if (i >= str.length)
throw new errors.URIError('ERR_INVALID_URI');
var c2 = str.charCodeAt(i) & 0x3FF;
lastPos = i + 1;
c = 0x10000 + (((c & 0x3FF) << 10) | c2);
out += hexTable[0xF0 | (c >> 18)] +
@@ -1,5 +1,5 @@
'use strict';
require('../common');
const common = require('../common');
const assert = require('assert');
const qs = require('querystring');
@@ -12,8 +12,15 @@ assert.deepStrictEqual(qs.escape('Ŋōđĕ'), '%C5%8A%C5%8D%C4%91%C4%95');
assert.deepStrictEqual(qs.escape('testŊōđĕ'), 'test%C5%8A%C5%8D%C4%91%C4%95');
assert.deepStrictEqual(qs.escape(`${String.fromCharCode(0xD800 + 1)}test`),
'%F0%90%91%B4est');
assert.throws(() => qs.escape(String.fromCharCode(0xD800 + 1)),
/^URIError: URI malformed$/);
common.expectsError(
() => qs.escape(String.fromCharCode(0xD800 + 1)),
{
code: 'ERR_INVALID_URI',
type: URIError,
message: 'URI malformed'
}
);
// using toString for objects
assert.strictEqual(
@@ -20,7 +20,7 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.
'use strict';
require('../common');
const common = require('../common');
const assert = require('assert');
const inspect = require('util').inspect;
@@ -271,9 +271,14 @@ qsWeirdObjects.forEach(function(testCase) {
});
// invalid surrogate pair throws URIError
assert.throws(function() {
qs.stringify({ foo: '\udc00' });
}, /^URIError: URI malformed$/);
common.expectsError(
() => qs.stringify({ foo: '\udc00' }),
{
code: 'ERR_INVALID_URI',
type: URIError,
message: 'URI malformed'
}
);
// coerce numbers to string
assert.strictEqual('foo=0', qs.stringify({ foo: 0 }));

0 comments on commit 9788e96

Please sign in to comment.