polen 0.11.0-next.16 → 0.11.0-next.17

package/src/template/components/VersionPicker.tsx

@@ -1,6 +1,8 @@
 import { Api } from '#api/iso'
 import type { React } from '#dep/react/index'
+import { Catalog } from '#lib/catalog/$'
 import { Version } from '#lib/version/$'
+import { HashMap, Option } from 'effect'
 import { useNavigate } from 'react-router'
 import { schemasCatalog } from 'virtual:polen/project/schemas'
 import { useReferencePath } from '../hooks/useReferencePath.js'
@@ -33,12 +35,17 @@ export const VersionPicker: React.FC<Props> = ({ data, current }) => {
 
       // Find the schema for the target version
       // Note: newVersion is a string that we need to parse
-      const targetSchema = catalog.entries.find(schema => Version.encodeSync(schema.version) === newVersion)
+      const targetSchemaOption = Option.map(
+        HashMap.findFirst(catalog.entries, (_, key) => Version.encodeSync(key) === newVersion),
+        ([, value]) => value,
+      )
 
-      if (!targetSchema) {
+      if (Option.isNone(targetSchemaOption)) {
         throw new Error(`Version ${newVersion} not found`)
       }
 
+      const targetSchema = Option.getOrThrow(targetSchemaOption)
+
       // Find fallback path if needed
       const fallbackPath = Api.Schema.Validation.findFallbackPath(targetSchema.definition, currentPath)
       // Get redirect description if path changed

package/src/template/components/home/FeaturesGrid.tsx

@@ -80,7 +80,7 @@ function getDefaultFeatures(): Feature[] {
   if (schemasCatalog) {
     try {
       // Get the latest schema from the catalog
-      const latestSchema = Catalog.getLatestSchema(schemasCatalog)
+      const latestSchema = Catalog.getLatest(schemasCatalog)
 
       if (latestSchema && latestSchema.definition) {
         // Build stats from the schema definition

package/src/template/components/home/HeroSection.tsx

@@ -84,7 +84,7 @@ export const Hero: React.FC<HeroProps> = ({
   let schemaStats = null
   if (schemasCatalog) {
     try {
-      const latestSchema = Catalog.getLatestSchema(schemasCatalog)
+      const latestSchema = Catalog.getLatest(schemasCatalog)
       if (latestSchema && latestSchema.definition) {
         const versionStats = CatalogStatistics.analyzeSchema(latestSchema.definition, 'current')
         schemaStats = {

package/src/template/components/home/RecentChanges.tsx

@@ -3,6 +3,8 @@ import * as React from 'react'
 import { Link } from 'react-router'
 import { schemasCatalog } from 'virtual:polen/project/schemas'
 
+import { Catalog } from '#lib/catalog'
+
 interface RecentChangesProps {
   limit?: number
   showVersions?: boolean
@@ -30,7 +32,7 @@ export const RecentChangesSection: React.FC<RecentChangesProps> = ({
 
     // For versioned catalogs, we look at entries
     if (schemasCatalog._tag === 'CatalogVersioned') {
-      const entries = schemasCatalog.entries || []
+      const entries = Catalog.Versioned.getAll(schemasCatalog)
       const recentEntries = entries.slice(0, limit)
 
       return recentEntries.flatMap(entry =>

package/src/template/routes/changelog.tsx

@@ -6,7 +6,7 @@ import { Revision } from '#lib/revision'
 import { Swiss } from '#lib/swiss'
 import { Version } from '#lib/version'
 import { Box, Flex, Text } from '@radix-ui/themes'
-import { Effect } from 'effect'
+import { Effect, HashMap, Option } from 'effect'
 import React, { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'react-router'
 import { schemasCatalog } from 'virtual:polen/project/schemas'
@@ -136,7 +136,7 @@ const Component = () => {
   // Get available versions if catalog is versioned
   const availableVersions = useMemo(() => {
     if (Catalog.Versioned.is(catalog)) {
-      return catalog.entries.map(entry => Version.encodeSync(entry.version))
+      return Catalog.Versioned.getVersions(catalog).map(Version.encodeSync)
     }
     return []
   }, [catalog])
@@ -148,8 +148,14 @@ const Component = () => {
     } else {
       // For versioned catalogs, show only current version's revisions
       if (urlVersion) {
-        const entry = catalog.entries.find(e => Version.encodeSync(e.version) === urlVersion)
-        return entry ? entry.revisions : []
+        const entryOption = Option.map(
+          HashMap.findFirst(catalog.entries, (_, key) => Version.encodeSync(key) === urlVersion),
+          ([, value]) => value,
+        )
+        return Option.match(entryOption, {
+          onNone: () => [],
+          onSome: (entry) => entry.revisions,
+        })
       }
       // No revisions if no version selected (will redirect)
       return []

package/src/template/routes/examples/_index.tsx

@@ -36,7 +36,7 @@ export const loader = async () => {
 
 const Component = () => {
   const examplesCatalog = useLoaderData(IndexSchema)
-  const schema = schemasCatalog && Catalog.getLatestSchema(schemasCatalog).definition
+  const schema = schemasCatalog && Catalog.getLatest(schemasCatalog).definition
   const hasExamples = examplesCatalog && examplesCatalog.examples.length > 0
 
   // TODO: This should become a proper diagnostic viewer component that displays

package/src/template/routes/reference.tsx

@@ -6,10 +6,10 @@ import { S } from '#lib/kit-temp/effect'
 import { Lifecycles } from '#lib/lifecycles/$'
 import { route, useLoaderData } from '#lib/react-router-effect/react-router-effect'
 import { Schema } from '#lib/schema/$'
-import { Swiss } from '#lib/swiss'
 import { Version } from '#lib/version/$'
 import { Flex } from '@radix-ui/themes'
 import { neverCase } from '@wollybeard/kit/language'
+import { HashMap, Option } from 'effect'
 import { Effect, Match } from 'effect'
 import React from 'react'
 import { useParams } from 'react-router'
@@ -49,15 +49,15 @@ const referenceLoader = ({ params }: any) => {
             // If version param provided, find that specific version
             if (params.version) {
               const requestedVersion = Version.decodeSync(params.version)
-              const found = c.entries.find(s => Version.equivalence(requestedVersion, s.version))
-              if (!found) {
+              const foundOption = HashMap.get(c.entries, requestedVersion)
+              if (Option.isNone(foundOption)) {
                 // TODO: Return 404 error
                 throw new Error(`Version ${params.version} not found`)
               }
-              return found
+              return Option.getOrThrow(foundOption)
             }
             // No version param means "latest" - use the last entry
-            const latest = c.entries[c.entries.length - 1]
+            const latest = Catalog.Versioned.getLatestOrThrow(c)
             if (!latest) {
               throw new Error('No schemas available in versioned catalog')
             }
@@ -161,7 +161,7 @@ const ReferenceView = () => {
           return catalog._tag === 'CatalogVersioned' && version
             ? (
               <VersionPicker
-                data={catalog.entries.map(entry => entry.version)}
+                data={Catalog.Versioned.getVersions(catalog)}
                 current={version}
               />
             )

package/src/vite/plugins/navbar.ts

@@ -59,7 +59,7 @@ export const Navbar = ({
             const hasMultipleRevisions = Catalog.fold(
               (versioned) => {
                 // For versioned catalogs, count total revisions across all entries
-                const totalRevisions = versioned.entries.reduce(
+                const totalRevisions = Catalog.Versioned.getAll(versioned).reduce(
                   (sum: number, entry) => sum + entry.revisions.length,
                   0,
                 )

package/src/vite/plugins/routes-manifest.ts

@@ -100,7 +100,7 @@ function processVersionedCatalog(
   catalog: Catalog.Versioned.Versioned,
   routes: string[],
 ): void {
-  for (const schema of catalog.entries) {
+  for (const schema of Catalog.Versioned.getAll(catalog)) {
     const version = schema.version
     routes.push(`/reference/version/${version}`)