Fix deprecation warning on Node.js 24

Change chunkify to return arrays and remove `shell: true`` from execFile

Author: XhmikosR

lib/chunkify.js

@@ -2,18 +2,26 @@
 
 function chunkify(files, maxChars) {
   const filesChunk = [];
-  let chunk = '';
+  let chunk = [];
+  let chunkLength = 0;
 
   for (const file of files) {
-    if (chunk.length + (file.length + 1) > maxChars) {
-      filesChunk.push(chunk.trim());
-      chunk = '';
+    // Account for space between arguments
+    const fileLength = file.length + 1;
+
+    if (chunkLength + fileLength > maxChars) {
+      filesChunk.push(chunk);
+      chunk = [];
+      chunkLength = 0;
     }
 
-    chunk += `"${file}" `;
+    chunk.push(file);
+    chunkLength += fileLength;
   }
 
-  filesChunk.push(chunk.trim());
+  if (chunk.length > 0) {
+    filesChunk.push(chunk);
+  }
 
   return filesChunk;
 }

lib/htmllint.js

@@ -43,7 +43,7 @@ function htmllint(config, done) {
     async.mapLimit(chunks, threads, (chunk, cb) => {
       const args = javaArgs(java, chunk, config);
 
-      execFile('java', args, { maxBuffer: MAX_BUFFER, shell: true }, (error, stdout, stderr) => {
+      execFile('java', args, { maxBuffer: MAX_BUFFER }, (error, stdout, stderr) => {
         if (error && (error.code !== 1 || error.killed || error.signal)) {
           cb(error);
           return;

lib/javaArgs.js

@@ -11,7 +11,7 @@ function javaArgs(java, chunk, config) {
     args.push('-Xss512k');
   }
 
-  args.push(config.server ? '-cp' : '-jar', `"${jar}"`);
+  args.push(config.server ? '-cp' : '-jar', jar);
 
   if (config.server) {
     if (config.server.host) {
@@ -22,7 +22,7 @@ function javaArgs(java, chunk, config) {
       args.push(`-Dnu.validator.client.port=${config.server.port}`);
     }
 
-    args.push('-Dnu.validator.client.out=json nu.validator.client.HttpClient');
+    args.push('-Dnu.validator.client.out=json', 'nu.validator.client.HttpClient');
   } else {
     args.push('--format', 'json');
   }
@@ -31,7 +31,7 @@ function javaArgs(java, chunk, config) {
     args.push('--no-langdetect');
   }
 
-  return [...args, chunk];
+  return [...args, ...chunk];
 }
 
 module.exports = javaArgs;

test/chunkify_test.js

@@ -11,10 +11,14 @@ describe('chunkify', () => {
       './some/long/path/to/3/file.html'
     ];
     const chunked = [
-      '"./some/long/path/to/1/file.html" "./some/long/path/to/2/file.html"',
-      '"./some/long/path/to/3/file.html"'
+      ['./some/long/path/to/1/file.html', './some/long/path/to/2/file.html'],
+      ['./some/long/path/to/3/file.html']
     ];
-    const all = ['"./some/long/path/to/1/file.html" "./some/long/path/to/2/file.html" "./some/long/path/to/3/file.html"'];
+    const all = [[
+      './some/long/path/to/1/file.html',
+      './some/long/path/to/2/file.html',
+      './some/long/path/to/3/file.html'
+    ]];
 
     assert.deepEqual(chunkify(files, 70), chunked, 'Should split the file list of file in 2 chunks');
     assert.deepEqual(chunkify(files, 120), all, 'Should do a single chunk');