@sanity/runtime-cli 7.0.3 → 7.2.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/7.0.3 linux-x64 node-v22.15.0
+@sanity/runtime-cli/7.2.0 linux-x64 node-v22.15.0
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -84,7 +84,7 @@ EXAMPLES
   $ sanity-run blueprints add function --name my-function --fn-type document-publish --lang js
 ```
 
-_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -112,7 +112,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -134,7 +134,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --no-wait
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -155,7 +155,7 @@ EXAMPLES
   $ sanity-run blueprints destroy
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ sanity-run blueprints info
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -204,7 +204,7 @@ EXAMPLES
   $ sanity-run blueprints init --blueprint-type <json|js|ts> --project-id <projectId>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -226,7 +226,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -243,7 +243,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run functions dev`
 
@@ -263,7 +263,7 @@ EXAMPLES
   $ sanity-run functions dev --port 8974
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -285,7 +285,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/v7.0.3/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -305,7 +305,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -326,7 +326,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/v7.0.3/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs NAME`
 
@@ -334,7 +334,7 @@ Retrieve or delete logs for a Sanity Function
 
 ```
 USAGE
-  $ sanity-run functions logs NAME [-u] [-f [-d | -l <value> | -j]]
+  $ sanity-run functions logs NAME [-u] [-f [-d | -l <value> | -j]] [-w]
 
 ARGUMENTS
   NAME  The name of the Sanity Function
@@ -345,6 +345,7 @@ FLAGS
   -j, --json           Return logs in JSON format
   -l, --limit=<value>  [default: 50] Total number of log entries to retrieve
   -u, --utc            Show dates in UTC time zone
+  -w, --watch          Watch for new logs (streaming mode)
 
 DESCRIPTION
   Retrieve or delete logs for a Sanity Function
@@ -359,7 +360,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.0.3/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -392,7 +393,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/v7.0.3/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v7.2.0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -1,4 +1,4 @@
-import type { AuthParams } from '../../utils/types.js';
+import type { AuthParams, FunctionLog } from '../../utils/types.js';
 /** @internal */
 export interface LoggingOptions {
     limit: number;
@@ -13,3 +13,4 @@ export declare function deleteLogs(id: string, auth: AuthParams): Promise<{
     ok: boolean;
     error: any;
 }>;
+export declare function streamLogs(id: string, auth: AuthParams, onLog: (log: FunctionLog) => void, onOpen: () => void, onError: (error: string) => void): () => void;

package/dist/actions/functions/logs.js

@@ -1,3 +1,4 @@
+import { EventSource } from 'eventsource';
 import config from '../../config.js';
 import getHeaders from '../../utils/get-headers.js';
 const { apiUrl } = config;
@@ -26,3 +27,57 @@ export async function deleteLogs(id, auth) {
         error: response.ok ? null : json?.error?.message,
     };
 }
+// Create streaming logs connection
+export function streamLogs(id, auth, onLog, onOpen, onError) {
+    const url = new URL(`${apiUrl}vX/functions/${id}/logs/stream`);
+    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 = (err) => {
+        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/commands/functions/dev.d.ts

@@ -1,9 +1,9 @@
 import { Command } from '@oclif/core';
-export default class Dev extends Command {
+export default class DevCommand extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        port: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        port: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/functions/dev.js

@@ -1,15 +1,21 @@
 import { Command, Flags } from '@oclif/core';
-import { dev } from '../../actions/functions/dev.js';
-export default class Dev extends Command {
+import { functionDevCore } from '../../cores/functions/dev.js';
+export default class DevCommand extends Command {
     static description = 'Start the Sanity Function emulator';
     static examples = ['<%= config.bin %> <%= command.id %> --port 8974'];
     static flags = {
-        port: Flags.string({ char: 'p', description: 'Port to start emulator on', required: false }),
+        port: Flags.integer({ char: 'p', description: 'Port to start emulator on', required: false }),
     };
     async run() {
-        const { flags } = await this.parse(Dev);
-        const { port = 8080 } = flags;
-        dev(Number(port));
-        this.log(`Server is running on port ${port}\n`);
+        const { flags } = await this.parse(DevCommand);
+        const { success, error, streaming } = await functionDevCore({
+            bin: this.config.bin,
+            log: (msg) => this.log(msg),
+            flags,
+        });
+        if (!success)
+            this.error(error);
+        if (streaming)
+            await streaming;
     }
 }

package/dist/commands/functions/env/add.js

@@ -1,6 +1,6 @@
 import { Args } from '@oclif/core';
 import { DeployedBlueprintCommand } from '../../../baseCommands.js';
-import { envAddCore } from '../../../cores/functions/env/add.js';
+import { functionEnvAddCore } from '../../../cores/functions/env/add.js';
 export default class EnvAddCommand extends DeployedBlueprintCommand {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -12,7 +12,7 @@ export default class EnvAddCommand extends DeployedBlueprintCommand {
         '<%= config.bin %> <%= command.id %> MyFunction API_URL https://api.example.com/',
     ];
     async run() {
-        const { success, error } = await envAddCore({
+        const { success, error } = await functionEnvAddCore({
             bin: this.config.bin,
             log: (msg) => this.log(msg),
             args: this.args,

package/dist/commands/functions/env/list.js

@@ -1,6 +1,6 @@
 import { Args } from '@oclif/core';
 import { DeployedBlueprintCommand } from '../../../baseCommands.js';
-import { envListCore } from '../../../cores/functions/env/list.js';
+import { functionEnvListCore } from '../../../cores/functions/env/list.js';
 export default class EnvListCommand extends DeployedBlueprintCommand {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -8,7 +8,7 @@ export default class EnvListCommand extends DeployedBlueprintCommand {
     static description = 'List the environment variables for a Sanity function';
     static examples = ['<%= config.bin %> <%= command.id %> MyFunction'];
     async run() {
-        const { success, error } = await envListCore({
+        const { success, error } = await functionEnvListCore({
             bin: this.config.bin,
             log: (msg) => this.log(msg),
             args: this.args,

package/dist/commands/functions/env/remove.js

@@ -1,6 +1,6 @@
 import { Args } from '@oclif/core';
 import { DeployedBlueprintCommand } from '../../../baseCommands.js';
-import { envRemoveCore } from '../../../cores/functions/env/remove.js';
+import { functionEnvRemoveCore } from '../../../cores/functions/env/remove.js';
 export default class EnvRemoveCommand extends DeployedBlueprintCommand {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -9,7 +9,7 @@ export default class EnvRemoveCommand extends DeployedBlueprintCommand {
     static description = 'Remove an environment variable for a Sanity function';
     static examples = ['<%= config.bin %> <%= command.id %> MyFunction API_URL'];
     async run() {
-        const { success, error } = await envRemoveCore({
+        const { success, error } = await functionEnvRemoveCore({
             bin: this.config.bin,
             log: (msg) => this.log(msg),
             args: this.args,

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

@@ -1,12 +1,4 @@
 import { DeployedBlueprintCommand } from '../../baseCommands.js';
-type RunDeleteOptions = {
-    force: boolean;
-};
-type RunGetOptions = {
-    limit: number;
-    json?: boolean;
-    utc?: boolean;
-};
 export default class LogsCommand extends DeployedBlueprintCommand<typeof LogsCommand> {
     static args: {
         name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
@@ -19,10 +11,7 @@ export default class LogsCommand extends DeployedBlueprintCommand<typeof LogsCom
         utc: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         delete: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        watch: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    externalId: string | undefined;
     run(): Promise<void>;
-    runDeleteLogs(name: string, options: RunDeleteOptions): Promise<void>;
-    runGetLogs(name: string, options: RunGetOptions): Promise<void>;
 }
-export {};

package/dist/commands/functions/logs.js

@@ -1,20 +1,6 @@
 import { Args, Flags } from '@oclif/core';
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import ora from 'ora';
-import { deleteLogs as deleteLogsAction, logs as getLogsAction, } from '../../actions/functions/logs.js';
 import { DeployedBlueprintCommand } from '../../baseCommands.js';
-import { formatTitle } from '../../utils/display/blueprints-formatting.js';
-import { findFunctionByName } from '../../utils/find-function.js';
-function logLevel(level) {
-    if (level === 'ERROR') {
-        return chalk.red(level);
-    }
-    if (level === 'WARN') {
-        return chalk.yellow(level);
-    }
-    return chalk.green(level);
-}
+import { functionLogsCore } from '../../cores/functions/logs.js';
 export default class LogsCommand extends DeployedBlueprintCommand {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -55,75 +41,26 @@ export default class LogsCommand extends DeployedBlueprintCommand {
             description: 'Skip confirmation for deleting logs',
             required: false,
         }),
+        watch: Flags.boolean({
+            char: 'w',
+            description: 'Watch for new logs (streaming mode)',
+            aliases: ['follow'],
+        }),
     };
-    externalId;
     async run() {
-        const args = this.args;
-        const flags = this.flags;
-        const { externalId } = findFunctionByName(this.deployedStack, args.name);
-        this.externalId = externalId;
-        if (flags.delete === true) {
-            await this.runDeleteLogs(args.name, flags);
-        }
-        else {
-            await this.runGetLogs(args.name, flags);
-        }
-    }
-    async runDeleteLogs(name, options) {
-        if (!this.externalId)
-            this.error('Unable to delete logs. Unable to determine function ID.');
-        if (!options.force) {
-            const { certain } = await inquirer.prompt({
-                type: 'confirm',
-                name: 'certain',
-                message: `Are you sure you want to delete ${chalk.bold('all')} logs for function ${chalk.yellow(name)}?`,
-                default: false,
-            });
-            if (!certain)
-                return;
-        }
-        const spinner = ora(`Deleting logs for function ${chalk.yellow(name)}`).start();
-        const { ok, error } = await deleteLogsAction(this.externalId, this.auth);
-        if (!ok) {
-            spinner.fail(`${chalk.red('Failed')} to retrieve logs`);
-            this.log(`Error: ${error || 'Unknown error'}`);
-            return;
-        }
-        spinner.succeed('Logs deleted');
-    }
-    async runGetLogs(name, options) {
-        if (!this.externalId)
-            this.error('Unable to retrieve logs. Unable to determine function ID.');
-        const spinner = ora(`Finding logs for function "${name}"`).start();
-        const { ok, error, logs, total } = await getLogsAction(this.externalId, { limit: options.limit }, this.auth);
-        if (!ok) {
-            spinner.fail(`${chalk.red('Failed')} to retrieve logs`);
-            this.log(`Error: ${error || 'Unknown error'}`);
-            return;
-        }
-        const filteredLogs = logs.filter((entry) => entry.level && entry.message);
-        if (filteredLogs.length === 0) {
-            spinner.info(`No logs found for function ${name}`);
-            return;
-        }
-        spinner.succeed(`${formatTitle('Function', name)} Logs`);
-        if (!options.json) {
-            this.log(`Found ${chalk.bold(total)} log entries for function ${chalk.yellow(name)}`);
-            if (logs.length < total) {
-                this.log(`Here are the last ${chalk.bold(filteredLogs.length.toString())} entries`);
-            }
-            this.log('\n');
-            for (const log of filteredLogs) {
-                const { time, level, message } = log;
-                const date = new Date(time);
-                const [dateString, timeString] = options.utc
-                    ? date.toISOString().slice(0, 19).split('T')
-                    : [date.toLocaleDateString(), date.toLocaleTimeString()];
-                this.log([chalk.bold(dateString), chalk.bold.blue(timeString), logLevel(level), message].join(' '));
-            }
-        }
-        else {
-            this.log(JSON.stringify(filteredLogs, null, 2));
-        }
+        const { success, error } = await functionLogsCore({
+            bin: this.config.bin,
+            log: (msg) => this.log(msg),
+            args: this.args,
+            flags: this.flags,
+            auth: this.auth,
+            blueprint: this.blueprint,
+            deployedStack: this.deployedStack,
+            projectId: this.projectId,
+            token: this.sanityToken,
+            stackId: this.stackId,
+        });
+        if (!success)
+            this.error(error);
     }
 }

package/dist/commands/functions/test.js

@@ -1,7 +1,6 @@
 import { Args, Flags } from '@oclif/core';
-import { testAction } from '../../actions/functions/test.js';
 import { BlueprintCommand } from '../../baseCommands.js';
-import { findFunctionByName } from '../../utils/find-function.js';
+import { functionTestCore } from '../../cores/functions/test.js';
 export default class TestCommand extends BlueprintCommand {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -40,34 +39,14 @@ export default class TestCommand extends BlueprintCommand {
         }),
     };
     async run() {
-        const args = this.args;
-        const flags = this.flags;
-        const parsedBlueprint = this.blueprint.parsedBlueprint;
-        try {
-            const resource = findFunctionByName(parsedBlueprint, args.name);
-            const { json, logs, error } = await testAction(resource, {
-                data: flags.data,
-                file: flags.file,
-                timeout: flags.timeout,
-            }, {
-                clientOptions: {
-                    apiVersion: flags.api,
-                    dataset: flags.dataset,
-                    projectId: flags['project-id'],
-                },
-            });
-            if (!error) {
-                this.log('Logs:');
-                this.log(logs);
-                this.log('Response:');
-                this.log(JSON.stringify(json, null, 2));
-            }
-            else {
-                this.log(error.toString());
-            }
-        }
-        catch (error) {
-            this.log(`Error: ${error || 'Unknown error'}`);
-        }
+        const { success, error } = await functionTestCore({
+            bin: this.config.bin,
+            log: (msg) => this.log(msg),
+            args: this.args,
+            flags: this.flags,
+            blueprint: this.blueprint,
+        });
+        if (!success)
+            this.error(error);
     }
 }

package/dist/cores/blueprints/add.js

@@ -7,37 +7,38 @@ import { validateFunctionName } from '../../utils/validate/resource.js';
 export async function blueprintAddCore(options) {
     const { bin = 'sanity', log, blueprint, args, flags } = options;
     const { type: resourceType } = args;
-    const { name: flagResourceName, 'fn-type': flagFnType, javascript: flagJs, 'fn-helpers': flagFnHelpers, install: flagI, } = flags;
-    let { language: flagFnLang, 'fn-installer': flagFnInstaller, // can be 'skip'!
+    const { name: flagResourceName, 'fn-type': flagFnType, javascript: flagJs, 'fn-helpers': flagFnHelpers, install: flagI, 'fn-installer': flagFnInstaller, // can be 'skip'!
      } = flags;
+    let { language: flagFnLang } = flags;
     flagFnLang = flagJs ? 'js' : flagFnLang;
-    flagFnInstaller = flagFnInstaller === 'skip' ? undefined : flagFnInstaller;
     if (resourceType !== 'function') {
         return {
             success: false,
             error: `Unsupported Resource type: ${resourceType}`,
         };
     }
-    if (flagI && flagFnInstaller) {
-        return {
-            success: false,
-            error: 'Cannot use -i flag with the --fn-installer flag',
-        };
+    if (flagI) {
+        if (flagFnInstaller) {
+            return {
+                success: false,
+                error: 'Cannot use --fn-installer flag with the --install flag',
+            };
+        }
+        if (!flagFnHelpers) {
+            return {
+                success: false,
+                error: 'Cannot use --no-fn-helpers flag with the --install flag',
+            };
+        }
     }
-    if (flagI && flagFnHelpers === false) {
+    if (flagResourceName && !validateFunctionName(flagResourceName)) {
+        // if provided && invalid, return error ASAP
         return {
             success: false,
-            error: 'Cannot use -i flag with the --no-fn-helpers flag',
+            error: `Invalid function name: ${flagResourceName}`,
         };
     }
     try {
-        if (flagResourceName && !validateFunctionName(flagResourceName)) {
-            // if provided && invalid, return error
-            return {
-                success: false,
-                error: `Invalid function name: ${flagResourceName}`,
-            };
-        }
         const fnName = flagResourceName || (await promptForFunctionName());
         // look for existing function with same name
         if (blueprint.parsedBlueprint.resources?.some((r) => r.name === fnName)) {
@@ -69,9 +70,8 @@ export async function blueprintAddCore(options) {
             installCommand = 'npm';
         }
         else if (flagFnInstaller) {
-            // user wants to install helpers using a specific command
-            addHelpers = true;
-            installCommand = flagFnInstaller;
+            addHelpers = true; //  if installer is passed, assume addHelpers
+            installCommand = flagFnInstaller === 'skip' ? null : flagFnInstaller;
         }
         else {
             // unsure; ask...
@@ -90,7 +90,7 @@ export async function blueprintAddCore(options) {
         log(`\nCreated function: ${filePath.replace(cwd(), '')}`);
         if (!resourceAdded) {
             // print the resource JSON for manual addition
-            log('\nAdd this Function resource to your blueprint:');
+            log('\nAdd this Function resource to your Blueprint:');
             log(highlight(JSON.stringify(resource, null, 2), undefined, undefined, 2));
         }
         else {

package/dist/cores/functions/dev.d.ts

@@ -0,0 +1,7 @@
+import type { CoreConfig, CoreResult } from '../index.js';
+export interface FunctionDevOptions extends CoreConfig {
+    flags: {
+        port?: number;
+    };
+}
+export declare function functionDevCore(options: FunctionDevOptions): Promise<CoreResult>;

package/dist/cores/functions/dev.js

@@ -0,0 +1,22 @@
+import { dev } from '../../actions/functions/dev.js';
+export async function functionDevCore(options) {
+    const { log, flags } = options;
+    const { port = 8080 } = flags;
+    try {
+        await dev(Number(port));
+        log(`Server is running on http://localhost:${port}\n`);
+        return {
+            success: true,
+            // hold the line...
+            streaming: new Promise(() => { }),
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        log(`Error starting server: ${errorMessage}`);
+        return {
+            success: false,
+            error: errorMessage,
+        };
+    }
+}

package/dist/cores/functions/env/add.d.ts

@@ -1,9 +1,9 @@
 import type { CoreResult, DeployedBlueprintConfig } from '../../index.js';
-export interface EnvAddOptions extends DeployedBlueprintConfig {
+export interface FunctionEnvAddOptions extends DeployedBlueprintConfig {
     args: {
         name: string;
         key: string;
         value: string;
     };
 }
-export declare function envAddCore(options: EnvAddOptions): Promise<CoreResult>;
+export declare function functionEnvAddCore(options: FunctionEnvAddOptions): Promise<CoreResult>;

package/dist/cores/functions/env/add.js

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import ora from 'ora';
 import { update } from '../../../actions/functions/env/update.js';
 import { findFunctionByName } from '../../../utils/find-function.js';
-export async function envAddCore(options) {
+export async function functionEnvAddCore(options) {
     const args = options.args;
     const spinner = ora(`Updating "${args.key}" environment variable in "${args.name}"`).start();
     const { externalId } = findFunctionByName(options.deployedStack, args.name);

package/dist/cores/functions/env/list.d.ts

@@ -1,7 +1,7 @@
 import type { CoreResult, DeployedBlueprintConfig } from '../../index.js';
-export interface EnvListOptions extends DeployedBlueprintConfig {
+export interface FunctionEnvListOptions extends DeployedBlueprintConfig {
     args: {
         name: string;
     };
 }
-export declare function envListCore(options: EnvListOptions): Promise<CoreResult>;
+export declare function functionEnvListCore(options: FunctionEnvListOptions): Promise<CoreResult>;

package/dist/cores/functions/env/list.js

@@ -1,7 +1,7 @@
 import ora from 'ora';
 import { list } from '../../../actions/functions/env/list.js';
 import { findFunctionByName } from '../../../utils/find-function.js';
-export async function envListCore(options) {
+export async function functionEnvListCore(options) {
     const args = options.args;
     const spinner = ora(`Listing environment variables for "${args.name}"`).start();
     const { externalId } = findFunctionByName(options.deployedStack, args.name);

package/dist/cores/functions/env/remove.d.ts

@@ -1,8 +1,8 @@
 import type { CoreResult, DeployedBlueprintConfig } from '../../index.js';
-export interface EnvRemoveOptions extends DeployedBlueprintConfig {
+export interface FunctionEnvRemoveOptions extends DeployedBlueprintConfig {
     args: {
         name: string;
         key: string;
     };
 }
-export declare function envRemoveCore(options: EnvRemoveOptions): Promise<CoreResult>;
+export declare function functionEnvRemoveCore(options: FunctionEnvRemoveOptions): Promise<CoreResult>;

package/dist/cores/functions/env/remove.js

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import ora from 'ora';
 import { remove } from '../../../actions/functions/env/remove.js';
 import { findFunctionByName } from '../../../utils/find-function.js';
-export async function envRemoveCore(options) {
+export async function functionEnvRemoveCore(options) {
     const args = options.args;
     const spinner = ora(`Removing "${args.key}" environment variable in "${args.name}"`).start();
     const { externalId } = findFunctionByName(options.deployedStack, args.name);

package/dist/cores/functions/index.d.ts

@@ -1,6 +1,12 @@
-export { envAddCore } from './env/add.js';
-export type { EnvAddOptions } from './env/add.js';
-export { envListCore } from './env/list.js';
-export type { EnvListOptions } from './env/list.js';
-export { envRemoveCore } from './env/remove.js';
-export type { EnvRemoveOptions } from './env/remove.js';
+export { functionEnvAddCore } from './env/add.js';
+export type { FunctionEnvAddOptions as EnvAddOptions } from './env/add.js';
+export { functionEnvListCore } from './env/list.js';
+export type { FunctionEnvListOptions as EnvListOptions } from './env/list.js';
+export { functionEnvRemoveCore } from './env/remove.js';
+export type { FunctionEnvRemoveOptions as EnvRemoveOptions } from './env/remove.js';
+export { functionLogsCore } from './logs.js';
+export type { FunctionLogsOptions } from './logs.js';
+export { functionTestCore } from './test.js';
+export type { FunctionTestOptions } from './test.js';
+export { functionDevCore } from './dev.js';
+export type { FunctionDevOptions } from './dev.js';

package/dist/cores/functions/index.js

@@ -1,3 +1,6 @@
-export { envAddCore } from './env/add.js';
-export { envListCore } from './env/list.js';
-export { envRemoveCore } from './env/remove.js';
+export { functionEnvAddCore } from './env/add.js';
+export { functionEnvListCore } from './env/list.js';
+export { functionEnvRemoveCore } from './env/remove.js';
+export { functionLogsCore } from './logs.js';
+export { functionTestCore } from './test.js';
+export { functionDevCore } from './dev.js';

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

@@ -0,0 +1,15 @@
+import type { CoreResult, DeployedBlueprintConfig } from '../index.js';
+export interface FunctionLogsOptions extends DeployedBlueprintConfig {
+    args: {
+        name: string;
+    };
+    flags: {
+        limit: number;
+        json?: boolean;
+        utc?: boolean;
+        delete?: boolean;
+        force?: boolean;
+        watch?: boolean;
+    };
+}
+export declare function functionLogsCore(options: FunctionLogsOptions): Promise<CoreResult>;

package/dist/cores/functions/logs.js

@@ -0,0 +1,108 @@
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import ora from 'ora';
+import { deleteLogs as deleteLogsAction, logs as getLogsAction, streamLogs as streamLogsAction, } from '../../actions/functions/logs.js';
+import { formatTitle } from '../../utils/display/blueprints-formatting.js';
+import { niceId } from '../../utils/display/presenters.js';
+import { findFunctionByName } from '../../utils/find-function.js';
+export async function functionLogsCore(options) {
+    const { args, flags, log, auth, deployedStack } = options;
+    const { name } = args;
+    const { delete: shouldDelete, watch: shouldWatch, force, limit, json, utc } = flags;
+    const { externalId } = findFunctionByName(deployedStack, name); // throws if not found
+    if (shouldDelete)
+        return deleteLogs({ name, externalId, auth, force, log });
+    if (shouldWatch)
+        return streamLogs({ name, externalId, auth, json, utc, log });
+    return getLogs({ name, externalId, auth, limit, json, utc, log });
+}
+async function deleteLogs({ name, externalId, auth, force, log, }) {
+    if (!force) {
+        const { certain } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'certain',
+            message: `Are you sure you want to delete ${chalk.bold('all')} logs for function ${chalk.yellow(name)}?`,
+            default: false,
+        });
+        if (!certain)
+            return { success: true };
+    }
+    const spinner = ora(`Deleting logs for function ${chalk.yellow(name)}`).start();
+    const { ok, error } = await deleteLogsAction(externalId, auth);
+    if (!ok) {
+        spinner.fail(`${chalk.red('Failed')} to delete logs`);
+        return { success: false, error: error || 'Unknown error' };
+    }
+    spinner.succeed('Logs deleted');
+    return { success: true };
+}
+async function streamLogs({ name, externalId, auth, json, utc, log, }) {
+    const spinner = ora(`Setting up streaming logs session for function ${niceId(name)}`).start();
+    try {
+        spinner.stop();
+        log(`Streaming log session for function ${niceId(name)}`);
+        log(`Watching for new logs... ${chalk.bold('ctrl+c')} to stop`);
+        const onOpen = () => {
+            // TODO delete line 97 and uncomment 101 when Fns service is updated
+            // log(`Watching for new logs... ${chalk.bold('ctrl+c')} to stop`)
+        };
+        const renderLog = (logEntry) => {
+            const { time, level, message } = logEntry;
+            log(formatLog(time, level, message, true));
+        };
+        streamLogsAction(externalId, auth, renderLog, onOpen, (error) => log(`${chalk.red('Error:')} ${error}`));
+        // Return a special key for streaming mode
+        return {
+            success: true,
+            streaming: new Promise(() => { }),
+        };
+    }
+    catch (err) {
+        spinner.fail('Failed to retrieve logs');
+        const errorMessage = err instanceof Error ? err.message : String(err);
+        log(`Error: ${errorMessage}`);
+        return { success: false, error: errorMessage };
+    }
+}
+async function getLogs({ name, externalId, auth, limit, json, utc, log, }) {
+    const spinner = ora(`Finding logs for function "${name}"`).start();
+    const { ok, error, logs, total } = await getLogsAction(externalId, { limit }, auth);
+    if (!ok) {
+        spinner.fail(`${chalk.red('Failed')} to retrieve logs`);
+        return { success: false, error: error || 'Unknown error' };
+    }
+    const filteredLogs = logs.filter((entry) => entry.level && entry.message);
+    if (filteredLogs.length === 0) {
+        spinner.info(`No logs found for function ${name}`);
+        return { success: true };
+    }
+    spinner.succeed(`${formatTitle('Function', name)} Logs`);
+    if (!json) {
+        log(`Found ${chalk.bold(total)} log entries for function ${chalk.yellow(name)}`);
+        if (logs.length < total) {
+            log(`Here are the last ${chalk.bold(filteredLogs.length.toString())} entries`);
+        }
+        log('\n');
+        for (const { time, level, message } of filteredLogs) {
+            log(formatLog(time, level, message, utc));
+        }
+    }
+    else {
+        log(JSON.stringify(filteredLogs, null, 2));
+    }
+    return { success: true };
+}
+function formatLog(time, level, message, utc) {
+    const date = new Date(time);
+    const [dateString, timeString] = utc
+        ? date.toISOString().slice(0, 19).split('T')
+        : [date.toLocaleDateString(), date.toLocaleTimeString()];
+    return [chalk.bold(dateString), chalk.bold.blue(timeString), logLevel(level), message].join(' ');
+}
+function logLevel(level) {
+    if (level === 'ERROR')
+        return chalk.red(level);
+    if (level === 'WARN')
+        return chalk.yellow(level);
+    return chalk.green(level);
+}

package/dist/cores/functions/test.d.ts

@@ -0,0 +1,17 @@
+import type { ReadBlueprintResult } from '../../actions/blueprints/blueprint.js';
+import type { CoreConfig, CoreResult } from '../index.js';
+export interface FunctionTestOptions extends CoreConfig {
+    blueprint: ReadBlueprintResult;
+    args: {
+        name: string;
+    };
+    flags: {
+        data?: string;
+        file?: string;
+        timeout?: number;
+        api?: string;
+        dataset?: string;
+        'project-id'?: string;
+    };
+}
+export declare function functionTestCore(options: FunctionTestOptions): Promise<CoreResult>;

package/dist/cores/functions/test.js

@@ -0,0 +1,43 @@
+import { testAction } from '../../actions/functions/test.js';
+import { findFunctionByName } from '../../utils/find-function.js';
+export async function functionTestCore(options) {
+    const { blueprint, log, args, flags } = options;
+    const { name: fnName } = args;
+    const { data, file, timeout, api, dataset, 'project-id': projectId } = flags;
+    const { parsedBlueprint } = blueprint;
+    try {
+        const resource = findFunctionByName(parsedBlueprint, fnName); // throws if not found
+        const invokeOptions = {
+            data,
+            file,
+            timeout,
+        };
+        const contextOptions = {
+            clientOptions: {
+                apiVersion: api,
+                dataset,
+                projectId,
+            },
+        };
+        const { json, logs, error } = await testAction(resource, invokeOptions, contextOptions);
+        if (error) {
+            return {
+                success: false,
+                error: error.toString(),
+            };
+        }
+        log('Logs:');
+        log(logs || '');
+        if (json) {
+            log('Response:');
+            log(JSON.stringify(json, null, 2));
+        }
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}

package/dist/utils/types.d.ts

@@ -82,10 +82,10 @@ export interface Stack {
 /** @internal */
 export interface StackResource {
     id: string;
-    displayName: string;
     name: string;
     type: string;
     externalId: string;
+    displayName?: string;
     parameters?: Record<string, unknown>;
 }
 /** @internal */

package/oclif.manifest.json

@@ -618,6 +618,16 @@
           "required": false,
           "allowNo": false,
           "type": "boolean"
+        },
+        "watch": {
+          "aliases": [
+            "follow"
+          ],
+          "char": "w",
+          "description": "Watch for new logs (streaming mode)",
+          "name": "watch",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -829,5 +839,5 @@
       ]
     }
   },
-  "version": "7.0.3"
+  "version": "7.2.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "7.0.3",
+  "version": "7.2.0",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",