Merge pull request #2210 from hey-api/fix/bin-watch

fix(cli): correctly handle watch mode

Author: mrlubos

.changeset/young-years-push.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix(cli): correctly detect watch mode

packages/openapi-ts-tests/test/openapi-ts.config.ts

@@ -69,7 +69,6 @@ export default defineConfig(() => {
       // project: 'upload-openapi-spec',
       validate_EXPERIMENTAL: true,
       // version: '1.0.0',
-      // watch: 5_000,
       // watch: {
       //   enabled: true,
       //   interval: 500,

packages/openapi-ts/bin/index.cjs

@@ -129,7 +129,13 @@ async function start() {
     }
 
     const context = await createClient(userConfig);
-    if (!context[0] || !context[0].config.watch) {
+    if (
+      !context[0] ||
+      !context[0].config ||
+      !context[0].config.input ||
+      !context[0].config.input.watch ||
+      !context[0].config.input.watch.enabled
+    ) {
       process.exit(0);
     }
   } catch {

packages/openapi-ts/src/createClient.ts

@@ -132,26 +132,8 @@ export const compileInputPath = (
   return result;
 };
 
-const logInputPath = ({
-  config,
-  inputPath,
-  watch,
-}: {
-  config: Config;
-  inputPath: ReturnType<typeof compileInputPath>;
-  watch?: boolean;
-}) => {
-  if (config.logs.level === 'silent') {
-    return;
-  }
-
-  if (watch) {
-    console.clear();
-  }
-
-  const baseString = watch
-    ? colors.magenta('Input changed, generating from')
-    : colors.cyan('Generating from');
+const logInputPath = (inputPath: ReturnType<typeof compileInputPath>) => {
+  const baseString = colors.cyan('Generating from');
 
   if (typeof inputPath.path === 'string') {
     const baseInput = isPlatformPath(inputPath.path)
@@ -192,18 +174,20 @@ export const createClient = async ({
 }: {
   config: Config;
   templates: Templates;
+  /**
+   * Always falsy on the first run, truthy on subsequent runs.
+   */
   watch?: WatchValues;
 }) => {
   const inputPath = compileInputPath(config.input);
   const { timeout } = config.input.watch;
 
   const watch: WatchValues = _watch || { headers: new Headers() };
 
-  logInputPath({
-    config,
-    inputPath,
-    watch: Boolean(_watch),
-  });
+  // on first run, print the message as soon as possible
+  if (config.logs.level !== 'silent' && !_watch) {
+    logInputPath(inputPath);
+  }
 
   Performance.start('spec');
   const { data, error, response } = await getSpec({
@@ -227,6 +211,13 @@ export const createClient = async ({
   let context: IR.Context | undefined;
 
   if (data) {
+    // on subsequent runs in watch mode, print the mssage only if we know we're
+    // generating the output
+    if (config.logs.level !== 'silent' && _watch) {
+      console.clear();
+      logInputPath(inputPath);
+    }
+
     Performance.start('input.patch');
     patchOpenApiSpec({ patchOptions: config.input.patch, spec: data });
     Performance.end('input.patch');