@devite/nuxt-sanity 1.5.2 → 1.5.3

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@devite/nuxt-sanity",
   "configKey": "@devite/nuxt-sanity",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "unknown"

package/dist/runtime/components/SanityComponent.vue

@@ -5,7 +5,15 @@
     ref="componentRef"
     v-bind="{ ...$props, ...$attrs }"
   >
-    <slot />
+    <template
+      v-for="(_, slotName) in $slots"
+      #[slotName]="slotProps"
+    >
+      <slot
+        :name="slotName"
+        v-bind="slotProps ?? {}"
+      />
+    </template>
   </component>
 </template>
 
@@ -14,24 +22,28 @@ import type { Component } from '@nuxt/schema'
 import { computed, ref, resolveComponent } from '#imports'
 import { SanityLinkExternal, SanityLinkInternal, SanityRichText } from '#components'
 
-const { data } = defineProps<{ data?: object }>()
+const { data } = defineProps<{ data?: { _type?: string } | Array<{ _type: string }> }>()
 
-const component = computed<Component>(() => {
-  const type = data?._type
+const component = computed<Component | null>(() => {
+  if (Array.isArray(data) && data.every((item) => item._type === 'block')) {
+    return SanityRichText
+  }
+
+  if (data && typeof data === 'object' && '_type' in data) {
+    const type = data._type as string
 
-  switch (type) {
-    case 'linkInternal':
-      return SanityLinkInternal
-    case 'linkExternal':
-      return SanityLinkExternal
-    default:
-      if (data?.constructor.name === 'Array' && data.every((item) => item._type === 'block'))
-        return SanityRichText
-      else if (type) {
+    switch (type) {
+      case 'linkInternal':
+        return SanityLinkInternal
+      case 'linkExternal':
+        return SanityLinkExternal
+      default: {
         const upperCamelCase = type.charAt(0).toUpperCase() + type.slice(1)
+        const resolvedComponent = resolveComponent('Sanity' + upperCamelCase)
 
-        return resolveComponent('Sanity' + upperCamelCase)
+        return resolvedComponent ? (resolvedComponent as Component) : null
       }
+    }
   }
 
   return null

package/dist/runtime/components/SanityRichText.vue

@@ -8,32 +8,26 @@
 <script setup lang="ts">
 import { PortableText, type PortableTextComponents } from '@portabletext/vue'
 import type { RichText } from '@devite/nuxt-sanity'
+import type { PortableTextChild, PortableTextSpan } from '@sanity/types'
 import { computed, h } from '#imports'
 import { SanityLinkExternal, SanityLinkInternal } from '#components'
 
-const { data, placeholders = {} as object } = defineProps<{ data: RichText, placeholders?: object }>()
+const props = defineProps<{ data: RichText, placeholders?: Record<string, string> }>()
 const currentData = computed(() => {
-  return data.map((block) => {
+  return props.data.map((block) => {
     return {
       ...block,
-      children: replaceChildren(block.children),
+      children: replaceChildren(block.children as PortableTextChild[]),
     }
   })
 })
 
-function replaceChildren(children: object[]) {
+function replaceChildren(children: PortableTextChild[]): PortableTextChild[] {
   return children.map((child) => {
     if (child._type === 'span') {
       return {
         ...child,
-        text: replacePlaceholders(child.text),
-      }
-    }
-
-    if (child.children) {
-      return {
-        ...child,
-        children: replaceChildren(child.children),
+        text: replacePlaceholders((child as PortableTextSpan).text),
       }
     }
 
@@ -42,15 +36,17 @@ function replaceChildren(children: object[]) {
 }
 
 function replacePlaceholders(text: string) {
-  return text.replace(/\{\{(.*?)\}\}/g, (match, key) => placeholders[key] || match)
+  return text.replace(/\{\{(.*?)\}\}/g, (match, key) => {
+    if (!props.placeholders || !Object.prototype.hasOwnProperty.call(props.placeholders, key)) return match
+
+    return props.placeholders[key]
+  })
 }
 
 const richTextSerializer: PortableTextComponents = {
   marks: {
-    linkExternal: ({ value }, { slots }) =>
-      h(SanityLinkExternal, { data: value }, slots.default),
-    linkInternal: ({ value }, { slots }) =>
-      h(SanityLinkInternal, { data: value }, slots.default),
+    linkExternal: ({ value }, { slots }) => h(SanityLinkExternal, { data: value }, slots.default),
+    linkInternal: ({ value }, { slots }) => h(SanityLinkInternal, { data: value }, slots.default),
   },
 }
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devite/nuxt-sanity",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Provides additional helper components and utilities for the Nuxt.js Sanity module",
   "repository": "devite-io/nuxt-sanity",
   "license": "MIT",
@@ -39,6 +39,7 @@
     "changelogen": "^0.5.7",
     "eslint": "^9.12.0",
     "nuxt": "^3.13.2",
+    "prettier": "^3.4.2",
     "typescript": "^5.7.2",
     "vitest": "^2.1.8",
     "vue-tsc": "^2.1.10"