polen 0.8.0-next.9 → 0.8.1-next.1

package/src/project-data.ts

@@ -1,6 +1,6 @@
-import type { Config } from '#api/config/index.js'
-import type { FileRouter } from '#lib/file-router/index.js'
-import type { Schema } from './api/schema/index.js'
+import type { Config } from '#api/config/index'
+import type { FileRouter } from '#lib/file-router/index'
+import type { Schema } from './api/schema/index.ts'
 
 export interface ProjectData {
   schema: null | Schema.Schema
@@ -23,25 +23,5 @@ export interface SiteNavigationItem {
 }
 
 export interface SidebarIndex {
-  [pathExpression: string]: Sidebar
-}
-
-export interface Sidebar {
-  items: SidebarItem[]
-}
-
-export type SidebarItem = SidebarNav | SidebarSection
-
-export interface SidebarNav {
-  type: `SidebarItem`
-  title: string
-  pathExp: string
-}
-
-export interface SidebarSection {
-  type: `SidebarSection`
-  title: string
-  pathExp: string
-  isNavToo: boolean
-  navs: SidebarNav[]
+  [pathExpression: string]: FileRouter.Sidebar.Sidebar
 }

package/src/singletons/debug.ts

@@ -0,0 +1,3 @@
+import { Debug } from '#lib/debug/index'
+
+export const debug = Debug.create(`polen`)

package/src/singletons/superjson.ts

@@ -1,5 +1,5 @@
-import { Superjson } from '#dep/superjson/index.js'
-import { SuperjsonCodecs } from '#lib/superjson-codec/index.js'
+import { Superjson } from '#dep/superjson/index'
+import { SuperjsonCodecs } from '#lib/superjson-codec/index'
 
 const superjson = new Superjson.SuperJSON()
 

package/src/template/components/ArgumentListAnnotation.tsx

@@ -1,4 +1,4 @@
-import { GrafaidOld } from '#lib/grafaid-old/index.js'
+import { GrafaidOld } from '#lib/grafaid-old/index'
 import { Box, Text } from '@radix-ui/themes'
 import type { GraphQLField } from 'graphql'
 import type { FC } from 'react'

package/src/template/components/Changelog.tsx

@@ -1,11 +1,11 @@
-import type { GrafaidOld } from '#lib/grafaid-old/index.js'
-import { Grafaid } from '#lib/grafaid/index.js'
-import type { GraphqlChange } from '#lib/graphql-change/index.js'
-import type { GraphqlChangeset } from '#lib/graphql-changeset/index.js'
+import type { GrafaidOld } from '#lib/grafaid-old/index'
+import { Grafaid } from '#lib/grafaid/index'
+import type { GraphqlChange } from '#lib/graphql-change/index'
+import type { GraphqlChangeset } from '#lib/graphql-changeset/index'
 import { Box, Code } from '@radix-ui/themes'
 import type React from 'react'
-import type { Schema as ChangelogData } from '../../api/schema/index.js'
-import { Graphql } from './graphql/index.js'
+import type { Schema as ChangelogData } from '../../api/schema/index.ts'
+import { Graphql } from './graphql/index.ts'
 
 export const renderDate = (date: Date) => {
   return date.toLocaleString(`default`, {

package/src/template/components/DeprecationReason.tsx

@@ -1,4 +1,4 @@
-import type { GrafaidOld } from '#lib/grafaid-old/index.js'
+import type { GrafaidOld } from '#lib/grafaid-old/index'
 import { Text } from '@radix-ui/themes'
 import type { FC } from 'react'
 import { Markdown } from './Markdown.jsx'

package/src/template/components/Description.tsx

@@ -2,7 +2,7 @@ import { Text } from '@radix-ui/themes'
 import type { FC } from 'react'
 import { Markdown } from './Markdown.jsx'
 // import type { Grafaid } from '#lib/grafaid'
-import type { GrafaidOld } from '#lib/grafaid-old/index.js'
+import type { GrafaidOld } from '#lib/grafaid-old/index'
 import type { GraphQLNamedType } from 'graphql'
 
 export const Description: FC<{ data: GraphQLNamedType | GrafaidOld.GraphQLField }> = ({ data }) => {

package/src/template/components/Field.tsx

@@ -1,4 +1,4 @@
-import { GrafaidOld } from '#lib/grafaid-old/index.js'
+import { GrafaidOld } from '#lib/grafaid-old/index'
 import type { BoxProps } from '@radix-ui/themes'
 import { Box, Text } from '@radix-ui/themes'
 import type { FC } from 'react'

package/src/template/components/FieldList.tsx

@@ -1,4 +1,4 @@
-import { Grafaid } from '#lib/grafaid/index.js'
+import { Grafaid } from '#lib/grafaid/index'
 import { Box } from '@radix-ui/themes'
 import type { FC } from 'react'
 import { Field } from './Field.jsx'

package/src/template/components/FieldListSection.tsx

@@ -1,4 +1,4 @@
-import { Grafaid } from '#lib/grafaid/index.js'
+import { Grafaid } from '#lib/grafaid/index'
 import { Box, Heading } from '@radix-ui/themes'
 import type { GraphQLNamedType } from 'graphql'
 import type { FC } from 'react'

package/src/template/components/Markdown.tsx

@@ -1,4 +1,4 @@
-import { Markdown as MarkdownParser } from '#api/singletons/markdown/index.js'
+import { Markdown as MarkdownParser } from '#api/singletons/markdown/index'
 import type { FC } from 'react'
 
 export const Markdown: FC<{ children: string }> = ({ children }) => {

package/src/template/components/Sidebar.tsx

@@ -1,11 +1,11 @@
+import type { FileRouter } from '#lib/file-router/index'
 import { ChevronDownIcon, ChevronRightIcon } from '@radix-ui/react-icons'
 import { Box, Flex, Text } from '@radix-ui/themes'
 import { useState } from 'react'
 import { Link, useLocation } from 'react-router'
-import type { SidebarItem, SidebarNav, SidebarSection } from '../../project-data.js'
 
 interface SidebarProps {
-  items: SidebarItem[]
+  items: FileRouter.Sidebar.Item[]
 }
 
 export const Sidebar = ({ items }: SidebarProps) => {
@@ -13,6 +13,7 @@ export const Sidebar = ({ items }: SidebarProps) => {
 
   return (
     <Box
+      data-testid='sidebar'
       style={{
         width: `240px`,
         minWidth: `240px`,
@@ -36,13 +37,13 @@ export const Sidebar = ({ items }: SidebarProps) => {
 }
 
 interface SidebarItemComponentProps {
-  item: SidebarItem
+  item: FileRouter.Sidebar.Item
   currentPathExp: string
   level?: number
 }
 
 const SidebarItemComponent = ({ item, currentPathExp, level = 0 }: SidebarItemComponentProps) => {
-  if (item.type === `SidebarItem`) {
+  if (item.type === `ItemLink`) {
     return <SidebarNavItem nav={item} currentPathExp={currentPathExp} level={level} />
   }
 
@@ -50,17 +51,19 @@ const SidebarItemComponent = ({ item, currentPathExp, level = 0 }: SidebarItemCo
 }
 
 interface SidebarNavItemProps {
-  nav: SidebarNav
+  nav: FileRouter.Sidebar.ItemLink
   currentPathExp: string
   level: number
 }
 
 const SidebarNavItem = ({ nav, currentPathExp, level }: SidebarNavItemProps) => {
-  const isActive = currentPathExp === nav.pathExp
+  // Normalize paths for comparison - remove leading slash if present
+  const normalizedCurrentPath = currentPathExp.startsWith('/') ? currentPathExp.slice(1) : currentPathExp
+  const isActive = normalizedCurrentPath === nav.pathExp
 
   return (
     <Link
-      to={nav.pathExp}
+      to={`/${nav.pathExp}`}
       style={{
         textDecoration: `none`,
         color: isActive ? `var(--accent-11)` : `var(--gray-12)`,
@@ -90,15 +93,17 @@ const SidebarNavItem = ({ nav, currentPathExp, level }: SidebarNavItemProps) =>
 }
 
 interface SidebarSectionItemProps {
-  section: SidebarSection
+  section: FileRouter.Sidebar.ItemSection
   currentPathExp: string
   level: number
 }
 
 const SidebarSectionItem = ({ section, currentPathExp, level }: SidebarSectionItemProps) => {
   const [isExpanded, setIsExpanded] = useState(true)
-  const isDirectlyActive = currentPathExp === section.pathExp
-  const hasActiveChild = section.navs.some(nav => currentPathExp === nav.pathExp)
+  // Normalize paths for comparison - remove leading slash if present
+  const normalizedCurrentPath = currentPathExp.startsWith('/') ? currentPathExp.slice(1) : currentPathExp
+  const isDirectlyActive = normalizedCurrentPath === section.pathExp
+  const hasActiveChild = section.navs.some(nav => normalizedCurrentPath === nav.pathExp)
   const isActiveGroup = isDirectlyActive || hasActiveChild
 
   return (
@@ -143,7 +148,7 @@ const SidebarSectionItem = ({ section, currentPathExp, level }: SidebarSectionIt
         {section.isNavToo
           ? (
             <Link
-              to={section.pathExp}
+              to={`/${section.pathExp}`}
               style={{
                 textDecoration: `none`,
                 color: isDirectlyActive ? `var(--accent-11)` : `var(--gray-12)`,

package/src/template/components/TypeIndex.tsx

@@ -1,4 +1,4 @@
-import { GrafaidOld } from '#lib/grafaid-old/index.js'
+import { GrafaidOld } from '#lib/grafaid-old/index'
 import { Box, Flex, Heading } from '@radix-ui/themes'
 import { Obj } from '@wollybeard/kit'
 import type { GraphQLNamedType, GraphQLSchema } from 'graphql'

package/src/template/components/graphql/type-kind-icon.tsx

@@ -1,7 +1,7 @@
-import type { React } from '#dep/react/index.js'
-import type { Grafaid } from '#lib/grafaid/index.js'
+import type { React } from '#dep/react/index'
+import type { Grafaid } from '#lib/grafaid/index'
 import { Code } from '@radix-ui/themes'
-import { typeKindTokensIndex, unknownTypeKindToken } from './type-kind-tokens.js'
+import { typeKindTokensIndex, unknownTypeKindToken } from './type-kind-tokens.ts'
 
 export const TypeKindIcon: React.FC<{ kind: Grafaid.Schema.TypeKindName }> = ({ kind }) => {
   // eslint-disable-next-line

package/src/template/components/graphql/type-kind-tokens.ts

@@ -1,4 +1,4 @@
-import type { Grafaid } from '#lib/grafaid/index.js'
+import type { Grafaid } from '#lib/grafaid/index'
 import type { colorPropDef } from '@radix-ui/themes/props'
 
 type RadixColor = typeof colorPropDef[`color`][`values`][number]

package/src/template/components/graphql/type-link.tsx

@@ -1,8 +1,8 @@
-import { Grafaid } from '#lib/grafaid/index.js'
+import { Grafaid } from '#lib/grafaid/index'
 import { Code, Flex } from '@radix-ui/themes'
 import { Link } from '../Link.jsx'
 import { TypeKindIcon } from './graphql.jsx'
-import { typeKindTokensIndex } from './type-kind-tokens.js'
+import { typeKindTokensIndex } from './type-kind-tokens.ts'
 
 export const TypeLink: React.FC<{ type: Grafaid.Schema.TypesLike.Named }> = ({ type }) => {
   const kind = Grafaid.Schema.typeKindFromClass(type)

package/src/template/entry.client.tsx

@@ -2,7 +2,7 @@
 // But then, we won't get it from the client manifest. But we could get it from the server manifest. Should we do that?
 // But then, that wouldn't work for SPA. Does that matter? Just put a conditional here e.g. if (import.meta.env.PROD) ...?
 import '@radix-ui/themes/styles.css'
-import { ReactDomClient } from '#dep/react-dom-client/index.js'
+import { ReactDomClient } from '#dep/react-dom-client/index'
 import { StrictMode } from 'react'
 import { createBrowserRouter, RouterProvider } from 'react-router'
 import { routes } from './routes.jsx'

package/src/template/routes/changelog.tsx

@@ -1,5 +1,5 @@
-import { createRoute } from '#lib/react-router-aid/react-router-aid.js'
-import { createLoader, useLoaderData } from '#lib/react-router-loader/react-router-loader.js'
+import { createRoute } from '#lib/react-router-aid/react-router-aid'
+import { createLoader, useLoaderData } from '#lib/react-router-loader/react-router-loader'
 import { PROJECT_DATA } from 'virtual:polen/project/data'
 import { Changelog } from '../components/Changelog.jsx'
 

package/src/template/routes/index.tsx

@@ -1,4 +1,4 @@
-import { createRouteIndex } from '#lib/react-router-aid/react-router-aid.js'
+import { createRouteIndex } from '#lib/react-router-aid/react-router-aid'
 import { Box } from '@radix-ui/themes'
 
 const Component = () => {

package/src/template/routes/reference.$type.$field.tsx

@@ -1,6 +1,6 @@
-import { Grafaid } from '#lib/grafaid/index.js'
-import { ReactRouterAid } from '#lib/react-router-aid/index.js'
-import { useLoaderData } from '#lib/react-router-loader/react-router-loader.js'
+import { Grafaid } from '#lib/grafaid/index'
+import { ReactRouterAid } from '#lib/react-router-aid/index'
+import { useLoaderData } from '#lib/react-router-loader/react-router-loader'
 import { useParams } from 'react-router'
 import { Field } from '../components/Field.jsx'
 import { MissingSchema } from '../components/MissingSchema.jsx'

package/src/template/routes/reference.$type.tsx

@@ -1,5 +1,5 @@
-import { createRoute } from '#lib/react-router-aid/react-router-aid.js'
-import { useLoaderData } from '#lib/react-router-loader/react-router-loader.js'
+import { createRoute } from '#lib/react-router-aid/react-router-aid'
+import { useLoaderData } from '#lib/react-router-loader/react-router-loader'
 import { useParams } from 'react-router'
 import { MissingSchema } from '../components/MissingSchema.jsx'
 import { NamedType } from '../components/NamedType.jsx'

package/src/template/routes/reference.tsx

@@ -1,5 +1,5 @@
-import { createRoute } from '#lib/react-router-aid/react-router-aid.js'
-import { createLoader, useLoaderData } from '#lib/react-router-loader/react-router-loader.js'
+import { createRoute } from '#lib/react-router-aid/react-router-aid'
+import { createLoader, useLoaderData } from '#lib/react-router-loader/react-router-loader'
 import { Container, Flex } from '@radix-ui/themes'
 import { Outlet } from 'react-router'
 import { PROJECT_DATA } from 'virtual:polen/project/data'

package/src/template/routes/root.tsx

@@ -1,12 +1,14 @@
-import type { ReactRouter } from '#dep/react-router/index.js'
-import { createRoute } from '#lib/react-router-aid/react-router-aid.js'
+import type { ReactRouter } from '#dep/react-router/index'
+import { createRoute } from '#lib/react-router-aid/react-router-aid'
 import { GitHubLogoIcon } from '@radix-ui/react-icons'
 import { Box, Button, Heading, Text } from '@radix-ui/themes'
 import { Flex, Theme } from '@radix-ui/themes'
 import radixStylesUrl from '@radix-ui/themes/styles.css?url'
+import { Arr } from '@wollybeard/kit'
 import { Link as LinkReactRouter } from 'react-router'
 import { Outlet, ScrollRestoration, useLocation } from 'react-router'
 import { PROJECT_DATA } from 'virtual:polen/project/data'
+import { pages } from 'virtual:polen/project/pages.jsx'
 import { templateVariables } from 'virtual:polen/template/variables'
 import { Link } from '../components/Link.jsx'
 import { Sidebar } from '../components/Sidebar.jsx'
@@ -194,9 +196,6 @@ children.push(notFoundRoute)
 //
 //
 
-import { Arr } from '@wollybeard/kit'
-import { pages } from 'virtual:polen/project/pages.jsx'
-
 export const root = createRoute({
   path: `/`,
   Component,

package/src/template/server/app.ts

@@ -1,11 +1,13 @@
-import { Hono } from '#dep/hono/index.js'
-import { AppleTouchIcon } from '#lib/apple-touch-icon/index.js'
-import { Favicon } from '#lib/favicon/index.js'
+import { Hono } from '#dep/hono/index'
+// import { Hono } from '../../dep/hono/index.ts'
+
+import { AppleTouchIcon } from '#lib/apple-touch-icon/index'
+import { Favicon } from '#lib/favicon/index'
 import { serveStatic } from '@hono/node-server/serve-static'
 import { Fs, Http, Path } from '@wollybeard/kit'
 import { PROJECT_DATA } from 'virtual:polen/project/data'
 import { renderPage } from './render-page.jsx'
-import { view } from './view.js'
+import { view } from './view.ts'
 
 export const app = new Hono.Hono()
 

package/src/template/server/main.ts

@@ -1,8 +1,8 @@
 import { serve } from '@hono/node-server' // TODO: support non-node platforms.
 import { neverCase } from '@wollybeard/kit/language'
-import { app } from './app.js'
-import { generate } from './ssg/generate.js'
-import { view } from './view.js'
+import { app } from './app.ts'
+import { generate } from './ssg/generate.ts'
+import { view } from './view.ts'
 
 if (__BUILDING__) {
   switch (__BUILD_ARCHITECTURE__) {

package/src/template/server/manifest.ts

@@ -1,4 +1,4 @@
-import type { Vite } from '#dep/vite/index.js'
+import type { Vite } from '#dep/vite/index'
 import { Group, Str } from '@wollybeard/kit'
 
 export const injectManifestIntoHtml = (

package/src/template/server/render-page.tsx

@@ -1,12 +1,12 @@
-import type { ReactRouter } from '#dep/react-router/index.js'
-import type { ReactRouterAid } from '#lib/react-router-aid/index.js'
+import type { ReactRouter } from '#dep/react-router/index'
+import type { ReactRouterAid } from '#lib/react-router-aid/index'
 import { Arr } from '@wollybeard/kit'
 import { StrictMode } from 'react'
 import * as ReactDomServer from 'react-dom/server'
 import { createStaticRouter, StaticRouterProvider } from 'react-router'
 import viteClientAssetManifest from 'virtual:polen/vite/client/manifest'
-import { injectManifestIntoHtml } from './manifest.js'
-import { view } from './view.js'
+import { injectManifestIntoHtml } from './manifest.ts'
+import { view } from './view.ts'
 
 export const renderPage = (
   staticHandlerContext: ReactRouter.StaticHandlerContext,

package/src/template/server/ssg/generate.ts

@@ -1,10 +1,10 @@
-import { Hono } from '#dep/hono/index.js'
-import type { ReactRouter } from '#dep/react-router/index.js'
-import { app } from '#template/server/app.js'
+import { Hono } from '#dep/hono/index'
+import type { ReactRouter } from '#dep/react-router/index'
+import { app } from '#template/server/app'
 import * as NodeFs from 'node:fs/promises'
 import { PROJECT_DATA } from 'virtual:polen/project/data'
 import { renderPage } from '../render-page.jsx'
-import { getRoutesPaths } from './get-route-paths.js'
+import { getRoutesPaths } from './get-route-paths.ts'
 
 export const generate = async (view: ReactRouter.StaticHandler) => {
   const handler: Hono.Handler = async (ctx) => {

package/src/template/server/ssg/get-route-paths.ts

@@ -1,7 +1,7 @@
-import { Grafaid } from '#lib/grafaid/index.js'
+import { Grafaid } from '#lib/grafaid/index'
 import { visit } from 'graphql'
 // Or your specific import path for this type
-import { ReactRouterAid } from '#lib/react-router-aid/index.js'
+import { ReactRouterAid } from '#lib/react-router-aid/index'
 import { PROJECT_DATA } from 'virtual:polen/project/data'
 import { routes } from '../../routes.jsx'
 

package/build/lib/file-router/sidebar.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=sidebar.d.ts.map

package/build/lib/file-router/sidebar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sidebar.d.ts","sourceRoot":"","sources":["../../../src/lib/file-router/sidebar.ts"],"names":[],"mappings":""}

package/build/lib/file-router/sidebar.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=sidebar.js.map

package/build/lib/file-router/sidebar.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sidebar.js","sourceRoot":"","sources":["../../../src/lib/file-router/sidebar.ts"],"names":[],"mappings":""}