@sanity/runtime-cli 17.12.0 → 17.13.0-next.g06897b0

package/README.md

@@ -90,7 +90,7 @@ EXAMPLES
   $ sanity-run blueprints add function --name my-function --fn-type document-create --fn-type document-update --lang js
 ```
 
-_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -127,7 +127,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -183,7 +183,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --new-stack-name <new-name>
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -221,7 +221,7 @@ EXAMPLES
   $ sanity-run blueprints destroy --stack <name-or-id> --project-id <projectId> --force --no-wait
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -253,7 +253,7 @@ EXAMPLES
   $ sanity-run blueprints doctor --fix
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -291,7 +291,7 @@ EXAMPLES
   $ sanity-run blueprints info --organization-id <orgId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -355,7 +355,7 @@ EXAMPLES
   $ sanity-run blueprints init old-stack --type <json|js|ts> --project-id <projectId> --stack-id <existingStackId>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -401,7 +401,7 @@ EXAMPLES
   $ sanity-run blueprints logs --before 2026-05-01T00:00:00Z
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints mint-deploy-token`
 
@@ -446,7 +446,7 @@ EXAMPLES
   $ sanity-run blueprints mint-deploy-token --organization-id <orgId>
 ```
 
-_See code: [src/commands/blueprints/mint-deploy-token.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/mint-deploy-token.ts)_
+_See code: [src/commands/blueprints/mint-deploy-token.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/mint-deploy-token.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -479,7 +479,7 @@ EXAMPLES
   $ sanity-run blueprints plan --organization-id <orgId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints promote`
 
@@ -515,7 +515,7 @@ EXAMPLES
   $ sanity-run blueprints promote --new-stack-name <new-name>
 ```
 
-_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/promote.ts)_
+_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/promote.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -556,7 +556,7 @@ EXAMPLES
   $ sanity-run blueprints stacks --organization-id <organizationId> --include-projects
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -608,7 +608,7 @@ EXAMPLES
   $ sanity-run functions add --name my-function --type document-create --type document-update --lang js
 ```
 
-_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -632,8 +632,8 @@ DESCRIPTION
 
   Open the emulator in your browser to interactively test your functions with the payload editor.
 
-  Optionally, set the host and port with the --host and --port flags. Port 8974 is reserved for the emulator's
-  live-reload WebSocket server. Function timeout can be configured with the --timeout flag.
+  Optionally, set the host and port with the --host and --port flags. The live-reload WebSocket server shares this host
+  and port. Function timeout can be configured with the --timeout flag.
 
   To invoke a function with the CLI, use 'functions test'.
 
@@ -643,7 +643,7 @@ EXAMPLES
   $ sanity-run functions dev --timeout 60
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -676,7 +676,7 @@ EXAMPLES
   $ sanity-run functions env add --stack <name-or-id> MyFunction API_URL https://api.example.com/
 ```
 
-_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -706,7 +706,7 @@ EXAMPLES
   $ sanity-run functions env list --stack <name-or-id> MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -738,7 +738,7 @@ EXAMPLES
   $ sanity-run functions env remove --stack <name-or-id> MyFunction API_URL
 ```
 
-_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs [NAME]`
 
@@ -778,7 +778,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test [NAME]`
 
@@ -836,7 +836,7 @@ EXAMPLES
   $ sanity-run functions test <name> --event update --data-before '{ "title": "before" }' --data-after '{ "title": "after" }'
 ```
 
-_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v17.12.0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v17.13.0-next.g06897b0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/actions/blueprints/assets.d.ts

@@ -1,26 +1,29 @@
-import AdmZip from 'adm-zip';
-import type { Logger } from '../../utils/logger.js';
-import type { AssetResource, AuthParams, InstallerType } from '../../utils/types.js';
+import type { BlueprintResource } from '@sanity/blueprints';
+import type { AuthParams, InstallerType, PrepAssetFn } from '../../utils/types.js';
 export declare const assetCheckUrl: string;
 export declare const assetStashUrl: string;
-export declare function stashAsset({ resource, auth, blueprintFileDir, logger, installer, }: {
-    resource: AssetResource;
+export type StashAssetResult = {
+    success: true;
+    /** The id of the asset that was found or stashed */
+    assetId: string;
+    /** The parameter where the asset id should be stored in the resource */
+    assetParameter: string;
+    /** Whether the asset was already in the stash */
+    exists: boolean;
+    /** The asset hash for later lookup */
+    hash: string;
+    /** Facts learned about the resource while preparing its asset */
+    metadata?: Record<string, unknown>;
+} | {
+    success: false;
+    error: string;
+};
+export declare function stashAsset<R extends BlueprintResource>({ resource, prepAsset, auth, blueprintFileDir, fetchFn, installer, }: {
+    resource: R;
+    prepAsset: PrepAssetFn<R>;
     auth: AuthParams;
     blueprintFileDir: string;
-    logger: Logger;
+    fetchFn: typeof fetch;
     installer?: InstallerType;
-}): Promise<{
-    success: boolean;
-    assetId?: string;
-    exists?: boolean;
-    hash?: string;
-    error?: string;
-}>;
+}): Promise<StashAssetResult>;
 export declare function hashBuffer(buffer: Buffer): string;
-export declare function pathToZip(path: string): Promise<AdmZip>;
-export declare function pathToB64ZipHash(path: string): Promise<{
-    b64: string;
-    buffer: Buffer;
-    hash: string;
-    zip: AdmZip;
-}>;

package/dist/actions/blueprints/assets.js

@@ -1,67 +1,34 @@
 import crypto from 'node:crypto';
-import fs from 'node:fs';
-import { readFile } from 'node:fs/promises';
-import AdmZip from 'adm-zip';
 import { blueprintsUrl } from '../../config.js';
-import { CONVERT_BYTES_TO_MB, MAX_ASSET_SIZE } from '../../constants.js';
-import { prepareAsset as prepareFunctionAsset } from '../../utils/functions/prepare-asset.js';
 import getHeaders from '../../utils/get-headers.js';
-import { prepareStudioAsset } from '../../utils/studios/prepare-asset.js';
-import { createTracedFetch } from '../../utils/traced-fetch.js';
-import { isLocalFunctionResource, isStudioResource } from '../../utils/types.js';
 const assetsUrl = blueprintsUrl('assets');
 export const assetCheckUrl = `${assetsUrl}/check`;
 export const assetStashUrl = `${assetsUrl}/stash`;
-export async function stashAsset({ resource, auth, blueprintFileDir, logger, installer, }) {
+export async function stashAsset({ resource, prepAsset, auth, blueprintFileDir, fetchFn, installer, }) {
     let cleanup = async () => { };
     try {
-        let b64;
-        let hash;
-        let extension;
-        if (isLocalFunctionResource(resource)) {
-            const prepResult = await prepareFunctionAsset({ resource, blueprintFileDir, installer });
-            if (prepResult.success === false) {
-                await prepResult.cleanup();
-                return {
-                    success: false,
-                    error: prepResult.error,
-                };
-            }
-            cleanup = prepResult.cleanup;
-            const zipResult = await pathToB64ZipHash(prepResult.outputPath);
-            b64 = zipResult.b64;
-            hash = zipResult.hash;
-            extension = 'zip';
-        }
-        else if (isStudioResource(resource)) {
-            const prepResult = await prepareStudioAsset({ resource, blueprintFileDir });
-            if (prepResult.success === false) {
-                await prepResult.cleanup();
-                return {
-                    success: false,
-                    error: prepResult.error,
-                };
-            }
-            cleanup = prepResult.cleanup;
-            const buffer = await readFile(prepResult.outputPath);
-            b64 = buffer.toString('base64');
-            hash = hashBuffer(buffer);
-            extension = 'tar.gz';
-        }
-        else {
+        const prepResult = await prepAsset({ resource, blueprintFileDir, installer });
+        if (prepResult.success === false) {
+            await prepResult.cleanup();
             return {
                 success: false,
-                error: `Unexpected resource for asset processing`,
+                error: prepResult.error,
             };
         }
+        cleanup = prepResult.cleanup;
+        const b64 = prepResult.outputBuffer.toString('base64');
+        const hash = hashBuffer(prepResult.outputBuffer);
+        const extension = prepResult.fileExtension;
         return await stashSingleAsset({
             b64,
             hash,
             extension,
+            assetParameter: prepResult.assetParameter,
+            metadata: prepResult.metadata,
             cleanup,
-            resource,
+            resourceName: resource.name,
             auth,
-            logger,
+            fetchFn,
         });
     }
     catch (err) {
@@ -74,8 +41,7 @@ export async function stashAsset({ resource, auth, blueprintFileDir, logger, ins
         return { success: false, error: err instanceof Error ? err.message : `${err}` };
     }
 }
-async function stashSingleAsset({ b64, hash, cleanup, resource, auth, logger, extension = 'zip', }) {
-    const fetchFn = createTracedFetch(logger);
+async function stashSingleAsset({ b64, hash, cleanup, resourceName, auth, fetchFn, extension, assetParameter, metadata, }) {
     try {
         try {
             const checkResponse = await fetchFn(`${assetCheckUrl}/${hash}`, {
@@ -84,7 +50,7 @@ async function stashSingleAsset({ b64, hash, cleanup, resource, auth, logger, ex
             });
             const checkJson = await checkResponse.json();
             if (checkResponse.ok && checkJson.exists && checkJson.id) {
-                return { success: true, assetId: checkJson.id, exists: true, hash };
+                return { success: true, assetId: checkJson.id, assetParameter, exists: true, hash, metadata };
             }
         }
         catch { } // Continue to stash the Asset
@@ -94,16 +60,16 @@ async function stashSingleAsset({ b64, hash, cleanup, resource, auth, logger, ex
             headers: getHeaders(auth),
             body: JSON.stringify({
                 file: b64,
-                filename: `${resource.name}.${extension}`,
+                filename: `${resourceName}.${extension}`,
             }),
         });
         const assetJson = await assetResponse.json();
         if (assetResponse.ok) {
-            return { success: true, assetId: assetJson.id, exists: false, hash };
+            return { success: true, assetId: assetJson.id, assetParameter, exists: false, hash, metadata };
         }
         return {
             success: false,
-            error: `Failed to stash asset for ${resource.name}: ${assetJson.message || 'Unknown error'}`,
+            error: `Failed to stash asset for ${resourceName}: ${assetJson.message || 'Unknown error'}`,
         };
     }
     catch (err) {
@@ -121,38 +87,3 @@ export function hashBuffer(buffer) {
     hash.update(buffer);
     return hash.digest('hex');
 }
-export async function pathToZip(path) {
-    const stats = await fs.promises.stat(path);
-    const zip = new AdmZip(undefined, {
-        fs: {
-            ...fs,
-            // @ts-expect-error monkey patching to return matching mtime for builds
-            statSync(path, options) {
-                const s = fs.statSync(path, options);
-                if (s)
-                    s.mtime = new Date(0);
-                return s;
-            },
-        },
-    });
-    if (stats.isDirectory())
-        zip.addLocalFolder(path);
-    else
-        zip.addLocalFile(path, '', 'index.js');
-    return zip;
-}
-export async function pathToB64ZipHash(path) {
-    const zip = await pathToZip(path);
-    // Add up the uncompressed sizes of all entries to get a more accurate size of the asset being uploaded
-    const size = zip
-        .getEntries()
-        .map((entry) => entry.header.size)
-        .reduce((a, b) => a + b, 0);
-    if (size > MAX_ASSET_SIZE) {
-        throw new Error(`Asset size of ${(size / CONVERT_BYTES_TO_MB).toFixed(2)} MB exceeds the maximum allowed size of 200 MB.`);
-    }
-    const buffer = zip.toBuffer();
-    const b64 = buffer.toString('base64');
-    const hash = hashBuffer(buffer);
-    return { b64, buffer, hash, zip };
-}

package/dist/actions/blueprints/logs-polling.d.ts

@@ -1,4 +1,3 @@
-import type { Logger } from '../../utils/logger.js';
 import type { AuthParams, BlueprintLog } from '../../utils/types.js';
 export declare const LOG_POLL_INTERVAL_MS = 725;
 export interface LogPollingConfig {
@@ -6,11 +5,10 @@ export interface LogPollingConfig {
     operationId?: string;
     knownIds?: string[];
     auth: AuthParams;
-    showBanner?: boolean;
-    verbose?: boolean;
-    log: Logger;
+    fetchFn: typeof fetch;
+    onShowBanner?: () => void;
     onActivity?: () => void;
-    onLogEntry?: (log: BlueprintLog) => void;
+    onLogEntry?: (logEntry: BlueprintLog, previousLog: BlueprintLog | undefined) => void;
 }
 /**
  * Polls the logs list endpoint at a fixed interval and displays new entries.

package/dist/actions/blueprints/logs-polling.js

@@ -1,5 +1,3 @@
-import { formatLogEntry } from '../../utils/display/logs-formatting.js';
-import { styleText } from '../../utils/style-text.js';
 import { getLogs } from './logs.js';
 export const LOG_POLL_INTERVAL_MS = 725;
 /**
@@ -8,19 +6,17 @@ export const LOG_POLL_INTERVAL_MS = 725;
  * @returns A cleanup function that stops polling
  */
 export function setupLogPolling(config) {
-    const { stackId, operationId, auth, log, showBanner, verbose = false } = config;
+    const { stackId, operationId, auth, fetchFn } = config;
     const seenIds = new Set(config.knownIds);
     let previousLog;
     let stopped = false;
-    if (showBanner) {
-        log(`Watching logs... ${styleText('bold', 'ctrl+c')} to cancel`);
-    }
+    config.onShowBanner?.();
     const fetchAndProcessLogs = async () => {
         if (stopped)
             return;
         try {
             const params = operationId ? { operationId } : { stackId };
-            const { ok, logs } = await getLogs(params, auth, log);
+            const { ok, logs } = await getLogs(params, auth, fetchFn);
             if (!ok || stopped)
                 return;
             // API returns newest first; reverse so we display in chronological order
@@ -28,8 +24,7 @@ export function setupLogPolling(config) {
             for (const logEntry of newLogs) {
                 seenIds.add(logEntry.id);
                 config.onActivity?.();
-                config.onLogEntry?.(logEntry);
-                log(formatLogEntry(logEntry, verbose, previousLog));
+                config.onLogEntry?.(logEntry, previousLog);
                 previousLog = logEntry;
             }
         }

package/dist/actions/blueprints/logs.d.ts

@@ -1,4 +1,3 @@
-import type { Logger } from '../../utils/logger.js';
 import type { ActionResponse, AuthParams, BlueprintLog } from '../../utils/types.js';
 export declare const logsUrl: string;
 export interface GetLogsParams {
@@ -8,7 +7,7 @@ export interface GetLogsParams {
     before?: string;
     after?: string;
 }
-export declare function getLogs(params: GetLogsParams, auth: AuthParams, logger: Logger): Promise<ActionResponse & {
+export declare function getLogs(params: GetLogsParams, auth: AuthParams, fetchFn: typeof fetch): Promise<ActionResponse & {
     logs: BlueprintLog[];
     hasMore: boolean;
 }>;

package/dist/actions/blueprints/logs.js

@@ -1,9 +1,7 @@
 import { blueprintsUrl } from '../../config.js';
 import getHeaders from '../../utils/get-headers.js';
-import { createTracedFetch } from '../../utils/traced-fetch.js';
 export const logsUrl = blueprintsUrl('logs');
-export async function getLogs(params, auth, logger) {
-    const fetchFn = createTracedFetch(logger);
+export async function getLogs(params, auth, fetchFn) {
     const url = new URL(logsUrl);
     if (params.stackId)
         url.searchParams.append('stackId', params.stackId);

package/dist/actions/blueprints/operations-state.d.ts

@@ -0,0 +1,10 @@
+import type { StateInfo } from '../../utils/blueprints/wait-for.js';
+import type { AuthParams } from '../../utils/types.js';
+export declare function getOperationStateInfo(options: {
+    stackId: string;
+    operationId: string;
+    auth: AuthParams;
+    fetchFn: typeof fetch;
+    includeDestroyed: boolean;
+    progressNoun: string;
+}): Promise<StateInfo>;

package/dist/actions/blueprints/operations-state.js

@@ -0,0 +1,42 @@
+import { classifyOperationPoll, getOperation } from './operations.js';
+export async function getOperationStateInfo(options) {
+    const { stackId, operationId, auth, fetchFn, includeDestroyed, progressNoun } = options;
+    const { ok, error, operation, response } = await getOperation({
+        stackId,
+        operationId,
+        auth,
+        fetchFn,
+        includeDestroyed,
+    });
+    const httpStatus = response?.status;
+    const state = classifyOperationPoll({ ok, httpStatus, operation });
+    switch (state) {
+        case 'completed':
+        case 'failed':
+            return {
+                state,
+            };
+        case 'error':
+            return {
+                state,
+                error,
+                verboseError: `Could not read ${progressNoun} status (HTTP ${httpStatus ?? 'unknown'}${error ? `: ${error}` : ''})`,
+            };
+        case 'pending':
+            if (httpStatus === 404 || !operation) {
+                return {
+                    state: 'not_found',
+                    verboseError: `Waiting for ${progressNoun} status (HTTP 404); retrying.`,
+                };
+            }
+            else {
+                return {
+                    state,
+                    latestStatus: operation.status,
+                    verboseMessage: `${progressNoun} operation status: ${operation.status}.`,
+                };
+            }
+        default:
+            throw new Error(`Unexpected poll state: ${state}`);
+    }
+}

package/dist/actions/blueprints/operations.d.ts

@@ -1,11 +1,4 @@
-import type { Logger } from '../../utils/logger.js';
 import type { ActionResponse, AuthParams, StackOperation } from '../../utils/types.js';
-/** Delay before the first operation poll. Override with SANITY_OPERATION_POLL_INITIAL_DELAY_MS. */
-export declare const OPERATION_POLL_INITIAL_DELAY_MS: number;
-/** Interval between operation status polls. Override with SANITY_OPERATION_POLL_INTERVAL_MS. */
-export declare const OPERATION_POLL_INTERVAL_MS: number;
-/** Consecutive failed polls tolerated before giving up on confirming status. */
-export declare const OPERATION_POLL_MAX_CONSECUTIVE_ERRORS = 5;
 /**
  * Classify a single poll. Terminal status -> 'completed'/'failed'. 404 ->
  * 'pending' (read-replica lag). Other failed responses -> 'error'. The caller
@@ -20,11 +13,11 @@ interface GetOperationResponse extends ActionResponse {
     operation?: StackOperation;
     response?: Response;
 }
-export declare function getOperation({ stackId, operationId, auth, logger, includeDestroyed, }: {
+export declare function getOperation({ stackId, operationId, auth, fetchFn, includeDestroyed, }: {
     stackId: string;
     operationId: string;
     auth: AuthParams;
-    logger: Logger;
+    fetchFn: typeof fetch;
     includeDestroyed?: boolean;
 }): Promise<GetOperationResponse>;
 export {};

package/dist/actions/blueprints/operations.js

@@ -1,18 +1,5 @@
 import getHeaders from '../../utils/get-headers.js';
-import { createTracedFetch } from '../../utils/traced-fetch.js';
 import { stacksUrl } from './stacks.js';
-const envMs = (value, fallback) => {
-    if (!value)
-        return fallback;
-    const parsed = Number(value);
-    return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
-};
-/** Delay before the first operation poll. Override with SANITY_OPERATION_POLL_INITIAL_DELAY_MS. */
-export const OPERATION_POLL_INITIAL_DELAY_MS = envMs(process.env.SANITY_OPERATION_POLL_INITIAL_DELAY_MS, 1000);
-/** Interval between operation status polls. Override with SANITY_OPERATION_POLL_INTERVAL_MS. */
-export const OPERATION_POLL_INTERVAL_MS = envMs(process.env.SANITY_OPERATION_POLL_INTERVAL_MS, 1500);
-/** Consecutive failed polls tolerated before giving up on confirming status. */
-export const OPERATION_POLL_MAX_CONSECUTIVE_ERRORS = 5;
 /**
  * Classify a single poll. Terminal status -> 'completed'/'failed'. 404 ->
  * 'pending' (read-replica lag). Other failed responses -> 'error'. The caller
@@ -31,8 +18,7 @@ export function classifyOperationPoll(options) {
         return 'pending';
     return 'error';
 }
-export async function getOperation({ stackId, operationId, auth, logger, includeDestroyed, }) {
-    const fetchFn = createTracedFetch(logger);
+export async function getOperation({ stackId, operationId, auth, fetchFn, includeDestroyed, }) {
     const url = new URL(`${stacksUrl}/${stackId}/operations/${operationId}`);
     if (includeDestroyed)
         url.searchParams.append('includeDestroyed', 'true');

package/dist/actions/blueprints/pre-deploy.d.ts

@@ -1,38 +1,46 @@
 import type { BlueprintResource } from '@sanity/blueprints';
-import type { Logger } from '../../utils/logger.js';
-import { type AuthParams, type InstallerType, type ScopeType } from '../../utils/types.js';
+import type { WaitForFn } from '../../utils/blueprints/wait-for.js';
+import type { AuthParams, InstallerType, ResourceMetadata, ScopeType } from '../../utils/types.js';
 import { type ProcessAssetsProgress, type ProcessedAsset } from './process-assets.js';
-type PreDeployResult = {
+type PreDeployFailure = {
     success: false;
     error: string;
     code?: string;
     exitCode?: number;
     suggestions?: string[];
-} | {
+};
+export type PreDeployResult = PreDeployFailure | {
     success: true;
+    /** One entry per prepared asset, for the deploy metadata */
+    resourceMetadata: ResourceMetadata[];
 };
-export type PreDeployAssetEvent = {
+export type PreDeployAssetEvent<R extends BlueprintResource> = {
     type: 'progress';
     progress: ProcessAssetsProgress;
 } | {
     type: 'complete';
 } | {
     type: 'result';
-    result: ProcessedAsset;
+    result: ProcessedAsset<R>;
 };
-type PreDeployOptions = {
+type PreDeployOptions<R extends BlueprintResource> = {
     scopeType: ScopeType;
     scopeId: string;
     resources: BlueprintResource[];
     stackId: string;
     stackName: string;
     bin: string;
-    verbose: boolean | undefined;
     auth: AuthParams;
     blueprintFileDir: string;
     installer: InstallerType;
-    logger: Logger;
-    onAssetEvent?: (event: PreDeployAssetEvent) => void;
+    fetchFn: typeof fetch;
+    waitForFn: WaitForFn;
+    onAssetEvent?: (event: PreDeployAssetEvent<R>) => void;
+    onPreDeployStackStart?: () => void;
+    onPreDeployStackFail?: () => void;
+    onPreDeployStackDone?: () => void;
+    onPreDeployOperationStart?: () => void;
+    onPreDeployOperationDone?: () => void;
 };
-export declare function preDeploy(options: PreDeployOptions): Promise<PreDeployResult>;
+export declare function preDeploy<R extends BlueprintResource>(options: PreDeployOptions<R>): Promise<PreDeployResult>;
 export {};