@sanity/runtime-cli 7.2.0 → 7.3.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @sanity/runtime-cli
 $ sanity-run COMMAND
 running command...
 $ sanity-run (--version)
-@sanity/runtime-cli/7.2.0 linux-x64 node-v22.15.0
+@sanity/runtime-cli/7.3.0 linux-x64 node-v22.15.0
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -84,7 +84,7 @@ EXAMPLES
   $ sanity-run blueprints add function --name my-function --fn-type document-publish --lang js
 ```
 
-_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -112,7 +112,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -134,7 +134,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --no-wait
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -155,7 +155,7 @@ EXAMPLES
   $ sanity-run blueprints destroy
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ sanity-run blueprints info
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -204,7 +204,7 @@ EXAMPLES
   $ sanity-run blueprints init --blueprint-type <json|js|ts> --project-id <projectId>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -226,7 +226,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -243,7 +243,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run functions dev`
 
@@ -263,7 +263,7 @@ EXAMPLES
   $ sanity-run functions dev --port 8974
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -285,7 +285,7 @@ EXAMPLES
   $ sanity-run functions env add MyFunction API_URL https://api.example.com/
 ```
 
-_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -305,7 +305,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -326,7 +326,7 @@ EXAMPLES
   $ sanity-run functions env remove MyFunction API_URL
 ```
 
-_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs NAME`
 
@@ -360,7 +360,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -393,7 +393,7 @@ EXAMPLES
   $ sanity-run functions test <name> --data '{ "id": 1 }' --timeout 60
 ```
 
-_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v7.3.0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/cores/blueprints/deploy.js

@@ -3,19 +3,22 @@ import chalk from 'chalk';
 import ora from 'ora';
 import { stashAsset } from '../../actions/blueprints/assets.js';
 import { getStack, updateStack } from '../../actions/blueprints/stacks.js';
+import { setupLogStreaming } from '../../utils/display/blueprints-logs-streaming.js';
 import { niceId } from '../../utils/display/presenters.js';
 import { isLocalFunctionResource } from '../../utils/types.js';
 export async function blueprintDeployCore(options) {
     const { bin = 'sanity', log, auth, stackId, projectId, deployedStack, blueprint, flags } = options;
     const noWait = flags['no-wait'] || false;
+    log(`Deploying "${deployedStack.name}" ${niceId(deployedStack.id)}...`);
     try {
         const { resources } = blueprint.parsedBlueprint;
         const validResources = resources?.filter((r) => r.type);
         const functionResources = validResources?.filter(isLocalFunctionResource);
         // First stash all function assets
         if (functionResources?.length) {
+            log('Processing function assets...');
             for (const resource of functionResources) {
-                const fnSpinner = ora(`Processing ${resource.name}...`).start();
+                const fnSpinner = ora({ text: `Processing ${resource.name}...`, prefixText: ' ' }).start();
                 const result = await stashAsset({ resource, auth });
                 if (result.success && result.assetId) {
                     const src = resource.src;
@@ -37,45 +40,59 @@ export async function blueprintDeployCore(options) {
         };
         const spinner = ora('Deploying...').start();
         const { ok: deployOk, stack, error: deployError, } = await updateStack({ stackId, stackPayload, auth });
-        if (deployOk) {
-            spinner.succeed(`Deployment "${chalk.bold(stack.name)}" ${niceId(stack.id)} started!`);
-            if (!noWait) {
-                const waitSpinner = ora('Waiting for deployment to complete...').start();
-                while (true) {
-                    // TODO: watch logs and print those while polling
-                    const { ok, stack: currentStack } = await getStack({ stackId: stack.id, auth });
-                    if (!ok) {
-                        waitSpinner.fail('Failed to check deployment status');
-                        return { success: false, error: 'Failed to check deployment status' };
-                    }
-                    const operation = currentStack.recentOperation;
-                    if (!operation) {
-                        waitSpinner.fail('No operation found');
-                        return { success: false, error: 'No operation found' };
-                    }
-                    if (operation.status === 'COMPLETED') {
-                        waitSpinner.succeed('Deployment completed successfully');
-                        break;
-                    }
-                    if (operation.status === 'FAILED') {
-                        waitSpinner.fail('Deployment failed');
-                        return { success: false, error: 'Deployment failed' };
-                    }
-                    await setTimeout(1000);
+        if (!deployOk) {
+            spinner.fail(`${chalk.red('Failed')} to update deployment`);
+            return { success: false, error: deployError || 'Failed to update deployment' };
+        }
+        spinner.stop().clear();
+        if (noWait) {
+            log(chalk.bold.green('Deployment started!'));
+            log(`Use \`${bin} blueprints info\` to check status`);
+            return { success: true };
+        }
+        log(chalk.dim('Deployment progress:'));
+        let logStreamCleanup = null;
+        try {
+            logStreamCleanup = await setupLogStreaming({
+                stackId: stack.id,
+                auth,
+                log,
+            });
+            while (true) {
+                const { ok, stack: currentStack } = await getStack({ stackId: stack.id, auth });
+                if (!ok) {
+                    if (logStreamCleanup)
+                        logStreamCleanup();
+                    return { success: false, error: 'Failed to check deployment status' };
                 }
+                const operation = currentStack.recentOperation;
+                if (!operation) {
+                    if (logStreamCleanup)
+                        logStreamCleanup();
+                    return { success: false, error: 'No deployment operation found' };
+                }
+                if (operation.status === 'FAILED') {
+                    if (logStreamCleanup)
+                        logStreamCleanup();
+                    return { success: false, error: 'Deployment failed' };
+                }
+                if (operation.status === 'COMPLETED') {
+                    if (logStreamCleanup)
+                        logStreamCleanup();
+                    log(chalk.bold.green('Deployment completed!'));
+                    return { success: true };
+                }
+                await setTimeout(1500);
             }
-            else {
-                log(`Use \`${bin} blueprints info\` to check status`);
-            }
-            return { success: true };
         }
-        spinner.fail(`${chalk.red('Failed')} to update deployment`);
-        log(`Error: ${deployError || JSON.stringify(stack, null, 2) || 'Unknown error'}`);
-        return { success: false, error: deployError || 'Failed to update deployment' };
+        catch (error) {
+            if (logStreamCleanup)
+                logStreamCleanup();
+            throw error;
+        }
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        log(`Error: ${errorMessage}`);
         return { success: false, error: errorMessage };
     }
 }

package/dist/cores/blueprints/destroy.js

@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import inquirer from 'inquirer';
 import ora from 'ora';
 import { destroyStack, getStack } from '../../actions/blueprints/stacks.js';
+import { setupLogStreaming } from '../../utils/display/blueprints-logs-streaming.js';
 import { niceId } from '../../utils/display/presenters.js';
 export async function blueprintDestroyCore(options) {
     const { bin = 'sanity', log, token, blueprint, flags } = options;
@@ -73,34 +74,47 @@ export async function blueprintDestroyCore(options) {
             destroySpinner.fail('Failed to destroy deployment');
             return { success: false, error: error || 'Failed to destroy deployment' };
         }
+        destroySpinner.stop().clear();
         if (noWait) {
-            destroySpinner.succeed(`Deployment "${stack.name}" ${niceId(stack.id)} destroy started!`);
+            log(chalk.bold.magenta('Destruction started!'));
             log(`Use \`${bin} blueprints info\` to check status`);
             return { success: true };
         }
-        destroySpinner.stop();
-        const waitSpinner = ora('Waiting for destruction to complete...').start();
-        while (true) {
-            const { ok: pollOk, stack: currentStack } = await getStack({ stackId: stack.id, auth });
-            const operation = currentStack?.recentOperation;
-            if (!pollOk || !operation || operation?.status === 'COMPLETED') {
-                // Operation is also marked destroyed when stack is deleted
-                // It's possible that the operation is "gone" or available and "COMPLETED"
-                waitSpinner.succeed(`Deployment "${stack.name}" ${niceId(stack.id)} destroyed`);
-                break;
+        log(chalk.dim('Destruction progress:'));
+        let logStreamCleanup = null;
+        try {
+            logStreamCleanup = await setupLogStreaming({
+                stackId: stack.id,
+                auth,
+                log,
+            });
+            while (true) {
+                const { ok, stack: currentStack } = await getStack({ stackId: stack.id, auth });
+                const operation = currentStack?.recentOperation;
+                if (!ok || !operation || operation?.status === 'COMPLETED') {
+                    // Operation is also marked destroyed when stack is deleted;
+                    // it's possible that the operation is "gone" or available and "COMPLETED"
+                    if (logStreamCleanup)
+                        logStreamCleanup();
+                    log(chalk.bold.magenta('Destruction completed!'));
+                    return { success: true };
+                }
+                if (operation.status === 'FAILED') {
+                    if (logStreamCleanup)
+                        logStreamCleanup();
+                    return { success: false, error: 'Destruction failed' };
+                }
+                await setTimeout(1500);
             }
-            if (operation.status === 'FAILED') {
-                waitSpinner.fail('Destruction failed');
-                log(`Run \`${bin} blueprints logs\` for more details`);
-                return { success: false, error: 'Destruction failed' };
-            }
-            await setTimeout(1000);
         }
-        return { success: true };
+        catch (error) {
+            if (logStreamCleanup)
+                logStreamCleanup();
+            throw error;
+        }
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        log(`Error: ${errorMessage}`);
         return { success: false, error: errorMessage };
     }
 }

package/dist/cores/blueprints/logs.js

@@ -1,7 +1,8 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import { findNewestLogTimestamp, getLogs, getRecentLogs, isNewerLog, streamLogs, } from '../../actions/blueprints/logs.js';
+import { getLogs, getRecentLogs } from '../../actions/blueprints/logs.js';
 import { formatTitle } from '../../utils/display/blueprints-formatting.js';
+import { setupLogStreaming } from '../../utils/display/blueprints-logs-streaming.js';
 import { formatLogEntry, formatLogsByDay, organizeLogsByDay, } from '../../utils/display/logs-formatting.js';
 import { niceId } from '../../utils/display/presenters.js';
 export async function blueprintLogsCore(options) {
@@ -28,17 +29,14 @@ export async function blueprintLogsCore(options) {
             else {
                 log(`No recent logs found for deployment ${niceId(stackId)}`);
             }
-            const onOpen = () => {
-                log(`Watching for new logs... ${chalk.bold('ctrl+c')} to stop`);
-            };
-            let newestTimestamp = findNewestLogTimestamp(logs);
-            const renderLog = (logEntry) => {
-                if (!isNewerLog(logEntry, newestTimestamp))
-                    return;
-                newestTimestamp = new Date(logEntry.timestamp).getTime();
-                log(formatLogEntry(logEntry, true));
-            };
-            streamLogs(stackId, auth, renderLog, onOpen, (error) => log(`${chalk.red('Error:')} ${error}`));
+            // Set up streaming log display
+            const streamCleanup = await setupLogStreaming({
+                stackId,
+                auth,
+                log,
+                showBanner: true,
+            });
+            // Note: don't call streamCleanup() here, it will close the stream
             // Return a special key for streaming mode
             return {
                 success: true,

package/dist/utils/display/blueprints-logs-streaming.d.ts

@@ -0,0 +1,13 @@
+import type { AuthParams } from '../types.js';
+export interface LogStreamingConfig {
+    stackId: string;
+    auth: AuthParams;
+    showBanner?: boolean;
+    log: (message: string) => void;
+}
+/**
+ * Sets up log streaming for operations like deploy or destroy with spinner integration
+ * @param config Configuration for log streaming
+ * @returns A cleanup function for closing the log stream
+ */
+export declare function setupLogStreaming(config: LogStreamingConfig): Promise<() => void>;

package/dist/utils/display/blueprints-logs-streaming.js

@@ -0,0 +1,26 @@
+import chalk from 'chalk';
+import { isNewerLog, streamLogs } from '../../actions/blueprints/logs.js';
+import { formatLogEntry } from './logs-formatting.js';
+/**
+ * Sets up log streaming for operations like deploy or destroy with spinner integration
+ * @param config Configuration for log streaming
+ * @returns A cleanup function for closing the log stream
+ */
+export async function setupLogStreaming(config) {
+    const { stackId, auth, log, showBanner } = config;
+    let newestTimestamp = new Date().getTime();
+    const onLogReceived = (logEntry) => {
+        if (!isNewerLog(logEntry, newestTimestamp))
+            return;
+        newestTimestamp = new Date(logEntry.timestamp).getTime();
+        log(formatLogEntry(logEntry, true));
+    };
+    const onStreamOpen = () => {
+        if (showBanner)
+            log(`Streaming logs... ${chalk.bold('ctrl+c')} to cancel`);
+    };
+    const onStreamError = (error) => {
+        log(`${chalk.yellow('Stream error:')} ${error}`);
+    };
+    return streamLogs(stackId, auth, onLogReceived, onStreamOpen, onStreamError);
+}

package/oclif.manifest.json

@@ -839,5 +839,5 @@
       ]
     }
   },
-  "version": "7.2.0"
+  "version": "7.3.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",