@graphql-codegen/cli 3.2.2-alpha-20230302095526-48dfe8bf9 → 3.2.2-alpha-20230303164721-1b08466b3

package/cjs/config.js

@@ -10,14 +10,12 @@ const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 const cosmiconfig_1 = require("cosmiconfig");
 const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
 const graphql_1 = require("graphql");
-const child_process_1 = require("child_process");
 const string_env_interpolation_1 = require("string-env-interpolation");
 const yaml_1 = tslib_1.__importDefault(require("yaml"));
 const yargs_1 = tslib_1.__importDefault(require("yargs"));
 const graphql_config_js_1 = require("./graphql-config.js");
 const load_js_1 = require("./load.js");
-const file_system_js_1 = require("./utils/file-system.js");
-const { lstat, rm } = fs_1.promises;
+const { lstat } = fs_1.promises;
 function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'ts', 'config.js'];
     // gives codegen.json...
@@ -29,7 +27,6 @@ function generateSearchPlaces(moduleName) {
 exports.generateSearchPlaces = generateSearchPlaces;
 function customLoader(ext) {
     return async function loader(filepath, content) {
-        var _a;
         if (typeof process !== 'undefined' && 'env' in process) {
             content = (0, string_env_interpolation_1.env)(content);
         }
@@ -49,6 +46,12 @@ function customLoader(ext) {
         if (ext === 'js') {
             return cosmiconfig_1.defaultLoaders['.js'](filepath, content);
         }
+        if (ext === 'mts' || ext === 'cts') {
+            const jiti = require('jiti')(__filename, {
+                interopDefault: true,
+            });
+            return jiti(filepath);
+        }
         if (ext === 'ts') {
             try {
                 // #8437: conflict with `graphql-config` also using TypeScriptLoader(), causing a double `ts-node` register.
@@ -57,37 +60,10 @@ function customLoader(ext) {
             }
             catch (err) {
                 if (isRequireESMError(err)) {
-                    const hash = hashContent(content, 'base64url');
-                    const tempDir = (0, file_system_js_1.getTempDir)();
-                    let inTempDir = [];
-                    try {
-                        inTempDir = await fs_1.promises.readdir(tempDir);
-                    }
-                    catch (err) {
-                        if (err.code === 'ENOENT') {
-                            // tsc will create the directory if it doesn't exist.
-                        }
-                        else {
-                            throw err;
-                        }
-                    }
-                    let outDir = (0, path_1.join)(tempDir, new Date().getTime() + '-' + hash);
-                    const previousOutDir = inTempDir.find(s => s.endsWith(hash));
-                    if (previousOutDir) {
-                        outDir = (0, path_1.join)(tempDir, previousOutDir);
-                    }
-                    else {
-                        // We're compiling the file, because ts-node doesn't work perfectly with ESM.
-                        (0, child_process_1.execSync)(`tsc ${filepath} --module commonjs --outDir ${outDir} --skipLibCheck`);
-                    }
-                    const newPath = (0, path_1.join)(outDir, (0, path_1.basename)(filepath).replace(/\.ts$/, '.js'));
-                    const config = (_a = newPath, Promise.resolve().then(() => tslib_1.__importStar(require(_a)))).then(m => {
-                        const config = m.default;
-                        return 'default' in config ? config.default : config;
+                    const jiti = require('jiti')(__filename, {
+                        interopDefault: true,
                     });
-                    // If the cache has more than 10 files, we delete the oldest one.
-                    await removeOldestDirInCache(inTempDir, tempDir, 10);
-                    return config;
+                    return jiti(filepath);
                 }
                 throw err;
             }
@@ -107,6 +83,8 @@ async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: add
             '.yml': customLoader('yaml'),
             '.js': customLoader('js'),
             '.ts': customLoader('ts'),
+            '.mts': customLoader('ts'),
+            '.cts': customLoader('ts'),
             noExt: customLoader('yaml'),
             ...customLoaders,
         },
@@ -124,6 +102,9 @@ async function loadContext(configFilePath) {
         if (isRequireESMError(err)) {
             // TODO: This needs a fix in graphql-config
         }
+        else if (isMissingLoaderError(err)) {
+            // TODO: This also needs a fix in graphql-config
+        }
         else {
             throw err;
         }
@@ -407,16 +388,9 @@ function shouldEmitLegacyCommonJSImports(config) {
     return globalValue;
 }
 exports.shouldEmitLegacyCommonJSImports = shouldEmitLegacyCommonJSImports;
-async function removeOldestDirInCache(inTempDir, tempDir, cacheLimit) {
-    if (inTempDir.length > cacheLimit) {
-        const oldest = inTempDir.sort((a, b) => {
-            const aTime = Number(a.split('-')[0]);
-            const bTime = Number(b.split('-')[0]);
-            return aTime - bTime;
-        })[0];
-        await rm((0, path_1.join)(tempDir, oldest), { recursive: true, force: true });
-    }
-}
 function isRequireESMError(err) {
     return typeof err.stack === 'string' && err.stack.startsWith('Error [ERR_REQUIRE_ESM]:');
 }
+function isMissingLoaderError(err) {
+    return typeof err.stack === 'string' && err.stack.startsWith('Error: No loader specified for extension');
+}

package/cjs/utils/file-system.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTempDir = exports.mkdirp = exports.unlinkFile = exports.readFile = exports.writeFile = void 0;
+exports.mkdirp = exports.unlinkFile = exports.readFile = exports.writeFile = void 0;
 const fs_1 = require("fs");
-const os_1 = require("os");
-const path_1 = require("path");
 const { writeFile: fsWriteFile, readFile: fsReadFile, mkdir } = fs_1.promises;
 function writeFile(filepath, content) {
     return fsWriteFile(filepath, content);
@@ -21,7 +19,3 @@ function mkdirp(filePath) {
     return mkdir(filePath, { recursive: true });
 }
 exports.mkdirp = mkdirp;
-function getTempDir() {
-    return (0, path_1.join)((0, os_1.tmpdir)(), `graphql-codegen-cli`);
-}
-exports.getTempDir = getTempDir;

package/esm/config.js

@@ -1,19 +1,17 @@
 import { createHash } from 'crypto';
 import { promises } from 'fs';
 import { createRequire } from 'module';
-import { basename, resolve, join } from 'path';
+import { resolve } from 'path';
 import { createNoopProfiler, createProfiler, getCachedDocumentNodeFromSchema, } from '@graphql-codegen/plugin-helpers';
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
 import { TypeScriptLoader } from 'cosmiconfig-typescript-loader';
 import { print } from 'graphql';
-import { execSync } from 'child_process';
 import { env } from 'string-env-interpolation';
 import yaml from 'yaml';
 import yargs from 'yargs';
 import { findAndLoadGraphQLConfig } from './graphql-config.js';
 import { defaultDocumentsLoadOptions, defaultSchemaLoadOptions, loadDocuments, loadSchema } from './load.js';
-import { getTempDir } from './utils/file-system.js';
-const { lstat, rm } = promises;
+const { lstat } = promises;
 export function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'ts', 'config.js'];
     // gives codegen.json...
@@ -43,6 +41,12 @@ function customLoader(ext) {
         if (ext === 'js') {
             return defaultLoaders['.js'](filepath, content);
         }
+        if (ext === 'mts' || ext === 'cts') {
+            const jiti = require('jiti')(__filename, {
+                interopDefault: true,
+            });
+            return jiti(filepath);
+        }
         if (ext === 'ts') {
             try {
                 // #8437: conflict with `graphql-config` also using TypeScriptLoader(), causing a double `ts-node` register.
@@ -51,37 +55,10 @@ function customLoader(ext) {
             }
             catch (err) {
                 if (isRequireESMError(err)) {
-                    const hash = hashContent(content, 'base64url');
-                    const tempDir = getTempDir();
-                    let inTempDir = [];
-                    try {
-                        inTempDir = await promises.readdir(tempDir);
-                    }
-                    catch (err) {
-                        if (err.code === 'ENOENT') {
-                            // tsc will create the directory if it doesn't exist.
-                        }
-                        else {
-                            throw err;
-                        }
-                    }
-                    let outDir = join(tempDir, new Date().getTime() + '-' + hash);
-                    const previousOutDir = inTempDir.find(s => s.endsWith(hash));
-                    if (previousOutDir) {
-                        outDir = join(tempDir, previousOutDir);
-                    }
-                    else {
-                        // We're compiling the file, because ts-node doesn't work perfectly with ESM.
-                        execSync(`tsc ${filepath} --module commonjs --outDir ${outDir} --skipLibCheck`);
-                    }
-                    const newPath = join(outDir, basename(filepath).replace(/\.ts$/, '.js'));
-                    const config = import(newPath).then(m => {
-                        const config = m.default;
-                        return 'default' in config ? config.default : config;
+                    const jiti = require('jiti')(__filename, {
+                        interopDefault: true,
                     });
-                    // If the cache has more than 10 files, we delete the oldest one.
-                    await removeOldestDirInCache(inTempDir, tempDir, 10);
-                    return config;
+                    return jiti(filepath);
                 }
                 throw err;
             }
@@ -101,6 +78,8 @@ export async function loadCodegenConfig({ configFilePath, moduleName, searchPlac
             '.yml': customLoader('yaml'),
             '.js': customLoader('js'),
             '.ts': customLoader('ts'),
+            '.mts': customLoader('ts'),
+            '.cts': customLoader('ts'),
             noExt: customLoader('yaml'),
             ...customLoaders,
         },
@@ -117,6 +96,9 @@ export async function loadContext(configFilePath) {
         if (isRequireESMError(err)) {
             // TODO: This needs a fix in graphql-config
         }
+        else if (isMissingLoaderError(err)) {
+            // TODO: This also needs a fix in graphql-config
+        }
         else {
             throw err;
         }
@@ -392,16 +374,9 @@ export function shouldEmitLegacyCommonJSImports(config) {
     // }
     return globalValue;
 }
-async function removeOldestDirInCache(inTempDir, tempDir, cacheLimit) {
-    if (inTempDir.length > cacheLimit) {
-        const oldest = inTempDir.sort((a, b) => {
-            const aTime = Number(a.split('-')[0]);
-            const bTime = Number(b.split('-')[0]);
-            return aTime - bTime;
-        })[0];
-        await rm(join(tempDir, oldest), { recursive: true, force: true });
-    }
-}
 function isRequireESMError(err) {
     return typeof err.stack === 'string' && err.stack.startsWith('Error [ERR_REQUIRE_ESM]:');
 }
+function isMissingLoaderError(err) {
+    return typeof err.stack === 'string' && err.stack.startsWith('Error: No loader specified for extension');
+}

package/esm/utils/file-system.js

@@ -1,6 +1,4 @@
 import { promises, unlink as fsUnlink } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
 const { writeFile: fsWriteFile, readFile: fsReadFile, mkdir } = promises;
 export function writeFile(filepath, content) {
     return fsWriteFile(filepath, content);
@@ -14,6 +12,3 @@ export function unlinkFile(filePath, cb) {
 export function mkdirp(filePath) {
     return mkdir(filePath, { recursive: true });
 }
-export function getTempDir() {
-    return join(tmpdir(), `graphql-codegen-cli`);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "3.2.2-alpha-20230302095526-48dfe8bf9",
+  "version": "3.2.2-alpha-20230303164721-1b08466b3",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
     "typescript": ">=3.0"
@@ -31,6 +31,7 @@
     "graphql-config": "^4.4.0",
     "inquirer": "^8.0.0",
     "is-glob": "^4.0.1",
+    "jiti": "^1.17.1",
     "json-to-pretty-yaml": "^1.2.2",
     "listr2": "^4.0.5",
     "log-symbols": "^4.0.0",

package/typings/utils/file-system.d.cts

@@ -2,4 +2,3 @@ export declare function writeFile(filepath: string, content: string): Promise<vo
 export declare function readFile(filepath: string): Promise<string>;
 export declare function unlinkFile(filePath: string, cb?: (err?: Error) => any): void;
 export declare function mkdirp(filePath: string): Promise<string>;
-export declare function getTempDir(): string;

package/typings/utils/file-system.d.ts

@@ -2,4 +2,3 @@ export declare function writeFile(filepath: string, content: string): Promise<vo
 export declare function readFile(filepath: string): Promise<string>;
 export declare function unlinkFile(filePath: string, cb?: (err?: Error) => any): void;
 export declare function mkdirp(filePath: string): Promise<string>;
-export declare function getTempDir(): string;