@sanity/runtime-cli 1.8.0 → 1.8.2

package/dist/commands/blueprints/init.js

@@ -26,9 +26,8 @@ export default class Init extends Command {
             },
         ]);
         const { ok, projects, error } = await listProjects();
-        if (!ok) {
+        if (!ok)
             this.error(error);
-        }
         if (projects.length === 0) {
             this.error('No projects found. Please create a project in Sanity.io first.');
         }

package/dist/commands/blueprints/logs.js

@@ -1,5 +1,5 @@
 import { Command, Flags } from '@oclif/core';
-import { Spinner } from 'picospinner';
+import Spinner from 'yocto-spinner';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
 import { findNewestLogTimestamp, getLogs, getRecentLogs, isNewerLog, streamLogs, } from '../../actions/blueprints/logs.js';
 import config from '../../config.js';
@@ -33,17 +33,16 @@ export default class Logs extends Command {
             if (!deployedStack)
                 this.error('Stack not found'); // returns
             const { id: stackId, projectId, name } = deployedStack;
-            const spinner = new Spinner(`Fetching logs for stack ${yellow(`<${stackId}>`)}`);
-            spinner.start();
+            const spinner = Spinner({ text: `Fetching logs for stack ${yellow(`<${stackId}>`)}` }).start();
             if (watchMode) {
                 const { ok, logs, error } = await getLogs(stackId, projectId, config.token);
                 if (!ok) {
-                    spinner.fail(`${red('Failed')} to retrieve logs`);
+                    spinner.error(`${red('Failed')} to retrieve logs`);
                     this.log(`Error: ${error || 'Unknown error'}`);
                     return;
                 }
-                spinner.stop(); // stop and remove the spinner
-                this.log(`${formatTitle('Blueprint', name)} ${bold('Live')} Logs`);
+                spinner.stop().clear(); // stop and remove the spinner
+                this.log(`${formatTitle('Blueprint', name)} <${yellow(stackId)}> logs`);
                 if (logs.length > 0) {
                     this.log('\nMost recent logs:');
                     const recentLogs = getRecentLogs(logs);
@@ -52,18 +51,22 @@ export default class Logs extends Command {
                     }
                 }
                 else {
-                    this.log(`No recent logs found for stack ${yellow(stackId)}`);
+                    this.log(`No recent logs found for stack <${yellow(stackId)}>`);
+                }
+                const watchSpinner = Spinner();
+                function onOpen() {
+                    if (watchSpinner.isSpinning)
+                        watchSpinner.stop().clear();
+                    watchSpinner.text = `Watching for new logs... ${bold('ctrl+c')} to stop`;
+                    watchSpinner.start();
                 }
-                const onOpen = () => {
-                    this.log(`Watching for new logs... ${bold('ctrl+c')} to stop`);
-                };
                 let newestTimestamp = findNewestLogTimestamp(logs);
                 const renderLog = (log) => {
-                    if (!isNewerLog(log, newestTimestamp)) {
+                    if (!isNewerLog(log, newestTimestamp))
                         return;
-                    }
                     newestTimestamp = new Date(log.timestamp).getTime();
                     this.log(formatLogEntry(log, true));
+                    onOpen();
                 };
                 this.debug(`${yellow('Debug:')} Connecting to streaming endpoint for stack ${stackId}...`);
                 streamLogs(stackId, projectId, config.token, renderLog, onOpen, (error) => this.log(`${red('Error:')} ${error}`));
@@ -73,7 +76,7 @@ export default class Logs extends Command {
             }
             const { ok, logs, error } = await getLogs(stackId, projectId, config.token);
             if (!ok) {
-                spinner.fail(`${red('Failed')} to retrieve logs`);
+                spinner.error(`${red('Failed')} to retrieve logs`);
                 this.log(`Error: ${error || 'Unknown error'}`);
                 return;
             }
@@ -81,7 +84,7 @@ export default class Logs extends Command {
                 spinner.info(`No logs found for stack ${stackId}`);
                 return;
             }
-            spinner.succeed(`${formatTitle('Blueprint', name)} Logs`);
+            spinner.success(`${formatTitle('Blueprint', name)} Logs`);
             this.log(`Found ${bold(logs.length.toString())} log entries for stack ${yellow(stackId)}\n`);
             // Organize and format logs by day
             const logsByDay = organizeLogsByDay(logs);
@@ -89,9 +92,8 @@ export default class Logs extends Command {
         }
         catch (err) {
             this.warn('Failed to retrieve logs');
-            if (err instanceof Error) {
+            if (err instanceof Error)
                 this.error(`Error: ${err.message}`);
-            }
         }
     }
 }

package/dist/commands/blueprints/plan.js

@@ -18,9 +18,7 @@ export default class Plan extends Command {
         this.log(`${formatTitle('Blueprint', name)} Plan\n`);
         this.log(`Blueprint document: (${fileInfo.fileName})`);
         this.log('');
-        formatResourceTree(resources, this.log.bind(this));
-        if (resources.length > 0) {
-            this.log('\nRun `sanity blueprints deploy` to deploy these changes');
-        }
+        this.log(formatResourceTree(resources));
+        this.log('\nRun `sanity blueprints deploy` to deploy these changes');
     }
 }

package/dist/commands/blueprints/stacks.js

@@ -19,10 +19,10 @@ export default class Stacks extends Command {
         if (!ok)
             this.error(error || 'Failed to list stacks');
         if (!stacks || stacks.length === 0) {
-            this.log('No stacks found');
+            this.warn('No stacks found');
             return;
         }
-        this.log(`${bold('Project')} <${yellow(projectId)}> ${bold('Stacks')} :\n`);
+        this.log(`${bold('Project')} <${yellow(projectId)}> ${bold('Stacks')}:\n`);
         this.log(formatStacksListing(stacks, stackId));
     }
 }

package/dist/commands/functions/invoke.js

@@ -1,5 +1,5 @@
 import { Args, Command, Flags } from '@oclif/core';
-import { Spinner } from 'picospinner';
+import Spinner from 'yocto-spinner';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
 import { invoke } from '../../actions/functions/invoke.js';
 import config from '../../config.js';
@@ -24,20 +24,19 @@ export default class Invoke extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(Invoke);
-        const spinner = new Spinner(`Invoking function "${args.name}"`);
+        const spinner = Spinner({ text: `Invoking function "${args.name}"` }).start();
         const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { projectId } = deployedStack;
-        spinner.start();
         const { externalId } = findFunctionByName(deployedStack, args.name);
         const result = await invoke(externalId, { data: flags.data, file: flags.file }, { token: config.token, projectId });
         if (result.ok) {
-            spinner.succeed(`Invocation of ${args.name} succeeded`);
+            spinner.success(`Invocation of ${args.name} succeeded`);
             this.log(JSON.stringify(result.json, null, 2));
         }
         else {
-            spinner.fail(`${red('Failed')} to invoke function`);
+            spinner.error(`${red('Failed')} to invoke function`);
             this.log(`Error: ${result.error || 'Unknown error'}`);
         }
     }

package/dist/commands/functions/logs.js

@@ -1,5 +1,5 @@
 import { Args, Command } from '@oclif/core';
-import { Spinner } from 'picospinner';
+import Spinner from 'yocto-spinner';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
 import { logs } from '../../actions/functions/logs.js';
 import config from '../../config.js';
@@ -13,16 +13,15 @@ export default class Logs extends Command {
     static examples = ['<%= config.bin %> <%= command.id %> <ID>'];
     async run() {
         const { args } = await this.parse(Logs);
-        const spinner = new Spinner(`Finding logs for function "${args.name}"`);
+        const spinner = Spinner({ text: `Finding logs for function "${args.name}"` }).start();
         const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { name, projectId } = deployedStack;
-        spinner.start();
         const { externalId } = findFunctionByName(deployedStack, args.name);
         const result = await logs(externalId, { token: config.token, projectId });
         if (result.ok) {
-            spinner.succeed(`Found logs ${args.name} for blueprint "${name}"`);
+            spinner.success(`Found logs ${args.name} for blueprint "${name}"`);
             for (const logGroup of result.logs) {
                 for (const log of logGroup.events) {
                     const { message, timestamp } = log;
@@ -41,7 +40,7 @@ export default class Logs extends Command {
             }
         }
         else {
-            spinner.fail(`${red('Failed')} to retrieve logs`);
+            spinner.error(`${red('Failed')} to retrieve logs`);
             this.log(`Error: ${result.error || 'Unknown error'}`);
         }
     }

package/dist/config.js

@@ -4,6 +4,7 @@ const nodeEnv = env.NODE_ENV ?? 'production';
 const isTest = nodeEnv === 'test';
 const isDev = nodeEnv === 'development';
 const useProd = nodeEnv === 'production';
+const isPublishing = env?.PUBLISHING === 'true';
 const apiUrls = {
     production: 'https://api.sanity.io/',
     staging: 'https://api.sanity.work/',
@@ -22,7 +23,7 @@ const blueprintsUrls = {
 const functionsUrl = new URL(functionsUrls[nodeEnv] ?? functionsUrls.default);
 const blueprintsUrl = new URL(blueprintsUrls[nodeEnv] ?? blueprintsUrls.default);
 export default {
-    token: isDev || isTest ? 'token' : getToken({ prod: useProd }),
+    token: isDev || isTest || isPublishing ? 'token' : getToken({ prod: useProd }),
     apiUrl,
     server: {
         functions: functionsUrl,

package/dist/utils/display/blueprints-formatting.d.ts

@@ -1,6 +1,5 @@
 import type { BlueprintResource, BlueprintStack } from '../types.js';
 export declare function formatTitle(title: string, name: string): string;
-export declare function formatStacksList(stacks: string[]): string;
-export declare function formatResourceTree(resources: BlueprintResource[], logger: (msg: string) => void): void;
+export declare function formatResourceTree(resources: BlueprintResource[]): string;
 export declare function formatStackInfo(stack: BlueprintStack, isCurrentStack?: boolean): string;
 export declare function formatStacksListing(stacks: BlueprintStack[], currentStackId?: string): string;

package/dist/utils/display/blueprints-formatting.js

@@ -1,67 +1,78 @@
-import { blue, bold, boldnblue, green, yellow } from './colors.js';
-import { formatDate } from './dates.js';
+import { treeify } from 'array-treeify';
+import { blue, bold, boldnblue, green, red, yellow } from './colors.js';
+import { formatDate, formatDuration } from './dates.js';
 export function formatTitle(title, name) {
     return `${boldnblue(title)} ${bold(`"${name}"`)}`;
 }
-export function formatStacksList(stacks) {
-    if (!stacks || stacks.length === 0) {
-        return 'No stacks found';
-    }
-    let result = '\nFound Stacks:\n';
-    for (const name of stacks) {
-        result += `  ${name}\n`;
-    }
-    return result;
-}
-export function formatResourceTree(resources, logger) {
+export function formatResourceTree(resources) {
     if (!resources || resources.length === 0) {
-        logger('  No resources in this stack');
-        return;
+        return '  No resources in this stack';
     }
-    logger(`${blue('Stack Resources')} [${resources.length}]`);
+    const output = [];
+    output.push(`${blue('Stack Resources')} [${resources.length}]`);
     const functionResources = resources.filter((r) => r.type?.startsWith('sanity.function.'));
     const otherResources = resources.filter((r) => !r.type?.startsWith('sanity.function.'));
     const hasOtherResources = otherResources.length > 0;
     if (functionResources.length > 0) {
-        logger(`  ${hasOtherResources ? '├─' : '└─'} ${bold('Functions')} [${functionResources.length}]`);
-        for (const [i, fn] of functionResources.entries()) {
-            const isLast = i === functionResources.length - 1;
-            const prefix = hasOtherResources ? '│' : ' ';
-            const connector = isLast ? '└─' : '├─';
+        const functionsOutput = [];
+        functionsOutput.push(`${bold('Functions')} [${functionResources.length}]`);
+        const functionResourcesOutput = functionResources.map((fn) => {
             const name = green(fn.displayName || fn.name);
             const externalId = fn.externalId ? `Fn<${yellow(fn.externalId)}>` : '';
-            logger(`  ${prefix}   ${connector} "${name}" ${externalId}`);
-        }
+            return `"${name}" ${externalId}`;
+        });
+        functionsOutput.push(functionResourcesOutput);
+        output.push(functionsOutput);
     }
     if (hasOtherResources) {
-        logger(`  └─ ${bold('Other Resources')} [${otherResources.length}]`);
-        for (const [i, other] of otherResources.entries()) {
-            const isLast = i === otherResources.length - 1;
-            logger(`       ${isLast ? '└─' : '├─'} "${yellow(other.displayName || other.name || other.src)}"`);
-        }
+        const otherOutput = [];
+        otherOutput.push(`${bold('Other Resources')} [${otherResources.length}]`);
+        const otherResourcesOutput = otherResources.map((other) => {
+            return `"${yellow(other.displayName || other.name || other.src)}"`;
+        });
+        otherOutput.push(otherResourcesOutput);
+        output.push(otherOutput);
     }
+    return treeify(output);
 }
 export function formatStackInfo(stack, isCurrentStack = false) {
-    let result = '';
+    const output = [];
     const stackName = isCurrentStack ? boldnblue(stack.name) : bold(stack.name);
-    result += `${stackName} <${yellow(stack.id)}>${isCurrentStack ? ' (current)' : ''}\n`;
-    if (stack.createdAt) {
-        result += `  Created: ${formatDate(stack.createdAt)}\n`;
-    }
-    if (stack.updatedAt) {
-        result += `  Updated: ${formatDate(stack.updatedAt)}\n`;
+    output.push(`"${stackName}" <${yellow(stack.id)}>${isCurrentStack ? ' (current)' : ''}`);
+    const infoOutput = [];
+    infoOutput.push(`${stack.resources.length} resource${stack.resources.length === 1 ? '' : 's'}`);
+    if (stack.createdAt)
+        infoOutput.push(`Created: ${formatDate(stack.createdAt)}`);
+    if (stack.updatedAt)
+        infoOutput.push(`Updated: ${formatDate(stack.updatedAt)}`);
+    if (stack.recentOperation) {
+        const operation = stack.recentOperation;
+        const operationOutput = [];
+        if (operation.id)
+            operationOutput.push(`Recent Operation <${yellow(operation.id)}>:`);
+        if (operation.status) {
+            const operationColor = operation.status === 'COMPLETED' ? green : red;
+            const status = operation.status || 'UNKNOWN';
+            operationOutput.push(`Status: ${operationColor(status)}`);
+        }
+        if (operation.createdAt)
+            operationOutput.push(`Started: ${formatDate(operation.createdAt)}`);
+        if (operation.status === 'COMPLETED' && operation.completedAt && operation.createdAt) {
+            operationOutput.push(`Completed: ${formatDate(operation.completedAt)}`);
+            operationOutput.push(`Duration: ${yellow(formatDuration(operation.createdAt, operation.completedAt))}`);
+        }
+        infoOutput.push(operationOutput);
     }
-    result += `  ${stack.resources.length} resource${stack.resources.length === 1 ? '' : 's'}\n\n`;
-    return result;
+    output.push(infoOutput);
+    return treeify(output, { plain: true });
 }
 export function formatStacksListing(stacks, currentStackId) {
-    if (!stacks || stacks.length === 0) {
+    if (!stacks || stacks.length === 0)
         return 'No stacks found';
-    }
-    let result = '';
+    const output = [];
     for (const stack of stacks) {
         const isCurrentStack = currentStackId === stack.id;
-        result += formatStackInfo(stack, isCurrentStack);
+        output.push(formatStackInfo(stack, isCurrentStack));
     }
-    return result;
+    return output.join('\n');
 }

package/dist/utils/display/colors.d.ts

@@ -1,4 +1,5 @@
 export declare function bold(str: string): string;
+export declare function dim(str: string): string;
 export declare function blue(str: string): string;
 export declare function green(str: string): string;
 export declare function red(str: string): string;

package/dist/utils/display/colors.js

@@ -1,6 +1,9 @@
 export function bold(str) {
     return `\x1b[1m${str}\x1b[0m`;
 }
+export function dim(str) {
+    return `\x1b[2m${str}\x1b[0m`;
+}
 export function blue(str) {
     return `\x1b[34m${str}\x1b[0m`;
 }

package/dist/utils/display/dates.js

@@ -1,20 +1,16 @@
 export function formatDate(dateString) {
-    const date = new Date(dateString);
-    return date.toLocaleString();
+    return new Date(dateString).toLocaleString();
 }
 export function formatDuration(startDate, endDate) {
     const start = new Date(startDate).getTime();
     const end = new Date(endDate).getTime();
-    if (start > end) {
+    if (start > end)
         return 'Invalid duration';
-    }
     const durationMs = end - start;
-    if (durationMs < 1000) {
+    if (durationMs < 1000)
         return `${durationMs}ms`;
-    }
-    if (durationMs < 60000) {
+    if (durationMs < 60000)
         return `${Math.round(durationMs / 1000)}s`;
-    }
     if (durationMs < 3600000) {
         const minutes = Math.floor(durationMs / 60000);
         const seconds = Math.floor((durationMs % 60000) / 1000);

package/dist/utils/display/logs-formatting.d.ts

@@ -1,5 +1,5 @@
 import type { BlueprintLog } from '../types.js';
-export declare function formatLogEntry(log: BlueprintLog, isNewest?: boolean): string;
+export declare function formatLogEntry(log: BlueprintLog, withDate?: boolean, isNewest?: boolean): string;
 export declare function formatRecentLogs(logs: BlueprintLog[]): string;
 export declare function organizeLogsByDay(logs: BlueprintLog[]): Map<string, BlueprintLog[]>;
 export declare function formatLogsByDay(logsByDay: Map<string, BlueprintLog[]>): string;

package/dist/utils/display/logs-formatting.js

@@ -1,9 +1,10 @@
-import { blue, bold, green, yellow } from './colors.js';
-export function formatLogEntry(log, isNewest = false) {
+import { treeify } from 'array-treeify';
+import { blue, bold, dim, green } from './colors.js';
+export function formatLogEntry(log, withDate = true, isNewest = false) {
     const date = new Date(log.timestamp);
     const time = date.toLocaleTimeString();
     const day = date.toLocaleDateString();
-    return `${isNewest ? `${green('>')} ` : ''}${bold(day)} ${yellow(time)} ${log.message}`;
+    return `${isNewest ? `${green('>')} ` : ''}${withDate ? `${day} ` : ''}${dim(time)} ${log.message}`;
 }
 export function formatRecentLogs(logs) {
     if (logs.length === 0)
@@ -11,9 +12,8 @@ export function formatRecentLogs(logs) {
     const sortedLogs = [...logs].sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
     const recentLogs = sortedLogs.slice(-10);
     let result = '\nMost recent logs:\n';
-    for (const log of recentLogs) {
+    for (const log of recentLogs)
         result += `  ${formatLogEntry(log)}\n`;
-    }
     return result;
 }
 export function organizeLogsByDay(logs) {
@@ -21,30 +21,25 @@ export function organizeLogsByDay(logs) {
     for (const log of logs) {
         const date = new Date(log.timestamp);
         const day = date.toLocaleDateString();
-        if (!logsByDay.has(day)) {
+        if (!logsByDay.has(day))
             logsByDay.set(day, []);
-        }
         logsByDay.get(day)?.push(log);
     }
     return logsByDay;
 }
 export function formatLogsByDay(logsByDay) {
-    let result = '';
+    const output = [];
     const sortedDays = Array.from(logsByDay.keys()).sort((a, b) => {
         return new Date(a).getTime() - new Date(b).getTime();
     });
     for (const day of sortedDays) {
-        result += `${blue('Date:')} ${bold(day)}\n`;
+        output.push(`${blue('Date:')} ${bold(day)}`);
         const dayLogs = logsByDay.get(day) || [];
         dayLogs.sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
-        for (const [i, log] of dayLogs.entries()) {
-            const date = new Date(log.timestamp);
-            const time = date.toLocaleTimeString();
-            const isLast = i === dayLogs.length - 1;
-            result += `  ${isLast ? '└─' : '├─'} ${yellow(time)} ${log.message}\n`;
-        }
-        // new line between days
-        result += '\n';
+        const dayLogsOutput = dayLogs.map((log) => formatLogEntry(log, false));
+        output.push(dayLogsOutput);
+        output.push('');
     }
-    return result;
+    output.pop(); // remove last empty line
+    return treeify(output);
 }

package/oclif.manifest.json

@@ -27,10 +27,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "add.ts"
+        "add.js"
       ]
     },
     "blueprints:config": {
@@ -59,10 +59,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "config.ts"
+        "config.js"
       ]
     },
     "blueprints:deploy": {
@@ -83,10 +83,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "deploy.ts"
+        "deploy.js"
       ]
     },
     "blueprints:info": {
@@ -117,10 +117,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "info.ts"
+        "info.js"
       ]
     },
     "blueprints:init": {
@@ -141,10 +141,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "init.ts"
+        "init.js"
       ]
     },
     "blueprints:logs": {
@@ -175,10 +175,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "logs.ts"
+        "logs.js"
       ]
     },
     "blueprints:plan": {
@@ -199,10 +199,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "plan.ts"
+        "plan.js"
       ]
     },
     "blueprints:stacks": {
@@ -223,10 +223,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "blueprints",
-        "stacks.ts"
+        "stacks.js"
       ]
     },
     "functions:dev": {
@@ -257,10 +257,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "functions",
-        "dev.ts"
+        "dev.js"
       ]
     },
     "functions:invoke": {
@@ -307,10 +307,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "functions",
-        "invoke.ts"
+        "invoke.js"
       ]
     },
     "functions:logs": {
@@ -337,10 +337,10 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "functions",
-        "logs.ts"
+        "logs.js"
       ]
     },
     "functions:test": {
@@ -397,12 +397,12 @@
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
-        "src",
+        "dist",
         "commands",
         "functions",
-        "test.ts"
+        "test.js"
       ]
     }
   },
-  "version": "1.8.0"
+  "version": "1.8.2"
 }