fulldev-ui 0.3.0-beta.1 → 0.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fulldev-ui",
-  "version": "0.3.0-beta.1",
+  "version": "0.3.0-beta.2",
   "description": "A component library built for Astro",
   "homepage": "https://ui.full.dev",
   "bugs": "https://github.com/fulldotdev/ui/issues",

package/src/components/_Block.astro

@@ -1,8 +1,6 @@
 ---
-import Component from '../_Component.astro'
-
 interface Props {
-  block?: string
+  _block?: string
   [key: string | number | symbol]: any
 }
 
@@ -10,13 +8,18 @@ const libraryComponents = await Astro.glob('../**/*.astro')
 const userComponents = await Astro.glob('/src/**/*.astro')
 const components = [...userComponents, ...libraryComponents]
 
-const { block, ...rest } = Astro.props
+const { _block, ...rest } = Astro.props
 
 const Component = components.find((component) => {
   const fileName = component.default.moduleId?.split('/').pop()
   const componentName = fileName?.split('.')[0]
-  return componentName === block
+  return componentName === _block
 })?.default
+
+console.log({
+  _block,
+  Component,
+})
 ---
 
 {Component && <Component {...rest} />}

package/src/components/_Blocks.astro

@@ -1,26 +1,11 @@
 ---
-import { pascal } from 'radash'
 import Block from './_Block.astro'
 
 interface Props {
-  [key: string | number | symbol]: {
-    block?: string
-    [key: string | number | symbol]: any
-  }
+  blocks?: any
 }
----
 
-{
-  Object.entries(Astro.props).map(([key, value]) => {
-    const { block, ...rest } = value
-    const keyPart = key.split(/(?=[A-Z])/).pop()
-    const keyBlock = keyPart ? pascal(keyPart) : ''
+const { blocks } = Astro.props
+---
 
-    return (
-      <Block
-        block={block ?? keyBlock}
-        {...rest}
-      />
-    )
-  })
-}
+{blocks?.map((block: any) => <Block {...block} />)}

package/src/schemas/collection.ts

@@ -60,7 +60,8 @@ export const pageSchema = <R extends ZodRawShape>(references: R) =>
       title: z.string(),
       description: z.string(),
       block: blockSchema(references),
-      blocks: z.object({}).catchall(blockSchema(references)).partial(),
+      blocks: blockSchema(references).array(),
+      main: z.object({}).catchall(blockSchema(references)).partial(),
       head: z
         .object({
           title: z.string(),