@sanity/runtime-cli 17.0.0 → 17.1.0-next.gcfbd613

package/dist/utils/functions/should-transpile.js

@@ -1,22 +1,22 @@
 import { findFunctionEntryPoint } from './find-entry-point.js';
-export async function shouldTranspileFunction(resource) {
-    if ('transpile' in resource && typeof resource.transpile === 'boolean') {
-        return resource.transpile;
-    }
-    if (!resource.src) {
-        // Cannot determine without a source path
-        return false;
+export async function shouldTranspileFunction(resource, functionPath) {
+    const hasTranspile = 'transpile' in resource && typeof resource.transpile === 'boolean';
+    if (!functionPath || (hasTranspile && resource.transpile === false)) {
+        return { transpile: false };
     }
     try {
         // 2. Find the actual entry point
-        const entryPoint = await findFunctionEntryPoint(resource.src, resource.displayName ?? resource.name);
+        const entryPoint = await findFunctionEntryPoint(functionPath, resource.displayName ?? resource.name);
         // 3. Check if the resolved entry point is a TypeScript file
-        return entryPoint.endsWith('.ts');
+        return {
+            entryPoint,
+            transpile: hasTranspile ? resource.transpile === true : entryPoint.endsWith('.ts'),
+        };
     }
     catch (err) {
         // If we cannot find the entry point, we cannot determine if it's TS.
         // Log a warning and default to false (don't bundle).
         console.warn(`[warn] Could not determine entry point for function "${resource.displayName ?? resource.name}" while checking if transpiling is needed: ${err instanceof Error ? err.message : err}`);
-        return false;
+        return { transpile: false };
     }
 }

package/dist/utils/functions/transpile/function.d.ts

@@ -1,6 +1,9 @@
 import type { FunctionResource, InstallerType } from '../../types.js';
 export declare const resolveViteRoot: (entry: string) => string;
-export declare function transpileFunction(resource: FunctionResource, { installer }?: {
+export declare function transpileFunction({ resource, functionPath, entryPoint, installer, }: {
+    resource: FunctionResource;
+    functionPath: string;
+    entryPoint: string;
     installer?: InstallerType;
 }): Promise<{
     type: string;

package/dist/utils/functions/transpile/function.js

@@ -3,9 +3,9 @@ import path from 'node:path';
 import { performance } from 'node:perf_hooks';
 import { cwd } from 'node:process';
 import * as find from 'empathic/find';
+import stripAnsi from 'strip-ansi';
 import { build as viteBuild } from 'vite';
 import { detectNativeModulesPlugin } from '../detect-native-modules.js';
-import { findFunctionEntryPoint } from '../find-entry-point.js';
 import { cleanupSourceMaps } from './cleanup-source-maps.js';
 import { createPnpmRequire } from './pnpm.js';
 import { verifyHandler } from './verify-handler.js';
@@ -13,23 +13,18 @@ export const resolveViteRoot = (entry) => {
     const nodeModulesDir = find.dir('node_modules', { cwd: entry });
     return nodeModulesDir ? path.dirname(nodeModulesDir) : entry;
 };
-export async function transpileFunction(resource, { installer } = {}) {
+export async function transpileFunction({ resource, functionPath, entryPoint, installer, }) {
     if (!resource.src)
         throw new Error('Resource src is required');
     if (!resource.name)
         throw new Error('Resource name is required');
     const timings = {};
     const transpileStart = performance.now();
-    const sourcePath = path.resolve(cwd(), resource.src);
-    const stats = await stat(sourcePath);
-    const fnDisplayName = resource.displayName ?? resource.name;
-    const findEntryStart = performance.now();
-    const entry = await findFunctionEntryPoint(sourcePath, fnDisplayName);
-    timings['transpile:findEntry'] = performance.now() - findEntryStart;
-    const entryDir = stats.isFile() ? path.dirname(sourcePath) : sourcePath;
+    const stats = await stat(functionPath);
+    const entryDir = stats.isFile() ? path.dirname(functionPath) : functionPath;
     const outputPathStart = performance.now();
     const outputDir = await getTranspileOutputPath(entryDir, resource.name);
-    const outputFile = path.join(outputDir, getOutputFilename(entry));
+    const outputFile = path.join(outputDir, getOutputFilename(entryPoint));
     const fnRootDir = resolveViteRoot(entryDir);
     timings['transpile:setupOutput'] = performance.now() - outputPathStart;
     async function cleanupTmpDir() {
@@ -51,10 +46,10 @@ export async function transpileFunction(resource, { installer } = {}) {
                 sourcemap: true,
                 ssr: true,
                 rolldownOptions: {
-                    input: entry,
+                    input: entryPoint,
                     output: {
                         format: 'esm',
-                        entryFileNames: getOutputFilename(entry),
+                        entryFileNames: getOutputFilename(entryPoint),
                         ...(bundle
                             ? {}
                             : {
@@ -86,7 +81,7 @@ export async function transpileFunction(resource, { installer } = {}) {
         await writeTranspiledPackageJson(entryDir, outputFile);
         timings['transpile:writePackage'] = performance.now() - pkgStart;
         const cleanupStart = performance.now();
-        await cleanupSourceMaps(sourcePath, outputDir);
+        await cleanupSourceMaps(functionPath, outputDir);
         timings['transpile:cleanupMaps'] = performance.now() - cleanupStart;
         timings.bundle = performance.now() - transpileStart;
         return {
@@ -100,7 +95,7 @@ export async function transpileFunction(resource, { installer } = {}) {
     }
     catch (err) {
         await cleanupTmpDir();
-        throw new Error(`Transpiling of function failed: ${formatBuildError(err)}`, {
+        throw new Error(`Transpiling of function failed: ${stripAnsi(formatBuildError(err))}`, {
             cause: err,
         });
     }

package/dist/utils/functions/transpile/verify-handler.js

@@ -4,7 +4,7 @@ export async function verifyHandler(result) {
     }
     const outputs = (Array.isArray(result) ? result : [result]).flatMap(({ output }) => output);
     const bundledIndex = outputs.find((output) => output.type === 'chunk' && output.isEntry && output.fileName === 'index.js');
-    if (!bundledIndex || bundledIndex.type !== 'chunk') {
+    if (bundledIndex?.type !== 'chunk') {
         throw new Error('Unexpected build output, no bundled index found');
     }
     if (!bundledIndex.exports.includes('handler')) {

package/dist/utils/isTrueish.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Quick check for 'true' or '1' from env
+ * @param val
+ */
+declare const isTrueish: (val?: string) => boolean;
+export default isTrueish;

package/dist/utils/isTrueish.js

@@ -0,0 +1,9 @@
+/**
+ * Quick check for 'true' or '1' from env
+ * @param val
+ */
+const isTrueish = (val) => {
+    const v = (val ?? '').toLowerCase();
+    return v === 'true' || parseInt(v, 10) > 0;
+};
+export default isTrueish;

package/dist/utils/logger.d.ts

@@ -6,11 +6,13 @@ export declare function Logger(log: (msg: string) => void, flags?: {
 }): {
     (msg: string): void;
     isTraceEnabled: boolean;
-    trace(formatter: unknown, ...args: unknown[]): false | void;
-    verbose(formatter: unknown, ...args: unknown[]): false | void;
-    info(formatter: unknown, ...args: unknown[]): false | void;
-    warn(formatter: unknown, ...args: unknown[]): false | void;
-    error(formatter: unknown, ...args: unknown[]): false | void;
+    trace: (formatter: unknown, ...args: unknown[]) => void | false;
+    verbose: (formatter: unknown, ...args: unknown[]) => void | false;
+    info: (formatter: unknown, ...args: unknown[]) => void | false;
+    warn: (formatter: unknown, ...args: unknown[]) => void | false;
+    error: (formatter: unknown, ...args: unknown[]) => void | false;
+    showProgress: (percent?: number) => void;
+    clearProgress: () => void;
     ora: typeof ora;
 };
 export type Logger = ReturnType<typeof Logger>;

package/dist/utils/logger.js

@@ -1,5 +1,6 @@
 import { format } from 'node:util';
 import ora from 'ora';
+import { clearProgress, showBusy, showError, showProgress } from './progress.js';
 var LogLevel;
 (function (LogLevel) {
     LogLevel[LogLevel["TRACE"] = 0] = "TRACE";
@@ -19,16 +20,47 @@ export function Logger(log, flags = {}) {
     logger.info = (formatter, ...args) => level <= LogLevel.INFO && logger(format(formatter, ...args));
     logger.warn = (formatter, ...args) => level <= LogLevel.WARN && logger(format(formatter, ...args));
     logger.error = (formatter, ...args) => level <= LogLevel.ERROR && logger(format(formatter, ...args));
+    logger.showProgress = (percent) => {
+        if (flags.json)
+            return;
+        if (percent === undefined)
+            showBusy();
+        else
+            showProgress(percent);
+    };
+    logger.clearProgress = () => {
+        if (flags.json)
+            return;
+        clearProgress();
+    };
     const oraWrapper = (opts) => {
         if (flags.json)
             return createOraLineLoggingWrapper(opts, logger);
         if (level >= LogLevel.INFO)
-            return ora(opts);
+            return withTerminalProgress(ora(opts));
         return createOraLineLoggingWrapper(opts, logger);
     };
     logger.ora = oraWrapper;
     return logger;
 }
+function withTerminalProgress(spinner) {
+    const wrap = (name, effect) => {
+        if (typeof spinner[name] !== 'function')
+            return;
+        const original = spinner[name].bind(spinner);
+        spinner[name] = (...args) => {
+            const result = original(...args);
+            effect();
+            return result;
+        };
+    };
+    wrap('start', showBusy);
+    wrap('fail', showError);
+    for (const name of ['stop', 'succeed', 'warn', 'info', 'stopAndPersist']) {
+        wrap(name, clearProgress);
+    }
+    return spinner;
+}
 /**
  * An ora-like wrapper that uses standard line output logging instead of rendering a spinner; used in verbose and trace modes.
  */

package/dist/utils/progress.d.ts

@@ -0,0 +1,5 @@
+export declare function showProgress(percent: number): void;
+export declare function showBusy(): void;
+export declare function showError(): void;
+export declare function showPaused(percent: number): void;
+export declare function clearProgress(): void;

package/dist/utils/progress.js

@@ -0,0 +1,40 @@
+import { stderr } from 'node:process';
+import { onExit } from 'signal-exit';
+const ST = '\x1b\\';
+const STATES = {
+    clear: 0,
+    normal: 1,
+    error: 2,
+    paused: 4,
+    busy: 3,
+};
+let exitHookRegistered = false;
+function write(state, value = 0) {
+    if (!stderr.isTTY)
+        return;
+    if (!exitHookRegistered) {
+        exitHookRegistered = true;
+        function clear() {
+            stderr.write(`\x1b]9;4;0;0${ST}`);
+        }
+        // arc/utils SIGINT handler clobbers our signal-exit; luckily it then calls process.exit()
+        process.once('exit', clear); // triggered by arc/utils SIGINT handler
+        onExit(clear); // triggered by all other exit paths
+    }
+    stderr.write(`\x1b]9;4;${STATES[state]};${Math.round(value)}${ST}`);
+}
+export function showProgress(percent) {
+    write('normal', Math.max(0, Math.min(100, percent)));
+}
+export function showBusy() {
+    write('busy');
+}
+export function showError() {
+    write('error', 100);
+}
+export function showPaused(percent) {
+    write('paused', Math.max(0, Math.min(100, percent)));
+}
+export function clearProgress() {
+    write('clear');
+}

package/dist/utils/types.d.ts

@@ -98,13 +98,14 @@ export interface InvokeGroqPayloadOptions {
     before: Record<string, unknown> | null;
     after: Record<string, unknown> | null;
 }
-export interface InvokeSchedulePayloadOptions {
+export interface InvokeNonGroqPayloadOptions {
     payload?: Record<string, unknown>;
-    event: 'scheduled';
+    event: NonGroqEventType;
 }
-export type InvokePayloadOptions = InvokeGroqPayloadOptions | InvokeSchedulePayloadOptions;
-export type InvokePayloadMetadata = Pick<InvokeGroqPayloadOptions, 'event' | 'before' | 'after'> | Pick<InvokeSchedulePayloadOptions, 'event'>;
+export type InvokePayloadOptions = InvokeGroqPayloadOptions | InvokeNonGroqPayloadOptions;
+export type InvokePayloadMetadata = Pick<InvokeGroqPayloadOptions, 'event' | 'before' | 'after'> | Pick<InvokeNonGroqPayloadOptions, 'event'>;
 export type EventType = 'create' | 'update' | 'delete';
+export type NonGroqEventType = 'scheduled' | 'nested';
 export declare function isEventType(arg: string): arg is EventType;
 /** @internal */
 export interface InvokeGroqContextOptions {
@@ -125,6 +126,8 @@ export interface InvokeGroqContextOptions {
     functionResourceId: string;
     /** All resources declared by the blueprint, used to populate `context.resources` at invoke time. */
     resources?: BlueprintResource[];
+    /** The directory where the blueprint manifest is located. */
+    blueprintFileDir: string;
 }
 /** @internal */
 export interface InvokeScheduleContextOptions {
@@ -133,6 +136,8 @@ export interface InvokeScheduleContextOptions {
     };
     /** All resources declared by the blueprint, used to populate `context.resources` at invoke time. */
     resources?: BlueprintResource[];
+    /** The directory where the blueprint manifest is located. */
+    blueprintFileDir: string;
 }
 export type InvokeContextOptions = InvokeGroqContextOptions | InvokeScheduleContextOptions;
 export declare function isGroqContextOptions(context: InvokeContextOptions): context is InvokeGroqContextOptions;
@@ -140,7 +145,64 @@ export declare function isGroqContextOptions(context: InvokeContextOptions): con
 export interface InvokeExecutionOptions {
     forceColor?: boolean;
     timeout?: number;
+    /**
+     * Callback used to resolve a nested `context.invoke(name, payload)` made from
+     * within a running function. When absent, nested invokes are rejected.
+     * @internal
+     */
+    onNestedInvoke?: NestedInvoke;
+    /** Current invocation depth, used to bound nested `context.invoke` recursion. @internal */
+    depth?: number;
+    /** Function names already on the invoke call stack (innermost last), used to detect cycles. @internal */
+    callStack?: string[];
 }
+/**
+ * Re-entrant callback that executes a named function from the blueprint on behalf
+ * of a nested `context.invoke(name, payload)` and returns its invocation result.
+ * @internal
+ */
+export type NestedInvoke = (name: string, payload: Record<string, unknown>, context: InvokeContextOptions, depth: number, callStack: string[]) => Promise<InvocationResponse & {
+    timings: Record<string, number>;
+}>;
+/**
+ * IPC messages sent from the parent (invoke-local) down to a function child process.
+ * @internal
+ */
+export type ParentToChildMessage = {
+    type: 'start';
+    srcPath: string;
+    payload: unknown;
+} | {
+    type: 'invoke-response';
+    id: string;
+    ok: true;
+    result: {
+        json: JsonInvocationResponse | undefined;
+    };
+} | {
+    type: 'invoke-response';
+    id: string;
+    ok: false;
+    error: InvocationError;
+};
+/**
+ * IPC messages sent from a function child process back up to the parent.
+ * `result` is terminal and triggers shutdown; `invoke-request` is a nested
+ * `context.invoke` awaiting a correlated `invoke-response`.
+ * @internal
+ */
+export type ChildToParentMessage = {
+    type: 'invoke-request';
+    id: string;
+    name: string;
+    payload: Record<string, unknown>;
+} | {
+    type: 'result';
+    json?: JsonInvocationResponse;
+    logs?: string;
+    errorLogs?: string;
+    error?: InvocationError;
+};
 /** @internal */
 export interface InvocationResponse {
     error: InvocationError | undefined;
@@ -207,7 +269,7 @@ export declare interface FetchConfig {
     apiHost?: string;
     apiVersion?: string;
 }
-export declare const INSTALLER_OPTIONS: readonly ["npm", "pnpm", "yarn"];
+export declare const INSTALLER_OPTIONS: readonly ['npm', 'pnpm', 'yarn'];
 export type InstallerType = 'npm' | 'pnpm' | 'yarn';
 export type AssetPrepResult = {
     success: true;

package/oclif.manifest.json

@@ -656,7 +656,7 @@
     "blueprints:doctor": {
       "aliases": [],
       "args": {},
-      "description": "Analyzes your local Blueprint and remote Stack configuration for common issues, such as missing authentication, invalid project references, or misconfigured resources.\n\nRun this command when encountering errors with other Blueprint commands. Use --fix to interactively resolve detected issues.",
+      "description": "Analyzes your local Blueprint and remote Stack configuration for common issues, such as missing authentication, invalid project references, or misconfigured resources.\n\nRun this command when encountering errors with other Blueprint commands. Use --fix to interactively resolve detected issues.\n\nSupports --json for programmatic consumption of diagnostic results.",
       "examples": [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %> --fix"
@@ -695,9 +695,10 @@
           "type": "boolean"
         },
         "verbose": {
-          "description": "Verbose output; defaults to true",
+          "description": "Verbose output",
+          "hidden": true,
           "name": "verbose",
-          "allowNo": true,
+          "allowNo": false,
           "type": "boolean"
         },
         "fix": {
@@ -2997,5 +2998,5 @@
       ]
     }
   },
-  "version": "17.0.0"
+  "version": "17.1.0-next.gcfbd613"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "17.0.0",
+  "version": "17.1.0-next.gcfbd613",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",
@@ -58,56 +58,57 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@architect/hydrate": "~6.0.0",
-    "@architect/inventory": "~6.0.0",
+    "@architect/hydrate": "~6.0.2",
+    "@architect/inventory": "~6.1.0",
     "@inquirer/prompts": "^8.5.2",
-    "@oclif/core": "^4.11.6",
-    "@oclif/plugin-help": "^6.2.50",
+    "@oclif/core": "^4.11.14",
+    "@oclif/plugin-help": "^6.2.53",
     "@sanity-labs/design-tokens": "^0.0.2-alpha.2",
-    "@sanity/blueprints": "^0.20.1",
+    "@sanity/blueprints": "^0.22.0",
     "@sanity/blueprints-parser": "^0.4.0",
-    "@sanity/client": "^7.22.1",
-    "adm-zip": "^0.5.17",
+    "@sanity/client": "^7.23.1",
+    "adm-zip": "^0.6.0",
     "array-treeify": "^0.1.5",
     "cardinal": "^2.1.1",
     "empathic": "^2.0.1",
     "eventsource": "^4.1.0",
-    "groq-js": "^1.30.2",
+    "groq-js": "^1.30.3",
     "jiti": "^2.7.0",
     "mime-types": "^3.0.2",
-    "ora": "^9.4.0",
+    "ora": "^9.4.1",
+    "signal-exit": "^4.1.0",
+    "strip-ansi": "^7.2.0",
     "tar-stream": "^3.2.0",
-    "vite": "^8.0.16",
-    "ws": "^8.21.0",
+    "vite": "^8.1.4",
+    "ws": "^8.21.1",
     "xdg-basedir": "^5.1.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.4.14",
+    "@biomejs/biome": "2.5.3",
     "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/state": "^6.6.0",
+    "@codemirror/state": "^6.7.1",
     "@enhance/store": "^1.0.2",
     "@lezer/highlight": "^1.2.3",
-    "@oclif/test": "^4.1.18",
-    "@playwright/test": "^1.59.1",
+    "@oclif/test": "^4.1.20",
+    "@playwright/test": "^1.61.1",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@sanity/functions": "^1.3.1",
+    "@sanity/functions": "^1.4.0",
     "@types/adm-zip": "^0.5.8",
     "@types/cardinal": "^2.1.1",
     "@types/mime-types": "^3.0.1",
     "@types/node": "^22",
     "@types/tar-stream": "^3.1.4",
     "@types/ws": "^8.18.1",
-    "@vitest/coverage-v8": "4.1.9",
+    "@vitest/coverage-v8": "4.1.10",
     "codemirror": "^6.0.2",
     "mentoss": "^0.13.0",
-    "oclif": "^4.23.0",
+    "oclif": "^4.23.27",
     "pretty-bytes": "^7.1.0",
     "pretty-ms": "^9.3.0",
-    "rollup": "^4.60.3",
+    "rollup": "^4.62.2",
     "shx": "^0.4.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^6.0.3",
-    "vitest": "4.1.9"
+    "typescript": "^7.0.2",
+    "vitest": "4.1.10"
   },
   "oclif": {
     "bin": "sanity-run",
@@ -129,5 +130,9 @@
   "publishConfig": {
     "access": "public",
     "provenance": false
+  },
+  "allowScripts": {
+    "fsevents@2.3.2": true,
+    "fsevents@2.3.3": true
   }
 }

package/dist/server/static/hot-reload.js

@@ -1,16 +0,0 @@
-import apiConstructor from '../api.js'
-
-const api = apiConstructor()
-
-// Create WebSocket connection.
-const socket = new WebSocket('ws://localhost:8974')
-
-// Connection opened
-socket.addEventListener('open', () => {
-  console.log('Watching for Blueprint changes')
-})
-
-// Listen for messages
-socket.addEventListener('message', (event) => {
-  if (event.data === 'reload-blueprint') api.blueprint()
-})