@graphql-codegen/cli 4.0.2-alpha-20230706143738-f59fb0497 → 4.0.2-alpha-20230725234859-7c312d8e7

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,19 +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(filePath => (0, path_1.normalize)(filePath)) // Normalize the file paths
         .map(patterned => micromatch_1.default.scan(patterned).base);
-    // Return longest common prefix if it's accessible, otherwise process.cwd()
+    // Log the dirPaths for debugging
+    (0, debugging_js_1.debugLog)(`[Watcher] dirPaths: ${JSON.stringify(dirPaths)}`);
     return (async (maybeValidPath) => {
         (0, debugging_js_1.debugLog)(`[Watcher] Longest common prefix of all files: ${maybeValidPath}...`);
         try {
             await (0, file_system_js_1.access)(maybeValidPath);
+            (0, debugging_js_1.debugLog)(`[Watcher] Access to ${maybeValidPath} successful.`);
             return maybeValidPath;
         }
-        catch {
+        catch (error) {
+            (0, debugging_js_1.debugLog)(`[Watcher] Error accessing path: ${error.message}`);
             log(`[Watcher] Longest common prefix (${maybeValidPath}) is not accessible`);
             log(`[Watcher] Watching current working directory (${process.cwd()}) instead`);
             return process.cwd();
@@ -185,39 +195,25 @@ const findHighestCommonDirectory = async (files) => {
 };
 /**
  * Find the longest common prefix of an array of paths, where each item in
- * the array is an array of path segments which comprise an absolute path when
- * joined together by a path separator.
+ * the array an array of path segments which comprise an absolute path when
+ * joined together by a path separator
  *
  * Adapted from:
  * https://duncan-mcardle.medium.com/leetcode-problem-14-longest-common-prefix-javascript-3bc6a2f777c4
  *
- * This version has been adjusted to support Windows paths, by treating the drive letter
- * as a separate segment and accounting for Windows-style backslashes as path separators.
- *
- * @param splitPaths An array of arrays, where each item is a path split by its separator.
- *                   The first item is treated separately as it could be a drive letter in Windows.
- * @returns An array of path segments representing the longest common prefix of splitPaths.
+ * @param splitPaths An array of arrays, where each item is a path split by its separator
+ * @returns An array of path segments representing the longest common prefix of splitPaths
  */
 const longestCommonPrefix = (splitPaths) => {
-    // Return early on empty input
     if (!splitPaths.length) {
         return [];
     }
-    // Added: handle Windows drive letters
-    const driveLetter = splitPaths[0][0];
-    if (driveLetter && splitPaths.every(string => string[0] === driveLetter)) {
-        splitPaths = splitPaths.map(path => path.slice(1));
-    }
-    else {
-        return [];
-    }
-    // Loop through the segments of the first path
     for (let i = 0; i <= splitPaths[0].length; i++) {
-        // Check if this path segment is present in the same position of every path
         if (!splitPaths.every(string => string[i] === splitPaths[0][i])) {
-            // If not, return the path segments up to and including the previous segment
-            return [driveLetter, ...splitPaths[0].slice(0, i)];
+            (0, debugging_js_1.debugLog)(`[Watcher] longestCommonPrefix at index ${i}: ${splitPaths[0].slice(0, i).join(path_1.sep)}`);
+            return splitPaths[0].slice(0, i);
         }
     }
-    return [driveLetter, ...splitPaths[0]];
+    (0, debugging_js_1.debugLog)(`[Watcher] longestCommonPrefix: ${splitPaths[0].join(path_1.sep)}`);
+    return splitPaths[0];
 };

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,19 +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(filePath => normalize(filePath)) // Normalize the file paths
         .map(patterned => mm.scan(patterned).base);
-    // Return longest common prefix if it's accessible, otherwise process.cwd()
+    // Log the dirPaths for debugging
+    debugLog(`[Watcher] dirPaths: ${JSON.stringify(dirPaths)}`);
     return (async (maybeValidPath) => {
         debugLog(`[Watcher] Longest common prefix of all files: ${maybeValidPath}...`);
         try {
             await access(maybeValidPath);
+            debugLog(`[Watcher] Access to ${maybeValidPath} successful.`);
             return maybeValidPath;
         }
-        catch {
+        catch (error) {
+            debugLog(`[Watcher] Error accessing path: ${error.message}`);
             log(`[Watcher] Longest common prefix (${maybeValidPath}) is not accessible`);
             log(`[Watcher] Watching current working directory (${process.cwd()}) instead`);
             return process.cwd();
@@ -180,39 +190,25 @@ const findHighestCommonDirectory = async (files) => {
 };
 /**
  * Find the longest common prefix of an array of paths, where each item in
- * the array is an array of path segments which comprise an absolute path when
- * joined together by a path separator.
+ * the array an array of path segments which comprise an absolute path when
+ * joined together by a path separator
  *
  * Adapted from:
  * https://duncan-mcardle.medium.com/leetcode-problem-14-longest-common-prefix-javascript-3bc6a2f777c4
  *
- * This version has been adjusted to support Windows paths, by treating the drive letter
- * as a separate segment and accounting for Windows-style backslashes as path separators.
- *
- * @param splitPaths An array of arrays, where each item is a path split by its separator.
- *                   The first item is treated separately as it could be a drive letter in Windows.
- * @returns An array of path segments representing the longest common prefix of splitPaths.
+ * @param splitPaths An array of arrays, where each item is a path split by its separator
+ * @returns An array of path segments representing the longest common prefix of splitPaths
  */
 const longestCommonPrefix = (splitPaths) => {
-    // Return early on empty input
     if (!splitPaths.length) {
         return [];
     }
-    // Added: handle Windows drive letters
-    const driveLetter = splitPaths[0][0];
-    if (driveLetter && splitPaths.every(string => string[0] === driveLetter)) {
-        splitPaths = splitPaths.map(path => path.slice(1));
-    }
-    else {
-        return [];
-    }
-    // Loop through the segments of the first path
     for (let i = 0; i <= splitPaths[0].length; i++) {
-        // Check if this path segment is present in the same position of every path
         if (!splitPaths.every(string => string[i] === splitPaths[0][i])) {
-            // If not, return the path segments up to and including the previous segment
-            return [driveLetter, ...splitPaths[0].slice(0, i)];
+            debugLog(`[Watcher] longestCommonPrefix at index ${i}: ${splitPaths[0].slice(0, i).join(sep)}`);
+            return splitPaths[0].slice(0, i);
         }
     }
-    return [driveLetter, ...splitPaths[0]];
+    debugLog(`[Watcher] longestCommonPrefix: ${splitPaths[0].join(sep)}`);
+    return splitPaths[0];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "4.0.2-alpha-20230706143738-f59fb0497",
+  "version": "4.0.2-alpha-20230725234859-7c312d8e7",
   "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"
   },