@sanity/runtime-cli 1.3.0 → 1.4.0

package/dist/commands/blueprints/info.js

@@ -1,51 +1,32 @@
 import { Command } from '@oclif/core';
 import readBlueprintOnDisk from '../../actions/blueprints/read-blueprint.js';
-import { getStackByName } from '../../actions/blueprints/stacks.js';
-import { formatResourceTree, formatStacksList, formatTitle, } from '../../utils/display/blueprints-formatting.js';
+import { formatResourceTree } from '../../utils/display/blueprints-formatting.js';
 import { bold, green, red, yellow } from '../../utils/display/colors.js';
 import { formatDate, formatDuration } from '../../utils/display/dates.js';
-import Spinner from '../../utils/spinner.js';
 export default class Info extends Command {
     static description = 'Show information about a Blueprint';
     static examples = ['<%= config.bin %> <%= command.id %>'];
     async run() {
-        const { document } = readBlueprintOnDisk();
-        const { displayName, name, projectId } = document;
-        const s = new Spinner();
-        if (!projectId) {
-            this.log(`Cannot determine project for Blueprint "${displayName}"`);
+        const { errors, deployedStack } = await readBlueprintOnDisk({ getStack: true });
+        if (errors.length > 0) {
+            // printErrors(errors)
+            this.log('Blueprint parse errors:');
+            console.dir(errors, { depth: null });
             return;
         }
-        s.start(`Retrieving info for "${displayName}"`);
+        if (!deployedStack)
+            this.error('Stack not found'); // returns
         try {
-            const { ok, stack, stackId: foundStackId, error, availableStacks, } = await getStackByName({
-                name,
-                projectId,
-            });
-            if (!ok) {
-                s.stop(`${red('Failed')} to retrieve stacks`);
-                this.log(`Error: ${error || 'Unknown error'}`);
-                return;
+            this.log(`Stack name: ${bold(deployedStack.name)}`);
+            this.log(`Stack ID: ${yellow(deployedStack.id)}`);
+            if (deployedStack.createdAt) {
+                this.log(`Created: ${formatDate(deployedStack.createdAt)}`);
             }
-            if (!foundStackId || !stack) {
-                s.stop(`${red('Failed')} to find Stack for ${formatTitle('Blueprint', displayName)}`);
-                if (availableStacks && availableStacks.length > 0) {
-                    this.log(formatStacksList(availableStacks));
-                }
-                return;
-            }
-            const foundStack = { id: foundStackId };
-            s.stop(`${formatTitle('Blueprint', displayName)} Info\n`);
-            this.log(`Stack name: ${bold(stack.name)}`);
-            this.log(`Stack ID: ${yellow(foundStack.id)}`);
-            if (stack.createdAt) {
-                this.log(`Created: ${formatDate(stack.createdAt)}`);
-            }
-            if (stack.updatedAt) {
-                this.log(`Updated: ${formatDate(stack.updatedAt)}`);
+            if (deployedStack.updatedAt) {
+                this.log(`Updated: ${formatDate(deployedStack.updatedAt)}`);
             }
-            if (stack.recentOperation) {
-                const operation = stack.recentOperation;
+            if (deployedStack.recentOperation) {
+                const operation = deployedStack.recentOperation;
                 if (operation.id) {
                     this.log(`Recent Operation <${yellow(operation.id)}>:`);
                 }
@@ -63,12 +44,11 @@ export default class Info extends Command {
                 }
             }
             this.log('');
-            if (stack?.resources) {
-                formatResourceTree(stack.resources, this.log.bind(this));
+            if (deployedStack.resources) {
+                formatResourceTree(deployedStack.resources, this.log.bind(this));
             }
         }
         catch (err) {
-            s.stop('Failed to parse Stack info');
             if (err instanceof Error) {
                 this.log(`Error: ${err.message}`);
             }

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

@@ -3,7 +3,6 @@ export default class Logs extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        'stack-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         watch: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/blueprints/logs.js

@@ -1,24 +1,17 @@
 import { Command, Flags } from '@oclif/core';
 import { getLogs, streamLogs } from '../../actions/blueprints/logs.js';
 import readBlueprintOnDisk from '../../actions/blueprints/read-blueprint.js';
-import { getStackByName } from '../../actions/blueprints/stacks.js';
 import config from '../../config.js';
-import { formatStacksList, formatTitle } from '../../utils/display/blueprints-formatting.js';
+import { formatTitle } from '../../utils/display/blueprints-formatting.js';
 import { blue, bold, green, red, yellow } from '../../utils/display/colors.js';
 import Spinner from '../../utils/spinner.js';
 export default class Logs extends Command {
     static description = 'Display logs for a Blueprint stack';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
-        '<%= config.bin %> <%= command.id %> --stack-id <stack-id>',
         '<%= config.bin %> <%= command.id %> --watch',
     ];
     static flags = {
-        'stack-id': Flags.string({
-            char: 's',
-            description: 'Stack ID to fetch logs for (optional if running in a blueprint directory)',
-            required: false,
-        }),
         watch: Flags.boolean({
             char: 'w',
             description: 'Watch for new logs (streaming mode)',
@@ -28,41 +21,19 @@ export default class Logs extends Command {
     };
     async run() {
         const { flags } = await this.parse(Logs);
-        const s = new Spinner();
         const watchMode = flags.watch;
+        const s = new Spinner();
         try {
-            const { document } = readBlueprintOnDisk();
-            const { name, displayName, projectId } = document;
-            if (!projectId) {
-                this.log('Cannot determine project ID for this Blueprint');
-                return;
-            }
-            let stackId = flags['stack-id'];
-            if (!stackId) {
-                s.start(`Finding stack for blueprint "${displayName}"`);
-                const { ok, stackId: foundStackId, error, availableStacks, } = await getStackByName({
-                    name,
-                    projectId,
-                });
-                if (!ok) {
-                    s.stop(`${red('Failed')} to retrieve stacks`);
-                    this.log(`Error: ${error || 'Unknown error'}`);
-                    return;
-                }
-                if (!foundStackId) {
-                    s.stop(`${red('Failed')} to find Stack for ${formatTitle('Blueprint', displayName)}`);
-                    if (availableStacks && availableStacks.length > 0) {
-                        this.log(formatStacksList(availableStacks));
-                    }
-                    return;
-                }
-                stackId = foundStackId;
-                s.stop(`Found stack ${stackId} for blueprint "${displayName}"`);
-            }
-            if (!stackId) {
-                s.stop(`${red('Failed')} to determine stack ID`);
+            const { errors, deployedStack } = await readBlueprintOnDisk({ getStack: true });
+            if (errors.length > 0) {
+                // printErrors(errors)
+                this.log('Blueprint parse errors:');
+                console.dir(errors, { depth: null });
                 return;
             }
+            if (!deployedStack)
+                this.error('Stack not found'); // returns
+            const { id: stackId, projectId, name } = deployedStack;
             if (watchMode) {
                 // recent logs
                 s.start(`Fetching recent logs for stack ${stackId}`);
@@ -72,7 +43,7 @@ export default class Logs extends Command {
                     this.log(`Error: ${error || 'Unknown error'}`);
                     return;
                 }
-                s.stop(`${formatTitle('Blueprint', displayName)} ${bold('Live')} Logs`);
+                s.stop(`${formatTitle('Blueprint', name)} ${bold('Live')} Logs`);
                 if (logs.length > 0) {
                     this.log('\nMost recent logs:');
                     const sortedLogs = [...logs].sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
@@ -128,7 +99,7 @@ export default class Logs extends Command {
                 s.stop(`No logs found for stack ${stackId}`);
                 return;
             }
-            s.stop(`${formatTitle('Blueprint', displayName)} Logs`);
+            s.stop(`${formatTitle('Blueprint', name)} Logs`);
             this.log(`Found ${bold(logs.length.toString())} log entries for stack ${yellow(stackId)}\n`);
             const logsByDay = new Map();
             for (const log of logs) {

package/dist/commands/blueprints/plan.js

@@ -5,10 +5,20 @@ export default class Plan extends Command {
     static description = 'Enumerate resources to be deployed - will not modify any resources';
     static examples = ['<%= config.bin %> <%= command.id %>'];
     async run() {
-        const { document, fileName } = readBlueprintOnDisk();
-        const { displayName, name, resources } = document;
-        this.log(`${formatTitle('Blueprint', displayName)} Plan\n`);
-        this.log(`Blueprint document: "${name}" (${fileName})`);
+        const { errors, projectResource, stackResource, parsedBlueprint: { resources }, fileInfo, } = await readBlueprintOnDisk();
+        if (errors.length > 0) {
+            // printErrors(errors)
+            this.log('Blueprint parse errors:');
+            console.dir(errors, { depth: null });
+            return;
+        }
+        if (!projectResource)
+            this.log('Blueprint must contain a project resource');
+        if (!stackResource)
+            this.log('Blueprint must contain a stack resource');
+        const name = stackResource?.name || 'Unknown';
+        this.log(`${formatTitle('Blueprint', name)} Plan\n`);
+        this.log(`Blueprint document: "${name}" (${fileInfo.fileName})`);
         this.log('');
         formatResourceTree(resources, this.log.bind(this));
         if (resources.length > 0) {

package/dist/commands/functions/invoke.js

@@ -1,5 +1,9 @@
 import { Args, Command, Flags } from '@oclif/core';
+import readBlueprintOnDisk from '../../actions/blueprints/read-blueprint.js';
 import { invoke } from '../../actions/functions/invoke.js';
+import config from '../../config.js';
+import { red } from '../../utils/display/colors.js';
+import Spinner from '../../utils/spinner.js';
 export default class Invoke extends Command {
     static args = {
         id: Args.string({ description: 'The ID of the function to invoke', required: true }),
@@ -19,7 +23,20 @@ export default class Invoke extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(Invoke);
-        const result = await invoke(args.id, { data: flags.data, file: flags.file });
-        this.log(JSON.stringify(result, null, 2));
+        const s = new Spinner();
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
+        if (!deployedStack)
+            this.error('Stack not found'); // returns
+        const { projectId } = deployedStack;
+        s.start(`Invoking function "${args.id}"`);
+        const result = await invoke(args.id, { data: flags.data, file: flags.file }, { token: config.token, projectId });
+        if (result.ok) {
+            s.stop(`Invocation of ${args.id} succeeded`);
+            this.log(JSON.stringify(result.json, null, 2));
+        }
+        else {
+            s.stop(`${red('Failed')} to invoke function`);
+            this.log(`Error: ${result.error || 'Unknown error'}`);
+        }
     }
 }

package/dist/commands/functions/logs.js

@@ -1,6 +1,9 @@
 import { Args, Command } from '@oclif/core';
+import readBlueprintOnDisk from '../../actions/blueprints/read-blueprint.js';
 import { logs } from '../../actions/functions/logs.js';
 import config from '../../config.js';
+import { bold, red, yellow } from '../../utils/display/colors.js';
+import Spinner from '../../utils/spinner.js';
 export default class Logs extends Command {
     static args = {
         id: Args.string({ description: 'The ID of the function to retrieve logs for', required: true }),
@@ -9,7 +12,28 @@ export default class Logs extends Command {
     static examples = ['<%= config.bin %> <%= command.id %> <ID>'];
     async run() {
         const { args } = await this.parse(Logs);
-        const result = await logs(args.id, config.token);
-        this.log(JSON.stringify(result, null, 2));
+        const s = new Spinner();
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true });
+        if (!deployedStack)
+            this.error('Stack not found'); // returns
+        s.start(`Finding logs for function "${args.id}"`);
+        const { name, projectId } = deployedStack;
+        const result = await logs(args.id, { token: config.token, projectId });
+        console.log(JSON.stringify(result, null, 2));
+        if (result.ok) {
+            s.stop(`Found logs ${args.id} for blueprint "${name}"`);
+            for (const logGroup of result.logs) {
+                for (const log of logGroup.events) {
+                    const date = new Date(log.timestamp);
+                    const time = date.toLocaleTimeString();
+                    const day = date.toLocaleDateString();
+                    this.log(`  ${bold(day)} ${yellow(time)} ${log.message}`);
+                }
+            }
+        }
+        else {
+            s.stop(`${red('Failed')} to retrieve logs`);
+            this.log(`Error: ${result.error || 'Unknown error'}`);
+        }
     }
 }

package/dist/config.js

@@ -1,22 +1,23 @@
 import { env } from 'node:process';
 import getToken from './utils/get-token.js';
 const nodeEnv = env.NODE_ENV ?? 'development';
+const isTest = nodeEnv === 'test';
 const isDev = nodeEnv === 'development';
-const isProd = nodeEnv === 'production';
+const useProd = nodeEnv === 'production';
 const functionsUrls = {
     production: 'https://api.sanity.io/',
     staging: 'https://api.sanity.work/',
     default: 'http://localhost:4567',
 };
 const blueprintsUrls = {
-    production: 'https://api.sanity.io',
-    staging: 'https://api.sanity.work',
-    default: 'http://localhost:4567',
+    production: 'https://api.sanity.io/',
+    staging: 'https://api.sanity.work/',
+    default: 'http://blueprints/',
 };
 const functionsUrl = new URL(functionsUrls[nodeEnv] ?? functionsUrls.default);
 const blueprintsUrl = new URL(blueprintsUrls[nodeEnv] ?? blueprintsUrls.default);
 export default {
-    token: isDev ? 'token' : getToken(isProd),
+    token: isDev || isTest ? 'token' : getToken({ prod: useProd }),
     server: {
         functions: functionsUrl,
         blueprints: blueprintsUrl,

package/dist/server/app.js

@@ -1,7 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { cwd } from 'node:process';
 import { default as mime } from 'mime-types';
+import readBlueprintOnDisk from '../actions/blueprints/read-blueprint.js';
 import invoke from '../utils/invoke-local.js';
 import * as http from 'node:http';
 const host = 'localhost';
@@ -10,10 +9,16 @@ const app = (port) => {
         res.setHeader('Content-Type', 'application/json');
         switch (req.url) {
             case '/blueprint': {
-                res.setHeader('Content-Type', 'application/json');
-                const blueprint = readFileSync(join(cwd(), './blueprint.json')).toString();
-                res.writeHead(200);
-                res.end(blueprint);
+                try {
+                    const blueprint = readBlueprintOnDisk();
+                    res.setHeader('Content-Type', 'application/json');
+                    res.writeHead(200);
+                    res.end(JSON.stringify(blueprint));
+                }
+                catch {
+                    res.writeHead(404);
+                    res.end();
+                }
                 break;
             }
             case '/invoke': {

package/dist/server/static/api.d.ts

@@ -0,0 +1,10 @@
+export default function API(): {
+    blueprint: typeof blueprint;
+    invoke: typeof invoke;
+    store: any;
+    subscribe: any;
+    unsubscribe: any;
+};
+declare function blueprint(): void;
+declare function invoke(payloadText?: string): void;
+export {};

package/dist/server/static/api.js

@@ -1,50 +1,48 @@
 /* eslint-disable n/no-unsupported-features/node-builtins */
-import {Store} from './vendor/vendor.bundle.js'
-
+import { Store } from './vendor/vendor.bundle.js';
 // eslint-disable-next-line new-cap
-const store = Store()
-
+const store = Store();
 export default function API() {
-  return {
-    blueprint,
-    invoke,
-    store,
-    subscribe: store.subscribe,
-    unsubscribe: store.unsubscribe,
-  }
+    return {
+        blueprint,
+        invoke,
+        store,
+        subscribe: store.subscribe,
+        unsubscribe: store.unsubscribe,
+    };
 }
-
 function invoke(payloadText = '{}') {
-  store.inprogress = true
-  const start = Date.now()
-  const payload = {
-    data: payloadText,
-    func: store.selectedIndex,
-  }
-  fetch('/invoke', {
-    body: JSON.stringify(payload),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'POST',
-  })
-    .then((response) => response.json())
-    .then((data) => {
-      store.inprogress = false
-      store.result = {
-        ...data,
-        time: Date.now() - start,
-      }
+    store.inprogress = true;
+    const start = Date.now();
+    const payload = {
+        data: payloadText,
+        func: store.selectedIndex,
+    };
+    fetch('/invoke', {
+        body: JSON.stringify(payload),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        method: 'POST',
     })
+        .then((response) => response.json())
+        .then((data) => {
+        store.inprogress = false;
+        store.result = {
+            ...data,
+            time: Date.now() - start,
+        };
+    });
 }
-
 function blueprint() {
-  fetch('/blueprint')
-    .then((response) => response.json())
-    .then((json) => {
-      const functions = json?.resources.filter((resource) => resource.kind === 'function')
-
-      store.functions = functions
-      store.selectedIndex = functions[0].src
+    fetch('/blueprint')
+        .then((response) => response.json())
+        .then((json) => {
+        const functions = json?.document?.resources.filter((resource) => resource.kind === 'function');
+        store.functions = functions;
+        store.selectedIndex = functions[0].src;
     })
+        .catch(() => {
+        store.functions = [];
+    });
 }

package/dist/server/static/components/api-base.d.ts

@@ -0,0 +1,9 @@
+export class ApiBaseElement extends HTMLElement {
+    api: {
+        blueprint: () => void;
+        invoke: (payloadText?: string) => void;
+        store: any;
+        subscribe: any;
+        unsubscribe: any;
+    };
+}

package/dist/server/static/components/api-base.js

@@ -1,10 +1,9 @@
 /* globals HTMLElement */
-import apiConstructor from '../api.js'
-const api = apiConstructor()
-
+import apiConstructor from '../api.js';
+const api = apiConstructor();
 export class ApiBaseElement extends HTMLElement {
-  constructor() {
-    super()
-    this.api = api
-  }
+    constructor() {
+        super();
+        this.api = api;
+    }
 }

package/dist/server/static/components/function-list.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server/static/components/function-list.js

@@ -1,49 +1,50 @@
 /* globals customElements */
-import {ApiBaseElement} from './api-base.js'
-
+import { ApiBaseElement } from './api-base.js';
 const template = `<ol class="hidden-lg" type="content"></ol>
 <fieldset class="pad-sm hidden block-lg"><select></select></fieldset>
-`
-
+`;
 class FunctionList extends ApiBaseElement {
-  functionClicked = (event) => {
-    // eslint-disable-next-line unicorn/prefer-dom-node-text-content
-    const target = this.api.store.functions.find((func) => func.name === event.srcElement.innerText)
-    this.api.store.selectedIndex = target.src
-  }
-  functionSelected = (event) => {
-    this.api.store.selectedIndex = event.srcElement.value
-  }
-  renderFunctions = () => {
-    this.list.innerHTML = this.api.store.functions
-      .map((func) => {
-        const selected = this.api.store.selectedIndex === func.src ? 'selected' : ''
-        return `<li class="pad-sm ${selected}">${func.name}</li>`
-      })
-      .join('')
-    this.select.innerHTML = this.api.store.functions
-      .map((func) => {
-        const selected = this.api.store.selectedIndex === func.src ? 'selected' : ''
-        return `<option value="${func.src}" ${selected}>${func.name}</option>`
-      })
-      .join('')
-  }
-
-  connectedCallback() {
-    this.innerHTML = template
-    this.list = this.querySelector('ol')
-    this.select = this.querySelector('select')
-    this.list.addEventListener('click', this.functionClicked)
-    this.select.addEventListener('change', this.functionSelected)
-    this.api.subscribe(this.renderFunctions, ['functions', 'selectedIndex'])
-    this.api.blueprint()
-  }
-
-  disconnectedCallback() {
-    this.list.removeEventListener('click', this.functionClicked)
-    this.select.removeEventListener('change', this.functionSelected)
-    this.api.unsubscribe(this.renderFunctions)
-  }
+    functionClicked = (event) => {
+        // eslint-disable-next-line unicorn/prefer-dom-node-text-content
+        const target = this.api.store.functions.find((func) => func.name === event.srcElement.innerText);
+        this.api.store.selectedIndex = target.src;
+    };
+    functionSelected = (event) => {
+        this.api.store.selectedIndex = event.srcElement.value;
+    };
+    renderFunctions = () => {
+        if (this.api.store.functions.length > 0) {
+            this.list.innerHTML = this.api.store.functions
+                .map((func) => {
+                const selected = this.api.store.selectedIndex === func.src ? 'selected' : '';
+                return `<li class="pad-sm ${selected}">${func.name}</li>`;
+            })
+                .join('');
+            this.select.innerHTML = this.api.store.functions
+                .map((func) => {
+                const selected = this.api.store.selectedIndex === func.src ? 'selected' : '';
+                return `<option value="${func.src}" ${selected}>${func.name}</option>`;
+            })
+                .join('');
+        }
+        else {
+            this.list.innerHTML = '<option class="pad-sm">No blueprint.json file found</li>';
+            this.select.innerHTML = '<option>No blueprint.json file found</option>';
+        }
+    };
+    connectedCallback() {
+        this.innerHTML = template;
+        this.list = this.querySelector('ol');
+        this.select = this.querySelector('select');
+        this.list.addEventListener('click', this.functionClicked);
+        this.select.addEventListener('change', this.functionSelected);
+        this.api.subscribe(this.renderFunctions, ['functions', 'selectedIndex']);
+        this.api.blueprint();
+    }
+    disconnectedCallback() {
+        this.list.removeEventListener('click', this.functionClicked);
+        this.select.removeEventListener('change', this.functionSelected);
+        this.api.unsubscribe(this.renderFunctions);
+    }
 }
-
-customElements.define('function-list', FunctionList)
+customElements.define('function-list', FunctionList);

package/dist/server/static/components/network-spinner.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server/static/components/network-spinner.js

@@ -60,12 +60,11 @@ const template = `<style>
 <svg part="base" class="spinner" role="progressbar" aria-label="loading">
     <circle class="spinner__track"></circle>
     <circle class="spinner__indicator"></circle>
-</svg>`
-
+</svg>`;
 class NetworkSpinner extends HTMLElement {
-  connectedCallback() {
-    this.innerHTML = template
-  }
+    connectedCallback() {
+        this.innerHTML = template;
+    }
 }
-
-customElements.define('network-spinner', NetworkSpinner)
+customElements.define('network-spinner', NetworkSpinner);
+export {};

package/dist/server/static/components/payload-panel.d.ts

@@ -0,0 +1 @@
+export {};