polen 0.8.0-next.4 → 0.8.0-next.5

package/build/template/routes/root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../../src/template/routes/root.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAyB7D,eAAO,MAAM,SAAS,mCA6BrB,CAAA;AAmHD,eAAO,MAAM,IAAI;;;;CAIf,CAAA"}
+{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../../src/template/routes/root.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AA0B7D,eAAO,MAAM,SAAS,mCA6BrB,CAAA;AAgJD,eAAO,MAAM,IAAI;;;;CAIf,CAAA"}

package/build/template/routes/root.jsx

@@ -4,10 +4,11 @@ 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 { Link as LinkReactRouter } from 'react-router';
-import { Outlet, ScrollRestoration } from 'react-router';
+import { Outlet, ScrollRestoration, useLocation } from 'react-router';
 import { PROJECT_DATA } from 'virtual:polen/project/data';
 import { templateVariables } from 'virtual:polen/template/variables';
 import { Link } from '../components/Link.jsx';
+import { Sidebar } from '../components/Sidebar.jsx';
 import entryClientUrl from '../entry.client.jsx?url';
 import { changelog } from './changelog.jsx';
 import { index } from './index.jsx';
@@ -40,6 +41,20 @@ export const Component = () => {
     </html>);
 };
 const Layout = () => {
+    const location = useLocation();
+    // Determine if we should show sidebar based on current path
+    const getCurrentNavPathExp = () => {
+        // todo: general path manipulation lib because we are duplicating logic here found in FileRouter
+        // todo: kit: try a Str.split that returns [] | string[] so that our predicates can refine on it?
+        const segments = location.pathname.split(`/`).filter(Boolean);
+        if (Arr.isntEmpty(segments)) {
+            return `/${segments[0]}`;
+        }
+        return null;
+    };
+    const currentNavPathExp = getCurrentNavPathExp();
+    const sidebarItems = currentNavPathExp && PROJECT_DATA.sidebar[currentNavPathExp];
+    const showSidebar = sidebarItems && sidebarItems.length > 0;
     return (<Theme asChild>
       <Box m='8'>
         <Flex align='center' gap='8' pb='4' mb='8' style={{
@@ -54,14 +69,21 @@ const Layout = () => {
             </Flex>
           </LinkReactRouter>
           <Flex direction='row' gap='4'>
-            {PROJECT_DATA.siteNavigationItems.map((item, key) => (<Link key={key} color='gray' to={item.path}>
+            {PROJECT_DATA.siteNavigationItems.map((item, key) => (<Link key={key} color='gray' to={item.pathExp}>
                 {item.title}
               </Link>))}
           </Flex>
         </Flex>
-        <Box>
-          <Outlet />
-        </Box>
+        {showSidebar
+            ? (<Flex gap='8'>
+              <Sidebar items={sidebarItems}/>
+              <Box style={{ flex: 1 }}>
+                <Outlet />
+              </Box>
+            </Flex>)
+            : (<Box>
+              <Outlet />
+            </Box>)}
       </Box>
     </Theme>);
 };
@@ -127,6 +149,7 @@ children.push(notFoundRoute);
 // ━━━━━━━━━━━━━━ • Root Route
 //
 //
+import { Arr } from '@wollybeard/kit';
 import { pages } from 'virtual:polen/project/pages.jsx';
 export const root = createRoute({
     path: `/`,

package/build/template/routes/root.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"root.jsx","sourceRoot":"","sources":["../../../src/template/routes/root.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"root.jsx","sourceRoot":"","sources":["../../../src/template/routes/root.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polen",
-  "version": "0.8.0-next.4",
+  "version": "0.8.0-next.5",
   "type": "module",
   "description": "A framework for delightful GraphQL developer portals",
   "author": {

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

@@ -1,13 +1,12 @@
-import { Markdown } from '#api/singletons/markdown/index.js'
 import type { ReactRouter } from '#dep/react-router/index.js'
 import type { Vite } from '#dep/vite/index.js'
 import { FileRouter } from '#lib/file-router/index.js'
 import { ViteVirtual } from '#lib/vite-virtual/index.js'
 import mdx from '@mdx-js/rollup'
-import { Cache, Fs, Json, Path, Str } from '@wollybeard/kit'
+import { Cache, Json, Path, Str } from '@wollybeard/kit'
 import jsesc from 'jsesc'
 import remarkGfm from 'remark-gfm'
-import type { ProjectData, SiteNavigationItem } from '../../../project-data.js'
+import type { ProjectData, Sidebar, SidebarItem, SiteNavigationItem } from '../../../project-data.js'
 import { superjson } from '../../../singletons/superjson.js'
 import type { Configurator } from '../../configurator/index.js'
 import { SchemaAugmentation } from '../../schema-augmentation/index.js'
@@ -53,27 +52,31 @@ export const Core = (config: Configurator.Config): Vite.PluginOption[] => {
         ],
       }),
     },
-    {
-      name: `polen:markdown`,
-      enforce: `pre`,
-      resolveId(id) {
-        if (id.endsWith(`.md`)) {
-          return id
-        }
-        return null
-      },
-      async load(id) {
-        if (id.endsWith(`.md`)) {
-          const markdownString = await Fs.read(id)
-          if (!markdownString) return null
-          const htmlString = await Markdown.parse(markdownString)
-
-          const code = `export default ${JSON.stringify(htmlString)}`
-          return code
-        }
-        return null
-      },
-    },
+    // TODO: We can remove, mdx subsumes this
+    // TODO: First we need to investigate how e can make our api singleton Markdown used by MDX.
+    // If we cannot, then we might want to ditch MDX instead and use our lower level solution here.
+    // It depends in part on how complex our Markdown singleton gets.
+    // {
+    //   name: `polen:markdown`,
+    //   enforce: `pre`,
+    //   resolveId(id) {
+    //     if (id.endsWith(`.md`)) {
+    //       return id
+    //     }
+    //     return null
+    //   },
+    //   async load(id) {
+    //     if (id.endsWith(`.md`)) {
+    //       const markdownString = await Fs.read(id)
+    //       if (!markdownString) return null
+    //       const htmlString = await Markdown.parse(markdownString)
+
+    //       const code = `export default ${JSON.stringify(htmlString)}`
+    //       return code
+    //     }
+    //     return null
+    //   },
+    // },
     {
       name: `polen:core:alias`,
       resolveId(id, importer) {
@@ -136,35 +139,84 @@ export const Core = (config: Configurator.Config): Vite.PluginOption[] => {
           async loader() {
             // todo: parallel
             const schema = await readSchema()
-            console.log({ schema })
             const pagesScanResult = await scanPageRoutes()
 
             const siteNavigationItems: SiteNavigationItem[] = []
 
-            const siteNavigationItemsFromTopLevelPages = pagesScanResult.routes
-              // We exclude home page
-              .filter(route => route.path.segments.length === 1)
-              .map(route => {
-                const path = FileRouter.routeToString(route)
-                const title = Str.titlizeSlug(path)
-                return {
-                  path,
-                  title,
-                }
-              })
+            //
+            // ━━ Build Navbar
+            //
 
-            siteNavigationItems.push(...siteNavigationItemsFromTopLevelPages)
+            // ━ Top pages become navigation items
+            const topPages = pagesScanResult.routes.filter(FileRouter.routeIsTopLevel)
+
+            for (const page of topPages) {
+              const path = FileRouter.routeToPathExpression(page)
+              const title = Str.titlizeSlug(path)
+              siteNavigationItems.push({ pathExp: path, title })
+            }
 
+            // ━ Top directories become navigation items
+            const topDirsPaths = pagesScanResult.routes
+              .filter(FileRouter.routeIsSubLevel)
+              // todo: kit, slice that understands non-empty
+              // Arr.slice(route.path.segments, 1)
+              .map(route => [route.logical.path[0]])
+
+            for (const dir of topDirsPaths) {
+              const pathExp = FileRouter.pathToExpression(dir)
+              const title = Str.titlizeSlug(pathExp)
+              // todo: this should never happen, if it does, swarn user
+              // Only add if not already added as a top page
+              if (!siteNavigationItems.some(item => item.pathExp === pathExp)) {
+                siteNavigationItems.push({ pathExp: pathExp, title })
+              }
+            }
+
+            // ━ Schema presence causes adding some navbar items
             if (schema) {
-              siteNavigationItems.push({ path: `/reference`, title: `Reference` })
+              siteNavigationItems.push({ pathExp: `/reference`, title: `Reference` })
               if (schema.versions.length > 1) {
-                siteNavigationItems.push({ path: `/changelog`, title: `Changelog` })
+                siteNavigationItems.push({ pathExp: `/changelog`, title: `Changelog` })
               }
             }
 
+            //
+            // ━━ Build Sidebar
+            //
+
+            const sidebar: Sidebar = {}
+
+            for (const dirPath of topDirsPaths) {
+              const childPages = pagesScanResult.routes.filter(page => FileRouter.routeIsSubOf(page, dirPath))
+
+              const sidebarItems: SidebarItem[] = []
+
+              // ━ Pages in this dir become sidebar items
+              for (const childPage of childPages) {
+                const childPageRelative = FileRouter.makeRelativeUnsafe(childPage, dirPath)
+
+                if (FileRouter.routeIsRootLevel(childPageRelative)) {
+                  // We elide root from items. Root represents this whole group of items.
+                  continue
+                }
+
+                if (FileRouter.routeIsTopLevel(childPageRelative)) {
+                  const pathExp = FileRouter.routeToPathExpression(childPage)
+                  const relativePathExp = FileRouter.routeToPathExpression(childPageRelative)
+                  const title = Str.titlizeSlug(relativePathExp)
+                  sidebarItems.push({ pathExp, title })
+                }
+                // TODO: Handle nested directories in phase 3
+              }
+
+              sidebar[FileRouter.pathToExpression(dirPath)] = sidebarItems
+            }
+
             const projectData: ProjectData = {
               schema,
               siteNavigationItems,
+              sidebar,
               faviconPath: `/logo.svg`,
               pagesScanResult: pagesScanResult,
               paths: config.paths.project,
@@ -204,25 +256,16 @@ export const Core = (config: Configurator.Config): Vite.PluginOption[] => {
 
             // todo: kit fs should accept parsed file paths
             for (const route of pagesScanResult.routes) {
-              const filePath = Path.format(route.file.path.absolute)
-              const path = FileRouter.routeToString(route)
-              const ident = Str.Case.camel(`page ` + Str.titlizeSlug(path))
+              const filePathExp = Path.format(route.file.path.absolute)
+              const pathExp = FileRouter.routeToPathExpression(route)
+              const ident = Str.Case.camel(`page ` + Str.titlizeSlug(pathExp))
 
               s`
-                import ${ident} from '${filePath}'
+                import ${ident} from '${filePathExp}'
 
                 ${$.pages}.push({
-                  path: '${path}',
-                  Component: () => {
-                    if (typeof ${ident} === 'function') {
-                      // ━ MDX
-                      const Component = ${ident}
-                      return <Component />
-                    } else {
-                      // ━ MD
-                      return <div dangerouslySetInnerHTML={{ __html: ${ident} }} />
-                    }
-                  }
+                  path: '${pathExp}',
+                  Component: ${ident}
                 })
               `
             }

package/src/lib/file-router/index.test.ts

@@ -21,7 +21,7 @@ describe('.scan', () => {
       const routes = await scan(project.dir)
       expect(routes).toMatchObject($({
         routes: [{
-          path: { segments: ['a'] },
+          logical: { path: ['a'] },
           file: { path: { relative: { dir: '', base: 'a.md' } } },
         }],
       }))
@@ -31,7 +31,7 @@ describe('.scan', () => {
       const routes = await scan(project.dir)
       expect(routes).toMatchObject($({
         routes: [{
-          path: { segments: ['a', 'b'] },
+          logical: { path: ['a', 'b'] },
           file: { path: { relative: { dir: 'a', base: 'b.md' } } },
         }],
       }))
@@ -43,7 +43,7 @@ describe('.scan', () => {
       const routes = await scan(project.dir)
       expect(routes).toMatchObject($({
         routes: [{
-          path: { segments: [] },
+          logical: { path: [] },
           file: { path: { relative: { dir: '', base: 'index.md' } } },
         }],
       }))
@@ -53,7 +53,7 @@ describe('.scan', () => {
       const routes = await scan(project.dir)
       expect(routes).toMatchObject($({
         routes: [{
-          path: { segments: ['a'] },
+          logical: { path: ['a'] },
           file: { path: { relative: { dir: 'a', base: 'index.md' } } },
         }],
       }))
@@ -66,7 +66,7 @@ describe('.scan', () => {
       expect(routes).toMatchObject($({
         diagnostics: [{}],
         routes: [{
-          path: { segments: ['a'] },
+          logical: { path: ['a'] },
           file: { path: { relative: { dir: '', base: 'a.md' } } },
         }],
       }))

package/src/lib/file-router/linter.ts

@@ -1,5 +1,5 @@
 import { Idx, Path } from '@wollybeard/kit'
-import { type Route, type RouteFile, routeIsIndex, routeToString } from './route.js'
+import { type Route, type RouteFile, routeIsFromIndexFile, routeToPathExpression } from './route.js'
 
 export type Diagnostic = DiagnosticIndexConflict
 
@@ -21,7 +21,7 @@ export interface LintResult {
 export const lint = (routes: Route[]): LintResult => {
   const diagnostics: Diagnostic[] = []
 
-  const seen = Idx.create({ toKey: routeToString })
+  const seen = Idx.create({ toKey: routeToPathExpression })
 
   // ━ Check for conflict between index and literal.
   //   Note: There is no other way for paths to conflict so we safely assuming the cause is index+literal.
@@ -31,7 +31,7 @@ export const lint = (routes: Route[]): LintResult => {
 
     if (seenRoute) {
       // Fix - ignore the index
-      const [index, literal] = routeIsIndex(route) ? [route, seenRoute] : [seenRoute, route]
+      const [index, literal] = routeIsFromIndexFile(route) ? [route, seenRoute] : [seenRoute, route]
       if (seenRoute === index) {
         seen.set(route)
       }

package/src/lib/file-router/route.ts

@@ -1,9 +1,45 @@
-import type { Path } from '@wollybeard/kit'
+import { arrayEquals } from '#lib/kit-temp.js'
+import { type Path } from '@wollybeard/kit'
 
-export type RoutePathSegment = string
+//
+//
+//
+//
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ • Path
+//
+//
 
-export interface RoutePath {
-  segments: RoutePathSegment[]
+export type Path = PathSegment[]
+
+export type PathRoot = []
+
+export type PathTop = [PathSegment]
+
+export type PathSub = [PathSegment, PathSegment, ...PathSegment[]]
+
+export type PathSegment = string
+
+export const sep = `/`
+
+export const pathToExpression = (path: Path) => {
+  return sep + path.join(sep)
+}
+
+//
+//
+//
+//
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ • Route (Generic)
+//
+//
+
+export interface Route {
+  logical: RouteLogical
+  file: RouteFile
+}
+
+export interface RouteLogical {
+  path: Path
 }
 
 export interface RouteFile {
@@ -13,21 +49,121 @@ export interface RouteFile {
   }
 }
 
-export interface Route {
-  path: RoutePath
-  file: RouteFile
+//
+//
+//
+//
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ • Top Level Route
+//
+//
+
+export interface TopLevelRoute extends Route {
+  logical: TopLevelRouteLogical
 }
 
-export const sep = `/`
+export interface TopLevelRouteLogical {
+  path: PathTop
+}
 
-export const routeToString = (route: Route) => {
-  return sep + route.path.segments.join(sep)
+/**
+ * Route is top level meaning exists directly under the root.
+ *
+ * It excludes the root level route.
+ */
+export const routeIsTopLevel = (route: Route): route is TopLevelRoute => {
+  return route.logical.path.length === 1
 }
 
-export const routeIsIndex = (route: Route) => {
+//
+// ━━ Sub Level
+//
+
+//
+//
+//
+//
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ • Sub Level Route
+//
+//
+
+export interface RouteSubLevel extends Route {
+  logical: RoutePathSubLevel
+}
+
+export interface RoutePathSubLevel {
+  path: PathSub
+}
+
+/**
+ * Route is not top or root level
+ */
+export const routeIsSubLevel = (route: Route): route is RouteSubLevel => {
+  return route.logical.path.length > 1
+}
+
+//
+// ━━ Root Level
+//
+
+//
+//
+//
+//
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ • Root Level Route
+//
+//
+
+/**
+* Route is the singular root route.
+
+* This is the case of index under root.
+*/
+export const routeIsRootLevel = (route: Route): route is TopLevelRoute => {
+  // No need to check for name "index"
+  // Segments is uniquely empty for <root>/index
+  return route.logical.path.length === 0
+}
+
+//
+//
+//
+// ━━━━━━━━━━━━━━ • Route Functions
+//
+//
+
+export const routeIsFromIndexFile = (route: Route): boolean => {
   return route.file.path.relative.name === conventions.index.name
 }
 
+export const routeIsSubOf = (route: Route, potentialAncestorPath: PathSegment[]): boolean => {
+  if (route.logical.path.length <= potentialAncestorPath.length) {
+    return false
+  }
+  return arrayEquals(
+    route.logical.path.slice(0, potentialAncestorPath.length),
+    potentialAncestorPath,
+  )
+}
+
+/**
+ * You are responsible for ensuring given ancestor path is really an ancestor of given route's path.
+ */
+export const makeRelativeUnsafe = (route: Route, assumedAncestorPath: PathSegment[]): Route => {
+  // We assume that we're working with paths where index is elided per our FileRouter system.
+  const newPath = route.logical.path.slice(assumedAncestorPath.length)
+  return {
+    ...route,
+    logical: {
+      ...route.logical,
+      path: newPath,
+    },
+  }
+}
+
+export const routeToPathExpression = (route: Route) => {
+  return pathToExpression(route.logical.path)
+}
+
 const conventions = {
   index: {
     name: `index`,

package/src/lib/file-router/scan.ts

@@ -1,7 +1,7 @@
 import { TinyGlobby } from '#dep/tiny-globby/index.js'
 import { Path, Str } from '@wollybeard/kit'
 import { type Diagnostic, lint } from './linter.js'
-import type { Route, RouteFile, RoutePath } from './route.js'
+import type { Route, RouteFile, RouteLogical } from './route.js'
 
 //
 //
@@ -64,26 +64,26 @@ export const filePathToRoute = (filePathExpression: string, rootDir: string): Ro
       relative: Path.parse(Path.relative(rootDir, filePathExpression)),
     },
   }
-  const path = filePathToRoutePath(file.path.relative)
+  const logical = filePathToRouteLogical(file.path.relative)
 
   return {
-    path,
+    logical,
     file,
   }
 }
 
-export const filePathToRoutePath = (filePath: Path.Parsed): RoutePath => {
-  const dirSegments = Str.split(Str.removeSurrounding(filePath.dir, Path.sep), Path.sep)
+export const filePathToRouteLogical = (filePath: Path.Parsed): RouteLogical => {
+  const dirPath = Str.split(Str.removeSurrounding(filePath.dir, Path.sep), Path.sep)
 
   if (Str.isMatch(filePath.name, conventions.index.name)) {
-    const segments = dirSegments
+    const path = dirPath
     return {
-      segments,
+      path,
     }
   }
 
-  const segments = dirSegments.concat(filePath.name)
+  const path = dirPath.concat(filePath.name)
   return {
-    segments,
+    path,
   }
 }

package/src/lib/kit-temp.ts

@@ -0,0 +1,21 @@
+//
+//
+//
+//
+//
+// Holding Module for Missing @wollybeard/kit Functionality
+//
+// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+//
+// Code here is meant to be migrated eventually to @wollybeard/kit.
+//
+//
+//
+
+export const arrayEquals = (a: any[], b: any[]) => {
+  if (a.length !== b.length) return false
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) return false
+  }
+  return true
+}

package/src/project-data.ts

@@ -5,6 +5,7 @@ import type { Schema } from './api/schema/index.js'
 export interface ProjectData {
   schema: null | Schema.Schema
   siteNavigationItems: SiteNavigationItem[]
+  sidebar: Sidebar
   faviconPath: string
   paths: Configurator.Config[`paths`][`project`]
   pagesScanResult: FileRouter.ScanResult
@@ -18,5 +19,15 @@ export interface ProjectData {
 
 export interface SiteNavigationItem {
   title: string
-  path: string
+  pathExp: string
+}
+
+export interface Sidebar {
+  [navPath: string]: SidebarItem[]
+}
+
+export interface SidebarItem {
+  title: string
+  pathExp: string
+  children?: SidebarItem[]
 }