@sanity/runtime-cli 7.3.5 → 7.4.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.3.5 linux-x64 node-v22.15.0
+@sanity/runtime-cli/7.4.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.3.5/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.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.3.5/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs NAME`
 
@@ -360,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.3.5/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test NAME`
 
@@ -393,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.3.5/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v7.4.0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -2,9 +2,12 @@ export * as assets from './assets.js';
 export * as blueprint from './blueprint.js';
 export * as logs from './logs.js';
 export * as operations from './operations.js';
-export * as projects from './projects.js';
 export * as resources from './resources.js';
 export * as stacks from './stacks.js';
+/**
+ * @deprecated Use actions/sanity/projects.js instead
+ */
+export * as projects from '../sanity/projects.js';
 import type { Stack } from '../../utils/types.js';
 import type { BlueprintParserError } from '../../utils/types.js';
 import { readLocalBlueprint } from './blueprint.js';

package/dist/actions/blueprints/index.js

@@ -2,9 +2,12 @@ export * as assets from './assets.js';
 export * as blueprint from './blueprint.js';
 export * as logs from './logs.js';
 export * as operations from './operations.js';
-export * as projects from './projects.js';
 export * as resources from './resources.js';
 export * as stacks from './stacks.js';
+/**
+ * @deprecated Use actions/sanity/projects.js instead
+ */
+export * as projects from '../sanity/projects.js';
 import { readLocalBlueprint } from './blueprint.js';
 import { getStack } from './stacks.js';
 /**

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

@@ -0,0 +1 @@
+export * as projects from './projects.js';

package/dist/actions/sanity/index.js

@@ -0,0 +1 @@
+export * as projects from './projects.js';

package/dist/actions/{blueprints → sanity}/projects.d.ts

@@ -1,4 +1,6 @@
-interface Project {
+export declare const projectsApiPath: string;
+export declare const orgsApiPath: string;
+export interface Project {
     id: string;
     displayName: string;
     studioHost: string | null;
@@ -18,6 +20,21 @@ interface ListProjectsResponse {
 export declare function listProjects({ token }: {
     token: string;
 }): Promise<ListProjectsResponse>;
+interface GroupedProjectsByOrganizationResponse {
+    ok: boolean;
+    error: string | null;
+    organizations: GroupedProjects[];
+}
+interface GroupedProjects {
+    organization: {
+        id: string;
+        name: string;
+    };
+    projects?: Project[];
+}
+export declare function groupProjectsByOrganization({ token, }: {
+    token: string;
+}): Promise<GroupedProjectsByOrganizationResponse>;
 interface GetProjectResponse {
     ok: boolean;
     error: string | null;

package/dist/actions/sanity/projects.js

@@ -0,0 +1,62 @@
+import config from '../../config.js';
+const { apiUrl } = config;
+export const projectsApiPath = `${apiUrl}v2021-06-07/projects`;
+export const orgsApiPath = `${apiUrl}v2021-06-07/organizations`;
+export async function listProjects({ token }) {
+    const projectsFetch = await fetch(projectsApiPath, {
+        method: 'GET',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+        },
+    });
+    const projects = await projectsFetch.json();
+    return {
+        ok: projectsFetch.ok,
+        error: projectsFetch.ok ? null : projects.error?.message,
+        projects,
+    };
+}
+export async function groupProjectsByOrganization({ token, }) {
+    const projectsResponse = await listProjects({ token });
+    if (!projectsResponse.ok) {
+        return {
+            ok: false,
+            error: projectsResponse.error,
+            organizations: [],
+        };
+    }
+    const orgsFetch = await fetch(orgsApiPath, {
+        method: 'GET',
+        headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
+    });
+    if (!orgsFetch.ok) {
+        return {
+            ok: false,
+            error: orgsFetch.statusText,
+            organizations: [],
+        };
+    }
+    const organizations = await orgsFetch.json();
+    const orgsWithProjects = organizations.map(({ name, id }) => {
+        const projects = projectsResponse.projects.filter((project) => project.organizationId === id);
+        return { organization: { name, id }, projects };
+    });
+    return {
+        ok: true,
+        error: null,
+        organizations: orgsWithProjects,
+    };
+}
+export async function getProject({ token, projectId, }) {
+    const response = await fetch(`${projectsApiPath}/${projectId}`, {
+        method: 'GET',
+        headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
+    });
+    const project = await response.json();
+    return {
+        ok: response.ok,
+        error: response.ok ? null : project.error?.message,
+        project,
+    };
+}

package/dist/cores/blueprints/add.js

@@ -130,8 +130,8 @@ async function promptForFunctionType() {
             message: 'Choose function type:',
             choices: [
                 { name: 'Document Publish', value: 'document-publish' },
-                { name: 'Document Create', value: 'document-create', disabled: true },
-                { name: 'Document Delete', value: 'document-delete', disabled: true },
+                { name: 'Document Create', value: 'document-create', disabled: '(Coming soon)' },
+                { name: 'Document Delete', value: 'document-delete', disabled: '(Coming soon)' },
             ],
             default: 'document-publish',
         },

package/dist/cores/blueprints/config.js

@@ -3,9 +3,10 @@ import highlight from 'color-json';
 import inquirer from 'inquirer';
 import ora from 'ora';
 import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_DIR, writeConfigFile, } from '../../actions/blueprints/blueprint.js';
-import { getProject, listProjects } from '../../actions/blueprints/projects.js';
 import { createStack, getStack, listStacks } from '../../actions/blueprints/stacks.js';
+import { getProject } from '../../actions/sanity/projects.js';
 import { niceId, warn } from '../../utils/display/presenters.js';
+import { promptForProject } from '../../utils/display/prompt.js';
 export async function blueprintConfigCore(options) {
     const { bin = 'sanity', log, token, flags } = options;
     const { edit: editConfig = false, 'test-config': testConfig = false, 'project-id': flagProjectId, 'stack-id': flagStackId, } = flags;
@@ -53,10 +54,10 @@ export async function blueprintConfigCore(options) {
         // editing...
         if (editConfig) {
             const updatedProjectId = flagProjectId ||
-                (await promptForProjectId({
+                (await promptForProject({
                     token,
                     knownProjectId: configProjectId,
-                }));
+                })).projectId;
             if (!updatedProjectId) {
                 return {
                     success: false,
@@ -134,29 +135,6 @@ export async function blueprintConfigCore(options) {
         return { success: false, error: 'Unknown error' };
     }
 }
-async function promptForProjectId({ token, knownProjectId, }) {
-    const { ok, projects, error } = await listProjects({ token });
-    if (!ok) {
-        throw new Error(error ?? 'Unknown error listing projects');
-    }
-    if (projects.length === 0) {
-        throw new Error('No Sanity projects found. Use `npx sanity init` to create one.');
-    }
-    const projectChoices = projects.map(({ displayName, id: projectId }) => ({
-        name: `"${displayName}" ${niceId(projectId)}`,
-        value: projectId,
-    }));
-    const { pickedProjectId } = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'pickedProjectId',
-            message: 'Select your Sanity project:',
-            choices: projectChoices,
-            default: knownProjectId,
-        },
-    ]);
-    return pickedProjectId;
-}
 async function promptForStackId({ token, projectId, knownStackId, }) {
     const auth = { token, projectId };
     // get stacks for selected project

package/dist/cores/blueprints/init.js

@@ -3,9 +3,10 @@ import { cwd } from 'node:process';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import { BLUEPRINT_CONFIG_FILE, BLUEPRINT_DIR, findBlueprintFile, writeBlueprintToDisk, writeConfigFile, } from '../../actions/blueprints/blueprint.js';
-import { getProject, listProjects } from '../../actions/blueprints/projects.js';
 import { createStack, getStack, listStacks } from '../../actions/blueprints/stacks.js';
+import { getProject } from '../../actions/sanity/projects.js';
 import { niceId } from '../../utils/display/presenters.js';
+import { promptForProject } from '../../utils/display/prompt.js';
 const LAUNCH_LIMIT_STACK_PER_PROJECT = true;
 export async function blueprintInitCore(options) {
     const { log, token, args, flags } = options;
@@ -26,7 +27,7 @@ export async function blueprintInitCore(options) {
         let projectId = flagProjectId;
         let stackId = flagStackId;
         if (!projectId) {
-            const pickedProject = await promptForProject(token);
+            const pickedProject = await promptForProject({ token });
             projectId = pickedProject.projectId;
         }
         if (flagStackName) {
@@ -76,37 +77,15 @@ async function promptForBlueprintType() {
             name: 'pickedBlueprintsType',
             message: 'Choose a blueprint type:',
             choices: [
-                { name: 'JSON (Recommended)', value: 'json' },
-                { name: 'JavaScript', value: 'js', disabled: true },
-                { name: 'TypeScript', value: 'ts', disabled: true },
+                { name: 'JSON', value: 'json' },
+                { name: 'TypeScript', value: 'ts', disabled: '(Coming soon)' },
+                { name: 'JavaScript', value: 'js', disabled: '(Coming soon)' },
             ],
             default: 'json',
         },
     ]);
     return pickedBlueprintsType;
 }
-async function promptForProject(token) {
-    const { ok: projectsOk, error: projectsErr, projects } = await listProjects({ token });
-    if (!projectsOk) {
-        throw new Error(projectsErr ?? 'Unknown error listing projects');
-    }
-    if (projects.length === 0) {
-        throw new Error('No Sanity projects found. Use `npx sanity init` to create one.');
-    }
-    const projectChoices = projects.map(({ displayName, id: projectId }) => ({
-        name: `"${displayName}" ${niceId(projectId)}`,
-        value: { projectId, displayName },
-    }));
-    const { pickedProject } = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'pickedProject',
-            message: 'Select your Sanity project:',
-            choices: projectChoices,
-        },
-    ]);
-    return pickedProject;
-}
 async function promptForStackId({ projectId, token, }) {
     const { ok: stacksOk, error: stacksErr, stacks } = await listStacks({ token, projectId });
     if (!stacksOk) {

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

@@ -0,0 +1,14 @@
+/**
+ * Prompt the user for a Project after selecting an Organization.
+ * @param token - The Sanity API token
+ * @returns The selected project, with the projectId and displayName
+ * @throws {Error} If the user does not have any projects or if the API call fails
+ */
+export declare function promptForProject({ token, knownOrganizationId, knownProjectId, }: {
+    token: string;
+    knownOrganizationId?: string;
+    knownProjectId?: string;
+}): Promise<{
+    projectId: string;
+    displayName: string;
+}>;

package/dist/utils/display/prompt.js

@@ -0,0 +1,53 @@
+import inquirer from 'inquirer';
+import { groupProjectsByOrganization } from '../../actions/sanity/projects.js';
+import { niceId } from './presenters.js';
+/**
+ * Prompt the user for a Project after selecting an Organization.
+ * @param token - The Sanity API token
+ * @returns The selected project, with the projectId and displayName
+ * @throws {Error} If the user does not have any projects or if the API call fails
+ */
+export async function promptForProject({ token, knownOrganizationId, knownProjectId, }) {
+    const { ok, error, organizations } = await groupProjectsByOrganization({ token });
+    if (!ok) {
+        throw new Error(error ?? 'Unknown error listing projects');
+    }
+    if (organizations.length === 0) {
+        throw new Error('No Sanity projects found. Use `npx sanity init` to create one.');
+    }
+    let projects;
+    if (organizations.length > 1) {
+        const orgChoices = organizations.map(({ organization, projects }) => ({
+            name: `"${organization.name}" ${niceId(organization.id)}`,
+            value: { organization, projects },
+            disabled: !projects || projects.length === 0 ? '(0 Projects)' : false,
+        }));
+        const { pickedOrganization } = await inquirer.prompt([
+            {
+                type: 'list',
+                name: 'pickedOrganization',
+                message: 'Which Organization would you like to use?',
+                choices: orgChoices,
+                default: knownOrganizationId,
+            },
+        ]);
+        projects = pickedOrganization.projects;
+    }
+    else {
+        projects = organizations[0].projects;
+    }
+    const projectChoices = projects.map(({ displayName, id: projectId }) => ({
+        name: `"${displayName}" ${niceId(projectId)}`,
+        value: { projectId, displayName },
+    }));
+    const { pickedProject } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'pickedProject',
+            message: 'Which Project would you like to use?',
+            choices: projectChoices,
+            default: knownProjectId,
+        },
+    ]);
+    return pickedProject;
+}

package/dist/utils/index.d.ts

@@ -3,3 +3,4 @@ export * as findFunction from './find-function.js';
 export * as types from './types.js';
 export * as validate from './validate/index.js';
 export * as vendor from './vendor/index.js';
+export * as validatedToken from './validated-token.js';

package/dist/utils/index.js

@@ -3,3 +3,4 @@ export * as findFunction from './find-function.js';
 export * as types from './types.js';
 export * as validate from './validate/index.js';
 export * as vendor from './vendor/index.js';
+export * as validatedToken from './validated-token.js';

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

@@ -1,5 +1,5 @@
-export declare function validToken(): Promise<string>;
-export declare function validTokenOrErrorMessage(): Promise<{
+export declare function validToken(maybeToken?: string): Promise<string>;
+export declare function validTokenOrErrorMessage(maybeToken?: string): Promise<{
     token: string;
     error?: never;
 } | {

package/dist/utils/validated-token.js

@@ -1,8 +1,8 @@
 import config from '../config.js';
-export async function validToken() {
+export async function validToken(maybeToken) {
     if (config.isTest)
         return 'token';
-    const token = config.token;
+    const token = maybeToken ?? config.token;
     if (!token)
         throw new Error('NO_TOKEN');
     const url = `${config.apiUrl}v2025-04-23/users/me`;
@@ -21,9 +21,9 @@ export async function validToken() {
     }
     throw new Error('SERVER_ERROR', { cause: response.statusText });
 }
-export async function validTokenOrErrorMessage() {
+export async function validTokenOrErrorMessage(maybeToken) {
     try {
-        const token = await validToken();
+        const token = await validToken(maybeToken);
         return { token };
     }
     catch (e) {

package/oclif.manifest.json

@@ -839,5 +839,5 @@
       ]
     }
   },
-  "version": "7.3.5"
+  "version": "7.4.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "7.3.5",
+  "version": "7.4.0",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",
@@ -23,6 +23,10 @@
       "types": "./dist/actions/functions/index.d.ts",
       "import": "./dist/actions/functions/index.js"
     },
+    "./actions/sanity": {
+      "types": "./dist/actions/sanity/index.d.ts",
+      "import": "./dist/actions/sanity/index.js"
+    },
     "./cores": {
       "types": "./dist/cores/index.d.ts",
       "import": "./dist/cores/index.js"

package/dist/actions/blueprints/projects.js

@@ -1,30 +0,0 @@
-import config from '../../config.js';
-const { apiUrl } = config;
-const projectsUrl = `${apiUrl}v2021-06-07/projects`;
-export async function listProjects({ token }) {
-    const response = await fetch(projectsUrl, {
-        method: 'GET',
-        headers: {
-            Authorization: `Bearer ${token}`,
-            'Content-Type': 'application/json',
-        },
-    });
-    const projects = await response.json();
-    return {
-        ok: response.ok,
-        error: response.ok ? null : projects.error?.message,
-        projects,
-    };
-}
-export async function getProject({ token, projectId, }) {
-    const response = await fetch(`${projectsUrl}/${projectId}`, {
-        method: 'GET',
-        headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
-    });
-    const project = await response.json();
-    return {
-        ok: response.ok,
-        error: response.ok ? null : project.error?.message,
-        project,
-    };
-}