@sanity/runtime-cli 13.1.0 → 13.2.1

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

@@ -1,5 +1,5 @@
 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: ReturnType<typeof Logger>, executionOptions?: Partial<InvokeExecutionOptions>): Promise<InvocationResponse & {
+export declare function handleInvokeRequest(functionName: string, event: Record<string, unknown>, metadata: InvokePayloadMetadata, context: InvokeContextOptions, logger: ReturnType<typeof Logger>, validateResources: boolean, executionOptions?: Partial<InvokeExecutionOptions>): Promise<InvocationResponse & {
     timings: Record<string, number>;
 }>;

package/dist/server/handlers/invoke.js

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

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

@@ -0,0 +1,41 @@
+export type SubscribeFunc = (fn: () => void) => void
+
+export interface ServerAPI {
+  blueprint(): Promise<void>
+  document({
+    projectId,
+    dataset,
+    docId,
+  }: {
+    projectId: string
+    dataset: string
+    docId: string
+  }): Promise<void>
+  invoke({
+    context,
+    event,
+    metadata,
+  }: {
+    context: unknown
+    event: unknown
+    metadata: unknown
+  }): Promise<void>
+  projects(): Promise<void>
+  datasets(selectedProject: string): Promise<void>
+  organizations(): Promise<void>
+  mediaLibraries(selectedOrganization: string): Promise<void>
+  asset({
+    organizationId,
+    mediaLibraryId,
+    docId,
+  }: {
+    organizationId: string
+    mediaLibraryId: string
+    docId: string
+  }): Promise<void>
+  store: Record<string, unknown> & {subscribe: SubscribeFunc; unsubscribe: SubscribeFunc}
+  subscribe: SubscribeFunc
+  unsubscribe: SubscribeFunc
+}
+
+export default function API(): ServerAPI

package/dist/server/static/api.js

@@ -4,6 +4,7 @@ import {Store} from './vendor/vendor.bundle.js'
 // list of events to simulate
 const events = ['create', 'update', 'delete'].map((e) => ({name: e}))
 
+/** @type {Record<string, unknown>} */
 // eslint-disable-next-line new-cap
 const store = Store({events, selectedEvent: events[0].name})
 
@@ -23,6 +24,12 @@ export default function API() {
   }
 }
 
+/**
+ * @param {object} params
+ * @param {unknown} params.context
+ * @param {unknown} params.event
+ * @param {unknown} params.metadata
+ */
 function invoke({context, event, metadata}) {
   store.inprogress = true
   const start = Date.now()
@@ -31,7 +38,7 @@ function invoke({context, event, metadata}) {
     func: store.selectedIndex,
     metadata,
   }
-  fetch('/invoke', {
+  return fetch('/invoke', {
     body: JSON.stringify(payload),
     headers: {
       'Content-Type': 'application/json',
@@ -52,7 +59,7 @@ function invoke({context, event, metadata}) {
 }
 
 function blueprint() {
-  fetch('/blueprint')
+  return fetch('/blueprint')
     .then((response) => response.json())
     .then((blueprint) => {
       const {parsedBlueprint, projectId, organizationId} = blueprint
@@ -72,7 +79,7 @@ function blueprint() {
 }
 
 function projects() {
-  fetch('/projects')
+  return fetch('/projects')
     .then((response) => response.json())
     .then(async (projects) => {
       store.projects = projects
@@ -84,8 +91,11 @@ function projects() {
     })
 }
 
+/**
+ * @param {string} selectedProject
+ */
 function datasets(selectedProject) {
-  fetch(`/datasets?project=${selectedProject}`)
+  return fetch(`/datasets?project=${selectedProject}`)
     .then((response) => response.json())
     .then((datasets) => {
       store.datasets = datasets
@@ -96,6 +106,12 @@ function datasets(selectedProject) {
     })
 }
 
+/**
+ * @param {object} params
+ * @param {string} params.projectId
+ * @param {string} params.dataset
+ * @param {string} params.docId
+ */
 function document({projectId, dataset, docId}) {
   return fetch(`/document?project=${projectId}&dataset=${dataset}&doc=${docId}`)
     .then((response) => response.json())
@@ -108,7 +124,7 @@ function document({projectId, dataset, docId}) {
 }
 
 function organizations() {
-  fetch('/organizations')
+  return fetch('/organizations')
     .then((response) => response.json())
     .then(async (organizations) => {
       store.organizations = organizations
@@ -123,7 +139,7 @@ function organizations() {
 }
 
 function mediaLibraries(selectedOrganization) {
-  fetch(`/media-libraries?organization=${selectedOrganization}`)
+  return fetch(`/media-libraries?organization=${selectedOrganization}`)
     .then((response) => response.json())
     .then((mediaLibraries) => {
       store.mediaLibraries = mediaLibraries
@@ -136,6 +152,13 @@ function mediaLibraries(selectedOrganization) {
     })
 }
 
+/**
+ *
+ * @param {object} params
+ * @param {string} params.organizationId
+ * @param {string} params.mediaLibraryId
+ * @param {string} params.docId
+ */
 function asset({organizationId, mediaLibraryId, docId}) {
   return fetch(`/asset?organization=${organizationId}&medialibrary=${mediaLibraryId}&doc=${docId}`)
     .then((response) => response.json())

package/dist/server/static/components/filters.js

@@ -56,18 +56,6 @@ form input {
 </style>
 <form class="gap-2 pad-l-3 pad-b-3 border-bottom">
   <fieldset class="flex gap-2">
-    <legend class="config-label">Client Options</legend>
-    <div id="dynamic-dropdowns" class="flex gap-2"></div>
-    <select-dropdown
-      label="Event"
-      store-key="events"
-      selected-key="selectedEvent"
-      value-prop="name"
-      label-prop="name"
-    ></select-dropdown>
-    <api-version></api-version>
-    <with-token></with-token>
-    <document-id></document-id>
   </fieldset>
 </form>
 `
@@ -87,54 +75,72 @@ class FiltersComponent extends ApiBaseElement {
   }
 
   renderFilters = () => {
-    const docFunction = this.api.store.selectedFunctionType === 'sanity.function.document'
+    const docFunction = this.api.store.selectedFunctionType === this.SANITY_FUNCTION_DOCUMENT
     const mediaFunction = this.api.store.selectedFunctionType?.startsWith(
-      'sanity.function.media-library',
+      this.SANITY_FUNCTION_MEDIA_LIBRARY_ASSET,
     )
+    const scheduleFunction = this.api.store.selectedFunctionType === this.SANITY_FUNCTION_SCHEDULE
+
+    const container = this.shadowRoot.querySelector('fieldset')
+    container.innerHTML = this.buildFilters(docFunction, mediaFunction, scheduleFunction)
+  }
 
-    const container = this.shadowRoot.querySelector('#dynamic-dropdowns')
-
-    if (docFunction) {
-      container.innerHTML = `
-        <select-dropdown
-          label="Project"
-          store-key="projects"
-          selected-key="selectedProject"
-          value-prop="id"
-          label-prop="displayName"
-          trigger-fetch
-        ></select-dropdown>
-        <select-dropdown
-          label="Dataset"
-          store-key="datasets"
-          selected-key="selectedDataset"
-          value-prop="name"
-          label-prop="name"
-          subscribe-to="selectedProject"
-        ></select-dropdown>
-      `
-    } else if (mediaFunction) {
-      container.innerHTML = `
-        <select-dropdown
-          label="Organization"
-          store-key="organizations"
-          selected-key="selectedOrganization"
-          value-prop="id"
-          label-prop="name"
-          trigger-fetch
-        ></select-dropdown>
-        <select-dropdown
-          label="Media Library"
-          store-key="mediaLibraries"
-          selected-key="selectedMediaLibrary"
-          value-prop="id"
-          label-prop="id"
-          subscribe-to="selectedOrganization"
-        ></select-dropdown>
-      `
-    } else {
-      container.innerHTML = ''
+  buildFilters = (docFunction, mediaFunction, scheduleFunction) => {
+    return `
+    <legend class="config-label">Client Options</legend>
+    <div id="dynamic-dropdowns" class="flex gap-2">
+      ${
+        docFunction || scheduleFunction
+          ? `<select-dropdown
+        label="Project"
+        store-key="projects"
+        selected-key="selectedProject"
+        value-prop="id"
+        label-prop="displayName"
+        trigger-fetch
+      ></select-dropdown>
+      <select-dropdown
+        label="Dataset"
+        store-key="datasets"
+        selected-key="selectedDataset"
+        value-prop="name"
+        label-prop="name"
+        subscribe-to="selectedProject"
+      ></select-dropdown>`
+          : `
+      <select-dropdown
+        label="Organization"
+        store-key="organizations"
+        selected-key="selectedOrganization"
+        value-prop="id"
+        label-prop="name"
+        trigger-fetch
+      ></select-dropdown>
+      <select-dropdown
+        label="Media Library"
+        store-key="mediaLibraries"
+        selected-key="selectedMediaLibrary"
+        value-prop="id"
+        label-prop="id"
+        subscribe-to="selectedOrganization"
+      ></select-dropdown>`
+      }
+    </div>
+    ${
+      docFunction || mediaFunction
+        ? `<select-dropdown
+      label="Event"
+      store-key="events"
+      selected-key="selectedEvent"
+      value-prop="name"
+      label-prop="name"
+    ></select-dropdown>`
+        : ''
     }
+    <api-version></api-version>
+    <with-token></with-token>
+    ${docFunction || mediaFunction ? `<document-id></document-id>` : ''}
+    `
   }
 
   disconnectedCallback() {

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

@@ -78,7 +78,7 @@ class FunctionList extends ApiBaseElement {
         })
         .join('')
     } else {
-      this.list.innerHTML = '<option class="pad-2">No Blueprint found</li>'
+      this.list.innerHTML = '<option class="pad-2">No Functions found</li>'
       this.select.innerHTML = '<option>No blueprint.json file found</option>'
     }
   }

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

@@ -1,10 +1,12 @@
 /* globals customElements document */
 
-import {basicSetup, EditorView, json} from '../vendor/vendor.bundle.js'
+import {basicSetup, Compartment, EditorView, json} from '../vendor/vendor.bundle.js'
 import {ApiBaseElement} from './api-base.js'
 import {sanityCodeMirrorTheme} from './codemirror-theme.js'
 import {getSharedStyleSheets} from './shared-styles.js'
 
+const editableCompartment = new Compartment()
+
 const template = document.createElement('template')
 template.innerHTML = `
 <style>
@@ -73,8 +75,32 @@ class PayloadPanel extends ApiBaseElement {
 
     this.api.subscribe(this.updatePayload, ['document'])
     this.api.subscribe(this.updateSelectedEvent, ['selectedEvent'])
+    this.api.subscribe(this.updateCodeMirror, ['selectedFunctionType'])
   }
 
+  updateCodeMirror = ({selectedFunctionType}) => {
+    if (selectedFunctionType === this.SANITY_FUNCTION_SCHEDULE) {
+      this.api.store.beforePayload.dispatch({
+        effects: editableCompartment.reconfigure(EditorView.editable.of(false)),
+      })
+      this.api.store.afterPayload.dispatch({
+        effects: editableCompartment.reconfigure(EditorView.editable.of(false)),
+      })
+      this.api.store.payload.dispatch({
+        effects: editableCompartment.reconfigure(EditorView.editable.of(false)),
+      })
+    } else {
+      this.api.store.beforePayload.dispatch({
+        effects: editableCompartment.reconfigure(EditorView.editable.of(true)),
+      })
+      this.api.store.afterPayload.dispatch({
+        effects: editableCompartment.reconfigure(EditorView.editable.of(true)),
+      })
+      this.api.store.payload.dispatch({
+        effects: editableCompartment.reconfigure(EditorView.editable.of(true)),
+      })
+    }
+  }
   updatePayload = ({document}) => {
     if (!document) return
 
@@ -93,8 +119,6 @@ class PayloadPanel extends ApiBaseElement {
     view.dispatch(transaction)
   }
   updateSelectedEvent = ({selectedEvent}) => {
-    console.log('updateSelectedEvent', selectedEvent)
-
     const payloadContainer = this.shadowRoot.querySelector('#payloadContainer')
     const deltaPayloadContainer = this.shadowRoot.querySelector('#deltaPayloadContainer')
 
@@ -113,7 +137,12 @@ class PayloadPanel extends ApiBaseElement {
 function attachEditorView(parent) {
   return new EditorView({
     doc: '\n\n\n\n',
-    extensions: [basicSetup, json(), sanityCodeMirrorTheme],
+    extensions: [
+      basicSetup,
+      json(),
+      sanityCodeMirrorTheme,
+      editableCompartment.of(EditorView.editable.of(false)),
+    ],
     parent,
   })
 }

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

@@ -23,6 +23,10 @@ class RunPanel extends ApiBaseElement {
   invoke = () => {
     const selectedEvent = this.api.store.selectedEvent
     const docFunction = this.api.store.selectedFunctionType === this.SANITY_FUNCTION_DOCUMENT
+    const mediaFunction =
+      this.api.store.selectedFunctionType === this.SANITY_FUNCTION_MEDIA_LIBRARY_ASSET
+    const scheduleFunction = this.api.store.selectedFunctionType === this.SANITY_FUNCTION_SCHEDULE
+    const docOrScheduleFunction = docFunction || scheduleFunction
 
     this.api.store.result = {logs: '', time: 0}
     let event = {}
@@ -53,12 +57,16 @@ class RunPanel extends ApiBaseElement {
         projectId: this.api.store.selectedProject,
         token: this.api.store.withToken,
       },
-      eventResourceType: docFunction ? 'dataset' : 'media-library',
-      eventResourceId: docFunction
+      eventResourceType: scheduleFunction
+        ? 'schedule'
+        : mediaFunction
+          ? 'media-library'
+          : 'dataset',
+      eventResourceId: docOrScheduleFunction
         ? `${this.api.store.selectedProject}.${this.api.store.selectedDataset}`
         : this.api.store.selectedMediaLibrary,
-      functionResourceType: 'project',
-      functionResourceId: docFunction
+      functionResourceType: docOrScheduleFunction ? 'project' : 'organization',
+      functionResourceId: docOrScheduleFunction
         ? this.api.store.selectedProject
         : this.api.store.selectedOrganization,
     }

package/dist/server/static/vendor/vendor.bundle.js

@@ -27259,4 +27259,4 @@ function prettyMilliseconds(milliseconds, options) {
 	return sign + result.join(separator);
 }
 
-export { EditorState, EditorView, HighlightStyle, Store, basicSetup, json, prettyBytes, prettyMilliseconds, syntaxHighlighting, tags };
+export { Compartment, EditorState, EditorView, HighlightStyle, Store, basicSetup, json, prettyBytes, prettyMilliseconds, syntaxHighlighting, tags };

package/dist/utils/functions/resolve-dependencies.js

@@ -1,11 +1,27 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import hydrate from '@architect/hydrate';
 import inventory from '@architect/inventory';
 import { convertResourceToArcFormat } from './resource-to-arc.js';
 export async function resolveResourceDependencies(resource, transpiled) {
     const rawArc = await convertResourceToArcFormat(resource, transpiled);
     const inv = await inventory({ rawArc });
+    const cwd = inv.inv._project.cwd;
+    const installOptions = {
+        inventory: inv,
+        hydrateShared: false,
+        quiet: true,
+        pnpm: false,
+        yarn: false,
+    };
+    if (existsSync(join(cwd, 'pnpm-lock.yaml'))) {
+        installOptions.pnpm = true;
+    }
+    else if (existsSync(join(cwd, 'yarn.lock'))) {
+        installOptions.yarn = true;
+    }
     try {
-        await hydrate.install({ inventory: inv, hydrateShared: false, quiet: true });
+        await hydrate.install(installOptions);
     }
     catch (err) {
         // This is a temporary fix.

package/dist/utils/functions/resource-to-arc.js

@@ -1,7 +1,16 @@
-import { sep } from 'node:path';
+import { stat } from 'node:fs/promises';
+import { resolve, sep } from 'node:path';
+import { cwd } from 'node:process';
 export async function convertResourceToArcFormat(resource, transpiled) {
+    if (!resource.src) {
+        throw Error('Missing `resource.src` property');
+    }
+    // Get stats from file
+    const stats = await stat(resolve(cwd(), resource.src));
+    // Convert resource.src to arc file path format
     const srcPath = resource.src?.split(sep).join('/');
-    const functionPath = transpiled ? `${srcPath}/.build/function-${resource.name}` : srcPath;
+    const entryDir = stats.isFile() ? srcPath.substring(0, srcPath.lastIndexOf('/')) : srcPath;
+    const functionPath = transpiled ? `${entryDir}/.build/function-${resource.name}` : entryDir;
     return `@app
 hydrate-function
 

package/dist/utils/validate/index.d.ts

@@ -1 +1,4 @@
+import type { Resource } from '@sanity/blueprints-parser';
+import type { BlueprintParserError } from '../types.js';
 export * as validate from './resource.js';
+export declare function validateResources(resources: Resource[]): BlueprintParserError[];

package/dist/utils/validate/index.js

@@ -1 +1,36 @@
+import { validateCorsOrigin, validateDataset, validateDocumentFunction, validateDocumentWebhook, validateMediaLibraryAssetFunction, validateRole, validateScheduleFunction, } from '@sanity/blueprints';
+import { SANITY_ACCESS_ROLE, SANITY_FUNCTION_DOCUMENT, SANITY_FUNCTION_MEDIA_LIBRARY_ASSET, SANITY_FUNCTION_SCHEDULE, SANITY_PROJECT_CORS, SANITY_PROJECT_DATASET, SANITY_PROJECT_WEBHOOK, } from '../../constants.js';
 export * as validate from './resource.js';
+const RESOURCE_VALIDATORS = {
+    [SANITY_ACCESS_ROLE]: {
+        validate: validateRole,
+    },
+    [SANITY_FUNCTION_DOCUMENT]: {
+        validate: validateDocumentFunction,
+    },
+    [SANITY_FUNCTION_MEDIA_LIBRARY_ASSET]: {
+        validate: validateMediaLibraryAssetFunction,
+    },
+    [SANITY_FUNCTION_SCHEDULE]: {
+        validate: validateScheduleFunction,
+    },
+    [SANITY_PROJECT_CORS]: {
+        validate: validateCorsOrigin,
+    },
+    [SANITY_PROJECT_DATASET]: {
+        validate: validateDataset,
+    },
+    [SANITY_PROJECT_WEBHOOK]: {
+        validate: validateDocumentWebhook,
+    },
+};
+export function validateResources(resources) {
+    const errors = [];
+    for (const resource of resources) {
+        const validator = RESOURCE_VALIDATORS[resource.type];
+        if (validator) {
+            errors.push(...validator.validate(resource));
+        }
+    }
+    return errors;
+}