@graphql-codegen/cli 4.0.1 → 4.0.2-alpha-20230725231005-5bc75d7f6

package/cjs/utils/watcher.js

@@ -34,7 +34,15 @@ const createWatcher = (initialContext, onNext) => {
     let watcherSubscription;
     const runWatcher = async (abortSignal) => {
         const watchDirectory = await findHighestCommonDirectory(allAffirmativePatterns);
-        const parcelWatcher = await Promise.resolve().then(() => tslib_1.__importStar(require('@parcel/watcher')));
+        // Try to load the parcel watcher, but don't fail if it's not available.
+        let parcelWatcher;
+        try {
+            parcelWatcher = await Promise.resolve().then(() => tslib_1.__importStar(require('@parcel/watcher')));
+        }
+        catch (err) {
+            log(`Parcel watcher not found. To use this feature, please make sure to provide @parcel/watcher as a peer dependency.`);
+            return;
+        }
         (0, debugging_js_1.debugLog)(`[Watcher] Parcel watcher loaded...`);
         let isShutdown = false;
         const debouncedExec = (0, debounce_1.default)(() => {
@@ -164,22 +172,21 @@ exports.createWatcher = createWatcher;
  * @param files List of relative and/or absolute file paths (or micromatch patterns)
  */
 const findHighestCommonDirectory = async (files) => {
-    // Map files to a list of basePaths, where "base" is the result of mm.scan(pathOrPattern)
-    // e.g. mm.scan("/**/foo/bar").base -> "/" ; mm.scan("/foo/bar/**/fizz/*.graphql") -> /foo/bar
     const dirPaths = files
         .map(filePath => ((0, path_1.isAbsolute)(filePath) ? filePath : (0, path_1.resolve)(filePath)))
-        .map(patterned => micromatch_1.default.scan(patterned).base);
-    // Return longest common prefix if it's accessible, otherwise process.cwd()
+        .map(patterned => micromatch_1.default.scan(patterned).base)
+        .map(path => (0, path_1.normalize)(path)); // Added normalization here
     return (async (maybeValidPath) => {
-        (0, debugging_js_1.debugLog)(`[Watcher] Longest common prefix of all files: ${maybeValidPath}...`);
+        const normalizedPath = (0, path_1.normalize)(maybeValidPath); // Normalize the path before checking accessibility
+        (0, debugging_js_1.debugLog)(`[Watcher] Longest common prefix of all files: ${normalizedPath}...`);
         try {
-            await (0, file_system_js_1.access)(maybeValidPath);
-            return maybeValidPath;
+            await (0, file_system_js_1.access)(normalizedPath); // Access the normalized path
+            return normalizedPath;
         }
         catch {
-            log(`[Watcher] Longest common prefix (${maybeValidPath}) is not accessible`);
-            log(`[Watcher] Watching current working directory (${process.cwd()}) instead`);
-            return process.cwd();
+            log(`[Watcher] Longest common prefix (${normalizedPath}) is not accessible`);
+            log(`[Watcher] Watching current working directory (${(0, path_1.normalize)(process.cwd())}) instead`);
+            return (0, path_1.normalize)(process.cwd());
         }
     })(longestCommonPrefix(dirPaths.map(path => path.split(path_1.sep))).join(path_1.sep));
 };

package/esm/utils/watcher.js

@@ -1,4 +1,4 @@
-import { join, isAbsolute, relative, resolve, sep } from 'path';
+import { join, isAbsolute, relative, resolve, sep, normalize } from 'path';
 import { normalizeOutputParam } from '@graphql-codegen/plugin-helpers';
 import debounce from 'debounce';
 import mm from 'micromatch';
@@ -30,7 +30,15 @@ export const createWatcher = (initialContext, onNext) => {
     let watcherSubscription;
     const runWatcher = async (abortSignal) => {
         const watchDirectory = await findHighestCommonDirectory(allAffirmativePatterns);
-        const parcelWatcher = await import('@parcel/watcher');
+        // Try to load the parcel watcher, but don't fail if it's not available.
+        let parcelWatcher;
+        try {
+            parcelWatcher = await import('@parcel/watcher');
+        }
+        catch (err) {
+            log(`Parcel watcher not found. To use this feature, please make sure to provide @parcel/watcher as a peer dependency.`);
+            return;
+        }
         debugLog(`[Watcher] Parcel watcher loaded...`);
         let isShutdown = false;
         const debouncedExec = debounce(() => {
@@ -159,22 +167,21 @@ export const createWatcher = (initialContext, onNext) => {
  * @param files List of relative and/or absolute file paths (or micromatch patterns)
  */
 const findHighestCommonDirectory = async (files) => {
-    // Map files to a list of basePaths, where "base" is the result of mm.scan(pathOrPattern)
-    // e.g. mm.scan("/**/foo/bar").base -> "/" ; mm.scan("/foo/bar/**/fizz/*.graphql") -> /foo/bar
     const dirPaths = files
         .map(filePath => (isAbsolute(filePath) ? filePath : resolve(filePath)))
-        .map(patterned => mm.scan(patterned).base);
-    // Return longest common prefix if it's accessible, otherwise process.cwd()
+        .map(patterned => mm.scan(patterned).base)
+        .map(path => normalize(path)); // Added normalization here
     return (async (maybeValidPath) => {
-        debugLog(`[Watcher] Longest common prefix of all files: ${maybeValidPath}...`);
+        const normalizedPath = normalize(maybeValidPath); // Normalize the path before checking accessibility
+        debugLog(`[Watcher] Longest common prefix of all files: ${normalizedPath}...`);
         try {
-            await access(maybeValidPath);
-            return maybeValidPath;
+            await access(normalizedPath); // Access the normalized path
+            return normalizedPath;
         }
         catch {
-            log(`[Watcher] Longest common prefix (${maybeValidPath}) is not accessible`);
-            log(`[Watcher] Watching current working directory (${process.cwd()}) instead`);
-            return process.cwd();
+            log(`[Watcher] Longest common prefix (${normalizedPath}) is not accessible`);
+            log(`[Watcher] Watching current working directory (${normalize(process.cwd())}) instead`);
+            return normalize(process.cwd());
         }
     })(longestCommonPrefix(dirPaths.map(path => path.split(sep))).join(sep));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "4.0.1",
+  "version": "4.0.2-alpha-20230725231005-5bc75d7f6",
   "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"
   },