polen 0.11.0-next.1 → 0.11.0-next.10

package/src/api/static/manifest.ts

@@ -5,7 +5,7 @@ export const PolenBuildManifestSchema = z.object({
   type: z.enum([`ssg`, `ssr`]),
   version: z.string(),
   basePath: z.string(),
-}).loose()
+})
 
 export type PolenBuildManifest = z.infer<typeof PolenBuildManifestSchema>
 

package/src/api/vite/plugins/build.ts

@@ -75,6 +75,9 @@ export const Build = (config: Config.Config): Vite.Plugin[] => {
           // @see https://github.com/vitejs/vite/issues/20098
           ssr: {
             noExternal: true,
+            // Exclude lightningcss from bundling due to native bindings
+            // @see https://github.com/parcel-bundler/lightningcss/issues/701
+            external: ['lightningcss'],
           },
           environments: {
             ssr: {

package/src/api/vite/plugins/core.ts

@@ -35,15 +35,15 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
 
   const readSchema = async () => {
     if (schemaCache === null) {
-      const schema = await Schema.readOrThrow({
+      const schemaResult = await Schema.readOrThrow({
         ...config.schema,
         projectRoot: config.paths.project.rootDir,
       })
       // todo: augmentations scoped to a version
-      schema?.forEach(version => {
+      schemaResult.data?.forEach(version => {
         SchemaAugmentation.apply(version.after, config.schemaAugmentations)
       })
-      schemaCache = schema
+      schemaCache = schemaResult
     }
     return schemaCache
   }
@@ -166,8 +166,8 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
             const debug = debugPolen.sub(`module-project-schema`)
             debug(`load`, { id: viProjectSchema.id })
 
-            const schema = await readSchema()
-            return superjson.stringify(schema)
+            const schemaResult = await readSchema()
+            return superjson.stringify(schemaResult.data)
           },
         },
         {
@@ -191,18 +191,18 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
 
             debug(`load`, { id: viProjectData.id })
 
-            const schema = await readSchema()
+            const schemaResult = await readSchema()
 
             const navbar = []
 
             // ━ Schema presence causes adding some navbar items
-            if (schema) {
+            if (schemaResult.data) {
               // IMPORTANT: Always ensure paths start with '/' for React Router compatibility.
               // Without the leading slash, React Router treats paths as relative, which causes
               // hydration mismatches between SSR (where base path is prepended) and client
               // (where basename is configured). This ensures consistent behavior.
               navbar.push({ pathExp: `/reference`, title: `Reference` })
-              if (schema.length > 1) {
+              if (schemaResult.data.length > 1) {
                 navbar.push({ pathExp: `/changelog`, title: `Changelog` })
               }
             }

package/src/api/vite/plugins/main.ts

@@ -2,9 +2,8 @@ import type { Config } from '#api/config/index'
 import type { Vite } from '#dep/vite/index'
 import { vitePluginSsrCss } from '@hiogawa/vite-plugin-ssr-css'
 import ViteReact from '@vitejs/plugin-react-oxc'
-import { Arr, Path } from '@wollybeard/kit'
+import { Path } from '@wollybeard/kit'
 import Inspect from 'vite-plugin-inspect'
-import Restart from 'vite-plugin-restart'
 import { Branding } from './branding.js'
 import { Build } from './build.js'
 import { Core } from './core.js'
@@ -26,13 +25,6 @@ export const Main = (
     plugins.push(plugin)
   }
 
-  if (Arr.isntEmpty(config.watch.also)) {
-    const plugin = Restart({
-      restart: config.watch.also,
-    })
-    plugins.push(plugin)
-  }
-
   plugins.push(
     ViteReact(),
     vitePluginSsrCss({

package/src/api/vite/plugins/schema-assets.ts

@@ -9,6 +9,7 @@ import { debugPolen } from '#singletons/debug'
 import { Cache } from '@wollybeard/kit'
 import * as NodeFs from 'node:fs/promises'
 import * as NodePath from 'node:path'
+import type { NonEmptyChangeSets } from '../../schema/schema.js'
 import { polenVirtual } from '../vi.js'
 
 export const viProjectSchemaMetadata = polenVirtual([`project`, `schema-metadata`])
@@ -35,27 +36,28 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
 
   // Helper to load and process schema data
   const loadAndProcessSchemaData = Cache.memoize(async () => {
-    const schemaData = await Schema.readOrThrow({
+    const schemaResult = await Schema.readOrThrow({
       ...config.schema,
       projectRoot: config.paths.project.rootDir,
     })
 
-    if (!schemaData) {
+    if (!schemaResult.data) {
       const metadata: Schema.SchemaMetadata = { hasSchema: false, versions: [] }
       return {
         schemaData: null,
         metadata,
+        source: schemaResult.source,
       }
     }
 
     // Apply augmentations
-    schemaData.forEach(version => {
+    schemaResult.data.forEach(version => {
       SchemaAugmentation.apply(version.after, config.schemaAugmentations)
     })
 
     // Build metadata
     const versionStrings: string[] = []
-    for (const [index, version] of schemaData.entries()) {
+    for (const [index, version] of schemaResult.data.entries()) {
       const versionName = index === 0 ? Schema.VERSION_LATEST : Schema.dateToVersionString(version.date)
       versionStrings.push(versionName)
     }
@@ -65,11 +67,12 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
       versions: versionStrings,
     }
 
-    debug(`schemaDataLoaded`, { versionCount: schemaData.length })
+    debug(`schemaDataLoaded`, { versionCount: schemaResult.data.length })
 
     return {
-      schemaData,
+      schemaData: schemaResult.data,
       metadata,
+      source: schemaResult.source,
     }
   })
 
@@ -102,10 +105,10 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
 
   // Helper to write assets using schema-source API
   const writeDevAssets = async (
-    schemaData: Awaited<ReturnType<typeof Schema.readOrThrow>>,
+    schemaData: NonEmptyChangeSets,
     metadata: Schema.SchemaMetadata,
   ) => {
-    if (!schemaData) return
+    // schemaData is now guaranteed to be non-null NonEmptyChangeSets
 
     const devAssetsDir = config.paths.framework.devAssets.schemas
     await NodeFs.mkdir(devAssetsDir, { recursive: true })
@@ -149,6 +152,13 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
         debug(`watchingSchemaFile`, { path: config.schema.dataSources.file.path })
       }
 
+      if (config.schema?.dataSources?.introspection?.url) {
+        // Watch the introspection file if introspection is configured
+        const introspectionFilePath = NodePath.join(config.paths.project.rootDir, `schema.introspection.json`)
+        server.watcher.add(introspectionFilePath)
+        debug(`watchingIntrospectionFile`, { path: introspectionFilePath })
+      }
+
       // Handle file removal
       server.watcher.on('unlink', async (file) => {
         const isSchemaFile = config.schema && (() => {
@@ -172,6 +182,15 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
             if (absoluteFile.startsWith(absoluteSchemaDir + NodePath.sep)) return true
           }
 
+          // Check if file is the introspection file
+          if (config.schema.dataSources?.introspection?.url) {
+            const absoluteIntrospectionFile = NodePath.resolve(
+              config.paths.project.rootDir,
+              `schema.introspection.json`,
+            )
+            if (absoluteFile === absoluteIntrospectionFile) return true
+          }
+
           return false
         })()
 
@@ -181,14 +200,33 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
           try {
             // Clear cache and regenerate
             loadAndProcessSchemaData.clear()
-            const { schemaData, metadata } = await loadAndProcessSchemaData()
-
-            if (schemaData) {
+            const { schemaData, metadata, source } = await loadAndProcessSchemaData()
+
+            // If file was deleted but can be recreated, attempt recreation
+            if (!schemaData && source.reCreate) {
+              debug(`attemptingSchemaRecreation`, { sourceType: source.type })
+              try {
+                const recreatedData = await source.reCreate()
+                if (recreatedData) {
+                  // Clear cache again and reload after recreation
+                  loadAndProcessSchemaData.clear()
+                  const reloadResult = await loadAndProcessSchemaData()
+                  if (reloadResult.schemaData) {
+                    await writeDevAssets(reloadResult.schemaData, reloadResult.metadata)
+                    debug(`hmr:schemaRecreatedAndWritten`, { versionCount: reloadResult.schemaData.length })
+                  }
+                } else {
+                  debug(`hmr:schemaRecreationFailed`, { reason: 'reCreate returned null' })
+                }
+              } catch (recreationError) {
+                debug(`hmr:schemaRecreationFailed`, { error: recreationError })
+              }
+            } else if (schemaData) {
               // Write new assets without the removed file
               await writeDevAssets(schemaData, metadata)
               debug(`hmr:schemaAssetsUpdatedAfterRemoval`, { versionCount: schemaData.length })
             } else {
-              // No schema data - clear all assets
+              // No schema data and cannot recreate - clear all assets
               const schemaSource = createDevSchemaSource({ hasSchema: false, versions: [] })
               await schemaSource.clearAllAssets()
               debug(`hmr:allAssetsCleared`, {})
@@ -274,6 +312,15 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
           if (absoluteFile.startsWith(absoluteSchemaDir + NodePath.sep)) return true
         }
 
+        // Check if file is the introspection file
+        if (config.schema.dataSources?.introspection?.url) {
+          const absoluteIntrospectionFile = NodePath.resolve(
+            config.paths.project.rootDir,
+            `schema.introspection.json`,
+          )
+          if (absoluteFile === absoluteIntrospectionFile) return true
+        }
+
         return false
       })()
       if (isSchemaFile) {

package/src/cli/commands/open.ts

@@ -132,7 +132,7 @@ const wrapCache = <fn extends Fn.AnyAnyAsync>(fn: fn): fn => {
 
 // todo: use a proper validation, e.g. zod, better yet: allow to specify the validation in molt itself
 const parseHeaders = (headersJsonEncoded: string): Record<string, string> => {
-  const headersJson = Json.codec.deserialize(headersJsonEncoded)
+  const headersJson = Json.codec.decode(headersJsonEncoded)
   if (!Rec.is(headersJson)) {
     console.log(`--introspection-headers must be a JSON object.`)
     process.exit(1)

package/src/lib/grafaid/schema/schema.ts

@@ -4,6 +4,7 @@ export {
   buildASTSchema as fromAST,
   buildClientSchema as fromIntrospectionQuery,
   GraphQLSchema as Schema,
+  introspectionFromSchema as toIntrospectionQuery,
   printSchema as print,
 } from 'graphql'
 

package/src/lib/kit-temp.ts

@@ -105,9 +105,9 @@ export const objPolicyFilter = <
   const result: any = mode === `deny` ? { ...obj } : {}
 
   if (mode === `allow`) {
-    // For allow mode, only add specified keys
+    // For allow mode, only add specified keys that are own properties
     for (const key of keys) {
-      if (key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
         // @ts-expect-error
         result[key] = obj[key]
       }

package/src/lib/mask/$.test.ts

@@ -113,9 +113,9 @@ describe('property-based tests', () => {
           // Result contains only keys that were in both mask and object
           expect(resultKeys.every(key => keys.includes(key))).toBe(true)
 
-          // All requested keys that exist in obj are in result
+          // All requested keys that are own properties of obj are in result
           keys.forEach(key => {
-            if (key in obj) {
+            if (Object.prototype.hasOwnProperty.call(obj, key)) {
               expect(result).toHaveProperty(key, (obj as any)[key])
             }
           })
@@ -169,7 +169,7 @@ describe('property-based tests', () => {
           const result = Mask.apply(obj as any, Mask.create(keys))
 
           keys.forEach(key => {
-            if (key in obj) {
+            if (Object.prototype.hasOwnProperty.call(obj, key)) {
               expect(result).toHaveProperty(key)
               expect((result as any)[key]).toBe((obj as any)[key])
             }

package/src/lib/react-router-aid/react-router-aid.ts

@@ -1,4 +1,5 @@
 import type { ReactRouter } from '#dep/react-router/index'
+import type { React } from '#dep/react/index'
 import type { Http } from '@wollybeard/kit'
 
 export * from './get-paths-patterns.js'
@@ -18,23 +19,28 @@ export interface RouteHandle {
   statusCode?: Http.Status.Code.All
 }
 
-export const createRoute = <routeObject extends RouteObject>(
+export const route = <routeObject extends RouteObject>(
   routeObject: routeObject,
 ): routeObject => {
   return {
-    id: routeObject.path,
     ...routeObject,
   }
 }
 
-export type RouteObjectIndexInput = Omit<RouteObjectIndex, `index` | `children`>
+export type RouteObjectIndexInput = RouteObjectIndexInputConfig | React.ComponentType
+export type RouteObjectIndexInputConfig = Omit<RouteObjectIndex, `index` | `children`>
 
-export const createRouteIndex = (
-  indexRouteObjectInput: RouteObjectIndexInput,
+export const routeIndex = (
+  input: RouteObjectIndexInput,
 ): RouteObjectIndex => {
+  const routeConfig: RouteObjectIndexInputConfig = isComponentType(input) ? { Component: input } : input
   return {
-    ...indexRouteObjectInput,
+    ...routeConfig,
     index: true,
     children: undefined,
   }
 }
+
+const isComponentType = (value: unknown): value is React.ComponentType => {
+  return typeof value === 'function'
+}

package/src/template/routes/changelog.tsx

@@ -1,5 +1,5 @@
 import type { GraphqlChangeset } from '#lib/graphql-changeset/index'
-import { createRoute } from '#lib/react-router-aid/react-router-aid'
+import { route } from '#lib/react-router-aid/react-router-aid'
 import { createLoader, useLoaderData } from '#lib/react-router-loader/react-router-loader'
 import { Changelog } from '../components/Changelog.js'
 import { ChangelogLayout } from '../layouts/index.js'
@@ -33,7 +33,7 @@ const Component = () => {
   )
 }
 
-export const changelog = createRoute({
+export const changelog = route({
   path: `changelog`,
   loader,
   Component,

package/src/template/routes/index.tsx

@@ -1,10 +1,10 @@
-import { createRouteIndex } from '#lib/react-router-aid/react-router-aid'
+import { routeIndex } from '#lib/react-router-aid/react-router-aid'
 import { Box } from '@radix-ui/themes'
 
 const Component = () => {
   return <Box>home todo</Box>
 }
 
-export const index = createRouteIndex({
+export const index = routeIndex({
   Component,
 })

package/src/template/routes/pages.tsx

@@ -1,4 +1,4 @@
-import { createRoute } from '#lib/react-router-aid/react-router-aid'
+import { route } from '#lib/react-router-aid/react-router-aid'
 import { createLoader, useLoaderData } from '#lib/react-router-loader/react-router-loader'
 import { SidebarLayout } from '#template/layouts/index'
 import { MDXProvider } from '@mdx-js/react'
@@ -101,7 +101,7 @@ const Component = () => {
   )
 }
 
-export const pages = createRoute({
+export const pages = route({
   // Pathless layout route - doesn't affect URL paths
   loader,
   Component,

package/src/template/routes/reference.tsx

@@ -1,19 +1,19 @@
 import type { Content } from '#api/content/$'
 import { GrafaidOld } from '#lib/grafaid-old/index'
-import { createRoute } from '#lib/react-router-aid/react-router-aid'
+import { Grafaid } from '#lib/grafaid/index'
+import { route, routeIndex } from '#lib/react-router-aid/react-router-aid'
 import { createLoader, useLoaderData } from '#lib/react-router-loader/react-router-loader'
 import { Box } from '@radix-ui/themes'
-import { Outlet } from 'react-router'
+import { Outlet, useParams } from 'react-router'
+import { Field } from '../components/Field.js'
 import { MissingSchema } from '../components/MissingSchema.js'
+import { NamedType } from '../components/NamedType.js'
 import { VersionSelector } from '../components/VersionSelector.js'
-import { useVersionPath } from '../hooks/useVersionPath.js'
 import { SidebarLayout } from '../layouts/index.js'
 import { VERSION_LATEST } from '../lib/schema-utils/constants.js'
 import { schemaSource } from '../sources/schema-source.js'
-import { reference$type } from './reference.$type.js'
-import { referenceVersion$version$type } from './reference.version.$version.$type.js'
 
-const loader = createLoader(async ({ params }) => {
+export const loader = createLoader(async ({ params }) => {
   // Handle both versioned and unversioned routes:
   // - Versioned: /reference/version/:version/:type → params.version exists
   // - Unversioned: /reference/:type → params.version is undefined, defaults to latest
@@ -29,7 +29,7 @@ const loader = createLoader(async ({ params }) => {
   }
 })
 
-const Component = () => {
+const RouteReferenceComponent = () => {
   const data = useLoaderData<typeof loader>()
 
   if (!data.schema) {
@@ -42,8 +42,11 @@ const Component = () => {
   const sidebarItems: Content.Item[] = []
   const kindEntries = Object.entries(kindMap.list).filter(([_, types]) => types.length > 0)
 
-  // Build path prefix based on current version using new route structure
-  const versionPath = useVersionPath()
+  // Build path prefix based on current version from loader data
+  // This ensures sidebar links always match the current version being viewed
+  const versionPath = data.currentVersion === VERSION_LATEST
+    ? ``
+    : `version/${data.currentVersion}/`
 
   for (const [title, types] of kindEntries) {
     sidebarItems.push({
@@ -72,18 +75,83 @@ const Component = () => {
   )
 }
 
-// Create the versioned reference route with explicit version prefix
-const referenceVersioned = createRoute({
-  path: `version/:version`,
-  loader,
-  Component,
-  children: [referenceVersion$version$type],
-})
+// Shared hooks for schema data validation and retrieval
+const useReferenceSchema = () => {
+  const data = useLoaderData<typeof loader>('reference')
+  if (!data?.schema) {
+    throw new Error('Schema not found')
+  }
+  return data
+}
+
+const useSchemaType = (typeName: string) => {
+  const { schema } = useReferenceSchema()
+  const type = schema.getType(typeName)
+  if (!type) {
+    throw new Error(`Could not find type ${typeName}`)
+  }
+  return type
+}
+
+const useSchemaField = (typeName: string, fieldName: string) => {
+  const type = useSchemaType(typeName)
+  if (!Grafaid.Schema.TypesLike.isFielded(type)) {
+    throw new Error(`Type ${typeName} does not have fields`)
+  }
+
+  const fields = type.getFields()
+  const field = fields[fieldName]
+  if (!field) {
+    throw new Error(`Could not find field ${fieldName} on type ${typeName}`)
+  }
+  return field
+}
+
+const RouteComponentIndex = () => {
+  return <div>Select a type from the sidebar to view its documentation.</div>
+}
+
+const RouteComponentType = () => {
+  const params = useParams() as { type: string }
+  const type = useSchemaType(params.type)
+  return <NamedType data={type} />
+}
+
+const RouteComponentTypeField = () => {
+  const params = useParams() as { type: string; field: string }
+  const field = useSchemaField(params.type, params.field)
+  return <Field data={field} />
+}
+
+const typeAndFieldRoutes = [
+  routeIndex(RouteComponentIndex),
+  route({
+    path: `:type`,
+    Component: RouteComponentType,
+    errorElement: <MissingSchema />,
+    children: [
+      route({
+        path: `:field`,
+        Component: RouteComponentTypeField,
+        errorElement: <MissingSchema />,
+      }),
+    ],
+  }),
+]
 
-// Create the main reference route with explicit version path and fallback type path
-export const reference = createRoute({
+/**
+ * Reference documentation with proper nested structure - all routes in one file
+ */
+export const reference = route({
+  id: 'reference',
   path: `reference`,
   loader,
-  Component,
-  children: [referenceVersioned, reference$type],
+  Component: RouteReferenceComponent,
+  children: [
+    ...typeAndFieldRoutes,
+    route({
+      path: `version/:version`,
+      children: typeAndFieldRoutes,
+    }),
+  ],
 })

package/src/template/routes/root.tsx

@@ -1,5 +1,5 @@
 import type { ReactRouter } from '#dep/react-router/index'
-import { createRoute } from '#lib/react-router-aid/react-router-aid'
+import { route } from '#lib/react-router-aid/react-router-aid'
 import { Box, Flex, Theme } from '@radix-ui/themes'
 import { Link as LinkReactRouter } from 'react-router'
 import { Outlet, ScrollRestoration } from 'react-router'
@@ -105,7 +105,7 @@ if (PROJECT_SCHEMA) {
 //
 //
 
-const notFoundRoute = createRoute({
+const notFoundRoute = route({
   id: `*_not_found`,
   path: `*`,
   Component: NotFound,
@@ -122,7 +122,7 @@ children.push(notFoundRoute)
 //
 //
 
-export const root = createRoute({
+export const root = route({
   path: `/`,
   Component,
   children,