@graphql-codegen/cli 3.2.1 → 3.2.2-alpha-20230301201322-189cfbbc9

package/cjs/config.js

@@ -10,12 +10,14 @@ 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 { lstat } = fs_1.promises;
+const file_system_js_1 = require("./utils/file-system.js");
+const { lstat, rm } = fs_1.promises;
 function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'ts', 'config.js'];
     // gives codegen.json...
@@ -26,7 +28,8 @@ function generateSearchPlaces(moduleName) {
 }
 exports.generateSearchPlaces = generateSearchPlaces;
 function customLoader(ext) {
-    function loader(filepath, content) {
+    return async function loader(filepath, content) {
+        var _a;
         if (typeof process !== 'undefined' && 'env' in process) {
             content = (0, string_env_interpolation_1.env)(content);
         }
@@ -47,12 +50,50 @@ function customLoader(ext) {
             return cosmiconfig_1.defaultLoaders['.js'](filepath, content);
         }
         if (ext === 'ts') {
-            // #8437: conflict with `graphql-config` also using TypeScriptLoader(), causing a double `ts-node` register.
-            const tsLoader = (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)({ transpileOnly: true });
-            return tsLoader(filepath, content);
+            try {
+                // #8437: conflict with `graphql-config` also using TypeScriptLoader(), causing a double `ts-node` register.
+                const tsLoader = (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)({ transpileOnly: true });
+                return tsLoader(filepath, content);
+            }
+            catch (err) {
+                if (typeof err.stack === 'string' && err.stack.startsWith('Error [ERR_REQUIRE_ESM]:')) {
+                    const hash = hashContent(content, 'base64url');
+                    const tempDir = (0, file_system_js_1.getTempDir)();
+                    // TODO
+                    let inTempDir = [];
+                    try {
+                        inTempDir = await fs_1.promises.readdir(tempDir);
+                    }
+                    catch (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}`, { stdio: 'pipe' });
+                    }
+                    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;
+                    });
+                    // If the cache has more than 10 files, we delete the oldest one.
+                    if (inTempDir.length > 10) {
+                        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 });
+                    }
+                    return config;
+                }
+                throw err;
+            }
         }
-    }
-    return loader;
+    };
 }
 async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }) {
     configFilePath || (configFilePath = process.cwd());
@@ -76,7 +117,18 @@ async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: add
 }
 exports.loadCodegenConfig = loadCodegenConfig;
 async function loadContext(configFilePath) {
-    const graphqlConfig = await (0, graphql_config_js_1.findAndLoadGraphQLConfig)(configFilePath);
+    let graphqlConfig;
+    try {
+        graphqlConfig = await (0, graphql_config_js_1.findAndLoadGraphQLConfig)(configFilePath);
+    }
+    catch (err) {
+        if (typeof err.stack === 'string' && err.stack.startsWith('Error [ERR_REQUIRE_ESM]:')) {
+            // TODO: This needs a fix in graphql-config
+        }
+        else {
+            throw err;
+        }
+    }
     if (graphqlConfig) {
         return new CodegenContext({ graphqlConfig });
     }
@@ -312,8 +364,8 @@ function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
 exports.ensureContext = ensureContext;
-function hashContent(content) {
-    return (0, crypto_1.createHash)('sha256').update(content).digest('hex');
+function hashContent(content, encoding = 'hex') {
+    return (0, crypto_1.createHash)('sha256').update(content).digest(encoding);
 }
 function hashSchema(schema) {
     return hashContent((0, graphql_1.print)((0, plugin_helpers_1.getCachedDocumentNodeFromSchema)(schema)));

package/cjs/utils/file-system.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mkdirp = exports.unlinkFile = exports.readFile = exports.writeFile = void 0;
+exports.getTempDir = 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);
@@ -19,3 +21,7 @@ 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,17 +1,19 @@
 import { createHash } from 'crypto';
 import { promises } from 'fs';
 import { createRequire } from 'module';
-import { resolve } from 'path';
+import { basename, resolve, join } 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';
-const { lstat } = promises;
+import { getTempDir } from './utils/file-system.js';
+const { lstat, rm } = promises;
 export function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'ts', 'config.js'];
     // gives codegen.json...
@@ -21,7 +23,7 @@ export function generateSearchPlaces(moduleName) {
     return [...regular.concat(dot), 'package.json'];
 }
 function customLoader(ext) {
-    function loader(filepath, content) {
+    return async function loader(filepath, content) {
         if (typeof process !== 'undefined' && 'env' in process) {
             content = env(content);
         }
@@ -42,12 +44,50 @@ function customLoader(ext) {
             return defaultLoaders['.js'](filepath, content);
         }
         if (ext === 'ts') {
-            // #8437: conflict with `graphql-config` also using TypeScriptLoader(), causing a double `ts-node` register.
-            const tsLoader = TypeScriptLoader({ transpileOnly: true });
-            return tsLoader(filepath, content);
+            try {
+                // #8437: conflict with `graphql-config` also using TypeScriptLoader(), causing a double `ts-node` register.
+                const tsLoader = TypeScriptLoader({ transpileOnly: true });
+                return tsLoader(filepath, content);
+            }
+            catch (err) {
+                if (typeof err.stack === 'string' && err.stack.startsWith('Error [ERR_REQUIRE_ESM]:')) {
+                    const hash = hashContent(content, 'base64url');
+                    const tempDir = getTempDir();
+                    // TODO
+                    let inTempDir = [];
+                    try {
+                        inTempDir = await promises.readdir(tempDir);
+                    }
+                    catch (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}`, { stdio: 'pipe' });
+                    }
+                    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;
+                    });
+                    // If the cache has more than 10 files, we delete the oldest one.
+                    if (inTempDir.length > 10) {
+                        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 });
+                    }
+                    return config;
+                }
+                throw err;
+            }
         }
-    }
-    return loader;
+    };
 }
 export async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }) {
     configFilePath || (configFilePath = process.cwd());
@@ -70,7 +110,18 @@ export async function loadCodegenConfig({ configFilePath, moduleName, searchPlac
     return pathStats.isDirectory() ? cosmi.search(configFilePath) : cosmi.load(configFilePath);
 }
 export async function loadContext(configFilePath) {
-    const graphqlConfig = await findAndLoadGraphQLConfig(configFilePath);
+    let graphqlConfig;
+    try {
+        graphqlConfig = await findAndLoadGraphQLConfig(configFilePath);
+    }
+    catch (err) {
+        if (typeof err.stack === 'string' && err.stack.startsWith('Error [ERR_REQUIRE_ESM]:')) {
+            // TODO: This needs a fix in graphql-config
+        }
+        else {
+            throw err;
+        }
+    }
     if (graphqlConfig) {
         return new CodegenContext({ graphqlConfig });
     }
@@ -299,8 +350,8 @@ export class CodegenContext {
 export function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
-function hashContent(content) {
-    return createHash('sha256').update(content).digest('hex');
+function hashContent(content, encoding = 'hex') {
+    return createHash('sha256').update(content).digest(encoding);
 }
 function hashSchema(schema) {
     return hashContent(print(getCachedDocumentNodeFromSchema(schema)));

package/esm/utils/file-system.js

@@ -1,4 +1,6 @@
 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);
@@ -12,3 +14,6 @@ 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,8 +1,9 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "3.2.1",
+  "version": "3.2.2-alpha-20230301201322-189cfbbc9",
   "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"
+    "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"
   },
   "dependencies": {
     "@babel/generator": "^7.18.13",

package/typings/config.d.cts

@@ -18,6 +18,7 @@ export type YamlCliFlags = {
     emitLegacyCommonJSImports?: boolean;
 };
 export declare function generateSearchPlaces(moduleName: string): string[];
+export type CodegenConfigLoader = (filepath: string, content: string) => Promise<Types.Config> | Types.Config;
 export interface LoadCodegenConfigOptions {
     /**
      * The path to the config file or directory contains the config file.
@@ -40,7 +41,7 @@ export interface LoadCodegenConfigOptions {
     /**
      * Overrides or extends the loaders for specific file extensions
      */
-    loaders?: Record<string, (filepath: string, content: string) => Promise<Types.Config> | Types.Config>;
+    loaders?: Record<string, CodegenConfigLoader>;
 }
 export interface LoadCodegenConfigResult {
     filepath: string;

package/typings/config.d.ts

@@ -18,6 +18,7 @@ export type YamlCliFlags = {
     emitLegacyCommonJSImports?: boolean;
 };
 export declare function generateSearchPlaces(moduleName: string): string[];
+export type CodegenConfigLoader = (filepath: string, content: string) => Promise<Types.Config> | Types.Config;
 export interface LoadCodegenConfigOptions {
     /**
      * The path to the config file or directory contains the config file.
@@ -40,7 +41,7 @@ export interface LoadCodegenConfigOptions {
     /**
      * Overrides or extends the loaders for specific file extensions
      */
-    loaders?: Record<string, (filepath: string, content: string) => Promise<Types.Config> | Types.Config>;
+    loaders?: Record<string, CodegenConfigLoader>;
 }
 export interface LoadCodegenConfigResult {
     filepath: string;

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

@@ -2,3 +2,4 @@ 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,3 +2,4 @@ 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;