@sanity/runtime-cli 10.11.0 → 10.11.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.11.0 linux-x64 node-v22.20.0
+@sanity/runtime-cli/10.11.2 linux-x64 node-v22.20.0
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -89,7 +89,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.11.0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -120,7 +120,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.11.0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -142,7 +142,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --no-wait
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -167,7 +167,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.11.0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -185,7 +185,7 @@ DESCRIPTION
   Diagnose potential issues with Blueprint configuration
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.0/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -207,7 +207,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.11.0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -245,7 +245,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.11.0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -267,7 +267,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -284,7 +284,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -306,7 +306,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.11.0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions dev`
 
@@ -328,7 +328,7 @@ EXAMPLES
   $ sanity-run functions dev --port 8974
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -350,7 +350,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.11.0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -370,7 +370,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.11.0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -391,7 +391,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.11.0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs NAME`
 
@@ -425,7 +425,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -472,7 +472,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.11.0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v10.11.2/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/actions/blueprints/blueprint.js

@@ -6,7 +6,7 @@ import { findUpSync } from 'find-up';
 import { createJiti } from 'jiti';
 import { isLocalFunctionResource } from '../../utils/types.js';
 import { validateFunctionResource } from '../../utils/validate/resource.js';
-import { readConfigFile } from './config.js';
+import { backfillOrganizationId, 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 = [
@@ -132,6 +132,16 @@ export async function readLocalBlueprint(blueprintPath) {
     const { SANITY_ORGANIZATION_ID: envOrganizationId, SANITY_PROJECT_ID: envProjectId, SANITY_BLUEPRINT_STACK_ID: envStackId, } = env;
     const configIds = readConfigFile(foundFilePath);
     const configPath = configIds?.configPath;
+    // passively heal config on disk by getting organizationId from projectId
+    if (configIds && !configIds.organizationId && configIds.projectId) {
+        try {
+            await backfillOrganizationId({
+                projectId: configIds.projectId,
+                blueprintFilePath: foundFilePath,
+            });
+        }
+        catch { }
+    }
     let organizationId;
     if (envOrganizationId)
         organizationId = envOrganizationId;

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

@@ -10,8 +10,17 @@ export declare function writeConfigFile({ blueprintFilePath, organizationId, pro
     stackId?: string;
 } & ({
     organizationId: string;
-    projectId?: never;
+    projectId?: string;
 } | {
     projectId: string;
-    organizationId?: never;
+    organizationId?: string;
 })): void;
+/**
+ * Find and write an organizationId to the config file by getting it from the projectId
+ * @throws {Error} if unable to fetch project
+ * @returns {Promise<string>} the discovered organizationId
+ */
+export declare function backfillOrganizationId({ blueprintFilePath, projectId, }: {
+    blueprintFilePath: string;
+    projectId: string;
+}): Promise<string>;

package/dist/actions/blueprints/config.js

@@ -1,7 +1,8 @@
 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';
+import config, { BLUEPRINT_CONFIG_FILE, BLUEPRINT_CONFIG_VERSION, BLUEPRINT_DIR, } from '../../config.js';
+import { getProject } from '../sanity/projects.js';
 export function readConfigFile(blueprintFilePath) {
     const blueprintDir = blueprintFilePath ? dirname(blueprintFilePath) : cwd();
     const configPath = join(blueprintDir, BLUEPRINT_DIR, BLUEPRINT_CONFIG_FILE);
@@ -32,10 +33,39 @@ export function writeConfigFile({ blueprintFilePath, organizationId, projectId,
             // config broken, start fresh
         }
     }
-    config.organizationId = organizationId;
-    config.projectId = projectId;
-    config.stackId = stackId;
+    if (organizationId)
+        config.organizationId = organizationId;
+    if (projectId)
+        config.projectId = projectId;
+    if (stackId)
+        config.stackId = stackId;
     config.blueprintConfigVersion = BLUEPRINT_CONFIG_VERSION;
     config.updatedAt = Date.now();
     writeFileSync(configPath, JSON.stringify(config, null, 2));
 }
+/**
+ * Find and write an organizationId to the config file by getting it from the projectId
+ * @throws {Error} if unable to fetch project
+ * @returns {Promise<string>} the discovered organizationId
+ */
+export async function backfillOrganizationId({ blueprintFilePath, projectId, }) {
+    const token = config.token;
+    if (!token)
+        throw new Error('No token found');
+    let organizationId;
+    try {
+        const response = await getProject({ token, scopeType: 'project', scopeId: projectId });
+        if (!response.ok)
+            throw new Error('Failed to get project');
+        if (!response.project)
+            throw new Error('No project found');
+        organizationId = response.project.organizationId;
+    }
+    catch (error) {
+        throw new Error('Failed to backfill organizationId', { cause: error });
+    }
+    if (!organizationId)
+        throw new Error('No organizationId found');
+    writeConfigFile({ blueprintFilePath, organizationId });
+    return organizationId;
+}

package/dist/actions/blueprints/index.js

@@ -33,11 +33,20 @@ export async function getBlueprintAndStack({ token, blueprintPath, }) {
             issues.push({ code: 'NO_STACK_ID', message: 'Stack ID not found' });
         return { localBlueprint, issues };
     }
-    const auth = { token, projectId };
-    const { error, ok, stack: deployedStack } = await getStack({ stackId, auth });
-    if (!ok) {
-        issues.push({ code: 'NO_STACK', message: error || 'Unknown error' });
+    const stackResponse = await getStack({
+        stackId,
+        auth: {
+            scopeType: 'project',
+            scopeId: projectId,
+            token,
+        },
+    });
+    if (!stackResponse.ok) {
+        issues.push({ code: 'NO_STACK', message: stackResponse.error || 'Unknown error' });
         return { localBlueprint, issues };
     }
-    return { localBlueprint: localBlueprint, deployedStack };
+    return {
+        localBlueprint: localBlueprint,
+        deployedStack: stackResponse.stack,
+    };
 }

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

@@ -1,4 +1,4 @@
-import type { AuthParams, Stack, StackMutation } from '../../utils/types.js';
+import type { AuthParams, ScopeType, Stack, StackMutation } from '../../utils/types.js';
 export declare const stacksUrl: string;
 interface ListStacksResponse {
     ok: boolean;
@@ -10,7 +10,7 @@ interface GetStackResponse {
     ok: boolean;
     error: string | null;
     stack: Stack;
-    response: Response;
+    response?: Response;
 }
 export declare function getStack({ stackId, auth, }: {
     stackId: string;
@@ -25,9 +25,10 @@ export declare function createStack({ stackMutation, auth, }: {
     stackMutation: StackMutation;
     auth: AuthParams;
 }): Promise<CreateStackResponse>;
-export declare function createEmptyStack({ token, projectId, name, projectBased, }: {
+export declare function createEmptyStack({ token, scopeType, scopeId, name, projectBased, }: {
     token: string;
-    projectId: string;
+    scopeType: ScopeType;
+    scopeId: string;
     name: string;
     projectBased?: boolean;
 }): Promise<Stack>;

package/dist/actions/blueprints/stacks.js

@@ -2,6 +2,7 @@ import config from '../../config.js';
 import getHeaders from '../../utils/get-headers.js';
 const { apiUrl } = config;
 export const stacksUrl = `${apiUrl}vX/blueprints/stacks`;
+/** Discriminate between Resource and Resource with parameters */
 function hasParameters(obj) {
     return (typeof obj === 'object' &&
         obj !== null &&
@@ -9,6 +10,7 @@ function hasParameters(obj) {
         typeof obj.parameters === 'object' &&
         obj.parameters !== null);
 }
+/** Flatten Resource with parameters */
 function flattenResource(resource) {
     if (hasParameters(resource)) {
         const { parameters, ...rest } = resource;
@@ -16,6 +18,7 @@ function flattenResource(resource) {
     }
     return resource;
 }
+/** Flatten a Stack's resources */
 function flattenStackResources(stack) {
     if (stack && Array.isArray(stack.resources)) {
         return {
@@ -63,15 +66,18 @@ export async function createStack({ stackMutation, auth, }) {
         stack: response.ok ? flattenStackResources(data) : data,
     };
 }
-export async function createEmptyStack({ token, projectId, name, projectBased = true, }) {
+export async function createEmptyStack({ token, scopeType, scopeId, name, projectBased = true, }) {
     const stackMutation = {
         name,
-        projectId,
+        scopeType,
+        scopeId,
         useProjectBasedId: projectBased,
         document: { resources: [] },
     };
-    const auth = { token, projectId };
-    const response = await createStack({ stackMutation, auth });
+    const response = await createStack({
+        stackMutation,
+        auth: { token, scopeType, scopeId },
+    });
     if (!response.ok) {
         throw new Error(response.error || 'Failed to create new Stack');
     }

package/dist/actions/sanity/projects.d.ts

@@ -1,3 +1,4 @@
+import type { ScopeType } from '../../utils/types.js';
 export declare const projectsApiPath: string;
 export declare const orgsApiPath: string;
 export interface Project {
@@ -40,8 +41,9 @@ interface GetProjectResponse {
     error: string | null;
     project: Project;
 }
-export declare function getProject({ token, projectId, }: {
+export declare function getProject({ token, scopeId, scopeType, }: {
     token: string;
-    projectId: string;
+    scopeId: string;
+    scopeType: ScopeType;
 }): Promise<GetProjectResponse>;
 export {};

package/dist/actions/sanity/projects.js

@@ -48,8 +48,11 @@ export async function groupProjectsByOrganization({ token, }) {
         organizations: orgsWithProjects,
     };
 }
-export async function getProject({ token, projectId, }) {
-    const response = await fetch(`${projectsApiPath}/${projectId}`, {
+export async function getProject({ token, scopeId, scopeType, }) {
+    if (scopeType !== 'project') {
+        throw new Error('Scope type must be project');
+    }
+    const response = await fetch(`${projectsApiPath}/${scopeId}`, {
         method: 'GET',
         headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
     });

package/dist/cores/blueprints/config.js

@@ -140,7 +140,7 @@ async function testConfigAndReport({ token, stackId, projectId, }) {
     const spinner = ora('Testing the configuration...').start();
     const { ok, error } = await getStack({
         stackId,
-        auth: { token, projectId },
+        auth: { token, scopeType: 'project', scopeId: projectId },
     });
     if (!ok) {
         spinner.fail('Configuration test failed.');
@@ -151,7 +151,7 @@ async function testConfigAndReport({ token, stackId, projectId, }) {
     return { ok, error };
 }
 async function startReinitializeStack({ token, projectId, }) {
-    const auth = { token, projectId };
+    const auth = { token, scopeType: 'project', scopeId: projectId };
     // stack id IS ST-${projectId} – it has already been checked and doesn't exist
     const { confirm } = await inquirer.prompt([
         {
@@ -170,8 +170,15 @@ async function startReinitializeStack({ token, projectId, }) {
         };
     }
     const projectDisplayName = project.displayName;
-    const stackMutation = { name: projectDisplayName, projectId, document: { resources: [] } };
-    const response = await createStack({ stackMutation, auth });
+    const response = await createStack({
+        stackMutation: {
+            name: projectDisplayName,
+            scopeType: 'project',
+            scopeId: projectId,
+            document: { resources: [] },
+        },
+        auth,
+    });
     if (!response.ok)
         return { ok: false, error: response.error || 'Failed to create new Stack' };
     return {

package/dist/cores/blueprints/deploy.js

@@ -46,14 +46,18 @@ export async function blueprintDeployCore(options) {
                 }
             }
         }
-        const stackMutation = {
-            projectId,
-            name: deployedStack.name,
-            document: { resources: validResources },
-        };
         const spinner = ora('Deploying...').start();
         const isoNow = new Date().toISOString();
-        const { ok: deployOk, stack, error: deployError, } = await updateStack({ stackId, stackMutation, auth });
+        const { ok: deployOk, stack, error: deployError, } = await updateStack({
+            stackId,
+            stackMutation: {
+                scopeType: 'project',
+                scopeId: projectId,
+                name: deployedStack.name,
+                document: { resources: validResources },
+            },
+            auth,
+        });
         if (!deployOk) {
             spinner.fail(`${chalk.red('Failed')} to update deployment`);
             return { success: false, error: deployError || 'Failed to update deployment' };

package/dist/cores/blueprints/destroy.js

@@ -12,7 +12,7 @@ export async function blueprintDestroyCore(options) {
     if (flagProjectId && flagStackId && force) {
         const { ok, error, stack } = await destroyStack({
             stackId: flagStackId,
-            auth: { token, projectId: flagProjectId },
+            auth: { token, scopeType: 'project', scopeId: flagProjectId },
         });
         if (!ok)
             return { success: false, error: error || 'Failed to destroy deployment' };
@@ -22,7 +22,7 @@ export async function blueprintDestroyCore(options) {
     const { projectId, stackId } = blueprint;
     if (!projectId)
         return { success: false, error: 'Project ID is required' };
-    const auth = { token, projectId };
+    const auth = { token, scopeType: 'project', scopeId: projectId };
     let stack;
     try {
         if (flagStackId) {

package/dist/cores/blueprints/doctor.js

@@ -125,7 +125,7 @@ export async function blueprintDoctorCore(options) {
         // STACK + ACCESS
         if (diagnostics.online && diagnostics.tokenValid && token && stackId && projectId) {
             const stackResponse = await getStack({
-                auth: { token, projectId },
+                auth: { token, scopeType: 'project', scopeId: projectId },
                 stackId,
             });
             if (stackResponse.ok) {
@@ -134,12 +134,12 @@ export async function blueprintDoctorCore(options) {
                 diagnostics.stackReady = true;
                 diagnostics.userHasAccess = true;
             }
-            else if (stackResponse.response.status === 404) {
+            else if (stackResponse.response?.status === 404) {
                 if (v)
                     yikes(`Deployment "Stack" <${stackId}> not found`);
                 diagnostics.stackReady = false;
             }
-            else if (stackResponse.response.status === 403 || stackResponse.response.status === 401) {
+            else if (stackResponse.response?.status === 403 || stackResponse.response?.status === 401) {
                 if (v)
                     yikes(`User does not have access to "Stack" <${stackId}>`);
                 diagnostics.userHasAccess = false;

package/dist/cores/blueprints/init.js

@@ -38,7 +38,8 @@ export async function blueprintInitCore(options) {
             // * 3. create empty stack with name from example name
             const stack = await createEmptyStack({
                 token,
-                projectId,
+                scopeType: 'project',
+                scopeId: projectId,
                 name: `example-${flagExample}`,
                 projectBased: false,
             });
@@ -106,17 +107,17 @@ export async function blueprintInitCore(options) {
             // using --stack-name gets around "LAUNCH LIMIT: 1 Stack per Project"
             const stack = await createEmptyStack({
                 token,
-                projectId,
+                scopeType: 'project',
+                scopeId: projectId,
                 name: flagStackName,
                 projectBased: false,
             });
             stackId = stack.id;
         }
-        const auth = { token: token, projectId };
         if (!stackId) {
             // LAUNCH LIMIT: 1 Stack per Project - do not prompt for Stack, just create one
             if (LAUNCH_LIMIT_STACK_PER_PROJECT) {
-                await createProjectBasedStack(auth, token, log);
+                await createProjectBasedStack({ token, scopeType: 'project', scopeId: projectId }, log);
                 // do not set stackId, to avoid saving it to the config file
             }
             else {
@@ -175,10 +176,17 @@ async function promptForBlueprintType() {
     return pickedBlueprintsType;
 }
 // LAUNCH LIMIT: 1 Stack per Project - create exclusive stack for project
-async function createProjectBasedStack(auth, token, log) {
-    const { projectId } = auth;
+async function createProjectBasedStack(auth, log) {
+    if (auth.scopeType !== 'project') {
+        throw new Error('Auth must be for a project');
+    }
+    const { scopeId: projectId, token } = auth;
     // get project
-    const { ok: projectOk, project } = await getProject(auth);
+    const { ok: projectOk, project } = await getProject({
+        token: auth.token,
+        scopeType: 'project',
+        scopeId: projectId,
+    });
     if (!projectOk) {
         throw new Error('Failed to find Project while creating Stack');
     }
@@ -196,7 +204,8 @@ async function createProjectBasedStack(auth, token, log) {
     // if not, create a stack
     const stack = await createEmptyStack({
         token,
-        projectId,
+        scopeType: 'project',
+        scopeId: projectId,
         name: projectDisplayName,
     });
     return stack;

package/dist/cores/blueprints/plan.js

@@ -7,7 +7,10 @@ export async function blueprintPlanCore(options) {
     log(`${chalk.bold.blueBright('Blueprint Deployment Plan')} ${chalk.dim(`(${fileInfo.fileName})`)}`);
     log(formatResourceTree(parsedBlueprint.resources));
     if (token && projectId && stackId) {
-        const stackResponse = await getStack({ stackId, auth: { token, projectId } });
+        const stackResponse = await getStack({
+            auth: { token, scopeType: 'project', scopeId: projectId },
+            stackId,
+        });
         if (!stackResponse.ok) {
             log(chalk.dim('Unable to retrieve live deployment for comparison'));
         }

package/dist/cores/blueprints/stacks.js

@@ -11,7 +11,7 @@ export async function blueprintStacksCore(options) {
         return { success: false, error: 'No Project ID provided' };
     }
     try {
-        const { ok, stacks, error } = await listStacks({ token, projectId });
+        const { ok, stacks, error } = await listStacks({ token, scopeType: 'project', scopeId: projectId });
         if (!ok)
             return { success: false, error: error || 'Failed to list stacks' };
         if (!stacks || stacks.length === 0) {

package/dist/cores/index.js

@@ -48,7 +48,7 @@ export async function initDeployedBlueprintConfig(config) {
         if (!stackId)
             return { ok: false, error: 'Missing deployment configuration for Blueprint' };
     }
-    const auth = { token: config.token, projectId };
+    const auth = { token: config.token, scopeType: 'project', scopeId: projectId };
     const stackResponse = await getStack({ stackId, auth });
     if (!stackResponse.ok) {
         config.log(`Could not retrieve deployment info for ${niceId(stackId)}. Was it destroyed?`);

package/dist/utils/display/prompt.js

@@ -54,7 +54,7 @@ export async function promptForProject({ token, knownOrganizationId, knownProjec
     return pickedProject;
 }
 export async function promptForStackId({ projectId, token, }) {
-    const { ok: stacksOk, error: stacksErr, stacks } = await listStacks({ token, projectId });
+    const { ok: stacksOk, error: stacksErr, stacks, } = await listStacks({ token, scopeType: 'project', scopeId: projectId });
     if (!stacksOk) {
         throw new Error(stacksErr || 'Failed to list Stacks');
     }
@@ -87,7 +87,8 @@ export async function promptForStackId({ projectId, token, }) {
         ]);
         const stack = await createEmptyStack({
             token,
-            projectId,
+            scopeType: 'project',
+            scopeId: projectId,
             name: stackName,
         });
         return stack.id;

package/dist/utils/get-headers.d.ts

@@ -1,9 +1,9 @@
 import type { AuthParams } from './types.js';
-export default function getHeaders({ token, projectId }: AuthParams): {
+export default function getHeaders({ token, scopeId, scopeType }: AuthParams): {
     Accept: string;
     'Content-Type': string;
     Authorization: string;
-    'X-Sanity-Scope-Type': string;
+    'X-Sanity-Scope-Type': import("./types.js").ScopeType;
     'X-Sanity-Scope-Id': string;
     'User-Agent': string;
 };

package/dist/utils/get-headers.js

@@ -1,21 +1,12 @@
-const userAgent = await getUserAgent();
-async function getUserAgent() {
-    try {
-        const pkg = await (await import('../../package.json', { with: { type: 'json' } })).default;
-        return `${pkg.name}@${pkg.version}`;
-    }
-    catch {
-        return 'unknown@0.0.0';
-    }
-}
-export default function getHeaders({ token, projectId }) {
-    // TODO: support organization scope type
+import pkg from '../../package.json' with { type: 'json' };
+const userAgent = `${pkg.name}@${pkg.version}`;
+export default function getHeaders({ token, scopeId, scopeType }) {
     return {
         Accept: 'application/json',
         'Content-Type': 'application/json',
         Authorization: `Bearer ${token}`,
-        'X-Sanity-Scope-Type': 'project',
-        'X-Sanity-Scope-Id': projectId,
+        'X-Sanity-Scope-Type': scopeType,
+        'X-Sanity-Scope-Id': scopeId,
         'User-Agent': userAgent,
     };
 }

package/dist/utils/types.d.ts

@@ -11,7 +11,8 @@ export type Result<T, E = string> = {
 /** @internal */
 export interface AuthParams {
     token: string;
-    projectId: string;
+    scopeType: ScopeType;
+    scopeId: string;
 }
 /** @internal */
 export interface GroqRule {
@@ -55,7 +56,8 @@ export interface Stack {
     id: string;
     name: string;
     displayName: string;
-    projectId: string;
+    scopeType: ScopeType;
+    scopeId: string;
     resources: Array<DeployedResource>;
     createdAt?: string;
     updatedAt?: string;
@@ -71,7 +73,8 @@ export interface StackOperation {
 /** @internal */
 export interface StackMutation {
     name: string;
-    projectId: string;
+    scopeType: ScopeType;
+    scopeId: string;
     document: Blueprint;
     useProjectBasedId?: boolean;
 }

package/dist/utils/validate/resource.js

@@ -1,7 +1,7 @@
 import { BlueprintParserErrorType } from '../types.js';
 export function validateFunctionName(name) {
-    // must be 6+ characters, no special characters, no spaces, allow _ and -
-    return /^[a-zA-Z0-9][a-zA-Z0-9_-]{5,}$/.test(name);
+    // must be 3+ characters, no special characters, no spaces, allow _ and -
+    return /^[a-zA-Z0-9][a-zA-Z0-9_-]{2,}$/.test(name);
 }
 const validFunctionEventNames = ['publish', 'create', 'update', 'delete'];
 export function validateFunctionResource(resource) {
@@ -10,7 +10,7 @@ export function validateFunctionResource(resource) {
     const errors = [];
     if (!validateFunctionName(resource.name)) {
         errors.push({
-            message: `${msgPrefix} Function name must be at least 6 characters, start with a letter or number, and only contain letters, numbers, _ or -`,
+            message: `${msgPrefix} Function name must be at least 3 characters, start with a letter or number, and only contain letters, numbers, _ or -`,
             type: BlueprintParserErrorType.InvalidProperty,
         });
     }

package/oclif.manifest.json

@@ -1177,5 +1177,5 @@
       ]
     }
   },
-  "version": "10.11.0"
+  "version": "10.11.2"
 }

package/package.json

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