Support ESM

cli/bin/mokey-patch-oclif.js

@@ -0,0 +1,68 @@
+/**
+ * Oclif mostly supports ESM, but it doesn't properly support commands
+ * in "index.js" files. It always thinks they are not ESM files.
+ *
+ * This file monkey-patches Oclif with the code
+ * from this PR https://github.com/oclif/core/pull/417 to support them.
+ */
+import { tsPath } from '@oclif/core';
+import ModuleLoader from '@oclif/core/lib/module-loader.js';
+import fs from 'fs';
+import path from 'path';
+
+ModuleLoader.default.resolvePath = (config, modulePath) => {
+  let isESM;
+  let filePath;
+
+  try {
+    // eslint-disable-next-line no-undef
+    filePath = require.resolve(modulePath);
+    isESM = ModuleLoader.default.isPathModule(filePath);
+  } catch {
+    filePath = tsPath(config.root, modulePath);
+
+    let fileExists = false;
+    let isDirectory = false;
+    if (fs.existsSync(filePath)) {
+      fileExists = true;
+      try {
+        if (fs.lstatSync(filePath)?.isDirectory?.()) {
+          fileExists = false;
+          isDirectory = true;
+        }
+      } catch {
+        // ignore
+      }
+    }
+
+    if (!fileExists) {
+      // Try all supported extensions.
+      let foundPath = findFile(filePath);
+      if (!foundPath && isDirectory) {
+        // Since filePath is a directory, try looking for index.js file.
+        foundPath = findFile(path.join(filePath, 'index'));
+      }
+
+      if (foundPath) {
+        filePath = foundPath;
+      }
+    }
+
+    isESM = ModuleLoader.default.isPathModule(filePath);
+  }
+
+  return { isESM, filePath };
+};
+
+function findFile(filePath) {
+  // eslint-disable-next-line camelcase
+  for (const extension of ['.js', '.cjs']) {
+    const testPath = `${filePath}${extension}`;
+
+    if (fs.existsSync(testPath)) {
+      return testPath;
+    }
+  }
+
+  return null;
+}

cli/bin/run.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+import { Errors, flush, run } from '@oclif/core';
+import './mokey-patch-oclif.js';
+
+run(void 0, import.meta.url)
+  .then(flush)
+  .catch(Errors.handle);

cli/package.json

@@ -9,6 +9,8 @@
   "homepage": "https://github.com/xataio/client-ts",
   "license": "MIT",
   "main": "dist/index.js",
+  "module": "dist/index.js",
+  "type": "module",
   "repository": "xataio/client-ts",
   "files": [
     "/bin",
@@ -17,7 +19,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@oclif/core": "^1",
+    "@oclif/core": "^1.8.1",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^2.0.1"
   },

cli/tsconfig.json

@@ -2,7 +2,8 @@
   "compilerOptions": {
     "declaration": true,
     "importHelpers": true,
-    "module": "commonjs",
+    "module": "es2020",
+    "moduleResolution": "node",
     "outDir": "dist",
     "rootDir": "src",
     "strict": true,