@sanity/runtime-cli 10.9.0 → 10.9.2

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.9.0 linux-x64 node-v22.19.0
+@sanity/runtime-cli/10.9.2 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.9.0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/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.9.0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -451,7 +451,7 @@ EXAMPLES
   $ sanity-run functions test <name> --event update --data-before '{ "title": "before" }' --data-after '{ "title": "after" }'
 ```
 
-_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v10.9.2/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -1,15 +1,14 @@
 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';
+import { type ScopeType } from '../../utils/types.js';
 declare const SUPPORTED_FILE_EXTENSIONS: readonly [".json", ".js", ".mjs", ".ts"];
 type BlueprintFileExtension = (typeof SUPPORTED_FILE_EXTENSIONS)[number];
 export declare const JSON_BLUEPRINT_CONTENT: {
     blueprintVersion: string;
     resources: never[];
 };
-export declare const TS_BLUEPRINT_CONTENT = "import {defineBlueprint, defineDocumentFunction} from '@sanity/blueprints'\n\nexport default defineBlueprint({\n  resources: [\n    // defineDocumentFunction({name: 'my-function'}),\n  ],\n})\n";
-export declare const GITIGNORE_FOR_FUNCTIONS = "\n# Sanity Functions\nfunctions/**/.env*\nfunctions/**/.build/\nfunctions/**/node_modules/\n";
-export declare const GITIGNORE_TEMPLATE = "node_modules\n.env\n\n# Sanity Functions\nfunctions/**/.env*\nfunctions/**/.build/\nfunctions/**/node_modules/\n\n";
+export declare const TS_BLUEPRINT_CONTENT: string;
+/** Function type with attached attributes */
 export type BlueprintModule = ((args?: unknown) => Record<string, unknown>) & {
     organizationId?: string;
     projectId?: string;
@@ -26,20 +25,21 @@ type FileInfo = {
  * @returns The path, file name, and extension of the blueprint file
  */
 export declare function findBlueprintFile(blueprintPath?: string): FileInfo | null;
-/**
- * Result of the blueprint read operation
- */
+/** Result of the blueprint read operation */
 export interface ReadBlueprintResult {
     fileInfo: FileInfo;
     rawBlueprint: Record<string, unknown>;
     parsedBlueprint: Blueprint;
     errors: BlueprintParserError[];
     configPath?: string;
+    scopeType?: ScopeType;
+    scopeId?: string;
+    organizationId?: string;
     projectId?: string;
     stackId?: string;
 }
 /**
- * Reads the blueprint file from disk and parses it. Greedily looks for project and stack config
+ * Reads the blueprint file from disk and parses it. Greedily looks for Blueprint config
  * @param blueprintPath - The path of the blueprint file or directory- will search up the directory tree!
  * @returns Known information about the Blueprint, config, and Stack
  */
@@ -48,24 +48,8 @@ export declare function writeBlueprintToDisk({ blueprintFilePath, jsonContent, }
     blueprintFilePath: string;
     jsonContent?: Blueprint;
 }): string;
-export declare function writeOrUpdateNodeDependency({ blueprintFilePath, dependency, }: {
-    blueprintFilePath: string;
-    dependency: string;
-}): Promise<void>;
-export declare function readConfigFile(blueprintFilePath: string): {
-    configPath: string;
-    projectId?: string;
-    stackId?: string;
-} | null;
-export declare function writeConfigFile({ blueprintFilePath, projectId, stackId, }: {
-    blueprintFilePath?: string;
-    projectId: string;
-    stackId?: string;
-}): void;
-export declare function writeGitignoreFile({ blueprintFilePath, }: {
-    blueprintFilePath: string;
-}): string | null;
 export declare function addResourceToBlueprint({ blueprintFilePath, resource, }: {
     blueprintFilePath?: string;
     resource: Resource;
 }): Resource | undefined;
+export {};

package/dist/actions/blueprints/blueprint.js

@@ -1,14 +1,12 @@
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
-import { basename, dirname, extname, join } from 'node:path';
+import { basename, dirname, extname } 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';
-export { BLUEPRINT_CONFIG_FILE, BLUEPRINT_CONFIG_VERSION, BLUEPRINT_DIR } from '../../config.js';
+import { readConfigFile } from './config.js';
 const SUPPORTED_FILE_EXTENSIONS = ['.json', '.js', '.mjs', '.ts'];
 let SUPPORTED_FILE_NAMES = SUPPORTED_FILE_EXTENSIONS.map((ext) => `blueprint${ext}`);
 SUPPORTED_FILE_NAMES = [
@@ -19,24 +17,15 @@ export const JSON_BLUEPRINT_CONTENT = {
     blueprintVersion: '2024-10-01',
     resources: [],
 };
-export const TS_BLUEPRINT_CONTENT = `import {defineBlueprint, defineDocumentFunction} from '@sanity/blueprints'
+export const TS_BLUEPRINT_CONTENT = `
+import {defineBlueprint, defineDocumentFunction} from '@sanity/blueprints'
 
 export default defineBlueprint({
   resources: [
     // defineDocumentFunction({name: 'my-function'}),
   ],
 })
-`;
-export const GITIGNORE_FOR_FUNCTIONS = `
-# Sanity Functions
-functions/**/.env*
-functions/**/.build/
-functions/**/node_modules/
-`;
-export const GITIGNORE_TEMPLATE = `node_modules
-.env
-${GITIGNORE_FOR_FUNCTIONS}
-`;
+`.trim();
 /**
  * Finds the blueprint file in the given path or current working directory
  * @param blueprintPath - The path of the blueprint file or directory
@@ -74,7 +63,7 @@ export function findBlueprintFile(blueprintPath) {
     };
 }
 /**
- * Reads the blueprint file from disk and parses it. Greedily looks for project and stack config
+ * Reads the blueprint file from disk and parses it. Greedily looks for Blueprint config
  * @param blueprintPath - The path of the blueprint file or directory- will search up the directory tree!
  * @returns Known information about the Blueprint, config, and Stack
  */
@@ -111,11 +100,20 @@ export async function readLocalBlueprint(blueprintPath) {
     catch (err) {
         throw Error(`Unable to parse Blueprint file: ${fileName}\n${err}`);
     }
+    /**
+     * Org, Project, Stack IDs can be set...
+     * - in the environment,
+     * - on the blueprint module,
+     * - and in the config file.
+     * The precedence is: environment > blueprint module > config file
+     */
+    let moduleOrganizationId;
     let moduleProjectId;
     let moduleStackId;
     if (blueprintModule) {
         if (typeof blueprintModule === 'function') {
             try {
+                moduleOrganizationId = blueprintModule.organizationId;
                 moduleProjectId = blueprintModule.projectId;
                 moduleStackId = blueprintModule.stackId;
                 rawBlueprint = blueprintModule();
@@ -131,19 +129,16 @@ export async function readLocalBlueprint(blueprintPath) {
     if (typeof rawBlueprint === 'undefined') {
         throw Error('Unable to read Blueprint');
     }
-    const parserResult = blueprintParserValidator(rawBlueprint);
-    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) {
-        // validate function resources
-        const functionResources = parsedBlueprint.resources.filter(isLocalFunctionResource);
-        const fnErrors = functionResources.map((r) => validateFunctionResource(r));
-        errors.push(...fnErrors.flat());
-    }
-    const { SANITY_PROJECT_ID: envProjectId, SANITY_BLUEPRINT_STACK_ID: envStackId } = env;
+    const { SANITY_ORGANIZATION_ID: envOrganizationId, SANITY_PROJECT_ID: envProjectId, SANITY_BLUEPRINT_STACK_ID: envStackId, } = env;
     const configIds = readConfigFile(foundFilePath);
     const configPath = configIds?.configPath;
+    let organizationId;
+    if (envOrganizationId)
+        organizationId = envOrganizationId;
+    else if (moduleOrganizationId)
+        organizationId = moduleOrganizationId;
+    else if (configIds?.organizationId)
+        organizationId = configIds.organizationId;
     let projectId;
     if (envProjectId)
         projectId = envProjectId;
@@ -161,10 +156,34 @@ export async function readLocalBlueprint(blueprintPath) {
     // LAUNCH LIMIT: 1 Stack per Project - infer stackId from projectId
     if (!stackId && projectId)
         stackId = `ST-${projectId}`;
+    let scopeType;
+    let scopeId;
+    // Scope is as specific as possible; project > organization
+    if (projectId) {
+        scopeType = 'project';
+        scopeId = projectId;
+    }
+    else if (organizationId) {
+        scopeType = 'organization';
+        scopeId = organizationId;
+    }
+    const parserResult = blueprintParserValidator(rawBlueprint);
+    const parsedBlueprint = parserResult.result === 'valid' ? parserResult.blueprint : undefined;
+    const errors = parserResult.result !== 'valid' ? parserResult.errors : [];
+    // further validation - remove if validator handles specific resource type validation
+    if (parsedBlueprint?.resources) {
+        // validate function resources
+        const functionResources = parsedBlueprint.resources.filter(isLocalFunctionResource);
+        const fnErrors = functionResources.map((r) => validateFunctionResource(r));
+        errors.push(...fnErrors.flat());
+    }
     return {
         fileInfo: { blueprintFilePath: foundFilePath, fileName, extension },
         rawBlueprint,
         errors,
+        scopeType,
+        scopeId,
+        organizationId,
         projectId,
         stackId,
         configPath,
@@ -195,93 +214,6 @@ export function writeBlueprintToDisk({ blueprintFilePath, jsonContent = JSON_BLU
     writeFileSync(blueprintFilePath, blueprintContent);
     return blueprintContent;
 }
-export async function writeOrUpdateNodeDependency({ blueprintFilePath, dependency, }) {
-    const dir = dirname(blueprintFilePath);
-    const extension = extname(blueprintFilePath);
-    if (extension === '.json')
-        return;
-    const version = await getLatestNpmVersion(dependency);
-    const packageJsonPath = join(dir, 'package.json');
-    const packageExists = existsSync(packageJsonPath);
-    if (!packageExists) {
-        writeFileSync(packageJsonPath, JSON.stringify({ type: 'module', devDependencies: { [dependency]: version } }, null, 2));
-        return;
-    }
-    const packageJson = readFileSync(packageJsonPath, 'utf8');
-    let packageJsonObject;
-    try {
-        packageJsonObject = JSON.parse(packageJson);
-    }
-    catch (err) {
-        throw Error(`Unable to parse package.json: ${err}`);
-    }
-    const allDependencies = { ...packageJsonObject.dependencies, ...packageJsonObject.devDependencies };
-    if (allDependencies[dependency])
-        return;
-    packageJsonObject.devDependencies = packageJsonObject.devDependencies || {};
-    packageJsonObject.devDependencies[dependency] = version;
-    writeFileSync(packageJsonPath, JSON.stringify(packageJsonObject, null, 2));
-}
-export function readConfigFile(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 configFilePath = join(cwd(), BLUEPRINT_DIR, BLUEPRINT_CONFIG_FILE);
-    if (!existsSync(configFilePath))
-        return null;
-    try {
-        const config = JSON.parse(readFileSync(configFilePath, 'utf8'));
-        return config || null;
-    }
-    catch {
-        return null;
-    }
-}
-export function writeConfigFile({ blueprintFilePath, projectId, stackId, }) {
-    const blueprintDir = blueprintFilePath ? dirname(blueprintFilePath) : cwd();
-    const configDir = join(blueprintDir, BLUEPRINT_DIR);
-    const configPath = join(configDir, BLUEPRINT_CONFIG_FILE);
-    if (!existsSync(configDir)) {
-        mkdirSync(configDir, { recursive: true });
-    }
-    let config = {};
-    if (existsSync(configPath)) {
-        try {
-            config = JSON.parse(readFileSync(configPath, 'utf8'));
-        }
-        catch {
-            // config broken, start fresh
-        }
-    }
-    config.projectId = projectId;
-    config.stackId = stackId;
-    config.blueprintConfigVersion = BLUEPRINT_CONFIG_VERSION;
-    config.updatedAt = Date.now();
-    writeFileSync(configPath, JSON.stringify(config, null, 2));
-}
-export function writeGitignoreFile({ blueprintFilePath, }) {
-    const blueprintDir = blueprintFilePath ? dirname(blueprintFilePath) : cwd();
-    const gitignorePath = join(blueprintDir, '.gitignore');
-    const gitignoreExists = existsSync(gitignorePath);
-    let content = GITIGNORE_TEMPLATE;
-    if (gitignoreExists) {
-        // append GITIGNORE_FOR_FUNCTIONS to existing .gitignore
-        const existingContent = readFileSync(gitignorePath, 'utf8').toString();
-        if (existingContent.includes(GITIGNORE_FOR_FUNCTIONS))
-            return null;
-        content = `${existingContent}\n${GITIGNORE_FOR_FUNCTIONS}`;
-    }
-    writeFileSync(gitignorePath, content);
-    return content;
-}
 export function addResourceToBlueprint({ blueprintFilePath, resource, }) {
     const blueprintFile = findBlueprintFile(blueprintFilePath);
     if (!blueprintFile)

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

@@ -0,0 +1,17 @@
+export interface BlueprintsConfig {
+    configPath: string;
+    organizationId?: string;
+    projectId?: string;
+    stackId?: string;
+}
+export declare function readConfigFile(blueprintFilePath: string): BlueprintsConfig | null;
+export declare function writeConfigFile({ blueprintFilePath, organizationId, projectId, stackId, }: {
+    blueprintFilePath?: string;
+    stackId?: string;
+} & ({
+    organizationId: string;
+    projectId?: never;
+} | {
+    projectId: string;
+    organizationId?: never;
+})): void;

package/dist/actions/blueprints/config.js

@@ -0,0 +1,50 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { cwd } from 'node:process';
+import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_CONFIG_VERSION, BLUEPRINT_DIR } from '../../config.js';
+export function readConfigFile(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 configFilePath = join(cwd(), BLUEPRINT_DIR, BLUEPRINT_CONFIG_FILE);
+    if (!existsSync(configFilePath))
+        return null;
+    try {
+        const config = JSON.parse(readFileSync(configFilePath, 'utf8'));
+        return config || null;
+    }
+    catch {
+        return null;
+    }
+}
+export function writeConfigFile({ blueprintFilePath, organizationId, projectId, stackId, }) {
+    const blueprintDir = blueprintFilePath ? dirname(blueprintFilePath) : cwd();
+    const configDir = join(blueprintDir, BLUEPRINT_DIR);
+    const configPath = join(configDir, BLUEPRINT_CONFIG_FILE);
+    if (!existsSync(configDir)) {
+        mkdirSync(configDir, { recursive: true });
+    }
+    let config = {};
+    if (existsSync(configPath)) {
+        try {
+            config = JSON.parse(readFileSync(configPath, 'utf8'));
+        }
+        catch {
+            // config broken, start fresh
+        }
+    }
+    config.organizationId = organizationId;
+    config.projectId = projectId;
+    config.stackId = stackId;
+    config.blueprintConfigVersion = BLUEPRINT_CONFIG_VERSION;
+    config.updatedAt = Date.now();
+    writeFileSync(configPath, JSON.stringify(config, null, 2));
+}

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

@@ -4,6 +4,7 @@
 export * as projects from '../sanity/projects.js';
 export * as assets from './assets.js';
 export * as blueprint from './blueprint.js';
+export * as config from './config.js';
 export * as logs from './logs.js';
 export * as resources from './resources.js';
 export * as stacks from './stacks.js';

package/dist/actions/blueprints/index.js

@@ -4,6 +4,7 @@
 export * as projects from '../sanity/projects.js';
 export * as assets from './assets.js';
 export * as blueprint from './blueprint.js';
+export * as config from './config.js';
 export * as logs from './logs.js';
 export * as resources from './resources.js';
 export * as stacks from './stacks.js';

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

@@ -15,6 +15,7 @@ export interface StreamLogsOptions {
     onError: (error: string) => void;
 }
 export declare function streamLogs({ stackId, after, auth, onLog, onOpen, onError, }: StreamLogsOptions): () => void;
+/** Check if a log is newer than a given timestamp */
 export declare function isNewerLog(log: BlueprintLog, timestamp: number): boolean;
 /**
  * Sets up log streaming for operations like deploy or destroy with spinner integration

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

@@ -59,7 +59,7 @@ export function streamLogs({ stackId, after, auth, onLog, onOpen, onError, }) {
         eventSource.close();
     };
 }
-// Check if a log is newer than a given timestamp
+/** 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;
@@ -78,12 +78,16 @@ export async function setupLogStreaming(config) {
         newestTimestamp = new Date(logEntry.timestamp).getTime();
         log(formatLogEntry(logEntry, true));
     };
+    let alreadyOpened = false;
     const onStreamOpen = () => {
-        if (showBanner)
+        if (!alreadyOpened && showBanner)
             log(`Streaming logs... ${chalk.bold('ctrl+c')} to cancel`);
+        if (alreadyOpened)
+            log(`${chalk.green('Reconnected')}`);
+        alreadyOpened = true;
     };
     const onStreamError = (error) => {
-        log(`${chalk.yellow('Stream error:')} ${error}`);
+        log(`${chalk.red('Stream error:')} ${error}`);
     };
     return streamLogs({
         stackId,

package/dist/actions/blueprints/resources.js

@@ -3,7 +3,8 @@ import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { cwd } from 'node:process';
 import chalk from 'chalk';
-import { addResourceToBlueprint, writeOrUpdateNodeDependency } from './blueprint.js';
+import { writeOrUpdateNodeDependency } from '../node.js';
+import { addResourceToBlueprint } from './blueprint.js';
 const DEFAULT_FUNCTION_TEMPLATE = /*js*/ `export async function handler({context, event}) {
   const time = new Date().toLocaleTimeString()
   console.log(\`👋 Your Sanity Function was called at \${time}\`)
@@ -43,7 +44,7 @@ export async function createFunctionResource(options) {
     writeFileSync(indexPath, addHelpers ? DEFAULT_HELPER_FUNCTION_TEMPLATE : DEFAULT_FUNCTION_TEMPLATE);
     if (addHelpers && blueprintFilePath) {
         try {
-            await writeOrUpdateNodeDependency({ blueprintFilePath, dependency: '@sanity/functions' });
+            await writeOrUpdateNodeDependency(blueprintFilePath, '@sanity/functions');
         }
         catch (err) {
             throw new Error('Unable to add @sanity/functions to your project.', { cause: err });

package/dist/actions/git.d.ts

@@ -0,0 +1,3 @@
+export declare const GITIGNORE_FOR_FUNCTIONS = "\n# Sanity Functions\nfunctions/**/.env*\nfunctions/**/.build/\nfunctions/**/node_modules/\n";
+export declare const GITIGNORE_TEMPLATE = "node_modules\n.env\n\n# Sanity Functions\nfunctions/**/.env*\nfunctions/**/.build/\nfunctions/**/node_modules/\n\n";
+export declare function writeGitignoreFile(nearFilePath: string): string | null;

package/dist/actions/git.js

@@ -0,0 +1,28 @@
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { cwd } from 'node:process';
+export const GITIGNORE_FOR_FUNCTIONS = `
+# Sanity Functions
+functions/**/.env*
+functions/**/.build/
+functions/**/node_modules/
+`;
+export const GITIGNORE_TEMPLATE = `node_modules
+.env
+${GITIGNORE_FOR_FUNCTIONS}
+`;
+export function writeGitignoreFile(nearFilePath) {
+    const dir = nearFilePath ? dirname(nearFilePath) : cwd();
+    const gitignorePath = join(dir, '.gitignore');
+    const gitignoreExists = existsSync(gitignorePath);
+    let content = GITIGNORE_TEMPLATE;
+    if (gitignoreExists) {
+        // append GITIGNORE_FOR_FUNCTIONS to existing .gitignore
+        const existingContent = readFileSync(gitignorePath, 'utf8').toString();
+        if (existingContent.includes(GITIGNORE_FOR_FUNCTIONS))
+            return null;
+        content = `${existingContent}\n${GITIGNORE_FOR_FUNCTIONS}`;
+    }
+    writeFileSync(gitignorePath, content);
+    return content;
+}

package/dist/actions/node.d.ts

@@ -0,0 +1 @@
+export declare function writeOrUpdateNodeDependency(nearFilePath: string, dependency: string): Promise<void>;

package/dist/actions/node.js

@@ -0,0 +1,30 @@
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, extname, join } from 'node:path';
+import { getLatestNpmVersion } from '../utils/other/npmjs.js';
+export async function writeOrUpdateNodeDependency(nearFilePath, dependency) {
+    const dir = dirname(nearFilePath);
+    const extension = extname(nearFilePath);
+    if (extension === '.json')
+        return; // ? why do we bail out here?
+    const version = await getLatestNpmVersion(dependency);
+    const packageJsonPath = join(dir, 'package.json');
+    const packageExists = existsSync(packageJsonPath);
+    if (!packageExists) {
+        writeFileSync(packageJsonPath, JSON.stringify({ type: 'module', devDependencies: { [dependency]: version } }, null, 2));
+        return;
+    }
+    const packageJson = readFileSync(packageJsonPath, 'utf8');
+    let packageJsonObject;
+    try {
+        packageJsonObject = JSON.parse(packageJson);
+    }
+    catch (err) {
+        throw Error(`Unable to parse package.json: ${err}`);
+    }
+    const allDependencies = { ...packageJsonObject.dependencies, ...packageJsonObject.devDependencies };
+    if (allDependencies[dependency])
+        return;
+    packageJsonObject.devDependencies = packageJsonObject.devDependencies || {};
+    packageJsonObject.devDependencies[dependency] = version;
+    writeFileSync(packageJsonPath, JSON.stringify(packageJsonObject, null, 2));
+}

package/dist/cores/blueprints/config.js

@@ -2,9 +2,10 @@ import { highlight } from 'cardinal';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import ora from 'ora';
-import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_DIR, writeConfigFile, } from '../../actions/blueprints/blueprint.js';
+import { writeConfigFile } from '../../actions/blueprints/config.js';
 import { createStack, getStack } from '../../actions/blueprints/stacks.js';
 import { getProject } from '../../actions/sanity/projects.js';
+import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_DIR } from '../../config.js';
 import { niceId, warn } from '../../utils/display/presenters.js';
 import { promptForProject } from '../../utils/display/prompt.js';
 export async function blueprintConfigCore(options) {

package/dist/cores/blueprints/init.js

@@ -2,10 +2,14 @@ import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
-import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_DIR, findBlueprintFile, writeBlueprintToDisk, writeConfigFile, writeGitignoreFile, writeOrUpdateNodeDependency, } from '../../actions/blueprints/blueprint.js';
+import { findBlueprintFile, writeBlueprintToDisk } from '../../actions/blueprints/blueprint.js';
+import { writeConfigFile } from '../../actions/blueprints/config.js';
 import { createEmptyStack, getStack } from '../../actions/blueprints/stacks.js';
+import { writeGitignoreFile } from '../../actions/git.js';
+import { writeOrUpdateNodeDependency } from '../../actions/node.js';
 import { verifyExampleExists, writeExample } from '../../actions/sanity/examples.js';
 import { getProject } from '../../actions/sanity/projects.js';
+import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_DIR } from '../../config.js';
 import { check, warn } from '../../utils/display/presenters.js';
 import { promptForProject, promptForStackId } from '../../utils/display/prompt.js';
 const LAUNCH_LIMIT_STACK_PER_PROJECT = true;
@@ -127,15 +131,12 @@ export async function blueprintInitCore(options) {
         log(check(`${chalk.bold('Created Blueprint:')}   ${providedDir ?? '.'}/${blueprintFileName}`));
         writeConfigFile({ blueprintFilePath, projectId, stackId });
         log(check(`${chalk.bold('Added configuration:')} ${providedDir ?? '.'}/${BLUEPRINT_DIR}/${BLUEPRINT_CONFIG_FILE}`));
-        writeGitignoreFile({ blueprintFilePath });
+        writeGitignoreFile(blueprintFilePath);
         log(check(`${chalk.bold('Added .gitignore:')}    ${providedDir ?? '.'}/.gitignore`));
         if (blueprintExtension !== 'json') {
             try {
                 // check for || create package.json and add @sanity/blueprints to dependencies
-                await writeOrUpdateNodeDependency({
-                    blueprintFilePath,
-                    dependency: '@sanity/blueprints',
-                });
+                await writeOrUpdateNodeDependency(blueprintFilePath, '@sanity/blueprints');
                 log(check(`${chalk.bold('Added dependency:')}    @sanity/blueprints`));
             }
             catch {

package/dist/cores/functions/logs.js

@@ -42,9 +42,11 @@ async function streamLogs({ name, externalId, auth, log, }) {
         spinner.stop();
         log(`Streaming log session for function ${niceId(name)}`);
         log(`Watching for new logs... ${chalk.bold('ctrl+c')} to stop`);
+        let alreadyOpened = false;
         const onOpen = () => {
-            // TODO delete log("Watching for new logs...") and uncomment this when Fns service is updated
-            // log(`Watching for new logs... ${chalk.bold('ctrl+c')} to stop`)
+            if (alreadyOpened)
+                log(`${chalk.green('Reconnected')}`);
+            alreadyOpened = true;
         };
         const renderLog = (logEntry) => {
             const { time, level, message } = logEntry;

package/dist/server/app.js

@@ -4,10 +4,9 @@ import { default as mime } from 'mime-types';
 import { WebSocketServer } from 'ws';
 import { readLocalBlueprint } from '../actions/blueprints/blueprint.js';
 import config from '../config.js';
-import { findFunctionByName } from '../utils/find-function.js';
-import invoke from '../utils/invoke-local.js';
 import { isRecord } from '../utils/is-record.js';
 import { isEventType } from '../utils/types.js';
+import { handleInvokeRequest } from './handlers/invoke.js';
 const host = 'localhost';
 const app = (port) => {
     const requestListener = async (req, res) => {
@@ -42,26 +41,16 @@ const app = (port) => {
                             else {
                                 delete context.clientOptions.token;
                             }
-                            const start = performance.now();
-                            const { parsedBlueprint } = await readLocalBlueprint();
-                            const resource = findFunctionByName(parsedBlueprint, functionName);
-                            const readBlueprintTime = performance.now() - start;
-                            const payload = {
-                                payload: event,
-                                ...metadata,
-                            };
-                            const response = await invoke(resource, payload, context, {
-                                forceColor: false,
-                            });
-                            const timings = { ...response.timings, 'blueprint:read': readBlueprintTime };
+                            const result = await handleInvokeRequest(functionName, event, metadata, context);
+                            // Add Server-Timing header
                             const timingHeaders = [];
-                            for (const [key, value] of Object.entries(timings)) {
+                            for (const [key, value] of Object.entries(result.timings)) {
                                 timingHeaders.push(`${key.replace(/:/g, '-')};dur=${Math.abs(value).toFixed(1)}`);
                             }
                             if (timingHeaders.length > 0) {
                                 res.setHeader('Server-Timing', timingHeaders.join(', '));
                             }
-                            res.end(JSON.stringify(response));
+                            res.end(JSON.stringify(result));
                         }
                         catch (error) {
                             console.error(error);

package/dist/server/handlers/invoke.d.ts

@@ -0,0 +1,4 @@
+import type { InvocationResponse, InvokeContextOptions, InvokePayloadOptions } from '../../utils/types.js';
+export declare function handleInvokeRequest(functionName: string, event: Record<string, unknown>, metadata: Pick<InvokePayloadOptions, 'event' | 'before' | 'after'>, context: InvokeContextOptions): Promise<InvocationResponse & {
+    timings: Record<string, number>;
+}>;

package/dist/server/handlers/invoke.js

@@ -0,0 +1,19 @@
+import { readLocalBlueprint } from '../../actions/blueprints/blueprint.js';
+import { findFunctionByName } from '../../utils/find-function.js';
+import invoke from '../../utils/invoke-local.js';
+export async function handleInvokeRequest(functionName, event, metadata, context) {
+    const start = performance.now();
+    const { parsedBlueprint } = await readLocalBlueprint();
+    const resource = findFunctionByName(parsedBlueprint, functionName);
+    const readBlueprintTime = performance.now() - start;
+    const payload = {
+        payload: event,
+        ...metadata,
+    };
+    const response = await invoke(resource, payload, context, {
+        forceColor: false,
+        timeout: resource.timeout,
+    });
+    const timings = { ...response.timings, 'blueprint:read': readBlueprintTime };
+    return { ...response, timings };
+}

package/dist/utils/types.d.ts

@@ -1,4 +1,5 @@
 import type { Blueprint } from '@sanity/blueprints-parser';
+export type ScopeType = 'organization' | 'project';
 /** Result utility type */
 export type Result<T, E = string> = {
     ok: true;

package/oclif.manifest.json

@@ -1132,5 +1132,5 @@
       ]
     }
   },
-  "version": "10.9.0"
+  "version": "10.9.2"
 }

package/package.json

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