Migrating to ESM

.eslintrc

@@ -7,19 +7,18 @@
     "jest": true
   },
   "parser": "@typescript-eslint/parser",
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended",
-    "prettier"
-  ],
-  "plugins": [
-    "import"
-  ],
   "parserOptions": {
     "project": "tsconfig.json",
     "sourceType": "module"
   },
+  "plugins": [
+    "import"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ],
   "rules": {
     "linebreak-style": ["error", "unix"],
     "no-empty": 1,

.gitlab-ci.yml

@@ -162,9 +162,10 @@ build:windows:
   stage: build
   needs: []
   tags:
-    - windows
+    - saas-windows-medium-amd64
   before_script:
     - mkdir -Force "$CI_PROJECT_DIR/tmp"
+    - Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
   script:
     - .\scripts\choco-install.ps1
     - refreshenv

README.md

@@ -21,7 +21,7 @@ npm install
 # build the dist
 npm run build
 # run the repl (this allows you to import from ./src)
-npm run ts-node
+npm run tsx
 # run the tests
 npm run test
 # lint the source code

benches/index.ts

@@ -1,29 +1,33 @@
 #!/usr/bin/env ts-node
 
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
 import si from 'systeminformation';
-import tableNotIndexed from './table_not_indexed';
-import tableIndexed from './table_indexed';
-import tableDerived from './table_derived';
+import { benchesPath } from './utils.js';
+import tableNotIndexed from './table_not_indexed.js';
+import tableIndexed from './table_indexed.js';
+import tableDerived from './table_derived.js';
 
 async function main(): Promise<void> {
-  await fs.promises.mkdir(path.join(__dirname, 'results'), { recursive: true });
+  await fs.promises.mkdir(path.join(benchesPath, 'results'), {
+    recursive: true,
+  });
   await tableNotIndexed();
   await tableIndexed();
   await tableDerived();
   const resultFilenames = await fs.promises.readdir(
-    path.join(__dirname, 'results'),
+    path.join(benchesPath, 'results'),
   );
   const metricsFile = await fs.promises.open(
-    path.join(__dirname, 'results', 'metrics.txt'),
+    path.join(benchesPath, 'results', 'metrics.txt'),
     'w',
   );
   let concatenating = false;
   for (const resultFilename of resultFilenames) {
     if (/.+_metrics\.txt$/.test(resultFilename)) {
       const metricsData = await fs.promises.readFile(
-        path.join(__dirname, 'results', resultFilename),
+        path.join(benchesPath, 'results', resultFilename),
       );
       if (concatenating) {
         await metricsFile.write('\n');
@@ -39,9 +43,16 @@ async function main(): Promise<void> {
     system: 'model, manufacturer',
   });
   await fs.promises.writeFile(
-    path.join(__dirname, 'results', 'system.json'),
+    path.join(benchesPath, 'results', 'system.json'),
     JSON.stringify(systemData, null, 2),
   );
 }
 
-void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
+}
+
+export default main;

benches/table_derived.ts

@@ -1,11 +1,14 @@
-import path from 'path';
+import path from 'node:path';
+import url from 'node:url';
 import b from 'benny';
-import Table from '@';
-import { suiteCommon } from './utils';
+import { suiteCommon } from './utils.js';
+import Table from '#Table.js';
+
+const filePath = url.fileURLToPath(import.meta.url);
 
 async function main() {
   const summary = await b.suite(
-    path.basename(__filename, path.extname(__filename)),
+    path.basename(filePath, path.extname(filePath)),
     b.add('insert', () => {
       const t = new Table(['a', 'b', 'c', 'd'], [['a', 'b', 'c', 'd']]);
       return () => {
@@ -34,8 +37,11 @@ async function main() {
   return summary;
 }
 
-if (require.main === module) {
-  void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
 }
 
 export default main;

benches/table_indexed.ts

@@ -1,11 +1,14 @@
-import path from 'path';
+import path from 'node:path';
+import url from 'node:url';
 import b from 'benny';
-import Table from '@';
-import { suiteCommon } from './utils';
+import { suiteCommon } from './utils.js';
+import Table from '#Table.js';
+
+const filePath = url.fileURLToPath(import.meta.url);
 
 async function main() {
   const summary = await b.suite(
-    path.basename(__filename, path.extname(__filename)),
+    path.basename(filePath, path.extname(filePath)),
     b.add('insert', () => {
       const t = new Table(['a', 'b', 'c', 'd'], ['a', 'b', 'c', 'd']);
       return () => {
@@ -34,8 +37,11 @@ async function main() {
   return summary;
 }
 
-if (require.main === module) {
-  void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
 }
 
 export default main;

benches/table_not_indexed.ts

@@ -1,11 +1,14 @@
-import path from 'path';
+import path from 'node:path';
+import url from 'node:url';
 import b from 'benny';
-import Table from '@';
-import { suiteCommon } from './utils';
+import { suiteCommon } from './utils.js';
+import Table from '#Table.js';
+
+const filePath = url.fileURLToPath(import.meta.url);
 
 async function main() {
   const summary = await b.suite(
-    path.basename(__filename, path.extname(__filename)),
+    path.basename(filePath, path.extname(filePath)),
     b.add('insert row', () => {
       const t = new Table(['a', 'b', 'c', 'd']);
       return () => {
@@ -34,8 +37,11 @@ async function main() {
   return summary;
 }
 
-if (require.main === module) {
-  void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
 }
 
 export default main;

benches/utils.ts

@@ -1,28 +1,33 @@
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
 import b from 'benny';
 import { codeBlock } from 'common-tags';
-import packageJson from '../package.json';
+import packageJson from '../package.json' assert { type: 'json' };
+
+const benchesPath = path.dirname(
+  path.dirname(url.fileURLToPath(import.meta.url)),
+);
 
 const suiteCommon = [
   b.cycle(),
   b.complete(),
   b.save({
     file: (summary) => summary.name,
-    folder: path.join(__dirname, '../results'),
+    folder: path.join(benchesPath, 'results'),
     version: packageJson.version,
     details: true,
   }),
   b.save({
     file: (summary) => summary.name,
-    folder: path.join(__dirname, '../results'),
+    folder: path.join(benchesPath, 'results'),
     version: packageJson.version,
     format: 'chart.html',
   }),
   b.complete((summary) => {
     const filePath = path.join(
-      __dirname,
-      '../results',
+      benchesPath,
+      'results',
       summary.name + '_metrics.txt',
     );
     fs.writeFileSync(
@@ -58,4 +63,4 @@ const suiteCommon = [
   }),
 ];
 
-export { suiteCommon };
+export { benchesPath, suiteCommon };