chore: removes the last require() usages (#2435)

Author: snebjorn

.github/workflows/deploy-doc.yaml

@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: 22
           # https://github.com/actions/setup-node/issues/1357
           package-manager-cache: false
       - name: Install Vercel CLI

.github/workflows/tests.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node-version: [20.x]
+        node-version: [22.x]
     steps:
       - uses: actions/checkout@v5
       - name: Use Node.js ${{ matrix.node-version }}

package.json

@@ -41,7 +41,7 @@
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
     "@eslint/js": "^9.35.0",
-    "@types/node": "^20.19.14",
+    "@types/node": "^22.18.10",
     "esbuild-plugin-alias": "^0.2.1",
     "eslint": "^9.35.0",
     "eslint-config-prettier": "^10.1.8",

packages/core/src/generators/mutator.ts

@@ -63,12 +63,10 @@ export const generateMutator = async ({
     ? `${pascal(name)}${BODY_TYPE_NAME}`
     : BODY_TYPE_NAME;
 
-  const { file, cached } = await loadFile<string>(importPath, {
-    isDefault: false,
+  const { file, cached } = await loadFile(importPath, {
     root: workspace,
     alias: mutator.alias,
     tsconfig,
-    load: false,
   });
 
   if (file) {

packages/core/src/utils/file.ts

@@ -9,7 +9,6 @@ import mm from 'micromatch';
 import type { Tsconfig } from '../types';
 import { isDirectory } from './assertion';
 import { createDebugger } from './debug';
-import { createLogger, type LogLevel } from './logger';
 import { joinSafe, normalizeSafe } from './path';
 
 export const getFileInfo = (
@@ -42,44 +41,36 @@ export const getFileInfo = (
 
 const debug = createDebugger('orval:file-load');
 
-const cache = new Map<string, { file?: any; error?: any }>();
+const cache = new Map<string, { file?: string; error?: unknown }>();
 
-export async function loadFile<File = any>(
+export async function loadFile(
   filePath?: string,
   options?: {
     root?: string;
     defaultFileName?: string;
-    logLevel?: LogLevel;
-    isDefault?: boolean;
     alias?: Record<string, string>;
     tsconfig?: Tsconfig;
-    load?: boolean;
   },
 ): Promise<{
   path: string;
-  file?: File;
-  error?: any;
+  file?: string;
+  error?: unknown;
   cached?: boolean;
 }> {
   const {
     root = process.cwd(),
-    isDefault = true,
     defaultFileName,
-    logLevel,
     alias,
     tsconfig,
-    load = true,
   } = options ?? {};
   const start = Date.now();
 
   let resolvedPath: string | undefined;
-  let isTS = false;
   let isMjs = false;
 
   if (filePath) {
     // explicit path is always resolved from cwd
     resolvedPath = path.resolve(filePath);
-    isTS = filePath.endsWith('.ts');
   } else if (defaultFileName) {
     // implicit file loaded from inline root (if present)
     // otherwise from cwd
@@ -107,7 +98,6 @@ export async function loadFile<File = any>(
       const tsFile = path.resolve(root, `${defaultFileName}.ts`);
       if (fs.existsSync(tsFile)) {
         resolvedPath = tsFile;
-        isTS = true;
       }
     }
   }
@@ -136,62 +126,23 @@ export async function loadFile<File = any>(
   }
 
   try {
-    let file: File | undefined;
-
-    if (!file && !isTS && !isMjs) {
-      // 1. try to directly require the module (assuming commonjs)
-      try {
-        // clear cache in case of server restart
-        delete require.cache[require.resolve(resolvedPath)];
-
-        file = require(resolvedPath);
-
-        debug(`cjs loaded in ${Date.now() - start}ms`);
-      } catch (error) {
-        const ignored = new RegExp(
-          [
-            `Cannot use import statement`,
-            `Must use import to load ES Module`,
-            // #1635, #2050 some Node 12.x versions don't have esm detection
-            // so it throws normal syntax errors when encountering esm syntax
-            `Unexpected token`,
-            `Unexpected identifier`,
-          ].join('|'),
-        );
-        //@ts-ignore
-        if (!ignored.test(error.message)) {
-          throw error;
-        }
-      }
-    }
-
-    if (!file) {
-      // 2. if we reach here, the file is ts or using es import syntax, or
-      // the user has type: "module" in their package.json (#917)
-      // transpile es import syntax to require syntax using rollup.
-      // lazy require rollup (it's actually in dependencies)
-      const { code } = await bundleFile(
-        resolvedPath,
-        isMjs,
-        root || path.dirname(normalizeResolvedPath),
-        alias,
-        tsconfig?.compilerOptions,
-      );
+    const { code: file } = await bundleFile(
+      resolvedPath,
+      isMjs,
+      root || path.dirname(normalizeResolvedPath),
+      alias,
+      tsconfig?.compilerOptions,
+    );
 
-      file = load
-        ? await loadFromBundledFile<File>(resolvedPath, code, isDefault)
-        : (code as any);
-
-      debug(`bundled file loaded in ${Date.now() - start}ms`);
-    }
+    debug(`bundled file loaded in ${Date.now() - start}ms`);
 
     cache.set(resolvedPath, { file });
 
     return {
       path: normalizeResolvedPath,
       file,
     };
-  } catch (error: any) {
+  } catch (error) {
     cache.set(resolvedPath, { error });
 
     return {
@@ -344,32 +295,6 @@ async function bundleFile(
   };
 }
 
-interface NodeModuleWithCompile extends NodeModule {
-  _compile(code: string, filename: string): any;
-}
-
-async function loadFromBundledFile<File = unknown>(
-  fileName: string,
-  bundledCode: string,
-  isDefault: boolean,
-): Promise<File> {
-  const extension = path.extname(fileName);
-  const defaultLoader = require.extensions[extension]!;
-  require.extensions[extension] = (module: NodeModule, filename: string) => {
-    if (filename === fileName) {
-      (module as NodeModuleWithCompile)._compile(bundledCode, filename);
-    } else {
-      defaultLoader(module, filename);
-    }
-  };
-  // clear cache in case of server restart
-  delete require.cache[require.resolve(fileName)];
-  const raw = require(fileName);
-  const file = isDefault && raw.__esModule ? raw.default : raw;
-  require.extensions[extension] = defaultLoader;
-  return file;
-}
-
 export async function removeFilesAndEmptyFolders(
   patterns: string[],
   dir: string,

packages/orval/package.json

@@ -15,6 +15,9 @@
       "default": "./dist/index.js"
     }
   },
+  "engines": {
+    "node": ">=22.18.0"
+  },
   "keywords": [
     "rest",
     "client",

packages/orval/src/generate.ts

@@ -1,3 +1,8 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import url from 'node:url';
+
 import {
   asyncReduce,
   type ConfigExternal,
@@ -6,13 +11,11 @@ import {
   type GlobalOptions,
   isFunction,
   isString,
-  loadFile,
   log,
   logError,
   type NormalizedConfig,
   type NormalizedOptions,
   removeFilesAndEmptyFolders,
-  upath,
 } from '@orval/core';
 
 import { importSpecs } from './import-specs';
@@ -90,23 +93,47 @@ export const generateSpecs = async (
     throw new Error('One or more project failed, see above for details');
 };
 
+function findConfigFile(configFilePath?: string) {
+  if (configFilePath) {
+    if (!fs.existsSync(configFilePath))
+      throw new Error(`Config file ${configFilePath} does not exist`);
+
+    return configFilePath;
+  }
+
+  const root = process.cwd();
+  const exts = ['.ts', '.js', '.mjs', '.cjs'];
+  for (const ext of exts) {
+    const fullPath = path.resolve(root, `orval.config${ext}`);
+    if (fs.existsSync(fullPath)) {
+      return fullPath;
+    }
+  }
+
+  throw new Error(`No config file found in ${root}`);
+}
+
 export const generateConfig = async (
   configFile?: string,
   options?: GlobalOptions,
 ) => {
-  const {
-    path,
-    file: configExternal,
-    error,
-  } = await loadFile<ConfigExternal>(configFile, {
-    defaultFileName: 'orval.config',
-  });
-
-  if (!configExternal) {
-    throw new Error(`failed to load from ${path} => ${error}`);
+  const configFilePath = findConfigFile(configFile);
+  let configExternal: ConfigExternal;
+  try {
+    const importPath = url.pathToFileURL(configFilePath).href;
+    const importedModule = (await import(importPath)) as {
+      default?: ConfigExternal;
+    };
+    if (importedModule.default === undefined) {
+      throw new Error(`${configFilePath} doesn't have a default export`);
+    }
+    configExternal = importedModule.default;
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : 'unknown error';
+    throw new Error(`failed to load from ${configFilePath} => ${errorMsg}`);
   }
 
-  const workspace = upath.dirname(path);
+  const workspace = path.dirname(configFilePath);
 
   const config = await (isFunction(configExternal)
     ? configExternal()

packages/tsdown.base.ts

@@ -2,7 +2,7 @@ import type { UserConfig } from 'tsdown';
 
 export const baseOptions: UserConfig = {
   entry: ['src/index.ts'],
-  target: 'node18',
+  target: 'node22.18',
   format: 'cjs',
   tsconfig: 'tsconfig.build.json',
   sourcemap: true,

samples/angular-app/src/api/endpoints/pets/pets.msw.ts

@@ -57,7 +57,7 @@ export const getShowPetByIdResponseMock = () =>
   (() => ({
     id: faker.number.int({ min: 1, max: 99 }),
     name: faker.person.firstName(),
-    tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
+    tag: faker.helpers.arrayElement([faker.word.sample(), undefined]),
   }))();
 
 export const getShowPetTextResponseMock = (): string => faker.word.sample();

samples/basic/api/endpoints/petstoreFromFileSpecWithTransformer.ts

@@ -140,7 +140,7 @@ export const getShowPetByIdResponseMock = () =>
   (() => ({
     id: faker.number.int({ min: 1, max: 99 }),
     name: faker.person.firstName(),
-    tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
+    tag: faker.helpers.arrayElement([faker.word.sample(), undefined]),
   }))();
 
 export const getListPetsMockHandler = (