@sanity/assist 1.2.16 → 2.0.0

package/src/assistInspector/helpers.ts

@@ -20,7 +20,7 @@ import {
 } from 'sanity'
 import {ComponentType, useContext, useMemo} from 'react'
 import {AssistInspectorRouteParams, documentRootKey, fieldPathParam} from '../types'
-import {usePaneRouter} from 'sanity/desk'
+import {type PaneRouterContextValue, usePaneRouter} from 'sanity/desk'
 import {isAssistSupported} from '../helpers/assistSupported'
 import {isPortableTextArray, isType} from '../helpers/typeUtils'
 import {SelectedFieldContext} from '../assistDocument/components/SelectedFieldContext'
@@ -96,7 +96,7 @@ export function getFieldRefs(
 
       const syntheticFields =
         field.type.jsonType === 'array' ? getSyntheticFields(field.type, fieldRef, depth + 1) : []
-      if (!isAssistSupported(field.type, true)) {
+      if (!isAssistSupported(field.type)) {
         return [...fields, ...syntheticFields]
       }
       return [fieldRef, ...fields, ...syntheticFields]
@@ -125,7 +125,7 @@ function getSyntheticFields(schemaType: ArraySchemaType, parent?: FieldRef, dept
       const fields =
         itemType.jsonType === 'object' ? getFieldRefs(itemType, fieldRef, depth + 1) : []
 
-      if (!isAssistSupported(itemType, true)) {
+      if (!isAssistSupported(itemType)) {
         return fields
       }
       return [fieldRef, ...fields]
@@ -198,18 +198,16 @@ export function getFieldTitle(field?: FieldRef) {
   return field?.title ?? schemaType?.title ?? schemaType?.name ?? 'Untitled'
 }
 
+export type AiPaneRouter = Omit<PaneRouterContextValue, 'setParams' | 'params'> & {
+  params: AssistInspectorRouteParams
+  setParams: (p: Record<keyof AssistInspectorRouteParams, string | undefined>) => void
+}
+
 export function useAiPaneRouter() {
   const paneRouter = usePaneRouter()
 
   return useMemo(
-    () =>
-      ({...paneRouter, params: paneRouter.params ?? {}} as Omit<
-        typeof paneRouter,
-        'setParams' | 'params'
-      > & {
-        params: AssistInspectorRouteParams
-        setParams: (p: Record<keyof AssistInspectorRouteParams, string | undefined>) => void
-      }),
+    () => ({...paneRouter, params: paneRouter.params ?? {}} as AiPaneRouter),
     [paneRouter]
   )
 }

package/src/assistLayout/AssistLayout.tsx

@@ -8,7 +8,7 @@ import {RunInstructionRequest} from '../useApiClient'
 import {StudioInstruction} from '../types'
 import {RunInstructionProvider} from './RunInstructionProvider'
 import {ThemeProvider} from '@sanity/ui'
-import {AlphaMigration} from './AlphaMigration'
+import {FieldTranslationProvider} from '../translate/FieldTranslationProvider'
 
 export interface AIStudioLayoutProps extends LayoutProps {
   config: AssistPluginConfig
@@ -20,18 +20,18 @@ export type RunInstructionArgs = Omit<RunInstructionRequest, 'instructionKey' |
 
 export function AssistLayout(props: AIStudioLayoutProps) {
   const [connectors, setConnectors] = useState<Connector[]>([])
-  const migrate = props.config.alphaMigration ?? true
 
   return (
     <AiAssistanceConfigProvider config={props.config}>
-      {migrate ? <AlphaMigration /> : null}
       <RunInstructionProvider>
-        <ConnectorsProvider onConnectorsChange={setConnectors}>
-          {props.renderDefault(props)}
-          <ThemeProvider tone="default">
-            <AssistConnectorsOverlay connectors={connectors} />
-          </ThemeProvider>
-        </ConnectorsProvider>
+        <FieldTranslationProvider>
+          <ConnectorsProvider onConnectorsChange={setConnectors}>
+            {props.renderDefault(props)}
+            <ThemeProvider tone="default">
+              <AssistConnectorsOverlay connectors={connectors} />
+            </ThemeProvider>
+          </ConnectorsProvider>
+        </FieldTranslationProvider>
       </RunInstructionProvider>
     </AiAssistanceConfigProvider>
   )

package/src/components/ImageContext.tsx

@@ -1,17 +1,18 @@
 import {createContext, useEffect, useMemo, useState} from 'react'
 import {InputProps, pathToString, useSyncState} from 'sanity'
-import {getCaptionFieldOption} from '../helpers/typeUtils'
+import {getDescriptionFieldOption, getImageInstructionFieldOption} from '../helpers/typeUtils'
 import {useAssistDocumentContext} from '../assistDocument/AssistDocumentContext'
 import {useApiClient, useGenerateCaption} from '../useApiClient'
 import {useAiAssistanceConfig} from '../assistLayout/AiAssistanceConfigContext'
 import {publicId} from '../helpers/ids'
 
 export interface ImageContextValue {
-  captionPath: string
+  imageDescriptionPath?: string
+  imageInstructionPath?: string
   assetRef?: string
 }
 
-export const ImageContext = createContext<ImageContextValue | undefined>(undefined)
+export const ImageContext = createContext<ImageContextValue>({})
 
 export function ImageContextProvider(props: InputProps) {
   const {schemaType, path, value} = props
@@ -26,16 +27,25 @@ export function ImageContextProvider(props: InputProps) {
   const {isSyncing} = useSyncState(publicId(documentId), documentSchemaType.name)
 
   useEffect(() => {
-    const captionField = getCaptionFieldOption(schemaType)
-    if (assetRef && documentId && captionField && assetRef !== assetRefState && !isSyncing) {
+    const descriptionField = getDescriptionFieldOption(schemaType)
+    if (assetRef && documentId && descriptionField && assetRef !== assetRefState && !isSyncing) {
       setAssetRefState(assetRef)
-      generateCaption({path: pathToString([...path, captionField]), documentId: documentId})
+      generateCaption({path: pathToString([...path, descriptionField]), documentId: documentId})
     }
   }, [schemaType, path, assetRef, assetRefState, documentId, generateCaption, isSyncing])
 
-  const context: ImageContextValue | undefined = useMemo(() => {
-    const captionField = getCaptionFieldOption(schemaType)
-    return captionField ? {captionPath: pathToString([...path, captionField]), assetRef} : undefined
+  const context: ImageContextValue = useMemo(() => {
+    const descriptionField = getDescriptionFieldOption(schemaType)
+    const imageInstructionField = getImageInstructionFieldOption(schemaType)
+    return {
+      imageDescriptionPath: descriptionField
+        ? pathToString([...path, descriptionField])
+        : undefined,
+      imageInstructionPath: imageInstructionField
+        ? pathToString([...path, imageInstructionField])
+        : undefined,
+      assetRef,
+    }
   }, [schemaType, path, assetRef])
 
   return <ImageContext.Provider value={context}>{props.renderDefault(props)}</ImageContext.Provider>

package/src/components/SafeValueInput.tsx

@@ -31,7 +31,10 @@ export function ErrorWrapper(
     [setError]
   )
 
-  const unsetValue = useCallback(() => onChange(PatchEvent.from(unset())), [onChange])
+  const unsetValue = useCallback(() => {
+    onChange(PatchEvent.from(unset()))
+    setError(undefined)
+  }, [onChange])
   const dismiss = useCallback(() => setError(undefined), [])
   const catcher = <ErrorBoundary onCatch={catchError}>{props.children}</ErrorBoundary>
 

package/src/fieldActions/assistFieldActions.tsx

@@ -3,11 +3,12 @@ import {
   DocumentFieldActionGroup,
   DocumentFieldActionItem,
   ObjectSchemaType,
+  typed,
   useCurrentUser,
 } from 'sanity'
 import {ControlsIcon, SparklesIcon} from '@sanity/icons'
-import {useCallback, useMemo} from 'react'
-import {pluginTitle, pluginTitleShort} from '../constants'
+import {useCallback, useMemo, useRef} from 'react'
+import {pluginTitleShort} from '../constants'
 import {useAssistSupported} from '../helpers/useAssistSupported'
 import {useAssistDocumentContext} from '../assistDocument/AssistDocumentContext'
 import {getInstructionTitle, usePathKey} from '../helpers/misc'
@@ -24,6 +25,9 @@ import {generateCaptionsActions} from './generateCaptionActions'
 import {useDocumentPane} from 'sanity/desk'
 import {useSelectedField, useTypePath} from '../assistInspector/helpers'
 import {isSchemaAssistEnabled} from '../helpers/assistSupported'
+import {translateActions, TranslateProps} from '../translate/translateActions'
+import {generateImagActions} from './generateImageActions'
+import {getConditionalMembers} from '../helpers/conditionalMembers'
 
 function node(node: DocumentFieldActionItem | DocumentFieldActionGroup) {
   return node
@@ -47,6 +51,7 @@ export const assistFieldActions: DocumentFieldAction = {
       documentSchemaType,
       documentId,
       selectedPath,
+      assistableDocumentId,
     } =
       // document field actions do not have access to the document context
       // conditional hook _should_ be safe here since the logical path will be stable
@@ -56,7 +61,10 @@ export const assistFieldActions: DocumentFieldAction = {
         : // eslint-disable-next-line react-hooks/rules-of-hooks
           useAssistDocumentContext()
 
-    const {value: docValue} = useDocumentPane()
+    const {value: docValue, formState} = useDocumentPane()
+    const formStateRef = useRef(formState)
+    formStateRef.current = formState
+
     const currentUser = useCurrentUser()
     const isHidden = !assistDocument
     const pathKey = usePathKey(props.path)
@@ -73,7 +81,8 @@ export const assistFieldActions: DocumentFieldAction = {
     const assistSupported =
       useAssistSupported(props.path, schemaType) &&
       isSelectable &&
-      isSchemaAssistEnabled(documentSchemaType)
+      isSchemaAssistEnabled(documentSchemaType) &&
+      schemaType.readOnly !== true
 
     const fieldAssist = useMemo(
       () =>
@@ -89,7 +98,15 @@ export const assistFieldActions: DocumentFieldAction = {
     const isSelected = isInspectorOpen && isPathSelected
 
     const imageCaptionAction = generateCaptionsActions.useAction(props)
-
+    const imageGenAction = generateImagActions.useAction(props)
+    const translateAction = translateActions.useAction(
+      typed<TranslateProps>({
+        ...props,
+        documentId: assistableDocumentId,
+        documentIsAssistable,
+        documentSchemaType,
+      })
+    )
     const manageInstructions = useCallback(
       () =>
         isSelected
@@ -112,6 +129,9 @@ export const assistFieldActions: DocumentFieldAction = {
           path: pathKey,
           typePath,
           instruction,
+          conditionalMembers: formStateRef.current
+            ? getConditionalMembers(formStateRef.current)
+            : [],
         })
       },
       [requestRunInstruction, assistableDocId, pathKey, typePath, assistDocumentId, fieldAssistKey]
@@ -134,7 +154,7 @@ export const assistFieldActions: DocumentFieldAction = {
     )
 
     const runInstructionsGroup = useMemo(() => {
-      return instructions?.length || imageCaptionAction
+      return instructions?.length || imageCaptionAction || translateAction || imageGenAction
         ? node({
             type: 'group',
             icon: () => null,
@@ -151,7 +171,8 @@ export const assistFieldActions: DocumentFieldAction = {
                 })
               ),
               imageCaptionAction,
-            ].filter(Boolean),
+              imageGenAction,
+            ].filter((a): a is DocumentFieldActionItem => !!a),
             expanded: true,
           })
         : undefined
@@ -163,6 +184,8 @@ export const assistFieldActions: DocumentFieldAction = {
       documentIsNew,
       assistSupported,
       imageCaptionAction,
+      translateAction,
+      imageGenAction,
     ])
 
     const instructionsLength = instructions?.length || 0
@@ -185,12 +208,16 @@ export const assistFieldActions: DocumentFieldAction = {
           type: 'group',
           icon: SparklesIcon,
           title: pluginTitleShort,
-          children: [runInstructionsGroup, assistSupported && manageInstructionsItem].filter(
-            (c): c is DocumentFieldActionItem | DocumentFieldActionGroup => !!c
-          ),
+          children: [
+            runInstructionsGroup,
+            translateAction,
+            assistSupported && manageInstructionsItem,
+          ]
+            .filter((c): c is DocumentFieldActionItem | DocumentFieldActionGroup => !!c)
+            .filter((c) => (c.type === 'group' ? c.children.length : true)),
           expanded: false,
           renderAsButton: true,
-          hidden: !assistSupported && !imageCaptionAction,
+          hidden: !assistSupported && !imageCaptionAction && !translateAction && !imageGenAction,
         }),
       [
         //documentIsNew,
@@ -198,6 +225,8 @@ export const assistFieldActions: DocumentFieldAction = {
         manageInstructionsItem,
         assistSupported,
         imageCaptionAction,
+        translateAction,
+        imageGenAction,
       ]
     )
 
@@ -216,7 +245,7 @@ export const assistFieldActions: DocumentFieldAction = {
     )
 
     // If there are no instructions, we don't want to render the group
-    if (instructionsLength === 0 && !imageCaptionAction) {
+    if (instructionsLength === 0 && !imageCaptionAction && !translateAction && !imageGenAction) {
       return emptyAction
     }
 
@@ -239,7 +268,7 @@ function instructionItem(props: {
     iconRight: isPrivate ? PrivateIcon : undefined,
     title: getInstructionTitle(instruction),
     onAction: () => onInstructionAction(instruction),
-    disabled: assistSupported ? false : {reason: `${pluginTitle} is not supported for this field`},
+    disabled: !assistSupported,
     hidden,
   })
 }

package/src/fieldActions/generateCaptionActions.tsx

@@ -23,7 +23,7 @@ export const generateCaptionsActions: DocumentFieldAction = {
 
     const imageContext = useContext(ImageContext)
 
-    if (imageContext && pathKey === imageContext?.captionPath) {
+    if (imageContext && pathKey === imageContext?.imageDescriptionPath) {
       //if this is true, it is stable, and not breaking rules of hooks
       // eslint-disable-next-line react-hooks/rules-of-hooks
       const {documentId} = useAssistDocumentContext()
@@ -38,7 +38,7 @@ export const generateCaptionsActions: DocumentFieldAction = {
                 </Box>
               )
             : ImageIcon,
-          title: 'Generate caption',
+          title: 'Generate image description',
           onAction: () => {
             if (loading) {
               return

package/src/fieldActions/generateImageActions.tsx

@@ -0,0 +1,57 @@
+import {DocumentFieldAction, DocumentFieldActionGroup, DocumentFieldActionItem} from 'sanity'
+import {ImageIcon} from '@sanity/icons'
+import {useContext, useMemo} from 'react'
+import {usePathKey} from '../helpers/misc'
+import {useApiClient, useGenerateImage} from '../useApiClient'
+import {useAiAssistanceConfig} from '../assistLayout/AiAssistanceConfigContext'
+import {useAssistDocumentContext} from '../assistDocument/AssistDocumentContext'
+import {ImageContext} from '../components/ImageContext'
+import {Box, Spinner} from '@sanity/ui'
+
+function node(node: DocumentFieldActionItem | DocumentFieldActionGroup) {
+  return node
+}
+
+export const generateImagActions: DocumentFieldAction = {
+  name: 'sanity-assist-generate-image',
+  useAction(props) {
+    const pathKey = usePathKey(props.path)
+
+    const {config} = useAiAssistanceConfig()
+    const apiClient = useApiClient(config?.__customApiClient)
+    const {generateImage, loading} = useGenerateImage(apiClient)
+
+    const imageContext = useContext(ImageContext)
+
+    if (imageContext && pathKey === imageContext?.imageInstructionPath) {
+      //if this is true, it is stable, and not breaking rules of hooks
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const {documentId} = useAssistDocumentContext()
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      return useMemo(() => {
+        return node({
+          type: 'action',
+          icon: loading
+            ? () => (
+                <Box style={{height: 17}}>
+                  <Spinner style={{transform: 'translateY(6px)'}} />
+                </Box>
+              )
+            : ImageIcon,
+          title: 'Generate image from prompt',
+          onAction: () => {
+            if (loading) {
+              return
+            }
+            generateImage({path: pathKey, documentId: documentId ?? ''})
+          },
+          renderAsButton: true,
+          disabled: loading,
+        })
+      }, [generateImage, pathKey, documentId, loading])
+    }
+
+    // works but not supported by types
+    return undefined as unknown as DocumentFieldActionItem
+  },
+}

package/src/helpers/assistSupported.ts

@@ -1,41 +1,34 @@
-import {SchemaType} from 'sanity'
+import {ReferenceOptions, SchemaType} from 'sanity'
 import {AssistOptions} from '../schemas/typeDefExtensions'
 import {isType} from './typeUtils'
 
 export function isSchemaAssistEnabled(type: SchemaType) {
-  return !(type.options as AssistOptions | undefined)?.aiWritingAssistance?.exclude
+  return !(type.options as AssistOptions | undefined)?.aiAssist?.exclude
 }
 
-export function isAssistSupported(type: SchemaType, allowReadonlyHidden = false) {
+export function isAssistSupported(type: SchemaType) {
   if (!isSchemaAssistEnabled(type)) {
     return false
   }
 
-  if (isDisabled(type, allowReadonlyHidden)) {
+  if (isDisabled(type)) {
     return false
   }
 
   if (type.jsonType === 'array') {
-    const unsupportedArray = type.of.every((t) => isDisabled(t, allowReadonlyHidden))
+    const unsupportedArray = type.of.every((t) => isDisabled(t))
     return !unsupportedArray
   }
 
   if (type.jsonType === 'object') {
-    const unsupportedObject = type.fields.every((field) =>
-      isDisabled(field.type, allowReadonlyHidden)
-    )
+    const unsupportedObject = type.fields.every((field) => isDisabled(field.type))
     return !unsupportedObject
   }
   return true
 }
 
-function isDisabled(type: SchemaType, allowReadonlyHidden: boolean) {
-  const readonlyHidden = !!type.readOnly || !!type.hidden
-  return (
-    !isSchemaAssistEnabled(type) ||
-    isUnsupportedType(type) ||
-    (!allowReadonlyHidden && readonlyHidden)
-  )
+function isDisabled(type: SchemaType) {
+  return !isSchemaAssistEnabled(type) || isUnsupportedType(type)
 }
 
 function isUnsupportedType(type: SchemaType) {
@@ -43,7 +36,8 @@ function isUnsupportedType(type: SchemaType) {
     type.jsonType === 'number' ||
     type.name === 'sanity.imageCrop' ||
     type.name === 'sanity.imageHotspot' ||
-    isType(type, 'reference') ||
+    (isType(type, 'reference') &&
+      !(type?.options as ReferenceOptions)?.aiAssist?.embeddingsIndex) ||
     isType(type, 'crossDatasetReference') ||
     isType(type, 'slug') ||
     isType(type, 'url') ||

package/src/helpers/conditionalMembers.test.ts

@@ -0,0 +1,200 @@
+import {describe, expect, test} from 'vitest'
+import {Schema} from '@sanity/schema'
+import {ArraySchemaType, defineField, defineType, ObjectSchemaType} from 'sanity'
+import {getConditionalMembers} from './conditionalMembers'
+
+describe('conditionalMembers', () => {
+  test('should not include paths without conditional hidden/readonly', () => {
+    const docSchema: ObjectSchemaType = Schema.compile({
+      name: 'test',
+      types: [
+        defineType({
+          type: 'document',
+          name: 'article',
+          fields: [{type: 'string', name: 'title'}],
+        }),
+      ],
+    }).get('article')
+
+    const docState = {
+      path: [],
+      schemaType: docSchema,
+      members: [
+        {
+          kind: 'field',
+          field: {path: [docSchema.fields[0].name], schemaType: docSchema.fields[0].type},
+        },
+      ],
+    } as any
+    const conditionalMembers = getConditionalMembers(docState)
+
+    expect(conditionalMembers).toEqual([])
+  })
+
+  test('should include path with conditional readonly', () => {
+    const docSchema: ObjectSchemaType = Schema.compile({
+      name: 'test',
+      types: [
+        defineType({
+          type: 'document',
+          name: 'article',
+          fields: [{type: 'string', name: 'title', readOnly: () => false}],
+        }),
+      ],
+    }).get('article')
+
+    const docState = {
+      path: [],
+      schemaType: docSchema,
+      members: [
+        {
+          kind: 'field',
+          field: {path: [docSchema.fields[0].name], schemaType: docSchema.fields[0].type},
+        },
+      ],
+    } as any
+    const conditionalMembers = getConditionalMembers(docState)
+
+    expect(conditionalMembers).toEqual([{path: 'title', hidden: false, readOnly: false}])
+  })
+
+  test('should include array item path with conditional readonly', () => {
+    const docSchema: ObjectSchemaType = Schema.compile({
+      name: 'test',
+      types: [
+        defineType({
+          type: 'document',
+          name: 'article',
+          fields: [{type: 'array', name: 'array', of: [{type: 'string', readOnly: () => true}]}],
+        }),
+      ],
+    }).get('article')
+
+    const docState = {
+      path: [],
+      schemaType: docSchema,
+      members: [
+        {
+          kind: 'field',
+          field: {
+            path: [docSchema.fields[0].name],
+            schemaType: docSchema.fields[0].type,
+            members: [
+              {
+                kind: 'item',
+                item: {
+                  path: [docSchema.fields[0].name, 0],
+                  schemaType: (docSchema.fields[0].type as ArraySchemaType).of[0],
+                  readOnly: true,
+                },
+              },
+            ],
+          },
+        },
+      ],
+    } as any
+    const conditionalMembers = getConditionalMembers(docState)
+
+    expect(conditionalMembers).toEqual([
+      {
+        path: 'array[0]',
+        hidden: false,
+        readOnly: true,
+      },
+    ])
+  })
+
+  test('should include object path with conditional hidden', () => {
+    const docSchema: ObjectSchemaType = Schema.compile({
+      name: 'test',
+      types: [
+        defineType({
+          type: 'document',
+          name: 'article',
+          fields: [
+            defineField({
+              type: 'object',
+              name: 'object',
+              fields: [{type: 'string', name: 'title', hidden: () => false}],
+            }),
+          ],
+        }),
+      ],
+    }).get('article')
+
+    const docState = {
+      path: [],
+      schemaType: docSchema,
+      members: [
+        {
+          kind: 'field',
+          field: {
+            path: [docSchema.fields[0].name],
+            schemaType: docSchema.fields[0].type,
+            members: [
+              {
+                kind: 'field',
+                field: {
+                  path: [docSchema.fields[0].name, 'title'],
+                  schemaType: (docSchema.fields[0].type as ObjectSchemaType).fields[0].type,
+                },
+              },
+            ],
+          },
+        },
+      ],
+    } as any
+    const conditionalMembers = getConditionalMembers(docState)
+
+    expect(conditionalMembers).toEqual([
+      {
+        path: 'object.title',
+        hidden: false,
+        readOnly: false,
+      },
+    ])
+  })
+
+  test('should include path with fieldset with conditional state', () => {
+    const docSchema: ObjectSchemaType = Schema.compile({
+      name: 'test',
+      types: [
+        defineType({
+          type: 'document',
+          name: 'article',
+          fieldsets: [{name: 'set', hidden: () => false}],
+          fields: [{type: 'string', fieldset: 'set', name: 'title'}],
+        }),
+      ],
+    }).get('article')
+
+    const docState = {
+      path: [],
+      schemaType: docSchema,
+      members: [
+        {
+          kind: 'fieldSet',
+          fieldSet: {
+            name: 'set',
+            path: ['set'],
+            members: [
+              {
+                kind: 'field',
+                field: {path: [docSchema.fields[0].name], schemaType: docSchema.fields[0].type},
+              },
+            ],
+          },
+        },
+      ],
+    } as any
+    const conditionalMembers = getConditionalMembers(docState)
+
+    expect(conditionalMembers).toEqual([
+      {
+        path: 'title',
+        hidden: false,
+        readOnly: false,
+      },
+    ])
+  })
+})