fix(cli): fix watching of schema files outside of working directory (#…

…1998) * chore(package/cli): cosmetic touch-ups * chore(package/cli): changeset --------- Co-authored-by: Vicary A <[email protected]>
gqty-dev · Aug 20, 2024 · 6bbdce8 · 6bbdce8
1 parent 1be3502
commit 6bbdce8
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 24 deletions.
diff --git a/.changeset/brown-beers-remain.md b/.changeset/brown-beers-remain.md
@@ -0,0 +1,5 @@
+---
+'@gqty/cli': patch
+---
+
+Allow watch targets above current working directory
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -108,9 +108,18 @@
     "typescript": "^5.5.4",
     "wait-on": "^7.2.0"
   },
-  "optionalDependencies": {
+  "peerDependencies": {
+    "iter-ops": "^3.5.0",
     "trading-signals": "^5.0.4"
   },
+  "peerDependenciesMeta": {
+    "iter-ops": {
+      "optional": true
+    },
+    "trading-signals": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "directory": "dist"
   }

diff --git a/packages/cli/src/commands/default.ts b/packages/cli/src/commands/default.ts
@@ -2,8 +2,9 @@ import type { PackageJSON } from 'bob-esbuild/config/packageJson';
 import type { Command } from 'commander';
 import { cosmiconfig } from 'cosmiconfig';
 import { readFile, watch } from 'node:fs/promises';
+import path from 'node:path';
 import type { GQtyConfig } from '../config';
-import { inquirer } from '../deps';
+import { fg, inquirer } from '../deps';
 import { convertHeadersInput } from './default/convertHeadersInput';
 import { fetchSchema, isURL } from './default/fetchSchema';
 import { generateClient } from './default/generateClient';
@@ -180,14 +181,15 @@ export const addCommand = (command: Command) => {
 
       // Watch mode
       if (options.watch) {
-        const { printSchema } = await import('graphql');
-        const { FasterSMA: SMA } = await import(
-          'trading-signals/dist/SMA/SMA.js'
-        );
-        const { default: throttle } = await import('lodash-es/throttle.js');
         const {
           default: { isMatch },
         } = await import('micromatch');
+        const { default: throttle } = await import('lodash-es/throttle.js');
+        const { FasterSMA: SMA } = await import(
+          'trading-signals/dist/SMA/SMA.js'
+        );
+        const { flat, map, pipeAsync } = await import('iter-ops');
+        const { printSchema } = await import('graphql');
 
         const sma = new SMA(3);
         const getMovingAverage = () => {
@@ -272,22 +274,44 @@ export const addCommand = (command: Command) => {
 
         // Watch file changes
         (async () => {
+          const matchPatterns = endpoints.map((endpoint) =>
+            // micromatch does not understand relative patterns, normalize them
+            // ahead of time.
+            path.resolve(endpoint)
+          );
+          const watchTargets = await fg(matchPatterns).then((files) => [
+            ...new Set(files.map((file) => path.dirname(file))),
+          ]);
+
+          const watchIterable = pipeAsync(
+            watchTargets,
+            map((watchTarget) =>
+              pipeAsync(
+                watch(watchTarget),
+                map(({ filename }) =>
+                  filename ? path.resolve(watchTarget, filename) : null
+                )
+              )
+            ),
+            flat()
+          );
+
           let shouldRun = false;
 
-          for await (const { filename } of watch('.', { recursive: true })) {
-            if (filename && isMatch(filename, endpoints)) {
-              // Already queued
-              if (shouldRun) continue;
-              shouldRun = true;
+          for await (const filePath of watchIterable) {
+            if (filePath && !isMatch(filePath, matchPatterns)) continue;
 
-              process.nextTick(() => {
-                // Already executed
-                if (!shouldRun) return;
-                shouldRun = false;
+            // Already queued
+            if (shouldRun) continue;
+            shouldRun = true;
 
-                doGenerateSchema();
-              });
-            }
+            process.nextTick(() => {
+              // Already executed
+              if (!shouldRun) return;
+              shouldRun = false;
+
+              doGenerateSchema();
+            });
           }
         })();
       }

diff --git a/packages/cli/src/commands/default/fetchSchema.ts b/packages/cli/src/commands/default/fetchSchema.ts
@@ -23,7 +23,7 @@ export class FetchError extends Error {
 }
 
 export type FetchSchemasOptions = {
-  headers?: Record<string, string>;
+  headers?: HeadersInit;
   headersByEndpoint?: GQtyConfig['introspections'];
   silent?: boolean;
 };

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml