@sanity/runtime-cli 14.12.0 → 14.12.1

package/dist/cores/blueprints/doctor.js

@@ -2,7 +2,9 @@ import { readFileSync } from 'node:fs';
 import { arch, cwd, env, version as nodeVersion, platform } from 'node:process';
 import * as resolve from 'empathic/resolve';
 import ora from 'ora';
-import { readLocalBlueprint, } from '../../actions/blueprints/blueprint.js';
+import { loadAndParseBlueprint, } from '../../actions/blueprints/blueprint.js';
+import { readConfigFile } from '../../actions/blueprints/config.js';
+import { resolveIds } from '../../actions/blueprints/resolve.js';
 import { getStack } from '../../actions/blueprints/stacks.js';
 import config, { RUNTIME_CLI_VERSION } from '../../config.js';
 import { check, filePathRelativeToCwd, niceId, renderSection, severe, unsure, } from '../../utils/display/presenters.js';
@@ -76,15 +78,27 @@ export async function blueprintDoctorCore(options) {
     // --- BLUEPRINT ---
     let localBlueprint;
     try {
-        localBlueprint = await readLocalBlueprint(log, { resources: options.validateResources || false }, path);
-        envRows.push(['Blueprint', filePathRelativeToCwd(localBlueprint.fileInfo.blueprintFilePath)]);
-        if (localBlueprint.errors.length === 0) {
+        const blueprint = await loadAndParseBlueprint(path, {
+            validateResources: options.validateResources || false,
+        });
+        const blueprintConfig = readConfigFile(blueprint.fileInfo.blueprintFilePath);
+        const resolved = resolveIds({
+            module: blueprint.module,
+            config: blueprintConfig,
+        });
+        localBlueprint = {
+            ...blueprint,
+            blueprintConfig,
+            ...resolved,
+        };
+        envRows.push(['Blueprint', filePathRelativeToCwd(blueprint.fileInfo.blueprintFilePath)]);
+        if (blueprint.errors.length === 0) {
             diagnostics.blueprintValid = { status: true };
         }
         else {
             diagnostics.blueprintValid = {
                 status: false,
-                detail: `${localBlueprint.errors.length} error(s)`,
+                detail: `${blueprint.errors.length} error(s)`,
             };
         }
     }

package/dist/cores/blueprints/init.js

@@ -17,7 +17,7 @@ const SCOPE_PROJECT = 'project';
 const SCOPE_ORGANIZATION = 'organization';
 export async function blueprintInitCore(options) {
     const { bin = 'sanity', log, token, knownProjectId, args, flags, validateResources } = options;
-    const { dir: flagDir, example: flagExample, 'blueprint-type': flagBlueprintType, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, 'stack-id': flagStackId, 'stack-name': flagStackName, verbose: v = false, } = flags;
+    const { dir: flagDir, example: flagExample, 'blueprint-type': flagBlueprintType, 'project-id': flagProjectId, 'organization-id': flagOrganizationId, 'stack-id': flagStackId, 'stack-name': flagStackName, verbose = false, } = flags;
     const { dir: argDir } = args;
     const userProvidedDirName = argDir || flagDir;
     const blueprintDir = userProvidedDirName || '.';
@@ -44,7 +44,7 @@ export async function blueprintInitCore(options) {
                 flagOrganizationId,
                 flagStackId,
                 flagStackName,
-                verbose: v,
+                verbose,
             });
         }
         // --example flag → scaffold from an example template

package/dist/cores/functions/dev.js

@@ -7,7 +7,7 @@ export async function functionDevCore(options) {
         ? { timeout }
         : undefined;
     try {
-        await dev(host, Number(port), log, options.validateResources || false, executionOptions);
+        await dev(host, Number(port), options.validateResources || false, executionOptions);
         log(`Server is running on http://${host}:${port}\n`);
         return {
             success: true,

package/dist/server/app.d.ts

@@ -1,6 +1,5 @@
-import type { Logger } from '../utils/logger.js';
 import { type InvokeExecutionOptions } from '../utils/types.js';
-declare const app: (host: string, port: number, logger: Logger, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>) => void;
+declare const app: (host: string, port: number, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>) => void;
 declare function parseDocumentUrl(url: string): {
     projectId: string;
     dataset: string;

package/dist/server/app.js

@@ -2,19 +2,25 @@ import { existsSync, readFileSync, watchFile } from 'node:fs';
 import * as http from 'node:http';
 import { default as mime } from 'mime-types';
 import { WebSocketServer } from 'ws';
-import { readLocalBlueprint } from '../actions/blueprints/blueprint.js';
+import { findBlueprintFile, loadAndParseBlueprint } from '../actions/blueprints/blueprint.js';
+import { readConfigFile } from '../actions/blueprints/config.js';
+import { resolveIds } from '../actions/blueprints/resolve.js';
 import config from '../config.js';
 import { isRecord } from '../utils/is-record.js';
 import { isEventType, isGroqContextOptions, } from '../utils/types.js';
 import { handleInvokeRequest } from './handlers/invoke.js';
-const app = (host, port, logger, validateResources, executionOptions) => {
+const app = (host, port, validateResources, executionOptions) => {
     const requestListener = async (req, res) => {
         res.setHeader('Content-Type', 'application/json');
         switch (true) {
             case req.url === '/blueprint': {
                 try {
-                    const { parsedBlueprint, projectId, organizationId } = await readLocalBlueprint(logger, {
-                        resources: validateResources,
+                    const blueprint = await loadAndParseBlueprint(undefined, { validateResources });
+                    const { parsedBlueprint, fileInfo, module: blueprintModule } = blueprint;
+                    const blueprintConfig = readConfigFile(fileInfo.blueprintFilePath);
+                    const { projectId, organizationId } = resolveIds({
+                        module: blueprintModule,
+                        config: blueprintConfig,
                     });
                     res.setHeader('Content-Type', 'application/json');
                     res.writeHead(200);
@@ -44,7 +50,7 @@ const app = (host, port, logger, validateResources, executionOptions) => {
                                     delete context.clientOptions.token;
                                 }
                             }
-                            const result = await handleInvokeRequest(functionName, event, metadata, context, logger, validateResources, executionOptions);
+                            const result = await handleInvokeRequest(functionName, event, metadata, context, validateResources, executionOptions);
                             // Add Server-Timing header
                             const timingHeaders = [];
                             for (const [key, value] of Object.entries(result.timings)) {
@@ -230,10 +236,12 @@ const app = (host, port, logger, validateResources, executionOptions) => {
     const server = http.createServer(requestListener);
     server.listen(port, host, () => { });
     const wss = new WebSocketServer({ port: 8974 });
-    wss.on('connection', async function connection(ws) {
+    wss.on('connection', function connection(ws) {
         ws.on('error', console.error);
-        const { fileInfo } = await readLocalBlueprint(logger, { resources: validateResources });
-        watchFile(fileInfo.blueprintFilePath, { interval: 2007 }, async () => {
+        const fileInfo = findBlueprintFile();
+        if (!fileInfo)
+            return;
+        watchFile(fileInfo.blueprintFilePath, { interval: 2007 }, () => {
             ws.send('reload-blueprint');
         });
     });

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

@@ -1,5 +1,4 @@
-import type { Logger } from '../../utils/logger.js';
 import type { InvocationResponse, InvokeContextOptions, InvokeExecutionOptions, InvokePayloadMetadata } from '../../utils/types.js';
-export declare function handleInvokeRequest(functionName: string, event: Record<string, unknown>, metadata: InvokePayloadMetadata, context: InvokeContextOptions, logger: Logger, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>): Promise<InvocationResponse & {
+export declare function handleInvokeRequest(functionName: string, event: Record<string, unknown>, metadata: InvokePayloadMetadata, context: InvokeContextOptions, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>): Promise<InvocationResponse & {
     timings: Record<string, number>;
 }>;

package/dist/server/handlers/invoke.js

@@ -1,10 +1,10 @@
-import { readLocalBlueprint } from '../../actions/blueprints/blueprint.js';
+import { loadAndParseBlueprint } from '../../actions/blueprints/blueprint.js';
 import { findFunctionInResources } from '../../utils/find-function.js';
 import invoke from '../../utils/invoke-local.js';
-export async function handleInvokeRequest(functionName, event, metadata, context, logger, validateResources, executionOptions) {
+export async function handleInvokeRequest(functionName, event, metadata, context, validateResources, executionOptions) {
     const start = performance.now();
-    const blueprint = await readLocalBlueprint(logger, { resources: validateResources });
-    const resource = findFunctionInResources(blueprint.resources, functionName);
+    const { resources } = await loadAndParseBlueprint(undefined, { validateResources });
+    const resource = findFunctionInResources(resources, functionName);
     const readBlueprintTime = performance.now() - start;
     const payload = {
         payload: event,

package/oclif.manifest.json

@@ -220,7 +220,6 @@
       "summary": "Add a function resource to a Blueprint",
       "enableJsonFlag": true,
       "needs": [
-        "token",
         "blueprint"
       ],
       "isESM": true,
@@ -405,7 +404,6 @@
         },
         "stack": {
           "description": "Stack name or ID to use instead of the locally configured Stack",
-          "hidden": false,
           "name": "stack",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -641,7 +639,6 @@
       "flags": {
         "json": {
           "description": "Format output as json",
-          "hidden": false,
           "name": "json",
           "allowNo": false,
           "type": "boolean"
@@ -653,7 +650,6 @@
           "char": "p",
           "description": "Path to a Blueprint file or directory containing one",
           "env": "SANITY_BLUEPRINT_PATH",
-          "hidden": false,
           "name": "path",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -857,7 +853,7 @@
         },
         "verbose": {
           "description": "Verbose output",
-          "hidden": false,
+          "hidden": true,
           "name": "verbose",
           "allowNo": false,
           "type": "boolean"
@@ -1016,7 +1012,6 @@
         },
         "stack": {
           "description": "Stack name or ID to use instead of the locally configured Stack",
-          "hidden": false,
           "name": "stack",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -1068,8 +1063,7 @@
       "summary": "Display logs for the current Blueprint's Stack deployment",
       "enableJsonFlag": true,
       "needs": [
-        "deployedStack",
-        "blueprint"
+        "deployedStack"
       ],
       "isESM": true,
       "relativePath": [
@@ -1128,7 +1122,6 @@
         },
         "stack": {
           "description": "Stack name or ID to use instead of the locally configured Stack",
-          "hidden": false,
           "name": "stack",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -1599,7 +1592,6 @@
       "summary": "Add a Function to your Blueprint",
       "enableJsonFlag": true,
       "needs": [
-        "token",
         "blueprint"
       ],
       "isESM": true,
@@ -1729,7 +1721,6 @@
       "summary": "Build Sanity Function(s) to zip archives",
       "enableJsonFlag": true,
       "needs": [
-        "token",
         "blueprint"
       ],
       "isESM": true,
@@ -1859,7 +1850,6 @@
       "summary": "Start the Sanity Function emulator",
       "enableJsonFlag": true,
       "needs": [
-        "token",
         "blueprint"
       ],
       "isESM": true,
@@ -1928,7 +1918,6 @@
         },
         "stack": {
           "description": "Stack name or ID to use instead of the locally configured Stack",
-          "hidden": false,
           "name": "stack",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -2335,7 +2324,6 @@
       "summary": "Invoke a local Sanity Function",
       "enableJsonFlag": true,
       "needs": [
-        "token",
         "blueprint"
       ],
       "isESM": true,
@@ -2689,5 +2677,5 @@
       ]
     }
   },
-  "version": "14.12.0"
+  "version": "14.12.1"
 }

package/package.json

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