@sanity/runtime-cli 10.4.1 → 10.5.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/10.4.1 linux-x64 node-v22.18.0
+@sanity/runtime-cli/10.5.0 linux-x64 node-v22.19.0
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -88,7 +88,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/v10.4.1/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -119,7 +119,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId> --stack-id <stackId>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -141,7 +141,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --no-wait
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -166,7 +166,7 @@ EXAMPLES
   $ sanity-run blueprints destroy --stack-id <stackId> --project-id <projectId> --force --no-wait
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -188,7 +188,7 @@ EXAMPLES
   $ sanity-run blueprints info --stack-id <stackId>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -226,7 +226,7 @@ EXAMPLES
   $ sanity-run blueprints init --blueprint-type <json|js|ts> --stack-name <stackName>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -248,7 +248,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -265,7 +265,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -287,7 +287,7 @@ EXAMPLES
   $ sanity-run blueprints stacks --project-id <projectId>
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions dev`
 
@@ -307,7 +307,7 @@ EXAMPLES
   $ sanity-run functions dev --port 8974
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -329,7 +329,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/v10.4.1/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -349,7 +349,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -370,7 +370,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/v10.4.1/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs NAME`
 
@@ -404,7 +404,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.4.1/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -439,7 +439,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/v10.4.1/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v10.5.0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -1,4 +1,5 @@
-import type { BlueprintParserError, LocalBlueprint, Resource } from '../../utils/types.js';
+import { type Blueprint } from '@sanity/blueprints-parser';
+import type { BlueprintParserError, Resource } from '../../utils/types.js';
 export { BLUEPRINT_CONFIG_FILE, BLUEPRINT_CONFIG_VERSION, BLUEPRINT_DIR } from '../../config.js';
 declare const SUPPORTED_FILE_EXTENSIONS: readonly [".json", ".js", ".mjs", ".ts"];
 type BlueprintFileExtension = (typeof SUPPORTED_FILE_EXTENSIONS)[number];
@@ -14,27 +15,24 @@ export type BlueprintModule = ((args?: unknown) => Record<string, unknown>) & {
     projectId?: string;
     stackId?: string;
 };
+type FileInfo = {
+    blueprintFilePath: string;
+    fileName: string;
+    extension: BlueprintFileExtension;
+};
 /**
  * Finds the blueprint file in the given path or current working directory
  * @param blueprintPath - The path of the blueprint file or directory
  * @returns The path, file name, and extension of the blueprint file
  */
-export declare function findBlueprintFile(blueprintPath?: string): {
-    blueprintFilePath: string;
-    fileName: string;
-    extension: BlueprintFileExtension;
-} | null;
+export declare function findBlueprintFile(blueprintPath?: string): FileInfo | null;
 /**
  * Result of the blueprint read operation
  */
 export interface ReadBlueprintResult {
-    fileInfo: {
-        blueprintFilePath: string;
-        fileName: string;
-        extension: string;
-    };
-    rawBlueprint: LocalBlueprint;
-    parsedBlueprint: LocalBlueprint;
+    fileInfo: FileInfo;
+    rawBlueprint: Record<string, unknown>;
+    parsedBlueprint: Blueprint;
     errors: BlueprintParserError[];
     configPath?: string;
     projectId?: string;
@@ -48,14 +46,14 @@ export interface ReadBlueprintResult {
 export declare function readLocalBlueprint(blueprintPath?: string): Promise<ReadBlueprintResult>;
 export declare function writeBlueprintToDisk({ blueprintFilePath, jsonContent, }: {
     blueprintFilePath: string;
-    jsonContent?: LocalBlueprint;
+    jsonContent?: Blueprint;
 }): string;
 export declare function writeOrUpdateNodeDependency({ blueprintFilePath, dependency, }: {
     blueprintFilePath: string;
     dependency: string;
 }): Promise<void>;
-export declare function readConfigFile(blueprintFilePath?: string | undefined): {
-    configPath?: string;
+export declare function readConfigFile(blueprintFilePath: string): {
+    configPath: string;
     projectId?: string;
     stackId?: string;
 } | null;
@@ -71,11 +69,3 @@ export declare function addResourceToBlueprint({ blueprintFilePath, resource, }:
     blueprintFilePath?: string;
     resource: Resource;
 }): Resource | undefined;
-export declare function updateBlueprintMetadata({ blueprintFilePath, metadata, }: {
-    blueprintFilePath?: string;
-    metadata: LocalBlueprint['metadata'];
-}): void;
-export declare function updateBlueprintValues({ blueprintFilePath, values, }: {
-    blueprintFilePath: string;
-    values: LocalBlueprint['values'];
-}): void;

package/dist/actions/blueprints/blueprint.js

@@ -1,13 +1,13 @@
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { basename, dirname, extname, join } from 'node:path';
 import { cwd, env } from 'node:process';
+import blueprintParserValidator from '@sanity/blueprints-parser';
 import { findUpSync } from 'find-up';
 import { createJiti } from 'jiti';
 import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_CONFIG_VERSION, BLUEPRINT_DIR } from '../../config.js';
 import { getLatestNpmVersion } from '../../utils/other/npmjs.js';
 import { isLocalFunctionResource } from '../../utils/types.js';
 import { validateFunctionResource } from '../../utils/validate/resource.js';
-import { blueprintParserValidator } from '../../utils/vendor/parser-validator.js';
 export { BLUEPRINT_CONFIG_FILE, BLUEPRINT_CONFIG_VERSION, BLUEPRINT_DIR } from '../../config.js';
 const SUPPORTED_FILE_EXTENSIONS = ['.json', '.js', '.mjs', '.ts'];
 let SUPPORTED_FILE_NAMES = SUPPORTED_FILE_EXTENSIONS.map((ext) => `blueprint${ext}`);
@@ -128,11 +128,14 @@ export async function readLocalBlueprint(blueprintPath) {
             throw Error(`Blueprint ${fileName} must export a default function`);
         }
     }
+    if (typeof rawBlueprint === 'undefined') {
+        throw Error('Unable to read Blueprint');
+    }
     const parserResult = blueprintParserValidator(rawBlueprint);
-    const parsedBlueprint = parserResult.blueprint;
-    const errors = parserResult.errors || [];
+    const parsedBlueprint = parserResult.result === 'valid' ? parserResult.blueprint : undefined;
+    const errors = parserResult.result !== 'valid' ? parserResult.errors : [];
     // further validation - remove once validator is updated
-    if (parsedBlueprint.resources) {
+    if (parsedBlueprint?.resources) {
         // validate function resources
         const functionResources = parsedBlueprint.resources.filter(isLocalFunctionResource);
         const fnErrors = functionResources.map((r) => validateFunctionResource(r));
@@ -160,12 +163,13 @@ export async function readLocalBlueprint(blueprintPath) {
         stackId = `ST-${projectId}`;
     return {
         fileInfo: { blueprintFilePath: foundFilePath, fileName, extension },
-        rawBlueprint: rawBlueprint,
+        rawBlueprint,
         errors,
         projectId,
         stackId,
         configPath,
-        parsedBlueprint,
+        // fallback to the raw blueprint if the parser found errors
+        parsedBlueprint: parsedBlueprint || rawBlueprint,
     };
 }
 export function writeBlueprintToDisk({ blueprintFilePath, jsonContent = JSON_BLUEPRINT_CONTENT, }) {
@@ -219,17 +223,15 @@ export async function writeOrUpdateNodeDependency({ blueprintFilePath, dependenc
     writeFileSync(packageJsonPath, JSON.stringify(packageJsonObject, null, 2));
 }
 export function readConfigFile(blueprintFilePath) {
-    if (blueprintFilePath) {
-        const blueprintDir = dirname(blueprintFilePath);
-        const configPath = join(blueprintDir, BLUEPRINT_DIR, BLUEPRINT_CONFIG_FILE);
-        if (existsSync(configPath)) {
-            try {
-                const config = JSON.parse(readFileSync(configPath, 'utf8'));
-                return { configPath, ...config };
-            }
-            catch {
-                return null;
-            }
+    const blueprintDir = dirname(blueprintFilePath);
+    const configPath = join(blueprintDir, BLUEPRINT_DIR, BLUEPRINT_CONFIG_FILE);
+    if (existsSync(configPath)) {
+        try {
+            const config = JSON.parse(readFileSync(configPath, 'utf8'));
+            return { configPath, ...config };
+        }
+        catch {
+            return null;
         }
     }
     const configFilePath = join(cwd(), BLUEPRINT_DIR, BLUEPRINT_CONFIG_FILE);
@@ -296,29 +298,3 @@ export function addResourceToBlueprint({ blueprintFilePath, resource, }) {
     }
     return resource;
 }
-export function updateBlueprintMetadata({ blueprintFilePath, metadata, }) {
-    const blueprintFile = findBlueprintFile(blueprintFilePath);
-    if (!blueprintFile)
-        throw Error('Could not find Blueprint file');
-    const { blueprintFilePath: foundPath, extension } = blueprintFile;
-    if (extension === '.json') {
-        const blueprintString = readFileSync(foundPath, 'utf8').toString();
-        const blueprint = JSON.parse(blueprintString);
-        blueprint.metadata = blueprint.metadata || {};
-        blueprint.metadata = { ...blueprint.metadata, ...metadata };
-        writeFileSync(foundPath, JSON.stringify(blueprint, null, 2));
-    }
-}
-export function updateBlueprintValues({ blueprintFilePath, values, }) {
-    const blueprintFile = findBlueprintFile(blueprintFilePath);
-    if (!blueprintFile)
-        throw Error('Could not find Blueprint file');
-    const { blueprintFilePath: foundPath, extension } = blueprintFile;
-    if (extension === '.json') {
-        const blueprintString = readFileSync(foundPath, 'utf8').toString();
-        const blueprint = JSON.parse(blueprintString);
-        blueprint.values = blueprint.values || {};
-        blueprint.values = { ...blueprint.values, ...values };
-        writeFileSync(foundPath, JSON.stringify(blueprint, null, 2));
-    }
-}

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

@@ -5,17 +5,16 @@ export * as projects from '../sanity/projects.js';
 export * as assets from './assets.js';
 export * as blueprint from './blueprint.js';
 export * as logs from './logs.js';
-export * as operations from './operations.js';
 export * as resources from './resources.js';
 export * as stacks from './stacks.js';
 import type { BlueprintParserError, Stack } from '../../utils/types.js';
-import { readLocalBlueprint } from './blueprint.js';
+import { type ReadBlueprintResult } from './blueprint.js';
 export type BlueprintIssue = {
     code: 'NO_STACK_ID' | 'NO_PROJECT_ID' | 'NO_STACK' | 'PARSE_ERROR';
     message: string;
     errors?: BlueprintParserError[];
 };
-type LocalBlueprintWithIds = Awaited<ReturnType<typeof readLocalBlueprint>> & {
+type LocalBlueprintWithIds = ReadBlueprintResult & {
     projectId: string;
     stackId: string;
 };
@@ -25,7 +24,7 @@ type BlueprintSuccess = {
     issues?: never;
 };
 type BlueprintFailure = {
-    localBlueprint: Awaited<ReturnType<typeof readLocalBlueprint>>;
+    localBlueprint: ReadBlueprintResult;
     issues: BlueprintIssue[];
     deployedStack?: never;
 };

package/dist/actions/blueprints/index.js

@@ -5,7 +5,6 @@ export * as projects from '../sanity/projects.js';
 export * as assets from './assets.js';
 export * as blueprint from './blueprint.js';
 export * as logs from './logs.js';
-export * as operations from './operations.js';
 export * as resources from './resources.js';
 export * as stacks from './stacks.js';
 import { readLocalBlueprint } from './blueprint.js';

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

@@ -0,0 +1,24 @@
+import type { AuthParams, BlueprintLog } from '../../utils/types.js';
+export interface LogStreamingConfig {
+    stackId: string;
+    after?: string;
+    auth: AuthParams;
+    showBanner?: boolean;
+    log: (message: string) => void;
+}
+export interface StreamLogsOptions {
+    stackId: string;
+    after?: string;
+    auth: AuthParams;
+    onLog: (log: BlueprintLog) => void;
+    onOpen: () => void;
+    onError: (error: string) => void;
+}
+export declare function streamLogs({ stackId, after, auth, onLog, onOpen, onError, }: StreamLogsOptions): () => void;
+export declare function isNewerLog(log: BlueprintLog, timestamp: number): boolean;
+/**
+ * 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/actions/blueprints/logs-streaming.js

@@ -0,0 +1,96 @@
+import chalk from 'chalk';
+import { EventSource } from 'eventsource';
+import { formatLogEntry } from '../../utils/display/logs-formatting.js';
+import getHeaders from '../../utils/get-headers.js';
+import { logsUrl } from './logs.js';
+export function streamLogs({ stackId, after, auth, onLog, onOpen, onError, }) {
+    const url = new URL(`${logsUrl}/stream`);
+    url.searchParams.append('stackId', stackId);
+    if (after)
+        url.searchParams.append('after', after);
+    const headers = getHeaders(auth);
+    const eventSource = new EventSource(url.toString(), {
+        fetch: (input, init) => fetch(input, {
+            ...init,
+            headers: {
+                ...init?.headers,
+                ...headers,
+            },
+        }),
+    });
+    eventSource.onopen = onOpen;
+    eventSource.onmessage = (event) => {
+        try {
+            const log = JSON.parse(event.data);
+            onLog(log);
+        }
+        catch (err) {
+            onError(`Failed to parse log data: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    };
+    eventSource.addEventListener('logs', (event) => {
+        try {
+            const logData = JSON.parse(event.data);
+            // usually an array
+            if (Array.isArray(logData)) {
+                for (const log of logData)
+                    onLog(log);
+            }
+            else {
+                onLog(logData);
+            }
+        }
+        catch (err) {
+            console.error('Error parsing logs event:', err);
+        }
+    });
+    eventSource.onerror = () => {
+        onError('Connection to log stream failed or was closed');
+        if (eventSource.readyState === eventSource.CLOSED) {
+            console.log('Connection is CLOSED');
+        }
+        else if (eventSource.readyState === eventSource.CONNECTING) {
+            console.log('Connection is attempting to reconnect...');
+            return; // Don't close if trying to reconnect
+        }
+        eventSource.close();
+    };
+    return () => {
+        eventSource.close();
+    };
+}
+// Check if a log is newer than a given timestamp
+export function isNewerLog(log, timestamp) {
+    const logTimestamp = new Date(log.timestamp).getTime();
+    return logTimestamp > timestamp;
+}
+/**
+ * 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, after } = config;
+    let newestTimestamp = Date.now();
+    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,
+        after,
+        auth,
+        onLog: onLogReceived,
+        onOpen: onStreamOpen,
+        onError: onStreamError,
+    });
+}

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

@@ -5,15 +5,4 @@ export declare function getLogs(stackId: string, auth: AuthParams): Promise<{
     ok: boolean;
     error: string | null;
 }>;
-export declare function findNewestLogTimestamp(logs: BlueprintLog[]): number;
-export declare function isNewerLog(log: BlueprintLog, timestamp: number): boolean;
 export declare function getRecentLogs(logs: BlueprintLog[], limit?: number): BlueprintLog[];
-export interface StreamLogsOptions {
-    stackId: string;
-    after?: string;
-    auth: AuthParams;
-    onLog: (log: BlueprintLog) => void;
-    onOpen: () => void;
-    onError: (error: string) => void;
-}
-export declare function streamLogs({ stackId, after, auth, onLog, onOpen, onError, }: StreamLogsOptions): () => void;

package/dist/actions/blueprints/logs.js

@@ -1,4 +1,3 @@
-import { EventSource } from 'eventsource';
 import config from '../../config.js';
 import getHeaders from '../../utils/get-headers.js';
 const { apiUrl } = config;
@@ -17,82 +16,8 @@ export async function getLogs(stackId, auth) {
         logs: response.ok ? result : [],
     };
 }
-// Process logs to find the newest timestamp
-export function findNewestLogTimestamp(logs) {
-    let newestTimestamp = 0;
-    if (logs.length > 0) {
-        for (const log of logs) {
-            const timestamp = new Date(log.timestamp).getTime();
-            if (timestamp > newestTimestamp) {
-                newestTimestamp = timestamp;
-            }
-        }
-    }
-    return newestTimestamp;
-}
-// Check if a log is newer than a given timestamp
-export function isNewerLog(log, timestamp) {
-    const logTimestamp = new Date(log.timestamp).getTime();
-    return logTimestamp > timestamp;
-}
 // Get most recent logs, up to a limit
 export function getRecentLogs(logs, limit = 10) {
     const sortedLogs = [...logs].sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
     return sortedLogs.slice(-limit);
 }
-export function streamLogs({ stackId, after, auth, onLog, onOpen, onError, }) {
-    const url = new URL(`${logsUrl}/stream`);
-    url.searchParams.append('stackId', stackId);
-    if (after)
-        url.searchParams.append('after', after);
-    const headers = getHeaders(auth);
-    const eventSource = new EventSource(url.toString(), {
-        fetch: (input, init) => fetch(input, {
-            ...init,
-            headers: {
-                ...init?.headers,
-                ...headers,
-            },
-        }),
-    });
-    eventSource.onopen = onOpen;
-    eventSource.onmessage = (event) => {
-        try {
-            const log = JSON.parse(event.data);
-            onLog(log);
-        }
-        catch (err) {
-            onError(`Failed to parse log data: ${err instanceof Error ? err.message : String(err)}`);
-        }
-    };
-    eventSource.addEventListener('logs', (event) => {
-        try {
-            const logData = JSON.parse(event.data);
-            // usually an array
-            if (Array.isArray(logData)) {
-                for (const log of logData)
-                    onLog(log);
-            }
-            else {
-                onLog(logData);
-            }
-        }
-        catch (err) {
-            console.error('Error parsing logs event:', err);
-        }
-    });
-    eventSource.onerror = () => {
-        onError('Connection to log stream failed or was closed');
-        if (eventSource.readyState === eventSource.CLOSED) {
-            console.log('Connection is CLOSED');
-        }
-        else if (eventSource.readyState === eventSource.CONNECTING) {
-            console.log('Connection is attempting to reconnect...');
-            return; // Don't close if trying to reconnect
-        }
-        eventSource.close();
-    };
-    return () => {
-        eventSource.close();
-    };
-}

package/dist/baseCommands.d.ts

@@ -1,6 +1,6 @@
 import type { Interfaces } from '@oclif/core';
 import { Command } from '@oclif/core';
-import type { readLocalBlueprint } from './actions/blueprints/blueprint.js';
+import type { ReadBlueprintResult } from './actions/blueprints/blueprint.js';
 import type { AuthParams, Stack } from './utils/types.js';
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof BlueprintCommand)['baseFlags'] & T['flags']>;
 export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
@@ -11,7 +11,7 @@ export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
  */
 export declare abstract class BlueprintCommand<T extends typeof Command> extends Command {
     protected sanityToken: string;
-    protected blueprint: Awaited<ReturnType<typeof readLocalBlueprint>>;
+    protected blueprint: ReadBlueprintResult;
     protected flags: Flags<T>;
     protected args: Args<T>;
     init(): Promise<void>;

package/dist/commands/blueprints/init.js

@@ -47,13 +47,13 @@ export default class InitCommand extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(InitCommand);
-        const { token, error: tokenErr } = await validTokenOrErrorMessage();
-        if (tokenErr)
-            this.error(tokenErr.message);
+        const result = await validTokenOrErrorMessage();
+        if (!result.ok)
+            this.error(result.error.message);
         const { success, error } = await blueprintInitCore({
             bin: this.config.bin,
             log: (message) => this.log(message),
-            token,
+            token: result.value,
             args,
             flags,
         });

package/dist/cores/blueprints/deploy.js

@@ -2,8 +2,8 @@ import { setTimeout } from 'node:timers/promises';
 import chalk from 'chalk';
 import ora from 'ora';
 import { stashAsset } from '../../actions/blueprints/assets.js';
+import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.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) {

package/dist/cores/blueprints/destroy.js

@@ -2,8 +2,8 @@ import { setTimeout } from 'node:timers/promises';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import ora from 'ora';
+import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.js';
 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 { log, token, blueprint, flags } = options;

package/dist/cores/blueprints/logs.js

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import { getLogs, getRecentLogs } from '../../actions/blueprints/logs.js';
+import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.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) {