force oazapfts to use the same TS version as the codegen (#1771)

Author: phryneas

packages/rtk-query-codegen-openapi/src/index.ts

@@ -1,7 +1,6 @@
 import path from 'path';
 import fs from 'fs';
 import type { CommonOptions, ConfigFile, GenerationOptions, OutputFileOptions } from './types';
-import { generateApi } from './generate';
 import { isValidUrl, prettify } from './utils';
 export { ConfigFile } from './types';
 
@@ -12,7 +11,10 @@ export async function generateEndpoints(options: GenerationOptions): Promise<str
     ? options.schemaFile
     : path.resolve(process.cwd(), schemaLocation);
 
-  const sourceCode = await generateApi(schemaAbsPath, options);
+  const sourceCode = await enforceOazapftsTsVersion(() => {
+    const { generateApi } = require('./generate');
+    return generateApi(schemaAbsPath, options);
+  });
   const outputFile = options.outputFile;
   if (outputFile) {
     fs.writeFileSync(path.resolve(process.cwd(), outputFile), await prettify(outputFile, sourceCode));
@@ -38,3 +40,23 @@ export function parseConfig(fullConfig: ConfigFile) {
   }
   return outFiles;
 }
+
+/**
+ * Enforces `oazapfts` to use the same TypeScript version as this module itself uses.
+ * That should prevent enums from running out of sync if both libraries use different TS versions.
+ */
+function enforceOazapftsTsVersion<T>(cb: () => T): T {
+  const ozTsPath = require.resolve('typescript', { paths: [require.resolve('oazapfts')] });
+  const tsPath = require.resolve('typescript');
+  const originalEntry = require.cache[ozTsPath];
+  try {
+    require.cache[ozTsPath] = require.cache[tsPath];
+    return cb();
+  } finally {
+    if (originalEntry) {
+      require.cache[ozTsPath] = originalEntry;
+    } else {
+      delete require.cache[ozTsPath];
+    }
+  }
+}

packages/rtk-query-codegen-openapi/test/cli.test.ts

@@ -33,6 +33,8 @@ afterEach(() => {
 
 describe('CLI options testing', () => {
   test('generation with `config.example.js`', async () => {
+    jest.setTimeout(10000);
+
     const out = await cli([`./config.example.js`], __dirname);
 
     expect(out).toEqual({
@@ -47,6 +49,8 @@ Done
   });
 
   test('paths are relative to configfile, not to cwd', async () => {
+    jest.setTimeout(10000);
+
     const out = await cli([`../test/config.example.js`], path.resolve(__dirname, '../src'));
 
     expect(out).toEqual({
@@ -61,7 +65,7 @@ Done
   });
 
   test('ts, js and json all work the same', async () => {
-    jest.setTimeout(15000);
+    jest.setTimeout(25000);
 
     await cli([`./config.example.js`], __dirname);
     const fromJs = fs.readFileSync(path.resolve(tmpDir, 'example.ts'), 'utf-8');