@graphql-codegen/cli 4.0.2-alpha-20230725231005-5bc75d7f6 → 4.0.2-alpha-20230725234859-7c312d8e7

package/cjs/utils/watcher.js

@@ -174,19 +174,22 @@ exports.createWatcher = createWatcher;
 const findHighestCommonDirectory = async (files) => {
     const dirPaths = files
         .map(filePath => ((0, path_1.isAbsolute)(filePath) ? filePath : (0, path_1.resolve)(filePath)))
-        .map(patterned => micromatch_1.default.scan(patterned).base)
-        .map(path => (0, path_1.normalize)(path)); // Added normalization here
+        .map(filePath => (0, path_1.normalize)(filePath)) // Normalize the file paths
+        .map(patterned => micromatch_1.default.scan(patterned).base);
+    // Log the dirPaths for debugging
+    (0, debugging_js_1.debugLog)(`[Watcher] dirPaths: ${JSON.stringify(dirPaths)}`);
     return (async (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}...`);
+        (0, debugging_js_1.debugLog)(`[Watcher] Longest common prefix of all files: ${maybeValidPath}...`);
         try {
-            await (0, file_system_js_1.access)(normalizedPath); // Access the normalized path
-            return normalizedPath;
+            await (0, file_system_js_1.access)(maybeValidPath);
+            (0, debugging_js_1.debugLog)(`[Watcher] Access to ${maybeValidPath} successful.`);
+            return maybeValidPath;
         }
-        catch {
-            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());
+        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();
         }
     })(longestCommonPrefix(dirPaths.map(path => path.split(path_1.sep))).join(path_1.sep));
 };
@@ -202,17 +205,15 @@ const findHighestCommonDirectory = async (files) => {
  * @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 [];
     }
-    // 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
+            (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);
         }
     }
+    (0, debugging_js_1.debugLog)(`[Watcher] longestCommonPrefix: ${splitPaths[0].join(path_1.sep)}`);
     return splitPaths[0];
 };

package/esm/utils/watcher.js

@@ -169,19 +169,22 @@ export const createWatcher = (initialContext, onNext) => {
 const findHighestCommonDirectory = async (files) => {
     const dirPaths = files
         .map(filePath => (isAbsolute(filePath) ? filePath : resolve(filePath)))
-        .map(patterned => mm.scan(patterned).base)
-        .map(path => normalize(path)); // Added normalization here
+        .map(filePath => normalize(filePath)) // Normalize the file paths
+        .map(patterned => mm.scan(patterned).base);
+    // Log the dirPaths for debugging
+    debugLog(`[Watcher] dirPaths: ${JSON.stringify(dirPaths)}`);
     return (async (maybeValidPath) => {
-        const normalizedPath = normalize(maybeValidPath); // Normalize the path before checking accessibility
-        debugLog(`[Watcher] Longest common prefix of all files: ${normalizedPath}...`);
+        debugLog(`[Watcher] Longest common prefix of all files: ${maybeValidPath}...`);
         try {
-            await access(normalizedPath); // Access the normalized path
-            return normalizedPath;
+            await access(maybeValidPath);
+            debugLog(`[Watcher] Access to ${maybeValidPath} successful.`);
+            return maybeValidPath;
         }
-        catch {
-            log(`[Watcher] Longest common prefix (${normalizedPath}) is not accessible`);
-            log(`[Watcher] Watching current working directory (${normalize(process.cwd())}) instead`);
-            return normalize(process.cwd());
+        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();
         }
     })(longestCommonPrefix(dirPaths.map(path => path.split(sep))).join(sep));
 };
@@ -197,17 +200,15 @@ const findHighestCommonDirectory = async (files) => {
  * @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 [];
     }
-    // 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
+            debugLog(`[Watcher] longestCommonPrefix at index ${i}: ${splitPaths[0].slice(0, i).join(sep)}`);
             return splitPaths[0].slice(0, i);
         }
     }
+    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-20230725231005-5bc75d7f6",
+  "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"
   },