feat: send props to renderer

Flowko · Flowko · commit 4446dc968369 · 2024-02-02T09:47:47.000+01:00
diff --git a/client/components/CodeContainer.vue b/client/components/CodeContainer.vue
@@ -6,7 +6,7 @@ defineEmits(['setlang'])
 
 const toast = useToast()
 const { editorCode } = useTool()
-const { template, email } = useEmail()
+const { template, email, props, renderEmail } = useEmail()
 
 function handleDownload(lang: 'html' | 'txt' | 'vue') {
   const content = template.value[lang]
@@ -58,6 +58,11 @@ const items = computed(() => {
         icon: 'i-ph-text-t-duotone',
         code: template.value.txt,
       },
+      {
+        key: 'props',
+        label: 'Props',
+        icon: 'i-ph-code-duotone',
+      },
     ]
   }
   else if (editorCode.value.id === 'html') {
@@ -102,7 +107,7 @@ const tab = ref(0)
         <UIcon :name="item.icon" class="w-7 h-7 flex-shrink-0" />
 
         <span class="truncate">{{ item.label }}</span>
-        <template v-if="selected">
+        <template v-if="selected && item.code">
           <UTooltip text="Copy to clipboard">
             <UButton class="ml-6" icon="i-ph-copy-duotone" size="xs" square color="gray" variant="solid" @click="handleClipboard(item.key)" />
           </UTooltip>
@@ -116,7 +121,18 @@ const tab = ref(0)
     </template>
 
     <template #item="{ item }">
-      <div class="w-full h-full" v-html="highlight(item.code, item.key)" />
+      <div v-if="item.code" class="w-full h-full" v-html="highlight(item.code, item.key)" />
+      <div v-else-if="item.key === 'props'" class="w-full h-full">
+        <UContainer class="py-5 flex flex-col gap-y-4">
+          <template v-for="(prop, idx) in props" :key="idx">
+            <UFormGroup v-if="prop.type === 'string'" :label="prop.label" :description="prop.description">
+              <UInput v-model="prop.value" type="text" />
+            </UFormGroup>
+
+            <UButton label="Update" @click="renderEmail()" />
+          </template>
+        </UContainer>
+      </div>
     </template>
   </UTabs>
 </template>
diff --git a/client/composables/shiki.ts b/client/composables/shiki.ts
@@ -1,5 +1,5 @@
-import type { Highlighter } from 'shikiji'
-import { getHighlighter } from 'shikiji'
+import type { Highlighter } from 'shiki'
+import { getHighlighter } from 'shiki'
 import { ref } from 'vue'
 
 export const shiki = ref<Highlighter>()
diff --git a/client/composables/useEmail.ts b/client/composables/useEmail.ts
@@ -1,17 +1,39 @@
 import pretty from 'pretty'
 import type { Result } from '@vue-email/compiler'
-import type { Email } from '@/types/email'
+import { upperFirst } from 'scule'
+import type { Email, Template } from '@/types/email'
+
+function removeQuotes(inputString: any) {
+  // Check if the input is a string and has at least two characters
+  if (typeof inputString === 'string' && inputString.length >= 2) {
+    // Check if the string starts and ends with double quotes
+    if (inputString[0] === '"' && inputString[inputString.length - 1] === '"') {
+      // Remove the quotes and return the modified string
+      return inputString.slice(1, -1)
+    }
+    else {
+      // If the string doesn't have quotes at the start and end, return the original string
+      return inputString
+    }
+  }
+  else {
+    // If the input is not a valid string, return an empty string or handle it accordingly
+    return ''
+  }
+}
 
 export function useEmail() {
   const emails = useState<Email[]>('emails')
   const email = useState<Email>('email')
   const sending = useState<boolean>('sending', () => false)
   const refresh = useState<boolean>('refresh', () => false)
-  const template = useState<{
-    vue: string
-    html: string
-    txt: string
-  }>('template')
+  const template = useState<Template>('template')
+  const props = useState<{
+    label: string
+    value: any
+    type: string
+    description?: string
+  }[]>('props')
 
   const { host } = useWindow()
 
@@ -34,18 +56,20 @@ export function useEmail() {
       return null
 
     const { data } = await useFetch<Result>(`/api/render/${email.value.filename}`, {
+      method: 'POST',
       baseURL: host.value,
+      body: {
+        props: props.value,
+      },
     })
 
     if (data.value) {
-      return {
+      template.value = {
         vue: email.value.content,
         html: pretty(data.value.html),
         txt: data.value.text,
-      }
+      } as Template
     }
-
-    return null
   }
 
   const getEmail = async (filename: string) => {
@@ -54,11 +78,39 @@ export function useEmail() {
 
       if (found) {
         email.value = found
-
-        await renderEmail().then((value) => {
-          if (value)
-            template.value = value
-        })
+        try {
+          if (found.props) {
+            props.value = found.props.map((prop) => {
+              const value = removeQuotes(prop.default) || ''
+              const destructuredType = prop.type.split('|').map((type) => {
+                if (type === 'string')
+                  return 'string'
+
+                if (type === 'number')
+                  return 'number'
+
+                if (type === 'boolean')
+                  return 'boolean'
+
+                if (type === 'object')
+                  return 'object'
+
+                return 'string'
+              })
+
+              return {
+                label: upperFirst(prop.name),
+                type: destructuredType[0],
+                value,
+              }
+            })
+          }
+        }
+        catch (error) {
+          console.error(error)
+        }
+
+        await renderEmail()
       }
     }
   }
@@ -119,6 +171,7 @@ export function useEmail() {
     sending,
     refresh,
     template,
+    props,
     getEmail,
     sendTestEmail,
     renderEmail,
diff --git a/client/emails/code-components.vue b/client/emails/code-components.vue
@@ -15,7 +15,7 @@ const box = {
   padding: '0 48px',
 }
 
-const code = `import { codeToThemedTokens } from 'shikiji'
+const code = `import { codeToThemedTokens } from 'shiki'
 
 const tokens = await codeToThemedTokens('<div class="foo">bar</div>', {
   lang: 'html',
diff --git a/client/package.json b/client/package.json
@@ -26,7 +26,7 @@
     "nuxt": "^3.9.3",
     "pretty": "^2.0.0",
     "scule": "^1.2.0",
-    "shikiji": "^0.9.19",
+    "shiki": "^1.0.0-beta.3",
     "splitpanes": "^3.1.5",
     "vue-component-meta": "^1.8.27"
   }
diff --git a/client/pages/email/[file].vue b/client/pages/email/[file].vue
@@ -4,12 +4,12 @@ const route = useRoute()
 const { getEmail, template } = useEmail()
 const { horizontalSplit, previewMode } = useTool({
   async onReload() {
-    await getEmail(`${route.params.file}`)
+    await getEmail(route.params.file as string)
   },
 })
 
 onMounted(async () => {
-  await getEmail(`${route.params.file}`)
+  await getEmail(route.params.file as string)
 })
 
 const showBoth = computed(() => previewMode.value.id === 'both')
diff --git a/client/server/api/render/[file].post.ts b/client/server/api/render/[file].post.ts
@@ -4,9 +4,20 @@ import { createError, defineEventHandler } from '#imports'
 export default defineEventHandler(async (event: any) => {
   try {
     const file = event.context.params && event.context.params.file ? event.context.params.file : null
+    const body = await readBody(event)
+
+    let props: any = null
+    if (body && body.props) {
+      props = body.props.reduce((acc: Record<string, any>, prop: any) => {
+        acc[prop.label.toLowerCase()] = prop.value
+        return acc
+      }, {})
+    }
 
     // TODO: pass props to template
-    const template = await useCompiler(file)
+    const template = await useCompiler(file, {
+      props,
+    })
 
     if (!template) {
       throw createError({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ const box = {`
`15`	`15`	`padding: '0 48px',`
`16`	`16`	`}`
`17`	`17`
`18`		-const code = `import { codeToThemedTokens } from 'shikiji'
	`18`	+const code = `import { codeToThemedTokens } from 'shiki'
`19`	`19`
`20`	`20`	`const tokens = await codeToThemedTokens('<div class="foo">bar</div>', {`
`21`	`21`	`lang: 'html',`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"nuxt": "^3.9.3",`
`27`	`27`	`"pretty": "^2.0.0",`
`28`	`28`	`"scule": "^1.2.0",`
`29`		`- "shikiji": "^0.9.19",`
	`29`	`+ "shiki": "^1.0.0-beta.3",`
`30`	`30`	`"splitpanes": "^3.1.5",`
`31`	`31`	`"vue-component-meta": "^1.8.27"`
`32`	`32`	`}`