@sanity/runtime-cli 1.6.0 → 1.8.1

package/dist/utils/display/blueprints-formatting.d.ts

@@ -1,4 +1,6 @@
-import type { BlueprintResource } from '../types.js';
+import type { BlueprintResource, BlueprintStack } from '../types.js';
 export declare function formatTitle(title: string, name: string): string;
 export declare function formatStacksList(stacks: string[]): string;
 export declare function formatResourceTree(resources: BlueprintResource[], logger: (msg: string) => void): void;
+export declare function formatStackInfo(stack: BlueprintStack, isCurrentStack?: boolean): string;
+export declare function formatStacksListing(stacks: BlueprintStack[], currentStackId?: string): string;

package/dist/utils/display/blueprints-formatting.js

@@ -1,4 +1,5 @@
 import { blue, bold, boldnblue, green, yellow } from './colors.js';
+import { formatDate } from './dates.js';
 export function formatTitle(title, name) {
     return `${boldnblue(title)} ${bold(`"${name}"`)}`;
 }
@@ -18,8 +19,8 @@ export function formatResourceTree(resources, logger) {
         return;
     }
     logger(`${blue('Stack Resources')} [${resources.length}]`);
-    const functionResources = resources.filter((r) => r.type?.startsWith('sanity.function.') || r.kind === 'function');
-    const otherResources = resources.filter((r) => !r.type?.startsWith('sanity.function.') && r.kind !== 'function');
+    const functionResources = resources.filter((r) => r.type?.startsWith('sanity.function.'));
+    const otherResources = resources.filter((r) => !r.type?.startsWith('sanity.function.'));
     const hasOtherResources = otherResources.length > 0;
     if (functionResources.length > 0) {
         logger(`  ${hasOtherResources ? '├─' : '└─'} ${bold('Functions')} [${functionResources.length}]`);
@@ -40,3 +41,27 @@ export function formatResourceTree(resources, logger) {
         }
     }
 }
+export function formatStackInfo(stack, isCurrentStack = false) {
+    let result = '';
+    const stackName = isCurrentStack ? boldnblue(stack.name) : bold(stack.name);
+    result += `${stackName} <${yellow(stack.id)}>${isCurrentStack ? ' (current)' : ''}\n`;
+    if (stack.createdAt) {
+        result += `  Created: ${formatDate(stack.createdAt)}\n`;
+    }
+    if (stack.updatedAt) {
+        result += `  Updated: ${formatDate(stack.updatedAt)}\n`;
+    }
+    result += `  ${stack.resources.length} resource${stack.resources.length === 1 ? '' : 's'}\n\n`;
+    return result;
+}
+export function formatStacksListing(stacks, currentStackId) {
+    if (!stacks || stacks.length === 0) {
+        return 'No stacks found';
+    }
+    let result = '';
+    for (const stack of stacks) {
+        const isCurrentStack = currentStackId === stack.id;
+        result += formatStackInfo(stack, isCurrentStack);
+    }
+    return result;
+}

package/dist/utils/display/logs-formatting.d.ts

@@ -0,0 +1,5 @@
+import type { BlueprintLog } from '../types.js';
+export declare function formatLogEntry(log: BlueprintLog, isNewest?: boolean): string;
+export declare function formatRecentLogs(logs: BlueprintLog[]): string;
+export declare function organizeLogsByDay(logs: BlueprintLog[]): Map<string, BlueprintLog[]>;
+export declare function formatLogsByDay(logsByDay: Map<string, BlueprintLog[]>): string;

package/dist/utils/display/logs-formatting.js

@@ -0,0 +1,50 @@
+import { blue, bold, green, yellow } from './colors.js';
+export function formatLogEntry(log, isNewest = false) {
+    const date = new Date(log.timestamp);
+    const time = date.toLocaleTimeString();
+    const day = date.toLocaleDateString();
+    return `${isNewest ? `${green('>')} ` : ''}${bold(day)} ${yellow(time)} ${log.message}`;
+}
+export function formatRecentLogs(logs) {
+    if (logs.length === 0)
+        return 'No recent logs found';
+    const sortedLogs = [...logs].sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
+    const recentLogs = sortedLogs.slice(-10);
+    let result = '\nMost recent logs:\n';
+    for (const log of recentLogs) {
+        result += `  ${formatLogEntry(log)}\n`;
+    }
+    return result;
+}
+export function organizeLogsByDay(logs) {
+    const logsByDay = new Map();
+    for (const log of logs) {
+        const date = new Date(log.timestamp);
+        const day = date.toLocaleDateString();
+        if (!logsByDay.has(day)) {
+            logsByDay.set(day, []);
+        }
+        logsByDay.get(day)?.push(log);
+    }
+    return logsByDay;
+}
+export function formatLogsByDay(logsByDay) {
+    let result = '';
+    const sortedDays = Array.from(logsByDay.keys()).sort((a, b) => {
+        return new Date(a).getTime() - new Date(b).getTime();
+    });
+    for (const day of sortedDays) {
+        result += `${blue('Date:')} ${bold(day)}\n`;
+        const dayLogs = logsByDay.get(day) || [];
+        dayLogs.sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
+        for (const [i, log] of dayLogs.entries()) {
+            const date = new Date(log.timestamp);
+            const time = date.toLocaleTimeString();
+            const isLast = i === dayLogs.length - 1;
+            result += `  ${isLast ? '└─' : '├─'} ${yellow(time)} ${log.message}\n`;
+        }
+        // new line between days
+        result += '\n';
+    }
+    return result;
+}

package/dist/utils/find-function.d.ts

@@ -0,0 +1,2 @@
+import type { Blueprint, BlueprintResource, BlueprintStack } from './types.js';
+export declare function findFunctionByName(blueprint: Blueprint | BlueprintStack, name: string): BlueprintResource;

package/dist/utils/find-function.js

@@ -0,0 +1,6 @@
+export function findFunctionByName(blueprint, name) {
+    const func = blueprint?.resources.find((r) => r?.type?.startsWith('sanity.function.') && r.name === name);
+    if (!func)
+        throw Error(`Unable to find function ${name}`);
+    return func;
+}

package/dist/utils/types.d.ts

@@ -37,7 +37,6 @@ export interface BlueprintResource {
     id: string;
     displayName: string;
     name: string;
-    kind: string;
     type: string;
     src: string;
     externalId: string;

package/oclif.manifest.json

@@ -1,5 +1,70 @@
 {
   "commands": {
+    "blueprints:add": {
+      "aliases": [],
+      "args": {
+        "type": {
+          "description": "Type of resource to add (e.g. function)",
+          "name": "type",
+          "options": [
+            "function"
+          ],
+          "required": true
+        }
+      },
+      "description": "Add a resource to a Blueprint",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> function"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "blueprints:add",
+      "pluginAlias": "@sanity/runtime-cli",
+      "pluginName": "@sanity/runtime-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "blueprints",
+        "add.js"
+      ]
+    },
+    "blueprints:config": {
+      "aliases": [],
+      "args": {},
+      "description": "View or edit Blueprint configuration",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --edit"
+      ],
+      "flags": {
+        "edit": {
+          "description": "Edit the configuration",
+          "name": "edit",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "blueprints:config",
+      "pluginAlias": "@sanity/runtime-cli",
+      "pluginName": "@sanity/runtime-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "blueprints",
+        "config.js"
+      ]
+    },
     "blueprints:deploy": {
       "aliases": [],
       "args": {},
@@ -58,6 +123,30 @@
         "info.js"
       ]
     },
+    "blueprints:init": {
+      "aliases": [],
+      "args": {},
+      "description": "Initialize a new Blueprint",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "blueprints:init",
+      "pluginAlias": "@sanity/runtime-cli",
+      "pluginName": "@sanity/runtime-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "blueprints",
+        "init.js"
+      ]
+    },
     "blueprints:logs": {
       "aliases": [],
       "args": {},
@@ -177,9 +266,9 @@
     "functions:invoke": {
       "aliases": [],
       "args": {
-        "id": {
-          "description": "The ID of the function to invoke",
-          "name": "id",
+        "name": {
+          "description": "The name of the Sanity Function",
+          "name": "name",
           "required": true
         }
       },
@@ -227,9 +316,9 @@
     "functions:logs": {
       "aliases": [],
       "args": {
-        "id": {
-          "description": "The ID of the function to retrieve logs for",
-          "name": "id",
+        "name": {
+          "description": "The name of the Sanity Function",
+          "name": "name",
           "required": true
         }
       },
@@ -257,17 +346,17 @@
     "functions:test": {
       "aliases": [],
       "args": {
-        "path": {
-          "description": "The path to the function source code",
-          "name": "path",
+        "name": {
+          "description": "The name of the Sanity Function",
+          "name": "name",
           "required": true
         }
       },
       "description": "Invoke a local Sanity Function",
       "examples": [
-        "<%= config.bin %> <%= command.id %> ./test.ts --data '{ \"id\": 1 }'",
-        "<%= config.bin %> <%= command.id %> ./test.js --file 'payload.json'",
-        "<%= config.bin %> <%= command.id %> ./test.ts --data '{ \"id\": 1 }' --timeout 60"
+        "<%= config.bin %> <%= command.id %> echo-fn --data '{ \"id\": 1 }'",
+        "<%= config.bin %> <%= command.id %> echo-fn --file 'payload.json'",
+        "<%= config.bin %> <%= command.id %> echo-fn --data '{ \"id\": 1 }' --timeout 60"
       ],
       "flags": {
         "data": {
@@ -315,5 +404,5 @@
       ]
     }
   },
-  "version": "1.6.0"
+  "version": "1.8.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "A new CLI generated with oclif",
-  "version": "1.6.0",
+  "version": "1.8.1",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "./oclif.manifest.json"
   ],
   "bin": {
-    "sanity": "./bin/run.js"
+    "sanity-run": "./bin/run.js"
   },
   "scripts": {
     "build": "rollup -c && npm run build:bin && npm run build:static",
     "build:bin": "shx rm -rf dist *.tsbuildinfo && tsc -b",
     "build:static": "npm run copy:wrapper && npm run copy:server",
-    "copy:server": "shx cp -r ./src/server/static ./dist/server/static",
+    "copy:server": "shx cp -r ./src/server/static ./dist/server",
     "copy:wrapper": "shx cp ./src/utils/child-process-wrapper.js ./dist/utils/child-process-wrapper.js",
     "lint": "biome ci",
     "lint:write": "biome check --write",
@@ -47,6 +47,9 @@
     "inquirer": "^12.5.0",
     "jszip": "^3.10.1",
     "mime-types": "^2.1.35",
+    "picocolors": "^1.1.1",
+    "picospinner": "^3.0.0",
+    "tinyhighlight": "^0.3.2",
     "xdg-basedir": "^5.1.0"
   },
   "devDependencies": {
@@ -72,19 +75,16 @@
     "vitest": "3.0.8"
   },
   "oclif": {
-    "bin": "sanity",
-    "dirname": "sanity",
+    "bin": "sanity-run",
+    "dirname": "sanity-run",
     "commands": "./dist/commands",
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-plugins"
     ],
+    "state": "beta",
     "topicSeparator": " ",
-    "topics": {
-      "hello": {
-        "description": "Say hello to the world and others"
-      }
-    }
+    "topics": {}
   },
   "publishConfig": {
     "access": "public",

package/dist/server/static/static/api.js

@@ -1,53 +0,0 @@
-/* eslint-disable n/no-unsupported-features/node-builtins */
-import {Store} from './vendor/vendor.bundle.js'
-
-// eslint-disable-next-line new-cap
-const store = Store()
-
-export default function API() {
-  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,
-      }
-    })
-}
-
-function blueprint() {
-  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/static/components/api-base.js

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

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

@@ -1,54 +0,0 @@
-/* globals customElements */
-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 = () => {
-    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)

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

@@ -1,71 +0,0 @@
-/* globals customElements HTMLElement */
-const template = `<style>
-  network-spinner {
-    --track-width: 2px;
-    --track-color: var(--card-border-color);
-    --indicator-color: var(--text-color);
-    --speed: 2s;
-
-    display: inline-flex;
-    width: 1em;
-    height: 1em;
-    flex: none;
-  }
-
-  .spinner {
-    flex: 1 1 auto;
-    height: 100%;
-    width: 100%;
-  }
-
-  .spinner__track,
-  .spinner__indicator {
-    fill: none;
-    stroke-width: var(--track-width);
-    r: calc(0.5em - var(--track-width) / 2);
-    cx: 0.5em;
-    cy: 0.5em;
-    transform-origin: 50% 50%;
-  }
-
-  .spinner__track {
-    stroke: var(--track-color);
-    transform-origin: 0% 0%;
-  }
-
-  .spinner__indicator {
-    stroke: var(--indicator-color);
-    stroke-linecap: round;
-    stroke-dasharray: 150% 75%;
-    animation: spin var(--speed) linear infinite;
-  }
-
-  @keyframes spin {
-    0% {
-      transform: rotate(0deg);
-      stroke-dasharray: 0.05em, 3em;
-    }
-
-    50% {
-      transform: rotate(450deg);
-      stroke-dasharray: 1.375em, 1.375em;
-    }
-
-    100% {
-      transform: rotate(1080deg);
-      stroke-dasharray: 0.05em, 3em;
-    }
-  }
-</style>
-<svg part="base" class="spinner" role="progressbar" aria-label="loading">
-    <circle class="spinner__track"></circle>
-    <circle class="spinner__indicator"></circle>
-</svg>`
-
-class NetworkSpinner extends HTMLElement {
-  connectedCallback() {
-    this.innerHTML = template
-  }
-}
-
-customElements.define('network-spinner', NetworkSpinner)

package/dist/server/static/static/components/payload-panel.js

@@ -1,45 +0,0 @@
-/* globals customElements */
-import {EditorView, basicSetup, json} from '../vendor/vendor.bundle.js'
-import {ApiBaseElement} from './api-base.js'
-
-const template = `<m-box>
-    <h2 class="mar-t-0">Payload</h2>
-    <div id="payload" name="payload"></div>
-    <button ord="primary" class="mar-t-sm sanity-button">Invoke</button>
-</m-box>
-`
-class PayloadPanel extends ApiBaseElement {
-  invoke = () => {
-    const payloadText = this.api.store.payload.state.doc.text.join('') || '{}'
-    this.api.invoke(payloadText)
-  }
-  updateButtonText = ({inprogress}) => {
-    if (inprogress) {
-      this.button.setAttribute('disabled', '')
-      this.button.innerHTML = '<network-spinner></network-spinner>'
-    } else {
-      this.button.removeAttribute('disabled')
-      this.button.innerText = 'Invoke'
-    }
-  }
-
-  connectedCallback() {
-    this.innerHTML = template
-    this.payload = this.querySelector('#payload')
-    this.button = this.querySelector('button')
-    this.button.addEventListener('click', this.invoke)
-    this.api.subscribe(this.updateButtonText, ['inprogress'])
-
-    this.api.store.payload = new EditorView({
-      doc: '\n\n\n\n',
-      extensions: [basicSetup, json()],
-      parent: this.payload,
-    })
-  }
-
-  disconnectedCallback() {
-    this.button.removeEventListener('click', this.invoke)
-  }
-}
-
-customElements.define('payload-panel', PayloadPanel)

package/dist/server/static/static/components/response-panel.js

@@ -1,83 +0,0 @@
-/* eslint-disable unicorn/prefer-dom-node-text-content */
-/* globals customElements document */
-import {
-  EditorState,
-  EditorView,
-  basicSetup,
-  json,
-  prettyBytes,
-  prettyMilliseconds,
-} from '../vendor/vendor.bundle.js'
-import {ApiBaseElement} from './api-base.js'
-
-const template = `<m-box>
-    <m-tabs role="tablist">
-        <button id="a" role="tab" aria-selected="true">Response</button>
-        <button id="b" role="tab">Console</button>
-    </m-tabs>
-    <div role="tabpanel" data-tab-id="a" class="pad-t-sm">
-        <div class="mar-b-sm">
-            <span id="time"></span> <span id="size"></span>
-        </div>
-        <div id="response" name="response"></div>
-    </div>
-    <div role="tabpanel" data-tab-id="b" class="pad-t-sm" hidden><pre></pre></div>
-</m-box>
-`
-class ResponsePanel extends ApiBaseElement {
-  switchTab = (e) => {
-    const selectedTabId = e.target.closest('[role=tab]').id
-
-    // Select the tab and its panel
-    for (const tab of e.currentTarget.querySelectorAll('[role=tab]')) {
-      tab.ariaSelected = tab.id === selectedTabId
-    }
-
-    for (const panel of document.querySelectorAll('[role=tabpanel')) {
-      panel.hidden = panel.dataset.tabId !== selectedTabId
-    }
-  }
-  updateResponse = ({result}) => {
-    const {error, json, logs, time} = result
-    if (!error) {
-      const transaction = this.api.store.response.state.update({
-        changes: {
-          from: 0,
-          insert: JSON.stringify(json, null, 2),
-          to: this.api.store.response.state.doc.length,
-        },
-      })
-      this.api.store.response.dispatch(transaction)
-
-      this.size.innerText = json ? prettyBytes(JSON.stringify(json).length) : ''
-      this.time.innerText = prettyMilliseconds(time)
-      this.consoleTab.innerText = logs
-    } else {
-      this.consoleTab.innerText = error?.details?.error
-    }
-  }
-
-  connectedCallback() {
-    this.innerHTML = template
-    this.response = this.querySelector('#response')
-    this.size = this.querySelector('#size')
-    this.time = this.querySelector('#time')
-    this.consoleTab = this.querySelector('pre')
-    this.tabs = this.querySelector('m-tabs')
-    this.tabs.addEventListener('click', this.switchTab)
-    this.api.subscribe(this.updateResponse, ['result'])
-
-    this.api.store.response = new EditorView({
-      doc: '\n\n\n\n',
-      extensions: [basicSetup, json(), EditorState.readOnly.of(true)],
-      parent: this.response,
-    })
-  }
-
-  disconnectedCallback() {
-    this.tabs.removeEventListener('click', this.switchTab)
-    this.api.unsubscribe(this.updateResponse)
-  }
-}
-
-customElements.define('response-panel', ResponsePanel)