@graphql-codegen/cli 4.0.2-alpha-20230706143738-f59fb0497 → 5.0.0-alpha-20230707093646-96773d928

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)(() => {
@@ -185,39 +193,27 @@ 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)];
+            return splitPaths[0].slice(0, i);
         }
     }
-    return [driveLetter, ...splitPaths[0]];
+    return splitPaths[0];
 };

package/esm/utils/watcher.js

@@ -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(() => {
@@ -180,39 +188,27 @@ 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)];
+            return splitPaths[0].slice(0, i);
         }
     }
-    return [driveLetter, ...splitPaths[0]];
+    return splitPaths[0];
 };

package/package.json

@@ -1,7 +1,13 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "4.0.2-alpha-20230706143738-f59fb0497",
+  "version": "5.0.0-alpha-20230707093646-96773d928",
+  "peerDependenciesMeta": {
+    "@parcel/watcher": {
+      "optional": true
+    }
+  },
   "peerDependencies": {
+    "@parcel/watcher": "^2.1.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"
   },
   "dependencies": {
@@ -20,7 +26,6 @@
     "@graphql-tools/prisma-loader": "^8.0.0",
     "@graphql-tools/url-loader": "^8.0.0",
     "@graphql-tools/utils": "^10.0.0",
-    "@parcel/watcher": "^2.1.0",
     "@whatwg-node/fetch": "^0.8.0",
     "chalk": "^4.1.0",
     "cosmiconfig": "^8.1.3",