fulldev-ui 0.6.0-beta.2 → 0.6.0-beta.3

package/src/layouts/ProductLayout.astro

@@ -2,7 +2,7 @@
 import { getImage } from 'astro:assets'
 import type { CollectionEntry } from 'astro:content'
 import { getCollection, getEntry } from 'astro:content'
-import Products from 'fulldev-ui/blocks/Products.astro'
+import Products1 from 'fulldev-ui/blocks/Products1.astro'
 import CartForm from 'fulldev-ui/components/CartForm.svelte'
 import Element from 'fulldev-ui/components/Element.astro'
 import Gallery from 'fulldev-ui/components/Gallery.astro'
@@ -11,12 +11,17 @@ import List from 'fulldev-ui/components/List.astro'
 import Paragraph from 'fulldev-ui/components/Paragraph.astro'
 import Prose from 'fulldev-ui/components/Prose.astro'
 import Layout from 'fulldev-ui/layouts/Layout.astro'
+import { mergeDeep } from 'remeda'
 
 type Props = CollectionEntry<'products'>
 
-const { render } = Astro.props
-const { title, price, images, description, soldout, categories, variants } =
-  Astro.props.data
+const layout = await getEntry('layouts', 'products')
+const merged = mergeDeep(layout || {}, Astro.props)
+
+const {
+  render,
+  data: { title, price, images, description, soldout, categories, variants },
+} = merged
 
 const slug = Astro.url.pathname.replace(/^\/|\/$/g, '') || 'index'
 const imageId = images?.[0]?.id
@@ -35,7 +40,7 @@ const relatedProducts = await getCollection('products', (product) =>
 const baseLayout = await getEntry('layouts', 'base')
 ---
 
-<Layout {...Astro.props}>
+<Layout {...merged}>
   <Element
     class:list="product"
     as="section"
@@ -49,7 +54,7 @@ const baseLayout = await getEntry('layouts', 'base')
         <Element class:list="product-content">
           <Heading
             as="h1"
-            level={2}
+            size="3xl"
             text={title}
           />
           <Paragraph text={description} />
@@ -65,7 +70,7 @@ const baseLayout = await getEntry('layouts', 'base')
       </Element>
     </Element>
   </Element>
-  <Products
+  <Products1
     heading="Gerelateerde producten"
     products={[...relatedProducts].sort(() => Math.random() - 0.5).slice(0, 6)}
   />

package/src/pages/test.astro

@@ -1,5 +1,11 @@
 ---
+import Hero1 from 'fulldev-ui/blocks/Hero1.astro'
 import Layout from 'fulldev-ui/layouts/Layout.astro'
 ---
 
-<Layout />
+<Layout>
+  <Hero1
+    heading="hello world"
+    class="hoi"
+  />
+</Layout>

package/src/schemas/blocks/banner.ts

@@ -0,0 +1,10 @@
+import { z } from 'astro:content'
+
+export const bannerSchema = z.preprocess(
+  (data: unknown) => (typeof data === 'string' ? { text: data } : data),
+  z.object({
+    text: z.string().optional(),
+  })
+)
+
+export type BannerSchema = z.infer<typeof bannerSchema>

package/src/schemas/blocks/categories.ts

@@ -0,0 +1,14 @@
+import { z } from 'astro:content'
+import { buttonSchema } from 'fulldev-ui/schemas/components/button.ts'
+import { headingSchema } from '../components/heading'
+import pathSchema from '../utils/pathSchema'
+
+export const categoriesSchema = z
+  .object({
+    heading: headingSchema.shape.text,
+    button: buttonSchema.optional(),
+    categories: pathSchema('categories').array().optional(),
+  })
+  .strict()
+
+export type CategoriesSchema = z.infer<typeof categoriesSchema>

package/src/schemas/blocks/contact.ts

@@ -0,0 +1,18 @@
+import { z } from 'astro:content'
+import { headingSchema } from 'fulldev-ui/schemas/components/heading'
+import { taglineSchema } from 'fulldev-ui/schemas/components/tagline'
+import { channelSchema } from '../components/channel'
+import { paragraphSchema } from '../components/paragraph'
+import { socialSchema } from '../components/social'
+
+export const contactSchema = z
+  .object({
+    tagline: taglineSchema.shape.text,
+    heading: headingSchema.shape.text,
+    paragraph: paragraphSchema.shape.text,
+    channels: channelSchema.array().optional(),
+    socials: socialSchema.shape.href.array().optional(),
+  })
+  .strict()
+
+export type ContactSchema = z.infer<typeof contactSchema>

package/src/schemas/blocks/cta.ts

@@ -0,0 +1,18 @@
+import { z } from 'astro:content'
+import { buttonSchema } from 'fulldev-ui/schemas/components/button.ts'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
+import { headingSchema } from '../components/heading'
+import { paragraphSchema } from '../components/paragraph'
+import { taglineSchema } from '../components/tagline'
+
+export const ctaSchema = z
+  .object({
+    tagline: taglineSchema.shape.text,
+    heading: headingSchema.shape.text,
+    paragraph: paragraphSchema.shape.text,
+    buttons: buttonSchema.array().optional(),
+    image: imageSchema.optional(),
+  })
+  .strict()
+
+export type CtaSchema = z.infer<typeof ctaSchema>

package/src/schemas/blocks/feature.ts

@@ -0,0 +1,18 @@
+import { z } from 'astro:content'
+import { buttonSchema } from 'fulldev-ui/schemas/components/button.ts'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
+import { headingSchema } from '../components/heading'
+import { paragraphSchema } from '../components/paragraph'
+import { taglineSchema } from '../components/tagline'
+
+export const featureSchema = z
+  .object({
+    tagline: taglineSchema.shape.text,
+    heading: headingSchema.shape.text,
+    paragraph: paragraphSchema.shape.text,
+    buttons: buttonSchema.array().optional(),
+    image: imageSchema.optional(),
+  })
+  .strict()
+
+export type FeatureSchema = z.infer<typeof featureSchema>

package/src/schemas/blocks/hero.ts

@@ -0,0 +1,20 @@
+import { z } from 'astro:content'
+import { badgeSchema } from 'fulldev-ui/schemas/components/badge.ts'
+import { buttonSchema } from 'fulldev-ui/schemas/components/button.ts'
+import { headingSchema } from 'fulldev-ui/schemas/components/heading'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
+import { taglineSchema } from 'fulldev-ui/schemas/components/tagline'
+import { paragraphSchema } from '../components/paragraph'
+
+export const heroSchema = z
+  .object({
+    badge: badgeSchema.optional(),
+    tagline: taglineSchema.shape.text,
+    heading: headingSchema.shape.text,
+    paragraph: paragraphSchema.shape.text,
+    buttons: buttonSchema.array().optional(),
+    image: imageSchema.optional(),
+  })
+  .strict()
+
+export type HeroSchema = z.infer<typeof heroSchema>

package/src/schemas/blocks/intro.ts

@@ -0,0 +1,16 @@
+import { z } from 'astro:content'
+import { buttonSchema } from 'fulldev-ui/schemas/components/button.ts'
+import { headingSchema } from 'fulldev-ui/schemas/components/heading'
+import { taglineSchema } from 'fulldev-ui/schemas/components/tagline'
+import { paragraphSchema } from '../components/paragraph'
+
+export const introSchema = z
+  .object({
+    tagline: taglineSchema.shape.text,
+    heading: headingSchema.shape.text,
+    paragraph: paragraphSchema.shape.text,
+    buttons: buttonSchema.array().optional(),
+  })
+  .strict()
+
+export type IntroSchema = z.infer<typeof introSchema>

package/src/schemas/blocks/products.ts

@@ -0,0 +1,14 @@
+import { z } from 'astro:content'
+import { buttonSchema } from 'fulldev-ui/schemas/components/button.ts'
+import { headingSchema } from 'fulldev-ui/schemas/components/heading'
+import pathSchema from '../utils/pathSchema'
+
+export const productsSchema = z
+  .object({
+    heading: headingSchema.shape.text,
+    button: buttonSchema.optional(),
+    products: pathSchema('products').array().optional(),
+  })
+  .strict()
+
+export type ProductsSchema = z.infer<typeof productsSchema>

package/src/schemas/categorySchema.ts

@@ -1,15 +1,15 @@
 import { z } from 'astro:content'
-import categories from 'fulldev-ui/schemas/fields/categories'
-import description from 'fulldev-ui/schemas/fields/description'
-import image from 'fulldev-ui/schemas/fields/image'
-import title from 'fulldev-ui/schemas/fields/title'
+import { headSchema } from 'fulldev-ui/schemas/components/head.ts'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
+import pathSchema from 'fulldev-ui/schemas/utils/pathSchema.ts'
 
 export const categorySchema = z
   .object({
-    title,
-    description,
-    image,
-    categories,
+    title: z.string().optional(),
+    description: z.string().optional(),
+    image: imageSchema.optional(),
+    categories: pathSchema('categories').array().optional(),
+    head: headSchema.optional(),
   })
   .strict()
 

package/src/schemas/components/avatar.ts

@@ -1,3 +1,6 @@
 import { z } from 'astro:content'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
 
-export default z.string()
+export const avatarSchema = imageSchema
+
+export type AvatarSchema = z.infer<typeof avatarSchema>

package/src/schemas/components/badge.ts

@@ -1,13 +1,18 @@
 import { z } from 'astro:content'
-import pathSchema from '../utils/pathSchema'
+import { iconSchema } from './icon'
 
-export default pathSchema('pages').or(
-  z
-    .object({
-      text: z.string(),
-      href: z.string(),
-      icon: z.string(),
-    })
-    .partial()
-    .passthrough()
-)
+export const badgeSchema = z
+  .object({
+    icon: iconSchema.shape.name,
+    text: z.string().optional(),
+    href: z.string().optional(),
+    target: z.literal('_blank').optional(),
+    size: z.enum(['sm', 'md', 'lg']).default('md').optional(),
+    variant: z
+      .enum(['primary', 'secondary', 'outline', 'ghost'])
+      .default('outline')
+      .optional(),
+  })
+  .strict()
+
+export type BadgeSchema = z.infer<typeof badgeSchema>

package/src/schemas/components/block.ts

@@ -0,0 +1,18 @@
+import { z } from 'astro:content'
+import { categoriesSchema } from 'fulldev-ui/schemas/blocks/categories'
+import { ctaSchema } from 'fulldev-ui/schemas/blocks/cta'
+import { featureSchema } from 'fulldev-ui/schemas/blocks/feature'
+import { heroSchema } from 'fulldev-ui/schemas/blocks/hero'
+import { productsSchema } from 'fulldev-ui/schemas/blocks/products'
+import { headerSchema } from './header'
+
+const _block = { _block: z.string() }
+
+export const blockSchema = z.union([
+  heroSchema.extend(_block),
+  ctaSchema.extend(_block),
+  featureSchema.extend(_block),
+  productsSchema.extend(_block),
+  categoriesSchema.extend(_block),
+  headerSchema.extend(_block),
+])

package/src/schemas/components/button.ts

@@ -1,24 +1,18 @@
 import { z } from 'astro:content'
-import pathSchema from '../utils/pathSchema'
-import globalSchema from './global'
+import { iconSchema } from './icon'
 
 export const buttonSchema = z
-  .union([pathSchema('pages'), z.object({}).passthrough()])
-  .pipe(
-    globalSchema
-      .extend({
-        slug: z
-          .string()
-          .refine(async (data) => await pathSchema('pages').parseAsync(data)),
-        text: z.string(),
-        href: z.string(),
-        icon: z.string(),
-      })
-      .partial()
-      .passthrough()
-      .merge(globalSchema)
-  )
+  .object({
+    icon: iconSchema.shape.name,
+    text: z.string().optional(),
+    href: z.string().optional(),
+    target: z.literal('_blank').optional(),
+    size: z.enum(['sm', 'md', 'lg']).default('md').optional(),
+    variant: z
+      .enum(['primary', 'secondary', 'outline', 'ghost'])
+      .default('primary')
+      .optional(),
+  })
+  .strict()
 
 export type ButtonSchema = z.infer<typeof buttonSchema>
-
-export default buttonSchema

package/src/schemas/components/channel.ts

@@ -1,13 +1,19 @@
 import { z } from 'astro:content'
-import heading from './heading'
-import icon from './icon'
-import text from './text'
+import { headingSchema } from './heading'
+import { iconSchema } from './icon'
 
-export default z
+export const channelSchema = z
   .object({
-    heading,
-    text,
-    icon,
-    href: z.string(),
+    icon: iconSchema.shape.name,
+    heading: headingSchema.shape.text,
+    text: z.string().optional(),
+    href: z.string().optional(),
+    size: z.enum(['sm', 'md', 'lg']).default('md').optional(),
+    variant: z
+      .enum(['primary', 'secondary', 'outline', 'ghost'])
+      .default('secondary')
+      .optional(),
   })
-  .partial()
+  .strict()
+
+export type ChannelSchema = z.infer<typeof channelSchema>

package/src/schemas/components/footer.ts

@@ -1,18 +1,19 @@
 import { z } from 'astro:content'
-import channels from './channels'
-import logo from './logo'
-import menu from './menu'
-import socials from './socials'
-import text from './text'
+import { channelSchema } from 'fulldev-ui/schemas/components/channel.ts'
+import { logoSchema } from 'fulldev-ui/schemas/components/logo.ts'
+import { menuSchema } from 'fulldev-ui/schemas/components/menu.ts'
+import { headingSchema } from './heading'
+import { paragraphSchema } from './paragraph'
 
-export default z
+export const footerSchema = z
   .object({
-    logo,
-    text,
-    socials,
-    channels,
-    menu,
+    logo: logoSchema.optional(),
+    heading: headingSchema.shape.text,
+    paragraph: paragraphSchema.shape.text,
+    socials: z.string().url().array().optional(),
+    channels: channelSchema.array().optional(),
+    menus: menuSchema.array().optional(),
   })
-  .partial()
-  .passthrough()
-  .optional()
+  .strict()
+
+export type FooterSchema = z.infer<typeof footerSchema>

package/src/schemas/components/head.ts

@@ -0,0 +1,17 @@
+import { z } from 'astro:content'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
+
+export const headSchema = z
+  .object({
+    title: z.string().optional(),
+    description: z.string().optional(),
+    image: imageSchema.optional(),
+    theme: z.enum(['light', 'dark', 'system']).default('light').optional(),
+    favicon: z.string().optional(),
+    company: z.string().optional(),
+    scripts: z.string().array().optional(),
+    code: z.string().optional(),
+  })
+  .strict()
+
+export type HeadSchema = z.infer<typeof headSchema>

package/src/schemas/components/header.ts

@@ -1,20 +1,23 @@
 import { z } from 'astro:content'
-import buttons from './buttons'
-import links from './links'
-import logo from './logo'
-import menu from './menu'
-import subheader from './subheader'
-import themer from './themer'
+import { buttonSchema } from 'fulldev-ui/schemas/components/button.ts'
+import { linkSchema } from 'fulldev-ui/schemas/components/link.ts'
+import { logoSchema } from 'fulldev-ui/schemas/components/logo.ts'
+import { menuSchema } from 'fulldev-ui/schemas/components/menu.ts'
+import { headingSchema } from './heading'
+import { socialSchema } from './social'
 
-export default z
+export const headerSchema = z
   .object({
-    themer,
-    subheader,
-    logo,
-    buttons,
-    links,
-    menu,
+    logo: logoSchema.optional(),
+    heading: headingSchema.shape.text,
+    links: linkSchema.array().optional(),
+    socials: socialSchema.shape.href.array().optional(),
+    buttons: buttonSchema.array().optional(),
+    menus: menuSchema.array().optional(),
+    themer: z.boolean().optional(),
+    cart: z.boolean().optional(),
+    search: z.boolean().optional(),
   })
-  .partial()
-  .passthrough()
-  .optional()
+  .strict()
+
+export type HeaderSchema = z.infer<typeof headerSchema>

package/src/schemas/components/heading.ts

@@ -1,3 +1,9 @@
 import { z } from 'astro:content'
 
-export default z.string()
+export const headingSchema = z
+  .object({
+    text: z.string().optional(),
+  })
+  .strict()
+
+export type HeadingSchema = z.infer<typeof headingSchema>

package/src/schemas/components/icon.ts

@@ -1,3 +1,9 @@
 import { z } from 'astro:content'
 
-export default z.string()
+export const iconSchema = z
+  .object({
+    name: z.string().optional(),
+  })
+  .strict()
+
+export type IconSchema = z.infer<typeof iconSchema>

package/src/schemas/components/image.ts

@@ -7,17 +7,20 @@ const imagePath = z.preprocess((data: unknown) => {
   return data
 }, reference('images'))
 
-export default z.union([imagePath, z.object({}).passthrough()]).pipe(
-  z
-    .object({
-      id: z
-        .string()
-        .refine(async (data) => await reference('images').parseAsync(data)),
-      src: z.string(),
-      alt: z.string(),
-      width: z.number(),
-      height: z.number(),
-    })
-    .partial()
-    .passthrough()
-)
+export const imageSchema = z
+  .union([imagePath, z.object({}).passthrough()])
+  .pipe(
+    z
+      .object({
+        id: z
+          .string()
+          .refine(async (data) => await reference('images').parseAsync(data)),
+        src: z.string(),
+        alt: z.string(),
+        width: z.number(),
+        height: z.number(),
+      })
+      .partial()
+      .passthrough()
+  )
+  .optional()

package/src/schemas/components/link.ts

@@ -1,23 +1,17 @@
 import { z } from 'astro:content'
 
-// export default z.union([pathSchema('pages'), z.object({}).passthrough()]).pipe(
-//   z
-//     .object({
-//       slug: z
-//         .string()
-//         .refine(async (data) => await pathSchema('pages').parseAsync(data)),
-//       text: z.string(),
-//       href: z.string(),
-//       icon: z.string(),
-//     })
-//     .partial()
-//     .passthrough()
-// )
-
-export default z
+export const linkSchema = z
   .object({
     text: z.string().optional(),
     href: z.string().optional(),
+    icon: z.string().optional(),
+    target: z.literal('_blank').optional(),
+    size: z.enum(['sm', 'md', 'lg']).default('md').optional(),
+    variant: z
+      .enum(['primary', 'underline', 'muted'])
+      .default('primary')
+      .optional(),
   })
   .strict()
-  .optional()
+
+export type LinkSchema = z.infer<typeof linkSchema>

package/src/schemas/components/logo.ts

@@ -1,3 +1,13 @@
-import image from './image'
+import { z } from 'astro:content'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
 
-export default image
+export const logoSchema = z
+  .object({
+    image: imageSchema,
+    text: z.string().optional(),
+    href: z.string().optional(),
+    size: z.enum(['sm', 'md', 'lg']).default('md').optional(),
+  })
+  .strict()
+
+export type LogoSchema = z.infer<typeof logoSchema>

package/src/schemas/components/menu.ts

@@ -1,15 +1,13 @@
 import { z } from 'astro:content'
-import buttons from './buttons'
-import heading from './heading'
-import links from './links'
+import { linkSchema } from 'fulldev-ui/schemas/components/link.ts'
+import { headingSchema } from './heading'
 
-export default z.array(
-  z
-    .object({
-      heading,
-      buttons,
-      links,
-    })
-    .partial()
-    .passthrough()
-)
+export const menuSchema = z
+  .object({
+    heading: headingSchema.shape.text,
+    href: z.string().optional(),
+    links: linkSchema.array().optional(),
+  })
+  .strict()
+
+export type MenuSchema = z.infer<typeof menuSchema>

package/src/schemas/components/navigation.ts

@@ -0,0 +1,10 @@
+import { z } from 'astro:content'
+import { headerSchema } from './header'
+import { sidebarSchema } from './sidebar'
+
+export const navigationSchema = headerSchema.merge(sidebarSchema).extend({
+  header: z.boolean().optional(),
+  sidebar: z.boolean().optional(),
+})
+
+export type NavigationSchema = z.infer<typeof navigationSchema>

package/src/schemas/components/paragraph.ts

@@ -0,0 +1,9 @@
+import { z } from 'astro:content'
+
+export const paragraphSchema = z
+  .object({
+    text: z.string().optional(),
+  })
+  .strict()
+
+export type ParagraphSchema = z.infer<typeof paragraphSchema>

package/src/schemas/components/price.ts

@@ -0,0 +1,9 @@
+import { z } from 'astro:content'
+
+export const priceSchema = z
+  .object({
+    amount: z.number().optional(),
+  })
+  .strict()
+
+export type PriceSchema = z.infer<typeof priceSchema>