@sanity/runtime-cli 13.4.1 → 14.0.1

package/dist/commands/blueprints/plan.js

@@ -1,4 +1,4 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
+import { LocalBlueprintCommand, stackFlag, unhide } from '../../baseCommands.js';
 import { blueprintPlanCore } from '../../cores/blueprints/plan.js';
 import { Logger } from '../../utils/logger.js';
 export default class PlanCommand extends LocalBlueprintCommand {
@@ -7,6 +7,9 @@ export default class PlanCommand extends LocalBlueprintCommand {
 
 Run 'blueprints plan' after making local changes to your Blueprint manifest to verify the expected diff. When ready, run 'blueprints deploy' to apply changes.`;
     static examples = ['<%= config.bin %> <%= command.id %>'];
+    static flags = {
+        stack: unhide(stackFlag),
+    };
     async run() {
         const { success, error } = await blueprintPlanCore({
             bin: this.config.bin,

package/dist/commands/functions/logs.d.ts

@@ -7,6 +7,7 @@ export default class LogsCommand extends DeployedStackCommand<typeof LogsCommand
     };
     static examples: string[];
     static flags: {
+        stack: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         limit: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         utc: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/functions/logs.js

@@ -1,5 +1,5 @@
 import { Args, Flags } from '@oclif/core';
-import { DeployedStackCommand } from '../../baseCommands.js';
+import { DeployedStackCommand, stackFlag, unhide } from '../../baseCommands.js';
 import { functionLogsCore } from '../../cores/functions/logs.js';
 import { Logger } from '../../utils/logger.js';
 export default class LogsCommand extends DeployedStackCommand {
@@ -17,6 +17,7 @@ Use --watch (-w) to stream logs in real-time. Use --delete to clear all logs for
         '<%= config.bin %> <%= command.id %> <name> --delete',
     ];
     static flags = {
+        stack: unhide(stackFlag),
         limit: Flags.integer({
             char: 'l',
             description: 'Total number of log entries to retrieve',

package/dist/cores/blueprints/config.d.ts

@@ -4,7 +4,7 @@ export interface BlueprintConfigOptions extends BlueprintConfig {
         edit?: boolean;
         'project-id'?: string;
         'organization-id'?: string;
-        'stack-id'?: string;
+        stack?: string;
         verbose?: boolean;
     };
 }

package/dist/cores/blueprints/config.js

@@ -1,11 +1,12 @@
 import { patchConfigFile, writeConfigFile, } from '../../actions/blueprints/config.js';
+import { resolveStackIdByNameOrId } from '../../actions/blueprints/stacks.js';
 import { filePathRelativeToCwd, labeledId, warn } from '../../utils/display/presenters.js';
 import { promptForProject, promptForStack } from '../../utils/display/prompt.js';
 import { styleText } from '../../utils/style-text.js';
 export async function blueprintConfigCore(options) {
     const { bin = 'sanity', blueprint, log, token, flags } = options;
-    const { edit: editConfig = false, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, 'stack-id': flagStackId, verbose: _v = false, } = flags;
-    const providedConfigFlag = [flagProjectId, flagStackId, flagOrganizationId].some(Boolean);
+    const { edit: editConfig = false, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, stack: flagStack, verbose: _v = false, } = flags;
+    const providedConfigFlag = [flagProjectId, flagStack, flagOrganizationId].some(Boolean);
     const { stackId: configStackId, scopeType: configScopeType, scopeId: configScopeId, blueprintConfig, fileInfo, } = blueprint;
     const blueprintFilePath = fileInfo.blueprintFilePath;
     if (!configStackId && !configScopeType && !configScopeId) {
@@ -34,8 +35,16 @@ export async function blueprintConfigCore(options) {
             const configUpdate = {};
             if (flagProjectId)
                 configUpdate.projectId = flagProjectId;
-            if (flagStackId)
-                configUpdate.stackId = flagStackId;
+            if (flagStack) {
+                const scopeType = flagProjectId ? 'project' : configScopeType;
+                const scopeId = flagProjectId || configScopeId;
+                if (scopeType && scopeId) {
+                    configUpdate.stackId = await resolveStackIdByNameOrId(flagStack, { token, scopeType, scopeId }, log);
+                }
+                else {
+                    configUpdate.stackId = flagStack;
+                }
+            }
             if (flagOrganizationId)
                 configUpdate.organizationId = flagOrganizationId;
             try {
@@ -44,7 +53,16 @@ export async function blueprintConfigCore(options) {
                 return { success: true };
             }
             catch {
-                return { success: false, error: 'Unable to update configuration.' };
+                // fallback to writeConfigFile if patchConfigFile fails
+                // creates a new config file with the given properties
+                try {
+                    const newConfig = writeConfigFile(blueprintFilePath, configUpdate);
+                    printConfig({ configLabel: 'Updated', log, config: newConfig });
+                    return { success: true };
+                }
+                catch {
+                    return { success: false, error: 'Unable to update configuration.' };
+                }
             }
         }
         // prompt for values interactively
@@ -60,7 +78,10 @@ export async function blueprintConfigCore(options) {
         }
         if (!updatedProjectId)
             return { success: false, error: 'Project ID is required.' };
-        let updatedStackId = flagStackId;
+        let updatedStackId;
+        if (flagStack) {
+            updatedStackId = await resolveStackIdByNameOrId(flagStack, { token, scopeType: 'project', scopeId: updatedProjectId }, log);
+        }
         if (!updatedStackId) {
             const pickedStack = await promptForStack({ projectId: updatedProjectId, token, logger: log });
             updatedStackId = pickedStack.stackId;

package/dist/cores/blueprints/deploy.js

@@ -1,10 +1,14 @@
-import { setTimeout } from 'node:timers/promises';
+import { setTimeout as sleep } from 'node:timers/promises';
 import { stashAsset } from '../../actions/blueprints/assets.js';
 import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.js';
 import { getStack, updateStack } from '../../actions/blueprints/stacks.js';
 import { niceId } from '../../utils/display/presenters.js';
 import { styleText } from '../../utils/style-text.js';
 import { isLocalFunctionCollection, isLocalFunctionResource } from '../../utils/types.js';
+const DEFAULT_ASSET_TIMEOUT = 60;
+const assetTimeoutS = Number(process.env.SANITY_ASSET_TIMEOUT) || DEFAULT_ASSET_TIMEOUT;
+const assetTimeoutMs = assetTimeoutS * 1000;
+const warnTimeoutMs = assetTimeoutMs / 2;
 export async function blueprintDeployCore(options) {
     const { bin = 'sanity', log, auth, stackId, scopeType, scopeId, deployedStack, blueprint, flags, } = options;
     const { verbose } = flags;
@@ -33,7 +37,26 @@ export async function blueprintDeployCore(options) {
             log('Processing function assets...');
             for (const resource of allFunctionResources) {
                 const fnSpinner = log.ora({ text: `Processing ${resource.name}...`, prefixText: ' ' }).start();
-                const result = await stashAsset({ resource, auth, logger: log });
+                const warnTimer = setTimeout(() => {
+                    fnSpinner.text = `Still processing ${resource.name}, this can take a moment...`;
+                }, warnTimeoutMs);
+                let result;
+                try {
+                    result = await Promise.race([
+                        stashAsset({ resource, auth, logger: log }),
+                        sleep(assetTimeoutMs).then(() => {
+                            throw new Error(`Processing ${resource.name} timed out after ${assetTimeoutS}s`);
+                        }),
+                    ]);
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    fnSpinner.fail(msg);
+                    return { success: false, error: msg };
+                }
+                finally {
+                    clearTimeout(warnTimer);
+                }
                 if (result.success && result.assetId) {
                     resource.src = result.assetId;
                     if (isLocalFunctionCollection(resource)) {
@@ -102,12 +125,17 @@ export async function blueprintDeployCore(options) {
         log(styleText('dim', 'Stack deployment progress:'));
         let logStreamCleanup = null;
         try {
+            let lastLogAt = Date.now();
+            let idleMessageShown = false;
             logStreamCleanup = await setupLogStreaming({
                 stackId: stack.id,
                 after: isoNow,
                 auth,
                 log,
                 verbose,
+                onActivity: () => {
+                    lastLogAt = Date.now();
+                },
             });
             while (true) {
                 const { ok, stack: currentStack } = await getStack({ stackId: stack.id, auth, logger: log });
@@ -133,7 +161,12 @@ export async function blueprintDeployCore(options) {
                     log(styleText(['bold', 'green'], 'Stack deployment completed!'));
                     return { success: true, data: { resources } };
                 }
-                await setTimeout(1500);
+                if (!idleMessageShown && Date.now() - lastLogAt > 60_000) {
+                    log(`No new activity for 60 seconds. The deployment is still running on Sanity servers.`);
+                    log(`You can safely exit and check status later with \`${bin} blueprints info\`.`);
+                    idleMessageShown = true;
+                }
+                await sleep(1500);
             }
         }
         catch (error) {

package/dist/cores/blueprints/destroy.d.ts

@@ -4,7 +4,7 @@ export interface BlueprintDestroyOptions extends BlueprintConfig {
         force?: boolean;
         'project-id'?: string;
         'organization-id'?: string;
-        'stack-id'?: string;
+        stack?: string;
         'no-wait'?: boolean;
         verbose?: boolean;
     };

package/dist/cores/blueprints/destroy.js

@@ -1,14 +1,14 @@
-import { setTimeout } from 'node:timers/promises';
+import { setTimeout as sleep } from 'node:timers/promises';
 import { confirm } from '@inquirer/prompts';
 import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.js';
-import { destroyStack, getStack } from '../../actions/blueprints/stacks.js';
+import { destroyStack, getStack, resolveStackIdByNameOrId } from '../../actions/blueprints/stacks.js';
 import { niceId } from '../../utils/display/presenters.js';
 import { styleText } from '../../utils/style-text.js';
 export async function blueprintDestroyCore(options) {
-    const { log, token, blueprint, flags } = options;
-    const { force = false, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, 'stack-id': flagStackId, 'no-wait': noWait = false, verbose: _verbose = false, } = flags;
+    const { bin = 'sanity', log, token, blueprint, flags } = options;
+    const { force = false, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, stack: flagStack, 'no-wait': noWait = false, verbose: _verbose = false, } = flags;
     // 3-flag combo: just destroy it
-    if ((flagProjectId || flagOrganizationId) && flagStackId && force) {
+    if ((flagProjectId || flagOrganizationId) && flagStack && force) {
         let scopeType;
         let scopeId;
         if (flagOrganizationId) {
@@ -22,9 +22,11 @@ export async function blueprintDestroyCore(options) {
         else {
             return { success: false, error: 'Unable to determine scope for Blueprint Destroy' };
         }
+        const auth = { token, scopeType, scopeId };
+        const resolvedId = await resolveStackIdByNameOrId(flagStack, auth, log);
         const { ok, error, stack } = await destroyStack({
-            stackId: flagStackId,
-            auth: { token, scopeType, scopeId },
+            stackId: resolvedId,
+            auth,
             logger: log,
         });
         if (!ok)
@@ -36,13 +38,16 @@ export async function blueprintDestroyCore(options) {
     if (!scopeType || !scopeId)
         return { success: false, error: 'Scope is required' };
     const auth = { token, scopeType, scopeId };
+    const resolvedStackId = flagStack
+        ? await resolveStackIdByNameOrId(flagStack, auth, log)
+        : undefined;
     let stack;
     try {
-        if (flagStackId) {
-            const flagStack = await getStack({ stackId: flagStackId, auth, logger: log });
-            if (!flagStack.ok)
-                return { success: false, error: flagStack.error || 'Failed to get Stack' };
-            stack = flagStack.stack;
+        if (resolvedStackId) {
+            const overrideStack = await getStack({ stackId: resolvedStackId, auth, logger: log });
+            if (!overrideStack.ok)
+                return { success: false, error: overrideStack.error || 'Failed to get Stack' };
+            stack = overrideStack.stack;
         }
         else if (stackId) {
             const blueprintStack = await getStack({ stackId, auth, logger: log });
@@ -70,10 +75,10 @@ export async function blueprintDestroyCore(options) {
             let i = 5;
             while (i >= 0) {
                 destroySpinner.text = `Destroying Stack deployment in ${styleText('bold', (i--).toString())} seconds...`;
-                await setTimeout(1000);
+                await sleep(1000);
             }
             destroySpinner.text = 'Destroying Stack deployment 💥';
-            await setTimeout(500);
+            await sleep(500);
         }
         else {
             destroySpinner.start();
@@ -92,11 +97,16 @@ export async function blueprintDestroyCore(options) {
         log(styleText('dim', 'Stack destruction progress:'));
         let logStreamCleanup = null;
         try {
+            let lastLogAt = Date.now();
+            let idleMessageShown = false;
             logStreamCleanup = await setupLogStreaming({
                 stackId: stack.id,
                 after: isoNow,
                 auth,
                 log,
+                onActivity: () => {
+                    lastLogAt = Date.now();
+                },
             });
             while (true) {
                 const { ok, stack: currentStack } = await getStack({ stackId: stack.id, auth, logger: log });
@@ -114,7 +124,12 @@ export async function blueprintDestroyCore(options) {
                         logStreamCleanup();
                     return { success: false, error: 'Stack destruction failed' };
                 }
-                await setTimeout(1500);
+                if (!idleMessageShown && Date.now() - lastLogAt > 60_000) {
+                    log(`No new activity for 60 seconds. The destruction is still running on Sanity servers.`);
+                    log(`You can safely exit and check status later with \`${bin} blueprints info\`.`);
+                    idleMessageShown = true;
+                }
+                await sleep(1500);
             }
         }
         catch (error) {