@sanity/runtime-cli 14.12.0 → 14.12.1

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @sanity/runtime-cli
 $ sanity-run COMMAND
 running command...
 $ sanity-run (--version)
-@sanity/runtime-cli/14.12.0 linux-x64 node-v24.14.1
+@sanity/runtime-cli/14.12.1 linux-x64 node-v24.14.1
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -101,7 +101,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/v14.12.0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -140,7 +140,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -182,7 +182,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --fn-installer npm
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -218,7 +218,7 @@ EXAMPLES
   $ sanity-run blueprints destroy --stack <name-or-id> --project-id <projectId> --force --no-wait
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -250,7 +250,7 @@ EXAMPLES
   $ sanity-run blueprints doctor --fix
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -285,7 +285,7 @@ EXAMPLES
   $ sanity-run blueprints info --project-id <id> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -293,7 +293,7 @@ Initialize a Blueprint and create a remote Stack
 
 ```
 USAGE
-  $ sanity-run blueprints init [DIR] [--json] [--validate-resources] [--verbose] [--dir <value>] [--example <value> |
+  $ sanity-run blueprints init [DIR] [--json] [--validate-resources] [--dir <value>] [--example <value> |
     --blueprint-type json|js|ts | --stack-id <value> | --stack-name <value>] [--project-id <value>] [--organization-id
     <value>]
 
@@ -311,7 +311,6 @@ FLAGS
   --stack-id=<value>         Existing Stack ID used to scope local Blueprint
   --stack-name=<value>       Name to use for a new Stack provisioned during initialization
   --[no-]validate-resources  Validate resources
-  --verbose                  Verbose output
 
 DESCRIPTION
   Initialize a Blueprint and create a remote Stack
@@ -339,7 +338,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/v14.12.0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -370,7 +369,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -398,7 +397,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -430,7 +429,7 @@ EXAMPLES
   $ sanity-run blueprints stacks --organization-id <organizationId>
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -483,7 +482,7 @@ EXAMPLES
   $ sanity-run functions add --name my-function --type document-create --type document-update --lang js
 ```
 
-_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -519,7 +518,7 @@ EXAMPLES
   $ sanity-run functions dev --timeout 60
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -550,7 +549,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/v14.12.0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -578,7 +577,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -608,7 +607,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/v14.12.0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs [NAME]`
 
@@ -650,7 +649,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test [NAME]`
 
@@ -708,7 +707,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/v14.12.0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v14.12.1/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

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

@@ -78,6 +78,23 @@ export declare function loadBlueprintFile(fileInfo: FileInfo): Promise<LoadedBlu
 export declare function parseBlueprintContent(rawBlueprint: Record<string, unknown>, options: {
     validateResources: boolean;
 }): ParsedBlueprintContent;
+/** Result of finding, loading, and parsing a blueprint file. */
+export interface LocalBlueprint extends ParsedBlueprintContent {
+    fileInfo: FileInfo;
+    rawBlueprint: Record<string, unknown>;
+    module?: BlueprintModule;
+}
+/**
+ * Find, load, and parse a local blueprint file in one step.
+ * Does not read the config file or resolve IDs -- callers that need
+ * scope/stack information should use `readConfigFile` + `resolveIds` separately.
+ *
+ * @param blueprintPath Path to a blueprint file or directory containing one
+ * @param options.validateResources Whether to validate function resources
+ */
+export declare function loadAndParseBlueprint(blueprintPath?: string, options?: {
+    validateResources: boolean;
+}): Promise<LocalBlueprint>;
 /**
  * Reads the blueprint file from disk and parses it.
  * Resolves IDs from environment > blueprint module > config file.

package/dist/actions/blueprints/blueprint.js

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { basename, dirname, extname } from 'node:path';
-import { cwd, env } from 'node:process';
+import { cwd } from 'node:process';
 import { pathToFileURL } from 'node:url';
 import blueprintParserValidator from '@sanity/blueprints-parser';
 import * as find from 'empathic/find';
@@ -138,6 +138,27 @@ export function parseBlueprintContent(rawBlueprint, options) {
         resources,
     };
 }
+/**
+ * Find, load, and parse a local blueprint file in one step.
+ * Does not read the config file or resolve IDs -- callers that need
+ * scope/stack information should use `readConfigFile` + `resolveIds` separately.
+ *
+ * @param blueprintPath Path to a blueprint file or directory containing one
+ * @param options.validateResources Whether to validate function resources
+ */
+export async function loadAndParseBlueprint(blueprintPath, options = { validateResources: true }) {
+    const fileInfo = findBlueprintFile(blueprintPath);
+    if (!fileInfo)
+        throw Error('Could not find Blueprint file! Use the `blueprints init` command.');
+    const loaded = await loadBlueprintFile(fileInfo);
+    const parsed = parseBlueprintContent(loaded.rawBlueprint, options);
+    return {
+        fileInfo,
+        rawBlueprint: loaded.rawBlueprint,
+        module: loaded.module,
+        ...parsed,
+    };
+}
 /**
  * Reads the blueprint file from disk and parses it.
  * Resolves IDs from environment > blueprint module > config file.
@@ -157,25 +178,8 @@ export async function readLocalBlueprint(logger, validate, blueprintPath) {
     const blueprintConfig = readConfigFile(fileInfo.blueprintFilePath);
     // 3. Resolve IDs: env > module > config
     const resolved = resolveIds({
-        env: {
-            organizationId: env.SANITY_ORGANIZATION_ID,
-            projectId: env.SANITY_PROJECT_ID,
-            stackId: env.SANITY_BLUEPRINT_STACK_ID,
-        },
-        module: loaded.module
-            ? {
-                organizationId: loaded.module.organizationId,
-                projectId: loaded.module.projectId,
-                stackId: loaded.module.stackId,
-            }
-            : undefined,
-        config: blueprintConfig
-            ? {
-                organizationId: blueprintConfig.organizationId,
-                projectId: blueprintConfig.projectId,
-                stackId: blueprintConfig.stackId,
-            }
-            : undefined,
+        module: loaded.module,
+        config: blueprintConfig,
     });
     // 4. Legacy stack ID inference: ST-<projectId>
     let { stackId } = resolved;

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

@@ -17,12 +17,15 @@ export interface IdValues {
 /**
  * Sources to resolve IDs from, in descending priority.
  * Each key maps to a source; the first non-empty value wins.
+ *
+ * - `env` defaults to reading SANITY_* process.env vars
+ * - `module` and `config` accept any object with `{organizationId?, projectId?, stackId?}`
  */
 export interface IdSources {
-    flags?: IdValues;
-    env?: IdValues;
-    module?: IdValues;
-    config?: IdValues;
+    flags?: IdValues | null;
+    env?: IdValues | null;
+    module?: IdValues | null;
+    config?: IdValues | null;
 }
 export interface ResolvedIds {
     organizationId?: string;
@@ -41,6 +44,8 @@ export interface ResolvedIds {
  * Precedence: flags > env > module > config.
  * Derives scopeType/scopeId from the resolved IDs (project > organization).
  *
- * This is a pure, synchronous function -- no I/O, no side effects.
+ * Env vars are read from process.env by default (SANITY_ORGANIZATION_ID,
+ * SANITY_PROJECT_ID, SANITY_BLUEPRINT_STACK_ID). Pass `env` explicitly to
+ * override, or `null` to skip.
  */
-export declare function resolveIds(sources: IdSources): ResolvedIds;
+export declare function resolveIds(sources?: IdSources): ResolvedIds;

package/dist/actions/blueprints/resolve.js

@@ -1,20 +1,30 @@
+import { env as processEnv } from 'node:process';
 /**
  * Resolve organization, project, and stack IDs from a prioritized set of sources.
  * Precedence: flags > env > module > config.
  * Derives scopeType/scopeId from the resolved IDs (project > organization).
  *
- * This is a pure, synchronous function -- no I/O, no side effects.
+ * Env vars are read from process.env by default (SANITY_ORGANIZATION_ID,
+ * SANITY_PROJECT_ID, SANITY_BLUEPRINT_STACK_ID). Pass `env` explicitly to
+ * override, or `null` to skip.
  */
-export function resolveIds(sources) {
+export function resolveIds(sources = {}) {
+    const envValues = sources.env !== undefined
+        ? sources.env
+        : {
+            organizationId: processEnv.SANITY_ORGANIZATION_ID,
+            projectId: processEnv.SANITY_PROJECT_ID,
+            stackId: processEnv.SANITY_BLUEPRINT_STACK_ID,
+        };
     const ordered = [
         { source: 'flags', values: sources.flags },
-        { source: 'env', values: sources.env },
+        { source: 'env', values: envValues },
         { source: 'module', values: sources.module },
         { source: 'config', values: sources.config },
     ];
     const result = { sources: {} };
     for (const { source, values } of ordered) {
-        if (!values)
+        if (values === null || values === undefined)
             continue;
         if (!result.organizationId && values.organizationId) {
             result.organizationId = values.organizationId;

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

@@ -1,3 +1,2 @@
-import type { Logger } from '../../utils/logger.js';
 import type { InvokeExecutionOptions } from '../../utils/types.js';
-export declare function dev(host: string, port: number, logger: Logger, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>): Promise<void>;
+export declare function dev(host: string, port: number, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>): Promise<void>;

package/dist/actions/functions/dev.js

@@ -1,4 +1,4 @@
 import { app } from '../../server/app.js';
-export async function dev(host, port, logger, validateResources, executionOptions) {
-    app(host, Number(port), logger, validateResources, executionOptions);
+export async function dev(host, port, validateResources, executionOptions) {
+    app(host, Number(port), validateResources, executionOptions);
 }

package/dist/baseCommands.d.ts

@@ -5,6 +5,12 @@ import type { CoreResult } from './cores/index.js';
 import type { AuthParams, ScopeType, Stack } from './utils/types.js';
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof RuntimeCommand)['baseFlags'] & T['flags']>;
 export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
+export declare const pathFlagConfig: {
+    description: string;
+    env: string;
+    aliases: string[];
+    char: "p";
+};
 export declare const baseFlags: {
     json: Interfaces.BooleanFlag<boolean>;
     path: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
@@ -12,7 +18,9 @@ export declare const baseFlags: {
     'validate-resources': Interfaces.BooleanFlag<boolean>;
     verbose: Interfaces.BooleanFlag<boolean>;
 };
-export declare const stackFlag: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+export declare const stackFlagConfig: {
+    description: string;
+};
 export declare const projectIdFlagConfig: {
     description: string;
     aliases: string[];
@@ -21,11 +29,6 @@ export declare const organizationIdFlagConfig: {
     description: string;
     aliases: string[];
 };
-/**
- * Unhides a flag by setting its hidden property to false
- * Also makes oclif's types happy when destructuring the flag
- */
-export declare function unhide<T>(flag: T): T;
 /**
  * Guarantees flags and args.
  * Also centralizes baseFlags and enables oclif's built-in --json for all subclasses.
@@ -111,7 +114,7 @@ export declare abstract class ResolvedCommand<T extends typeof Command> extends
         'validate-resources': Interfaces.BooleanFlag<boolean>;
         verbose: Interfaces.BooleanFlag<boolean>;
     };
-    protected token: string;
+    protected sanityToken: string;
     protected blueprint: ReadBlueprintResult;
     protected scopeType: ScopeType;
     protected scopeId: string;
@@ -120,19 +123,3 @@ export declare abstract class ResolvedCommand<T extends typeof Command> extends
     protected deployedStack: Stack;
     init(): Promise<void>;
 }
-/**
- * Guarantees token and blueprint.
- * @extends ResolvedCommand
- */
-export declare abstract class LocalBlueprintCommand<T extends typeof Command> extends ResolvedCommand<T> {
-    static needs: Need[];
-    /** @deprecated Use `this.token` instead. */
-    protected get sanityToken(): string;
-}
-/**
- * Guarantees token, scope, stackId, deployedStack, and blueprint.
- * @extends LocalBlueprintCommand
- */
-export declare abstract class DeployedStackCommand<T extends typeof Command> extends LocalBlueprintCommand<T> {
-    static needs: Need[];
-}

package/dist/baseCommands.js

@@ -1,5 +1,4 @@
 // * https://oclif.io/docs/base_class
-import { env } from 'node:process';
 import { Command, CommandHelp, Flags as OclifFlags } from '@oclif/core';
 import { findBlueprintFile, loadBlueprintFile, parseBlueprintContent, } from './actions/blueprints/blueprint.js';
 import { backfillProjectBasedStackId, readConfigFile } from './actions/blueprints/config.js';
@@ -17,23 +16,25 @@ const CATCH_HINT_PATTERNS = [
 // Add patterns here as needed, for example:
 // [/scope/i, (bin) => [`Run \`npx ${bin} blueprints promote\` to change the Stack scope.`]],
 ];
-const hidden = true;
+export const pathFlagConfig = {
+    description: 'Path to a Blueprint file or directory containing one',
+    env: 'SANITY_BLUEPRINT_PATH',
+    aliases: ['blueprint-path'],
+    char: 'p',
+};
 export const baseFlags = {
     json: OclifFlags.boolean({
         // override defaults from oclif's built-in --json flag
         description: 'Format output as json',
     }),
     path: OclifFlags.string({
-        description: 'Path to a Blueprint file or directory containing one',
-        env: 'SANITY_BLUEPRINT_PATH',
-        aliases: ['blueprint-path'],
-        char: 'p',
-        hidden,
+        ...pathFlagConfig,
+        hidden: true,
     }),
     trace: OclifFlags.boolean({
         description: 'Trace output',
         default: false,
-        hidden,
+        hidden: true,
     }),
     'validate-resources': OclifFlags.boolean({
         description: 'Validate resources',
@@ -43,13 +44,12 @@ export const baseFlags = {
     verbose: OclifFlags.boolean({
         description: 'Verbose output',
         default: false,
-        hidden,
+        hidden: true,
     }),
 };
-export const stackFlag = OclifFlags.string({
+export const stackFlagConfig = {
     description: 'Stack name or ID to use instead of the locally configured Stack',
-    hidden: true,
-});
+};
 export const projectIdFlagConfig = {
     description: 'Sanity project ID used to scope Blueprint and Stack',
     aliases: ['project', 'projectId'],
@@ -58,13 +58,6 @@ export const organizationIdFlagConfig = {
     description: 'Sanity organization ID used to scope Blueprint and Stack',
     aliases: ['organization', 'organizationId', 'org'],
 };
-/**
- * Unhides a flag by setting its hidden property to false
- * Also makes oclif's types happy when destructuring the flag
- */
-export function unhide(flag) {
-    return { ...flag, hidden: false };
-}
 /**
  * Guarantees flags and args.
  * Also centralizes baseFlags and enables oclif's built-in --json for all subclasses.
@@ -182,12 +175,12 @@ export class ResolvedCommand extends RuntimeCommand {
     static needs = [];
     static baseFlags = {
         ...baseFlags,
-        stack: stackFlag,
+        stack: OclifFlags.string({ ...stackFlagConfig, hidden: true }),
         'project-id': OclifFlags.string({ ...projectIdFlagConfig, hidden: true }),
         'organization-id': OclifFlags.string({ ...organizationIdFlagConfig, hidden: true }),
     };
     // Populated by init() according to `needs`
-    token;
+    sanityToken;
     blueprint;
     scopeType;
     scopeId;
@@ -213,31 +206,14 @@ export class ResolvedCommand extends RuntimeCommand {
                     suggestions: ['Run `npx @sanity/cli login` to authenticate.'],
                 });
             }
-            this.token = check.value;
+            this.sanityToken = check.value;
         }
-        // 2. Gather ID sources
-        const flagIds = {
-            projectId: this.flags['project-id'],
-            organizationId: this.flags['organization-id'],
-        };
-        const envIds = {
-            organizationId: env.SANITY_ORGANIZATION_ID,
-            projectId: env.SANITY_PROJECT_ID,
-            stackId: env.SANITY_BLUEPRINT_STACK_ID,
-        };
-        // Try to read the config file (cheap single-file JSON read).
+        // 2. Read config file (cheap single-file JSON read).
         // Anchor to --path flag or the blueprint file location if found, else cwd.
         const blueprintFileInfo = findBlueprintFile(this.flags.path);
         const blueprintConfig = readConfigFile(blueprintFileInfo?.blueprintFilePath);
-        const configIds = blueprintConfig
-            ? {
-                organizationId: blueprintConfig.organizationId,
-                projectId: blueprintConfig.projectId,
-                stackId: blueprintConfig.stackId,
-            }
-            : undefined;
         // 3. Blueprint (if needed)
-        let moduleIds;
+        let blueprintModule;
         if (needsBlueprint) {
             if (!blueprintFileInfo) {
                 this.error('Could not find Blueprint file! Use the `blueprints init` command.', {
@@ -260,13 +236,7 @@ export class ResolvedCommand extends RuntimeCommand {
                     ],
                 });
             }
-            if (loaded.module) {
-                moduleIds = {
-                    organizationId: loaded.module.organizationId,
-                    projectId: loaded.module.projectId,
-                    stackId: loaded.module.stackId,
-                };
-            }
+            blueprintModule = loaded.module;
             // Assemble the full ReadBlueprintResult -- will be completed with resolved IDs below
             this.blueprint = {
                 fileInfo: blueprintFileInfo,
@@ -277,10 +247,12 @@ export class ResolvedCommand extends RuntimeCommand {
         }
         // 4. Resolve IDs
         const resolved = resolveIds({
-            flags: flagIds,
-            env: envIds,
-            module: moduleIds,
-            config: configIds,
+            flags: {
+                projectId: this.flags['project-id'],
+                organizationId: this.flags['organization-id'],
+            },
+            module: blueprintModule,
+            config: blueprintConfig,
         });
         // Legacy stack ID inference (only when we have a blueprint file path for the write side-effect)
         if (!resolved.stackId && resolved.projectId && blueprintFileInfo) {
@@ -328,7 +300,7 @@ export class ResolvedCommand extends RuntimeCommand {
             const stackOverride = this.flags.stack;
             if (stackOverride) {
                 const auth = {
-                    token: this.token,
+                    token: this.sanityToken,
                     scopeType: this.scopeType,
                     scopeId: this.scopeId,
                 };
@@ -345,7 +317,7 @@ export class ResolvedCommand extends RuntimeCommand {
         }
         // 7. Auth
         if (needsScope) {
-            this.auth = { token: this.token, scopeType: this.scopeType, scopeId: this.scopeId };
+            this.auth = { token: this.sanityToken, scopeType: this.scopeType, scopeId: this.scopeId };
         }
         // 8. Deployed Stack
         if (needsDeployedStack) {
@@ -364,24 +336,3 @@ export class ResolvedCommand extends RuntimeCommand {
         }
     }
 }
-// ---------------------------------------------------------------------------
-// Legacy base classes -- thin wrappers around ResolvedCommand
-// ---------------------------------------------------------------------------
-/**
- * Guarantees token and blueprint.
- * @extends ResolvedCommand
- */
-export class LocalBlueprintCommand extends ResolvedCommand {
-    static needs = ['token', 'blueprint'];
-    /** @deprecated Use `this.token` instead. */
-    get sanityToken() {
-        return this.token;
-    }
-}
-/**
- * Guarantees token, scope, stackId, deployedStack, and blueprint.
- * @extends LocalBlueprintCommand
- */
-export class DeployedStackCommand extends LocalBlueprintCommand {
-    static needs = ['deployedStack', 'blueprint'];
-}

package/dist/commands/blueprints/add.d.ts

@@ -3,8 +3,9 @@
  * @deprecated Use `functions add` instead.
  * We're in the process of deprecating the `blueprints add` command.
  */
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class AddCommand extends LocalBlueprintCommand<typeof AddCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class AddCommand extends ResolvedCommand<typeof AddCommand> {
+    static needs: readonly ["blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/add.js

@@ -4,13 +4,14 @@
  * We're in the process of deprecating the `blueprints add` command.
  */
 import { Args, Flags } from '@oclif/core';
-import { LocalBlueprintCommand } from '../../baseCommands.js';
+import { ResolvedCommand } from '../../baseCommands.js';
 import { FUNCTION_TYPES } from '../../constants.js';
 import { functionAddCore } from '../../cores/functions/index.js';
 import { Logger } from '../../utils/logger.js';
 import { INSTALLER_OPTIONS } from '../../utils/types.js';
 // import {warn} from '../../utils/display/presenters.js'
-export default class AddCommand extends LocalBlueprintCommand {
+export default class AddCommand extends ResolvedCommand {
+    static needs = ['blueprint'];
     // static state = 'deprecated'
     // static deprecationOptions = {
     //   message: '`blueprints add` is deprecated. Use `functions add` instead.',

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

@@ -1,5 +1,6 @@
-import { LocalBlueprintCommand } from '../../baseCommands.js';
-export default class ConfigCommand extends LocalBlueprintCommand<typeof ConfigCommand> {
+import { ResolvedCommand } from '../../baseCommands.js';
+export default class ConfigCommand extends ResolvedCommand<typeof ConfigCommand> {
+    static needs: readonly ["token", "blueprint"];
     static summary: string;
     static description: string;
     static examples: string[];

package/dist/commands/blueprints/config.js

@@ -1,8 +1,9 @@
 import { Flags } from '@oclif/core';
-import { LocalBlueprintCommand, organizationIdFlagConfig, projectIdFlagConfig, } from '../../baseCommands.js';
+import { organizationIdFlagConfig, projectIdFlagConfig, ResolvedCommand } from '../../baseCommands.js';
 import { blueprintConfigCore } from '../../cores/blueprints/config.js';
 import { Logger } from '../../utils/logger.js';
-export default class ConfigCommand extends LocalBlueprintCommand {
+export default class ConfigCommand extends ResolvedCommand {
+    static needs = ['token', 'blueprint'];
     static summary = 'View or edit the local Blueprint configuration';
     static description = `Manages the local Blueprint configuration, which links your Blueprint to a Sanity project and Stack.