Require Node.js 18

sindresorhus · Feb 26, 2024 · fd5a1c9 · fd5a1c9
1 parent cc232cb
commit fd5a1c9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,9 +10,8 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
+          - 20
           - 18
-          - 16
-          - 14
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

diff --git a/base.js b/base.js
@@ -5,7 +5,7 @@ import {includeKeys} from 'filter-obj';
 const isNullOrUndefined = value => value === null || value === undefined;
 
 // eslint-disable-next-line unicorn/prefer-code-point
-const strictUriEncode = string => encodeURIComponent(string).replace(/[!'()*]/g, x => `%${x.charCodeAt(0).toString(16).toUpperCase()}`);
+const strictUriEncode = string => encodeURIComponent(string).replaceAll(/[!'()*]/g, x => `%${x.charCodeAt(0).toString(16).toUpperCase()}`);
 
 const encodeFragmentIdentifier = Symbol('encodeFragmentIdentifier');
 
@@ -87,7 +87,7 @@ function encoderForArrayFormat(options) {
 		case 'comma':
 		case 'separator':
 		case 'bracket-separator': {
-			const keyValueSep = options.arrayFormat === 'bracket-separator'
+			const keyValueSeparator = options.arrayFormat === 'bracket-separator'
 				? '[]='
 				: '=';
 
@@ -104,7 +104,7 @@ function encoderForArrayFormat(options) {
 				value = value === null ? '' : value;
 
 				if (result.length === 0) {
-					return [[encode(key, options), keyValueSep, encode(value, options)].join('')];
+					return [[encode(key, options), keyValueSeparator, encode(value, options)].join('')];
 				}
 
 				return [[result, encode(value, options)].join(options.arrayFormatSeparator)];
@@ -353,7 +353,7 @@ export function parse(query, options) {
 			continue;
 		}
 
-		const parameter_ = options.decode ? parameter.replace(/\+/g, ' ') : parameter;
+		const parameter_ = options.decode ? parameter.replaceAll('+', ' ') : parameter;
 
 		let [key, value] = splitOnFirst(parameter_, '=');
 
@@ -395,10 +395,13 @@ export function stringify(object, options) {
 		return '';
 	}
 
-	options = {encode: true,
+	options = {
+		encode: true,
 		strict: true,
 		arrayFormat: 'none',
-		arrayFormatSeparator: ',', ...options};
+		arrayFormatSeparator: ',',
+		...options,
+	};
 
 	validateArrayFormatSeparator(options.arrayFormatSeparator);
 
@@ -484,9 +487,7 @@ export function stringifyUrl(object, options) {
 	};
 
 	let queryString = stringify(query, options);
-	if (queryString) {
-		queryString = `?${queryString}`;
-	}
+	queryString &&= `?${queryString}`;
 
 	let hash = getHash(object.url);
 	if (typeof object.fragmentIdentifier === 'string') {

diff --git a/benchmark.js b/benchmark.js
@@ -24,10 +24,10 @@ const TEST_URL = stringifyUrl({url: TEST_HOST, query: TEST_OBJECT});
 
 // Creates a test case and adds it to the suite
 const defineTestCase = (methodName, input, options) => {
-	const fn = queryString[methodName];
+	const function_ = queryString[methodName];
 	const label = options ? ` (${stringify(options)})` : '';
 
-	suite.add(methodName + label, () => fn(input, options || {}));
+	suite.add(methodName + label, () => function_(input, options || {}));
 };
 
 // Define all test cases

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
 	},
 	"sideEffects": false,
 	"engines": {
-		"node": ">=14.16"
+		"node": ">=18"
 	},
 	"scripts": {
 		"benchmark": "node benchmark.js",
@@ -51,12 +51,12 @@
 		"split-on-first": "^3.0.0"
 	},
 	"devDependencies": {
-		"ava": "^5.1.0",
+		"ava": "^6.1.1",
 		"benchmark": "^2.1.4",
-		"deep-equal": "^2.1.0",
-		"fast-check": "^3.4.0",
-		"tsd": "^0.25.0",
-		"xo": "^0.54.2"
+		"deep-equal": "^2.2.3",
+		"fast-check": "^3.15.1",
+		"tsd": "^0.30.7",
+		"xo": "^0.57.0"
 	},
 	"tsd": {
 		"compilerOptions": {

diff --git a/test/parse-url.js b/test/parse-url.js
@@ -2,7 +2,6 @@ import test from 'ava';
 import queryString from '../index.js';
 
 test('handles strings with query string', t => {
-	console.log('f', queryString.parseUrl('https://foo.bar#top?foo=bar'));
 	t.deepEqual(queryString.parseUrl('https://foo.bar#top?foo=bar'), {url: 'https://foo.bar', query: {}});
 	t.deepEqual(queryString.parseUrl('https://foo.bar?foo=bar&foo=baz#top'), {url: 'https://foo.bar', query: {foo: ['bar', 'baz']}});
 	t.deepEqual(queryString.parseUrl('https://foo.bar?foo=bar&foo=baz'), {url: 'https://foo.bar', query: {foo: ['bar', 'baz']}});