@sanity/runtime-cli 10.4.0 → 10.5.0

package/dist/cores/index.js

@@ -9,10 +9,10 @@ export async function initBlueprintConfig({ bin, log, token, validateToken = tru
     let checkedToken = token;
     if (!token || (token && validateToken)) {
         const tokenCheck = await validTokenOrErrorMessage(token);
-        if (tokenCheck.error) {
+        if (!tokenCheck.ok) {
             return { ok: false, error: tokenCheck.error.message };
         }
-        checkedToken = tokenCheck.token;
+        checkedToken = tokenCheck.value;
     }
     if (!checkedToken) {
         return { ok: false, error: 'A valid token is required but was not provided.' };

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

@@ -1,6 +1,7 @@
-import type { LocalBlueprint, Resource, Stack } from '../types.js';
+import type { Blueprint } from '@sanity/blueprints-parser';
+import type { Resource, Stack } from '../types.js';
 export declare function formatTitle(title: string, name: string): string;
 export declare function formatResourceTree(resources: Resource[] | undefined): string;
-export declare function formatStackInfo(stack: Stack | LocalBlueprint, isCurrentStack?: boolean): string;
+export declare function formatStackInfo(stack: Stack | Blueprint, isCurrentStack?: boolean): string;
 export declare function formatStacksListing(stacks: Stack[], currentStackId?: string): string;
-export declare function stackDeployDiff(localBlueprint: LocalBlueprint, deployedStack: Stack): string | null;
+export declare function stackDeployDiff(localBlueprint: Blueprint, deployedStack: Stack): string | null;

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

@@ -1,5 +1,4 @@
 export * as blueprintsFormatting from './blueprints-formatting.js';
-export * as colors from './colors.js';
 export * as dates from './dates.js';
 export * as errors from './errors.js';
 export * as logsFormatting from './logs-formatting.js';

package/dist/utils/display/index.js

@@ -1,5 +1,4 @@
 export * as blueprintsFormatting from './blueprints-formatting.js';
-export * as colors from './colors.js';
 export * as dates from './dates.js';
 export * as errors from './errors.js';
 export * as logsFormatting from './logs-formatting.js';

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

@@ -1,5 +1,4 @@
 import type { BlueprintLog } from '../types.js';
 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

@@ -6,16 +6,6 @@ export function formatLogEntry(log, withDate = true, isNewest = false) {
     const day = date.toLocaleDateString();
     return `${isNewest ? `${chalk.green('>')} ` : ''}${withDate ? `${day} ` : ''}${chalk.dim(time)} ${log.message}`;
 }
-export function formatRecentLogs(logs) {
-    if (logs.length === 0)
-        return 'No recent logs found';
-    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)
-        result += `  ${formatLogEntry(log)}\n`;
-    return result;
-}
 export function organizeLogsByDay(logs) {
     const logsByDay = new Map();
     for (const log of logs) {

package/dist/utils/find-function.d.ts

@@ -1,4 +1,4 @@
-import type { DeployedResource, FunctionResource, LocalBlueprint, Stack } from './types.js';
-export declare function findFunctionByName(blueprintOrStack: LocalBlueprint, name: string): FunctionResource;
+import type { Blueprint } from '@sanity/blueprints-parser';
+import type { DeployedResource, FunctionResource, Stack } from './types.js';
+export declare function findFunctionByName(blueprintOrStack: Blueprint, name: string): FunctionResource;
 export declare function findFunctionByName(blueprintOrStack: Stack, name: string): FunctionResource & DeployedResource;
-export declare function getFunctionSource(blueprintOrStack: LocalBlueprint | Stack, name: string): string;

package/dist/utils/find-function.js

@@ -1,24 +1,6 @@
-import { existsSync, statSync } from 'node:fs';
-import { join } from 'node:path';
 export function findFunctionByName(blueprintOrStack, name) {
     const func = blueprintOrStack?.resources?.find((r) => r?.type?.startsWith('sanity.function.') && r.name === name);
     if (!func)
         throw Error(`Unable to find function ${name}`);
     return func;
 }
-export function getFunctionSource(blueprintOrStack, name) {
-    const func = findFunctionByName(blueprintOrStack, name);
-    const { src } = func;
-    if (!src)
-        throw Error(`Function ${name} has no source code`);
-    if (!existsSync(src))
-        throw Error(`Function source not found: ${src}`);
-    if (statSync(src).isDirectory()) {
-        const indexPath = join(src, 'index.js');
-        if (!existsSync(indexPath)) {
-            throw Error(`Function directory ${src} has no index.js`);
-        }
-        return indexPath;
-    }
-    return src;
-}

package/dist/utils/index.d.ts

@@ -4,4 +4,3 @@ export * as invokeLocal from './invoke-local.js';
 export * as types from './types.js';
 export * as validate from './validate/index.js';
 export * as validatedToken from './validated-token.js';
-export * as vendor from './vendor/index.js';

package/dist/utils/index.js

@@ -4,4 +4,3 @@ export * as invokeLocal from './invoke-local.js';
 export * as types from './types.js';
 export * as validate from './validate/index.js';
 export * as validatedToken from './validated-token.js';
-export * as vendor from './vendor/index.js';

package/dist/utils/types.d.ts

@@ -1,10 +1,11 @@
+import type { Blueprint } from '@sanity/blueprints-parser';
 /** Result utility type */
-export type Result<T> = {
+export type Result<T, E = string> = {
     ok: true;
     value: T;
 } | {
     ok: false;
-    error: string;
+    error: E;
 };
 /** @internal */
 export interface AuthParams {
@@ -20,44 +21,6 @@ export interface GroqRule {
     projection?: string;
 }
 /** @internal */
-export interface LocalBlueprint {
-    /** @link https://github.com/sanity-io/blueprints-rfc/blob/main/readme.md#versioning */
-    blueprintVersion?: string;
-    /** @link https://github.com/sanity-io/blueprints-rfc/blob/main/readme.md#values */
-    values?: Record<string, unknown>;
-    /** @link https://github.com/sanity-io/blueprints-rfc/blob/main/readme.md#outputs */
-    outputs?: Array<Record<string, unknown>>;
-    /** @link https://github.com/sanity-io/blueprints-rfc/blob/main/readme.md#resources */
-    resources?: Array<Resource | FunctionResource>;
-    /** @link https://github.com/sanity-io/blueprints-rfc/blob/main/readme.md#parameters */
-    parameters?: Array<{
-        name: string;
-        type: 'arg' | 'argument' | 'env-var' | 'envVar' | 'config' | 'stdin';
-    } & ({
-        type: 'arg' | 'argument';
-        argument: string;
-        'env-var'?: never;
-        setting?: never;
-    } | {
-        type: 'env-var' | 'envVar';
-        'env-var': string;
-        argument?: never;
-        setting?: never;
-    } | {
-        type: 'config';
-        setting: string;
-        'env-var'?: never;
-        argument?: never;
-    } | {
-        type: 'stdin';
-        'env-var'?: never;
-        argument?: never;
-        setting?: never;
-    })>;
-    /** @link https://github.com/sanity-io/blueprints-rfc/blob/main/readme.md#arbitrary-userland-data */
-    metadata?: Record<string, unknown>;
-}
-/** @internal */
 export interface Resource {
     name: string;
     type: string;
@@ -104,7 +67,7 @@ export interface StackOperation {
 export interface StackMutation {
     name: string;
     projectId: string;
-    document: LocalBlueprint;
+    document: Blueprint;
     useProjectBasedId?: boolean;
 }
 /** @internal */
@@ -174,5 +137,5 @@ export declare enum BlueprintParserErrorType {
 /** @internal */
 export interface BlueprintParserError {
     message: string;
-    type: BlueprintParserErrorType;
+    type: string;
 }

package/dist/utils/validated-token.d.ts

@@ -1,11 +1,6 @@
+import type { Result } from './types.js';
 export declare function validToken(maybeToken?: string): Promise<string>;
-export declare function validTokenOrErrorMessage(maybeToken?: string): Promise<{
-    token: string;
-    error?: never;
-} | {
-    token?: never;
-    error: {
-        e: Error | unknown;
-        message: string;
-    };
-}>;
+export declare function validTokenOrErrorMessage(maybeToken?: string): Promise<Result<string, {
+    e: Error | unknown;
+    message: string;
+}>>;

package/dist/utils/validated-token.js

@@ -24,13 +24,14 @@ export async function validToken(maybeToken) {
 export async function validTokenOrErrorMessage(maybeToken) {
     try {
         const token = await validToken(maybeToken);
-        return { token };
+        return { ok: true, value: token };
     }
     catch (e) {
         if (e instanceof Error) {
             switch (e.message) {
                 case 'NO_TOKEN':
                     return {
+                        ok: false,
                         error: {
                             e,
                             message: 'No API token found. Use `npx @sanity/cli login` to login.',
@@ -38,6 +39,7 @@ export async function validTokenOrErrorMessage(maybeToken) {
                     };
                 case 'NO_USER':
                     return {
+                        ok: false,
                         error: {
                             e,
                             message: 'User is not authenticated. Use `npx @sanity/cli login` to login.',
@@ -45,15 +47,16 @@ export async function validTokenOrErrorMessage(maybeToken) {
                     };
                 case 'SERVER_ERROR':
                     return {
+                        ok: false,
                         error: {
                             e,
                             message: `Authentication server error: "${e.cause}". Try again later`,
                         },
                     };
                 default:
-                    return { error: { e, message: e.message } };
+                    return { ok: false, error: { e, message: e.message } };
             }
         }
-        return { error: { e, message: 'Unknown error' } };
+        return { ok: false, error: { e, message: 'Unknown error' } };
     }
 }

package/oclif.manifest.json

@@ -907,5 +907,5 @@
       ]
     }
   },
-  "version": "10.4.0"
+  "version": "10.5.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "10.4.0",
+  "version": "10.5.0",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",
@@ -80,6 +80,7 @@
     "@architect/inventory": "^4.0.9",
     "@oclif/core": "^4.5.2",
     "@oclif/plugin-help": "^6.2.32",
+    "@sanity/blueprints-parser": "^0.2.0",
     "@sanity/client": "^7.8.2",
     "adm-zip": "^0.5.16",
     "array-treeify": "^0.1.5",

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

@@ -1,19 +0,0 @@
-import type { AuthParams, StackOperation } from '../../utils/types.js';
-export declare const stacksUrl: string;
-export declare function getOperation({ stackId, operationId, auth, }: {
-    stackId: string;
-    operationId: string;
-    auth: AuthParams;
-}): Promise<{
-    ok: boolean;
-    error: string | null;
-    operation: StackOperation | null;
-}>;
-export declare function listOperations({ stackId, auth, }: {
-    stackId: string;
-    auth: AuthParams;
-}): Promise<{
-    ok: boolean;
-    error: string | null;
-    operations: StackOperation[];
-}>;

package/dist/actions/blueprints/operations.js

@@ -1,46 +0,0 @@
-import config from '../../config.js';
-import getHeaders from '../../utils/get-headers.js';
-const { apiUrl } = config;
-export const stacksUrl = `${apiUrl}vX/blueprints/stacks`;
-export async function getOperation({ stackId, operationId, auth, }) {
-    const path = `${stacksUrl}/${stackId}/operations/${operationId}`;
-    const response = await fetch(path, {
-        method: 'GET',
-        headers: getHeaders(auth),
-    });
-    if (!response.ok) {
-        const errorText = await response.text();
-        return {
-            ok: false,
-            error: errorText || 'Failed to fetch operation details',
-            operation: null,
-        };
-    }
-    const operation = await response.json();
-    return {
-        ok: true,
-        error: null,
-        operation,
-    };
-}
-export async function listOperations({ stackId, auth, }) {
-    const path = `${stacksUrl}/${stackId}/operations`;
-    const response = await fetch(path, {
-        method: 'GET',
-        headers: getHeaders(auth),
-    });
-    if (!response.ok) {
-        const errorText = await response.text();
-        return {
-            ok: false,
-            error: errorText || 'Failed to fetch operations',
-            operations: [],
-        };
-    }
-    const operations = await response.json();
-    return {
-        ok: true,
-        error: null,
-        operations,
-    };
-}

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

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

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

@@ -1,33 +0,0 @@
-import chalk from 'chalk';
-import { isNewerLog, streamLogs } from '../../actions/blueprints/logs.js';
-import { formatLogEntry } from './logs-formatting.js';
-/**
- * Sets up log streaming for operations like deploy or destroy with spinner integration
- * @param config Configuration for log streaming
- * @returns A cleanup function for closing the log stream
- */
-export async function setupLogStreaming(config) {
-    const { stackId, auth, log, showBanner, 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/utils/display/colors.d.ts

@@ -1,15 +0,0 @@
-export { info, niceId, severe, warn } from './presenters.js';
-/** @deprecated Use `chalk.bold` directly */
-export declare function bold(str: string): string;
-/** @deprecated Use `chalk.underline` directly */
-export declare function underline(str: string): string;
-/** @deprecated Use `chalk.dim` directly */
-export declare function dim(str: string): string;
-/** @deprecated Use `chalk.blue` directly */
-export declare function blue(str: string): string;
-/** @deprecated Use `chalk.green` directly */
-export declare function green(str: string): string;
-/** @deprecated Use `chalk.red` directly */
-export declare function red(str: string): string;
-/** @deprecated Use `chalk.yellow` directly */
-export declare function yellow(str: string): string;

package/dist/utils/display/colors.js

@@ -1,30 +0,0 @@
-import chalk from 'chalk';
-export { info, niceId, severe, warn } from './presenters.js';
-/** @deprecated Use `chalk.bold` directly */
-export function bold(str) {
-    return chalk.bold(str);
-}
-/** @deprecated Use `chalk.underline` directly */
-export function underline(str) {
-    return chalk.underline(str);
-}
-/** @deprecated Use `chalk.dim` directly */
-export function dim(str) {
-    return chalk.dim(str);
-}
-/** @deprecated Use `chalk.blue` directly */
-export function blue(str) {
-    return chalk.blue(str);
-}
-/** @deprecated Use `chalk.green` directly */
-export function green(str) {
-    return chalk.green(str);
-}
-/** @deprecated Use `chalk.red` directly */
-export function red(str) {
-    return chalk.red(str);
-}
-/** @deprecated Use `chalk.yellow` directly */
-export function yellow(str) {
-    return chalk.yellow(str);
-}

package/dist/utils/vendor/index.d.ts

@@ -1 +0,0 @@
-export { blueprintParserValidator } from './parser-validator.js';

package/dist/utils/vendor/index.js

@@ -1 +0,0 @@
-export { blueprintParserValidator } from './parser-validator.js';

package/dist/utils/vendor/parser-validator.d.ts

@@ -1,7 +0,0 @@
-export function blueprintParserValidator(input: any, options?: {}): {
-    blueprint: any;
-    errors: any[];
-} | {
-    blueprint: any;
-    errors?: undefined;
-};