.eslintrc.js

@@ -18,6 +18,12 @@ module.exports = {
     'no-constant-condition': 'off',
     'no-unused-labels': 'off',
     'prefer-rest-params': 'off',
+    'prefer-const': [
+      'error',
+      {
+        destructuring: 'all',
+      },
+    ],
   },
   overrides: [
     {

.github/workflows/nodejs.yml

@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        latest-node-version: [16.x]
-        node-version: [16.x]
+        latest-node-version: [20.x]
+        node-version: [18.x, 20.x]
 
     steps:
       - uses: actions/checkout@v1

.mocharc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  spec: ['test/**/*.test.ts'],
+  'node-option': ['import=tsx'],
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jridgewell/trace-mapping",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "description": "Trace the original position through a source map",
   "keywords": [
     "source",
@@ -44,24 +44,26 @@
     "prepublishOnly": "npm run preversion",
     "preversion": "run-s test build",
     "test": "run-s -n test:lint test:only",
-    "test:debug": "ava debug",
+    "test:debug": "mocha --inspect-brk",
     "test:lint": "run-s -n test:lint:*",
     "test:lint:prettier": "prettier --check '{src,test}/**/*.ts' '**/*.md'",
     "test:lint:ts": "eslint '{src,test}/**/*.ts'",
-    "test:only": "c8 ava",
-    "test:watch": "ava --watch"
+    "test:only": "c8 mocha",
+    "test:watch": "mocha --watch"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "11.1.6",
+    "@types/mocha": "10.0.6",
+    "@types/node": "20.11.20",
     "@typescript-eslint/eslint-plugin": "6.18.1",
     "@typescript-eslint/parser": "6.18.1",
-    "ava": "6.0.1",
     "benchmark": "2.1.4",
     "c8": "9.0.0",
     "esbuild": "0.19.11",
     "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-no-only-tests": "3.1.0",
+    "mocha": "10.3.0",
     "npm-run-all": "4.1.5",
     "prettier": "3.1.1",
     "rollup": "4.9.4",

src/by-source.ts

@@ -34,13 +34,14 @@ export default function buildBySources(
       // segment should go. Either way, we want to insert after that. And there may be multiple
       // generated segments associated with an original location, so there may need to move several
       // indexes before we find where we need to insert.
-      const index = upperBound(
+      let index = upperBound(
         originalLine,
         sourceColumn,
         memoizedBinarySearch(originalLine, sourceColumn, memo, sourceLine),
       );
 
-      insert(originalLine, (memo.lastIndex = index + 1), [sourceColumn, i, seg[COLUMN]]);
+      memo.lastIndex = ++index;
+      insert(originalLine, index, [sourceColumn, i, seg[COLUMN]]);
     }
   }