@graphql-codegen/cli 7.4.0 → 7.4.1-alpha-20260906052927-fb05cdd753213e6c67cf8cb80fc55a6d47eaecfb

package/cjs/codegen.js

@@ -6,6 +6,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const module_1 = require("module");
 const os_1 = require("os");
 const path_1 = tslib_1.__importDefault(require("path"));
+const url_1 = require("url");
 const graphql_1 = require("graphql");
 const listr2_1 = require("listr2");
 const core_1 = require("@graphql-codegen/core");
@@ -14,7 +15,6 @@ const load_1 = require("@graphql-tools/load");
 const merge_1 = require("@graphql-tools/merge");
 const config_js_1 = require("./config.js");
 const documentTransforms_js_1 = require("./documentTransforms.js");
-const isESMModule_js_1 = require("./isESMModule.js");
 const plugins_js_1 = require("./plugins.js");
 const presets_js_1 = require("./presets.js");
 const debugging_js_1 = require("./utils/debugging.js");
@@ -24,16 +24,11 @@ const makeDefaultLoader = (from) => {
     }
     const relativeRequire = (0, module_1.createRequire)(from);
     return async (mod) => {
-        return Promise.resolve(`${isESMModule_js_1.isESMModule
-            ? /**
-               * For ESM we currently have no "resolve path" solution
-               * as import.meta is unavailable in a CommonJS context
-               * and furthermore unavailable in stable Node.js.
-               **/
-                // FIXME(pnpm-update): this causes dev-test devDeps to be brought into CLI's package.json, which is not ideal.
-                // Note that `relativeRequire.resolve(mod)` seems to work correctly for ESM as well.
-                mod
-            : relativeRequire.resolve(mod)}`).then(s => tslib_1.__importStar(require(s)));
+        // `import()` always goes through Node's ESM resolver, so a resolved absolute
+        // filename must be converted to a `file://` URL first -- on Windows, a raw
+        // `C:\\...` path is parsed as a URL with an (invalid) `c:` protocol otherwise.
+        const resolved = relativeRequire.resolve(mod);
+        return Promise.resolve(`${(0, url_1.pathToFileURL)(resolved).href}`).then(s => tslib_1.__importStar(require(s)));
     };
 };
 function createCache() {

package/cjs/config.js

@@ -23,7 +23,6 @@ const yaml_1 = tslib_1.__importDefault(require("yaml"));
 const yargs_1 = tslib_1.__importDefault(require("yargs"));
 const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 const graphql_config_js_1 = require("./graphql-config.js");
-const isESMModule_js_1 = require("./isESMModule.js");
 const load_js_1 = require("./load.js");
 const version_js_1 = require("./version.js");
 const { lstat } = fs_1.promises;
@@ -383,18 +382,12 @@ async function addMetadataToSources(documentFilesPromise, type) {
  * `safeDynamicImport` is a wrapper of dynamic `import()`
  * to work across Linux and Windows
  *
- * CJS:
- * `import()` seems to work well in CJS when given resolved filename
- *
- * ESM:
+ * `import()` always goes through Node's ESM resolver, in both CJS and ESM callers.
  * On native Windows (i.e. no WSL or CI), filename may look like this: `C:\\Users\\path\\to\\file.ts`
  * If used directly with `import()`, we'll see `ERR_UNSUPPORTED_ESM_URL_SCHEME` error because `c:` is not a valid protocol
  * `url.pathToFileURL` turns the filename to `file:///C:/Users/path/to/file.ts`, which is import-able
  */
 const safeDynamicImport = (absoluteFilename) => {
-    if (isESMModule_js_1.isESMModule) {
-        const { href: fileUrl } = url.pathToFileURL(absoluteFilename);
-        return Promise.resolve(`${fileUrl}`).then(s => tslib_1.__importStar(require(s)));
-    }
-    return Promise.resolve(`${absoluteFilename}`).then(s => tslib_1.__importStar(require(s)));
+    const { href: fileUrl } = url.pathToFileURL(absoluteFilename);
+    return Promise.resolve(`${fileUrl}`).then(s => tslib_1.__importStar(require(s)));
 };

package/cjs/utils/watcher.js

@@ -89,12 +89,17 @@ afterRun = () => Promise.resolve()) => {
             config: (0, plugin_helpers_1.normalizeOutputParam)(config.generates[filename]),
         }))) {
             // ParcelWatcher expects relative ignore patterns to be relative from watchDirectory,
-            // but we expect filename from config to be relative from cwd, so we need to convert
-            const filenameRelativeFromWatchDirectory = (0, path_1.relative)(watchDirectory, (0, path_1.resolve)(process.cwd(), entry.filename));
+            // but we expect filename from config to be relative from cwd, so we need to convert.
+            // NOTE: `relative()` uses the native path separator, but ignore patterns are glob
+            // patterns, which must use `/` regardless of OS (backslash is the glob escape
+            // character), so normalize to `/` here rather than joining with `join()`.
+            const filenameRelativeFromWatchDirectory = (0, path_1.relative)(watchDirectory, (0, path_1.resolve)(process.cwd(), entry.filename))
+                .split(path_1.sep)
+                .join('/');
             if (entry.config.preset) {
                 const extension = entry.config.presetConfig?.extension;
                 if (extension) {
-                    ignored.push((0, path_1.join)(filenameRelativeFromWatchDirectory, '**', '*' + extension));
+                    ignored.push(`${filenameRelativeFromWatchDirectory}/**/*${extension}`);
                 }
             }
             else {

package/cjs/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = '7.4.0';
+exports.version = '7.4.1-alpha-20260906052927-fb05cdd753213e6c67cf8cb80fc55a6d47eaecfb';

package/esm/codegen.js

@@ -2,6 +2,7 @@ import fs from 'fs';
 import { createRequire } from 'module';
 import { cpus } from 'os';
 import path from 'path';
+import { pathToFileURL } from 'url';
 import { buildASTSchema, GraphQLError, isSchema } from 'graphql';
 import { Listr } from 'listr2';
 import { codegen } from '@graphql-codegen/core';
@@ -10,7 +11,6 @@ import { NoTypeDefinitionsFound } from '@graphql-tools/load';
 import { mergeTypeDefs } from '@graphql-tools/merge';
 import { ensureContext } from './config.js';
 import { getDocumentTransform } from './documentTransforms.js';
-import { isESMModule } from './isESMModule.js';
 import { getPluginByName } from './plugins.js';
 import { getPresetByName } from './presets.js';
 import { debugLog, printLogs } from './utils/debugging.js';
@@ -20,16 +20,11 @@ const makeDefaultLoader = (from) => {
     }
     const relativeRequire = createRequire(from);
     return async (mod) => {
-        return import(isESMModule
-            ? /**
-               * For ESM we currently have no "resolve path" solution
-               * as import.meta is unavailable in a CommonJS context
-               * and furthermore unavailable in stable Node.js.
-               **/
-                // FIXME(pnpm-update): this causes dev-test devDeps to be brought into CLI's package.json, which is not ideal.
-                // Note that `relativeRequire.resolve(mod)` seems to work correctly for ESM as well.
-                mod
-            : relativeRequire.resolve(mod));
+        // `import()` always goes through Node's ESM resolver, so a resolved absolute
+        // filename must be converted to a `file://` URL first -- on Windows, a raw
+        // `C:\\...` path is parsed as a URL with an (invalid) `c:` protocol otherwise.
+        const resolved = relativeRequire.resolve(mod);
+        return import(pathToFileURL(resolved).href);
     };
 };
 function createCache() {

package/esm/config.js

@@ -11,7 +11,6 @@ import yaml from 'yaml';
 import yargs from 'yargs';
 import { createNoopProfiler, createProfiler, getCachedDocumentNodeFromSchema, } from '@graphql-codegen/plugin-helpers';
 import { findAndLoadGraphQLConfig } from './graphql-config.js';
-import { isESMModule } from './isESMModule.js';
 import { defaultDocumentsLoadOptions, defaultSchemaLoadOptions, loadDocuments, loadSchema, } from './load.js';
 import { version } from './version.js';
 const { lstat } = promises;
@@ -370,18 +369,12 @@ async function addMetadataToSources(documentFilesPromise, type) {
  * `safeDynamicImport` is a wrapper of dynamic `import()`
  * to work across Linux and Windows
  *
- * CJS:
- * `import()` seems to work well in CJS when given resolved filename
- *
- * ESM:
+ * `import()` always goes through Node's ESM resolver, in both CJS and ESM callers.
  * On native Windows (i.e. no WSL or CI), filename may look like this: `C:\\Users\\path\\to\\file.ts`
  * If used directly with `import()`, we'll see `ERR_UNSUPPORTED_ESM_URL_SCHEME` error because `c:` is not a valid protocol
  * `url.pathToFileURL` turns the filename to `file:///C:/Users/path/to/file.ts`, which is import-able
  */
 const safeDynamicImport = (absoluteFilename) => {
-    if (isESMModule) {
-        const { href: fileUrl } = url.pathToFileURL(absoluteFilename);
-        return import(fileUrl);
-    }
-    return import(absoluteFilename);
+    const { href: fileUrl } = url.pathToFileURL(absoluteFilename);
+    return import(fileUrl);
 };

package/esm/utils/watcher.js

@@ -1,4 +1,4 @@
-import { isAbsolute, join, relative, resolve, sep } from 'path';
+import { isAbsolute, relative, resolve, sep } from 'path';
 import debounce from 'debounce';
 import logSymbols from 'log-symbols';
 import mm from 'micromatch';
@@ -85,12 +85,17 @@ afterRun = () => Promise.resolve()) => {
             config: normalizeOutputParam(config.generates[filename]),
         }))) {
             // ParcelWatcher expects relative ignore patterns to be relative from watchDirectory,
-            // but we expect filename from config to be relative from cwd, so we need to convert
-            const filenameRelativeFromWatchDirectory = relative(watchDirectory, resolve(process.cwd(), entry.filename));
+            // but we expect filename from config to be relative from cwd, so we need to convert.
+            // NOTE: `relative()` uses the native path separator, but ignore patterns are glob
+            // patterns, which must use `/` regardless of OS (backslash is the glob escape
+            // character), so normalize to `/` here rather than joining with `join()`.
+            const filenameRelativeFromWatchDirectory = relative(watchDirectory, resolve(process.cwd(), entry.filename))
+                .split(sep)
+                .join('/');
             if (entry.config.preset) {
                 const extension = entry.config.presetConfig?.extension;
                 if (extension) {
-                    ignored.push(join(filenameRelativeFromWatchDirectory, '**', '*' + extension));
+                    ignored.push(`${filenameRelativeFromWatchDirectory}/**/*${extension}`);
                 }
             }
             else {

package/esm/version.js

@@ -1 +1 @@
-export const version = '7.4.0';
+export const version = '7.4.1-alpha-20260906052927-fb05cdd753213e6c67cf8cb80fc55a6d47eaecfb';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "7.4.0",
+  "version": "7.4.1-alpha-20260906052927-fb05cdd753213e6c67cf8cb80fc55a6d47eaecfb",
   "peerDependenciesMeta": {
     "@parcel/watcher": {
       "optional": true
@@ -43,9 +43,9 @@
     "tslib": "^2.4.0",
     "yaml": "^2.3.1",
     "yargs": "^18.0.0",
+    "@graphql-codegen/plugin-helpers": "^7.3.0",
     "@graphql-codegen/client-preset": "^6.1.3",
-    "@graphql-codegen/core": "^6.2.0",
-    "@graphql-codegen/plugin-helpers": "^7.3.0"
+    "@graphql-codegen/core": "^6.2.0"
   },
   "repository": {
     "type": "git",