@hypequery/cli 1.10.0 → 1.10.1

package/dist/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA6BD,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,iBAwMvE"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA6BD,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,iBAkQvE"}

package/dist/commands/dev.js

@@ -65,7 +65,42 @@ export async function devCommand(file, options = {}) {
     logger.newline();
     let currentServer = null;
     let currentGateway = null;
+    let lifecycleOperation = Promise.resolve();
+    let shutdownRequested = false;
     const shouldWatch = options.watch !== false; // Default to true
+    const queueLifecycleOperation = (operation) => {
+        const queued = lifecycleOperation.then(operation, operation);
+        lifecycleOperation = queued.catch(() => undefined);
+        return queued;
+    };
+    const stopCurrentRuntime = async () => {
+        const gateway = currentGateway;
+        const server = currentServer;
+        // Clear references before awaiting teardown so a second signal or restart
+        // cannot stop the same resources twice.
+        currentGateway = null;
+        currentServer = null;
+        let teardownError;
+        if (gateway) {
+            try {
+                await gateway.shutdown();
+            }
+            catch (error) {
+                teardownError = error;
+            }
+        }
+        if (server) {
+            try {
+                await server.stop();
+            }
+            catch (error) {
+                teardownError ??= error;
+            }
+        }
+        if (teardownError) {
+            throw teardownError;
+        }
+    };
     const startServer = async () => {
         // Loading spinners for slow operations
         const compileSpinner = ora('Compiling queries...').start();
@@ -146,6 +181,16 @@ export async function devCommand(file, options = {}) {
             }
         }
         catch (error) {
+            // Gateway creation happens before serveDev so its mount can be passed to
+            // the server. If server startup (or any later setup) fails, tear down all
+            // resources acquired by this attempt before retrying or exiting.
+            try {
+                await stopCurrentRuntime();
+            }
+            catch (teardownError) {
+                const message = teardownError instanceof Error ? teardownError.message : String(teardownError);
+                logger.warn(`Failed to clean up dev server resources: ${message}`);
+            }
             // Stop spinners if they're still running
             if (compileSpinner.isSpinning) {
                 compileSpinner.fail('Failed to compile queries');
@@ -172,26 +217,29 @@ export async function devCommand(file, options = {}) {
             }
         }
     };
-    const restartServer = async () => {
-        if (currentServer) {
+    const restartServer = () => queueLifecycleOperation(async () => {
+        if (shutdownRequested)
+            return;
+        if (currentServer || currentGateway) {
             logger.newline();
             logger.reload('File changed, restarting...');
             logger.newline();
-            if (currentGateway)
-                await currentGateway.shutdown();
-            await currentServer.stop();
+            await stopCurrentRuntime();
         }
-        await startServer();
-    };
-    const shutdown = async () => {
+        if (!shutdownRequested) {
+            await startServer();
+        }
+    });
+    const shutdown = () => {
+        if (shutdownRequested)
+            return lifecycleOperation;
+        shutdownRequested = true;
         logger.newline();
         logger.info('Shutting down dev server...');
-        if (currentGateway)
-            await currentGateway.shutdown();
-        if (currentServer) {
-            await currentServer.stop();
-        }
-        process.exit(0);
+        return queueLifecycleOperation(async () => {
+            await stopCurrentRuntime();
+            process.exit(0);
+        });
     };
     // Start initial server
     await startServer();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Command-line interface for hypequery",
   "license": "Apache-2.0",
   "type": "module",