Merge pull request #15400 from hasezoey/lintChanges

General minor test and lint changes

Author: vkarpov15

.eslintrc.js

@@ -7,7 +7,6 @@ module.exports = {
   ignorePatterns: [
     'tools',
     'dist',
-    'website.js',
     'test/files/*',
     'benchmarks',
     '*.min.js',

.github/workflows/documentation.yml

@@ -10,7 +10,7 @@ on:
       - 'website.js'
       - 'CHANGELOG.md'
   push:
-    branches:ubuntu
+    branches:
       - master
     paths:
       - '.github/workflows/documentation.yml'

.github/workflows/test.yml

@@ -87,11 +87,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
-<<<<<<< HEAD
           node-version: 22
-=======
-          node-version: 20
->>>>>>> 7.x
       - name: Load MongoDB binary cache
         id: cache-mongodb-binaries
         uses: actions/cache@v4
@@ -119,11 +115,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
-<<<<<<< HEAD
           node-version: 22
-=======
-          node-version: 20
->>>>>>> 7.x
       - run: npm install
       - name: Test
         run: npm run test-rs

.gitignore

@@ -59,6 +59,9 @@ index.html
 # yarn package-lock
 yarn.lock
 
+# deno lock
+deno.lock
+
 # npm pack output
 mongoose.tgz
 mongoose-*.tgz

package.json

@@ -101,7 +101,7 @@
     "mongo": "node ./tools/repl.js",
     "publish-7x": "npm publish --tag 7x",
     "test": "mocha --exit ./test/*.test.js",
-    "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.js",
+    "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.mjs",
     "test-rs": "START_REPLICA_SET=1 mocha --timeout 30000 --exit ./test/*.test.js",
     "test-tsd": "node ./test/types/check-types-filename && tsd",
     "setup-test-encryption": "bash scripts/configure-cluster-with-encryption.sh",

scripts/website.js

@@ -9,7 +9,7 @@ const path = require('path');
 const pug = require('pug');
 const pkg = require('../package.json');
 const transform = require('acquit-require');
-const childProcess = require("child_process");
+const childProcess = require('child_process');
 
 // using "__dirname" and ".." to have a consistent CWD, this script should not be runnable, even when not being in the root of the project
 // also a consistent root path so that it is easy to change later when the script should be moved
@@ -183,8 +183,8 @@ function parseVersion(str) {
 
   const match = versionReg.exec(str);
 
-  if (!!match) {
-    const parsed = [parseInt(match[1]), parseInt(match[2]), parseInt(match[3])]
+  if (match) {
+    const parsed = [parseInt(match[1]), parseInt(match[2]), parseInt(match[3])];
 
     // fallback just in case some number did not parse
     if (Number.isNaN(parsed[0]) || Number.isNaN(parsed[1]) || Number.isNaN(parsed[2])) {
@@ -195,7 +195,7 @@ function parseVersion(str) {
   }
 
   // special case, to not log a warning
-  if (str === "test") {
+  if (str === 'test') {
     return undefined;
   }
 
@@ -210,27 +210,27 @@ function parseVersion(str) {
 function getVersions() {
   // get all tags from git
   // "trim" is used to remove the ending new-line
-  const res = childProcess.execSync("git tag").toString().trim();
+  const res = childProcess.execSync('git tag').toString().trim();
 
   filteredTags = res.split('\n')
   // map all gotten tags if they match the regular expression
-  .map(parseVersion)
+    .map(parseVersion)
   // filter out all null / undefined / falsy values
-  .filter(v => !!v)
+    .filter(v => !!v)
   // sort tags with latest (highest) first
-  .sort((a, b) => {
-    if (a[0] === b[0]) {
-      if (a[1] === b[1]) {
-        return b[2] - a[2];
+    .sort((a, b) => {
+      if (a[0] === b[0]) {
+        if (a[1] === b[1]) {
+          return b[2] - a[2];
+        }
+        return b[1] - a[1];
       }
-      return b[1] - a[1];
-    }
-    return b[0] - a[0];
-  });
+      return b[0] - a[0];
+    });
 
   if (filteredTags.length === 0) {
-    console.error("no tags found!");
-    filteredTags.push([0,0,0]);
+    console.error('no tags found!');
+    filteredTags.push([0, 0, 0]);
   }
 }
 
@@ -269,7 +269,7 @@ function getLatestVersionOf(version) {
     foundVersion = [0, 0, 0];
   }
 
-  return {listed: stringifySemverNumber(foundVersion), path: stringifySemverNumber(foundVersion, true)};
+  return { listed: stringifySemverNumber(foundVersion), path: stringifySemverNumber(foundVersion, true) };
 }
 
 /**
@@ -281,11 +281,11 @@ function getCurrentVersion() {
 
   // i dont think this will ever happen, but just in case
   if (!pkg.version) {
-    console.log("no version from package?");
+    console.log('no version from package?');
     versionToUse = getLatestVersion();
   }
 
-  return {listed: versionToUse, path: stringifySemverNumber(parseVersion(versionToUse), true) };
+  return { listed: versionToUse, path: stringifySemverNumber(parseVersion(versionToUse), true) };
 }
 
 // execute function to get all tags from git
@@ -314,7 +314,7 @@ const versionObj = (() => {
       getLatestVersionOf(6)
     ]
   };
-  const versionedDeploy = !!process.env.DOCS_DEPLOY ? !(base.currentVersion.listed === base.latestVersion.listed) : false;
+  const versionedDeploy = process.env.DOCS_DEPLOY ? !(base.currentVersion.listed === base.latestVersion.listed) : false;
 
   const versionedPath = versionedDeploy ? `/docs/${base.currentVersion.path}` : '';
 
@@ -380,20 +380,20 @@ function mapURLs(block, currentUrl) {
   while ((match = mongooseComRegex.exec(block)) !== null) {
     // console.log("match", match);
     // cant just use "match.index" byitself, because of the extra "href=\"" condition, which is not factored in in "match.index"
-    let startIndex = match.index + match[0].length - match[1].length;
+    const startIndex = match.index + match[0].length - match[1].length;
     out += block.slice(lastIndex, startIndex);
     lastIndex = startIndex + match[1].length;
 
     // somewhat primitive gathering of the url, but should be enough for now
-    let fullUrl = /^\/[^"]+/.exec(block.slice(lastIndex-1));
+    const fullUrl = /^\/[^"]+/.exec(block.slice(lastIndex - 1));
 
     let noPrefix = false;
 
     if (fullUrl) {
       // extra processing to only use "#otherId" instead of using full url for the same page
       // at least firefox does not make a difference between a full path and just "#", but it makes debugging paths easier
       if (fullUrl[0].startsWith(currentUrl)) {
-        let indexMatch = /#/.exec(fullUrl);
+        const indexMatch = /#/.exec(fullUrl);
 
         if (indexMatch) {
           lastIndex += indexMatch.index - 1;
@@ -404,10 +404,10 @@ function mapURLs(block, currentUrl) {
 
     if (!noPrefix) {
       // map all to the versioned-path, unless a explicit version is given
-      if (!versionedDocs.test(block.slice(lastIndex, lastIndex+10))) {
-        out += versionObj.versionedPath + "/";
+      if (!versionedDocs.test(block.slice(lastIndex, lastIndex + 10))) {
+        out += versionObj.versionedPath + '/';
       } else {
-        out += "/";
+        out += '/';
       }
     }
   }
@@ -429,7 +429,7 @@ async function pugify(filename, options, isReload = false) {
   let newfile = undefined;
   options = options || {};
   options.package = pkg;
-  const isAPI = options.api && !filename.endsWith('docs/api.pug');
+  // const isAPI = options.api && !filename.endsWith('docs/api.pug');
 
   const _editLink = 'https://github.com/Automattic/mongoose/blob/master' +
     filename.replace(cwd, '');
@@ -443,7 +443,7 @@ async function pugify(filename, options, isReload = false) {
     if (isReload) {
       apiReq.parseFile(options.file);
       // overwrite original options because of reload
-      options = {...options, ...apiReq.docs.get(options.file)};
+      options = { ...options, ...apiReq.docs.get(options.file) };
     }
     inputFile = path.resolve(cwd, 'docs/api_split.pug');
   }
@@ -453,7 +453,7 @@ async function pugify(filename, options, isReload = false) {
   if (options.acquit) {
     contents = transform(contents, getTests());
 
-    contents = contents.replaceAll(/^```acquit$/gmi, "```javascript");
+    contents = contents.replaceAll(/^```acquit$/gmi, '```javascript');
   }
   if (options.markdown) {
     const lines = contents.split('\n');
@@ -486,7 +486,7 @@ async function pugify(filename, options, isReload = false) {
 
   if (versionObj.versionedDeploy) {
     newfile = path.resolve(cwd, path.join('.', versionObj.versionedPath), path.relative(cwd, newfile));
-    await fs.promises.mkdir(path.dirname(newfile), {recursive:true});
+    await fs.promises.mkdir(path.dirname(newfile), { recursive: true });
   }
 
   options.outputUrl = newfile.replace(cwd, '');
@@ -497,11 +497,11 @@ async function pugify(filename, options, isReload = false) {
 
   let str = await pugRender(contents, options).catch(console.error);
 
-  if (typeof str !== "string") {
+  if (typeof str !== 'string') {
     return;
   }
 
-  str = mapURLs(str, '/' + path.relative(cwd, docsPath))
+  str = mapURLs(str, '/' + path.relative(cwd, docsPath));
 
   await fs.promises.writeFile(newfile, str).catch((err) => {
     console.error('could not write', err.stack);
@@ -534,20 +534,20 @@ function startWatch() {
     }
   });
 
-  fs.watchFile(path.join(cwd, 'docs/api_split.pug'), {interval: 1000}, (cur, prev) => {
+  fs.watchFile(path.join(cwd, 'docs/api_split.pug'), { interval: 1000 }, (cur, prev) => {
     if (cur.mtime > prev.mtime) {
       console.log('docs/api_split.pug modified, reloading all api files');
-      Promise.all(files.filter(v=> v.startsWith('docs/api')).map(async (file) => {
+      Promise.all(files.filter(v => v.startsWith('docs/api')).map(async(file) => {
         const filename = path.join(cwd, file);
         await pugify(filename, docsFilemap.fileMap[file], true);
       }));
     }
   });
 
-  fs.watchFile(path.join(cwd, 'docs/api_split.pug'), {interval: 1000}, (cur, prev) => {
+  fs.watchFile(path.join(cwd, 'docs/api_split.pug'), { interval: 1000 }, (cur, prev) => {
     if (cur.mtime > prev.mtime) {
       console.log('docs/api_split.pug modified, reloading all api files');
-      Promise.all(files.filter(v=> v.startsWith('docs/api')).map(async (file) => {
+      Promise.all(files.filter(v => v.startsWith('docs/api')).map(async(file) => {
         const filename = path.join(cwd, file);
         await pugify(filename, docsFilemap.fileMap[file]);
       }));
@@ -561,7 +561,7 @@ function startWatch() {
  * @param {Boolean} isReload Indicate this is a reload of all files
  */
 async function pugifyAllFiles(noWatch, isReload = false) {
-  await Promise.all(files.map(async (file) => {
+  await Promise.all(files.map(async(file) => {
     const filename = path.join(cwd, file);
     await pugify(filename, docsFilemap.fileMap[file], isReload);
   }));
@@ -590,7 +590,7 @@ async function copyAllRequiredFiles() {
   await Promise.all(pathsToCopy.map(async v => {
     const resultPath = path.resolve(cwd, path.join('.', versionObj.versionedPath, v));
     await fsextra.copy(v, resultPath);
-  }))
+  }));
 }
 
 exports.default = pugify;
@@ -626,7 +626,10 @@ if (isMain) {
     }
 
     console.log('Done Processing');
-  })();
+  })().catch((err) => {
+    console.error('Website Generation failed:', err);
+    process.exit(-1);
+  });
 }
 
 // Modified from github-slugger

test/.eslintrc.yml

@@ -4,5 +4,4 @@ rules:
   # In `document.test.js` we sometimes use self assignment to test setters
   no-self-assign: off
 ignorePatterns:
-  - deno.js
-  - deno*.js
+  - deno*.mjs

test/aggregate.test.js

@@ -817,12 +817,6 @@ describe('aggregate: ', function() {
 
     it('explain()', async function() {
       const aggregate = new Aggregate([], db.model('Employee'));
-      const version = await start.mongodVersion();
-
-      const mongo26 = version[0] > 2 || (version[0] === 2 && version[1] >= 6);
-      if (!mongo26) {
-        return;
-      }
 
       const output = await aggregate.
         match({ sal: { $lt: 16000 } }).
@@ -868,16 +862,13 @@ describe('aggregate: ', function() {
       const match = { $match: { sal: { $gt: 15000 } } };
       const pref = 'primaryPreferred';
       const aggregate = m.aggregate([match]).read(pref);
-      const mongo26_or_greater = version[0] > 2 || (version[0] === 2 && version[1] >= 6);
       const mongo32_or_greater = version[0] > 3 || (version[0] === 3 && version[1] >= 2);
 
       assert.equal(aggregate.options.readPreference.mode, pref);
-      if (mongo26_or_greater) {
-        aggregate.allowDiskUse(true);
-        aggregate.option({ maxTimeMS: 1000 });
-        assert.equal(aggregate.options.allowDiskUse, true);
-        assert.equal(aggregate.options.maxTimeMS, 1000);
-      }
+      aggregate.allowDiskUse(true);
+      aggregate.option({ maxTimeMS: 1000 });
+      assert.equal(aggregate.options.allowDiskUse, true);
+      assert.equal(aggregate.options.maxTimeMS, 1000);
 
       if (mongo32_or_greater) {
         aggregate.readConcern('m');

test/browser/.eslintrc.yml

@@ -17,7 +17,7 @@ await fixtures.mochaGlobalSetup();
 
 const child_args = [
   ...Deno.args,
-  resolve(fileURLToPath(import.meta.url), '../deno_mocha.js')
+  resolve(fileURLToPath(import.meta.url), '../deno_mocha.mjs')
 ];
 
 const child = spawn(process.execPath, child_args, { stdio: 'inherit' });