polen 0.10.0-next.8 → 0.10.0

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

@@ -2,6 +2,7 @@ import type { Config } from '#api/config/index'
 import { reportError } from '#api/server/report-error'
 import type { Hono } from '#dep/hono/index'
 import type { Vite } from '#dep/vite/index'
+import { createHtmlTransformer } from '#lib/html-utils/html-transformer'
 import { ResponseInternalServerError } from '#lib/kit-temp'
 import { debugPolen } from '#singletons/debug'
 import * as HonoNodeServer from '@hono/node-server'
@@ -9,21 +10,78 @@ import { Err } from '@wollybeard/kit'
 
 type App = Hono.Hono
 
+interface AppOptions {
+  hooks?: {
+    transformHtml?: ((html: string, ctx: Hono.Context) => Promise<string> | string)[]
+  }
+}
+
 interface AppServerModule {
-  app: App
+  createApp: (options: AppOptions) => App
 }
 
 export const Serve = (
   config: Config.Config,
 ): Vite.PluginOption => {
   const debug = debugPolen.sub(`serve`)
+  const appModulePath = config.paths.framework.template.absolute.server.app
+
   let appPromise: Promise<App | Error>
 
-  const reloadApp = async ({ server }: { server: Vite.ViteDevServer }): Promise<App | Error> => {
-    debug('reloadApp')
-    return server.ssrLoadModule(config.paths.framework.template.server.app)
+  const isNeedAppLoadOrReload = (server: Vite.ViteDevServer): boolean => {
+    const appModule = server.moduleGraph.getModuleById(appModulePath)
+    if (!appModule) return true // Not loaded yet
+
+    // Check if the module or any of its dependencies are invalidated
+    const checkInvalidated = (mod: Vite.ModuleNode, visited = new Set<string>()): boolean => {
+      if (!mod.id || visited.has(mod.id)) return false
+      visited.add(mod.id)
+
+      // Check if this module is invalidated
+      // SSR modules use ssrInvalidationState, client modules use invalidationState
+      if (mod.ssrInvalidationState === `HARD_INVALIDATED` || mod.invalidationState === `HARD_INVALIDATED`) {
+        return true
+      }
+
+      // Also check if transformResult is null (indicates invalidation)
+      if (mod.ssrTransformResult === null && mod.transformResult === null) {
+        return true
+      }
+
+      // Check all imported modules recursively
+      for (const imported of mod.importedModules) {
+        if (checkInvalidated(imported, visited)) return true
+      }
+
+      return false
+    }
+
+    return checkInvalidated(appModule)
+  }
+
+  const reloadApp = async (server: Vite.ViteDevServer): Promise<App | Error> => {
+    debug(`reloadApp`)
+
+    return server.ssrLoadModule(config.paths.framework.template.absolute.server.app)
       .then(module => module as AppServerModule)
-      .then(module => module.app)
+      .then(module => {
+        return module.createApp({
+          hooks: {
+            transformHtml: [
+              // Inject entry client script for development
+              createHtmlTransformer((html, ___ctx) => {
+                const entryClientPath = `/${config.paths.framework.template.relative.client.entrypoint}`
+                const entryClientScript = `<script type="module" src="${entryClientPath}"></script>`
+                return html.replace(`</body>`, `${entryClientScript}\n</body>`)
+              }),
+              // Apply Vite's transformations
+              createHtmlTransformer(async (html, ctx) => {
+                return await server.transformIndexHtml(ctx.req.url, html)
+              }),
+            ],
+          },
+        })
+      })
       .catch(async (error) => {
         if (Err.is(error)) {
           // ━ Clean Stack Trace
@@ -41,7 +99,7 @@ export const Serve = (
     config() {
       return {
         server: {
-          port: 3000,
+          port: config.server.port,
           watch: {
             disableGlobbing: false,
           },
@@ -55,14 +113,14 @@ export const Serve = (
       }
     },
     handleHotUpdate({ server }) {
-      debug('handleHotUpdate')
+      debug(`handleHotUpdate`)
       // Reload app server immediately in the background
-      appPromise = reloadApp({ server })
+      appPromise = reloadApp(server)
     },
     async configureServer(server) {
-      debug('configureServer')
+      debug(`configureServer`)
       // Initial load
-      appPromise = reloadApp({ server })
+      appPromise = reloadApp(server)
 
       return () => {
         // Remove index.html serving middleware.
@@ -74,6 +132,11 @@ export const Serve = (
 
         // Add middleware that runs our entry server
         server.middlewares.use((req, res, ___next) => {
+          // Check if app needs reloading due to module invalidation
+          if (isNeedAppLoadOrReload(server)) {
+            appPromise = reloadApp(server)
+          }
+
           void HonoNodeServer.getRequestListener(async request => {
             // Always await the current app promise
             const app = await appPromise
@@ -81,8 +144,8 @@ export const Serve = (
               // Err.log(app)
               return ResponseInternalServerError()
             }
-            const response = await app.fetch(request, { viteDevServer: server })
-            return response
+
+            return await app.fetch(request)
           })(req, res)
         })
       }

package/src/cli/_/parameters.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod'
+
+/**
+ * Common parameter schemas for CLI commands
+ */
+
+export const projectParameter = z
+  .string()
+  .optional()
+  .describe(`The path to the project directory. Default is CWD (current working directory).`)

package/src/cli/commands/build.ts

@@ -1,12 +1,16 @@
-/* eslint-disable */
 // @ts-nocheck
 import { Api } from '#api/index'
-import { Vite } from '#dep/vite/index'
+import { projectParameter } from '#cli/_/parameters'
+import { ensureOptionalAbsoluteWithCwd } from '#lib/kit-temp'
 import { Command } from '@molt/command'
 import { z } from 'zod'
 
 const args = Command.create()
   .parameter(`--debug -d`, z.boolean().default(false))
+  .parameter(
+    `--project -p`,
+    projectParameter,
+  )
   .parameter(
     `--architecture -a`,
     Api.Config.BuildArchitecture.default('ssg').describe('Which kind of application architecture to output.'),
@@ -15,6 +19,10 @@ const args = Command.create()
     `--base -b`,
     z.string().optional().describe('Base public path for deployment (e.g., /my-project/)'),
   )
+  .parameter(
+    `--port`,
+    z.number().optional().describe('Default port for the SSR application'),
+  )
   .settings({
     parameters: {
       environment: {
@@ -28,14 +36,24 @@ const args = Command.create()
   })
   .parse()
 
-// HACK:
-// todo
-// we don't want to  lose pretty preting of defaults in Molt but
-// we don't want cli defaults to override explicit inputs in the config file either
-// we need something like setset and/or an ability in molt to show a default but then have undefined internally etc.
-// and now if user passes --no-debug/ --debug false it has no effect which is wrong since its not via default anymore, ... ugh
+const dir = ensureOptionalAbsoluteWithCwd(args.project)
+
+if (!await Api.Project.validateProjectDirectory(dir)) {
+  process.exit(1)
+}
+
 await Api.Builder.build({
-  ...(args.debug === false ? {} : { debug: args.debug }),
-  ...(args.architecture === 'ssg' ? {} : { architecture: args.architecture }),
-  ...(args.base ? { base: args.base } : {}),
+  dir,
+  overrides: {
+    build: {
+      architecture: args.architecture,
+      base: args.base,
+    },
+    server: {
+      port: args.port,
+    },
+    advanced: {
+      debug: args.debug,
+    },
+  },
 })

package/src/cli/commands/config/$default.ts

@@ -0,0 +1,7 @@
+import { consola } from 'consola'
+
+consola.info(`Available config commands:`)
+console.log(``)
+console.log(`  polen config create    Create a Polen configuration file`)
+console.log(``)
+consola.info(`Run a command to see its help.`)

package/src/cli/commands/config/create.ts

@@ -0,0 +1,42 @@
+import { Api } from '#api/index'
+import { projectParameter } from '#cli/_/parameters'
+import { ensureOptionalAbsoluteWithCwd } from '#lib/kit-temp'
+import { Command } from '@molt/command'
+import { Fs, Path } from '@wollybeard/kit'
+import consola from 'consola'
+
+const args = Command.create()
+  .parameter(
+    `--project -p`,
+    projectParameter,
+  )
+  .parse()
+
+const dir = ensureOptionalAbsoluteWithCwd(args.project)
+
+if (!await Api.Project.validateProjectDirectory(dir)) {
+  process.exit(1)
+}
+
+const fileName = 'polen.config.ts'
+const fileContent = `import { Polen } from 'polen'
+
+export default Polen.defineConfig({
+  // Your configuration options
+})
+`
+
+const filePath = Path.join(dir, fileName)
+
+const exists = await Fs.exists(filePath)
+if (exists) {
+  consola.info(`Polen configuration file already exists at ${fileName}`)
+  process.exit(0)
+}
+
+await Fs.write({
+  path: filePath,
+  content: fileContent,
+})
+
+consola.success(`Created Polen configuration file at ${fileName}`)

package/src/cli/commands/config.ts

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+import { Cli, Path } from '@wollybeard/kit'
+
+const commandsDir = Path.join(import.meta.dirname, `config`)
+await Cli.dispatch(commandsDir)

package/src/cli/commands/create.ts

@@ -1,5 +1,5 @@
-/* eslint-disable */
 // @ts-nocheck
+import { Api } from '#api/index'
 import { Command } from '@molt/command'
 import { Err, Fs, Manifest, Name, Path, Str } from '@wollybeard/kit'
 import * as Ansis from 'ansis'
@@ -7,7 +7,7 @@ import consola from 'consola'
 import { z } from 'zod'
 import { $ } from 'zx'
 
-const Examples = z.enum([`github`, `pokemon`])
+const Examples = z.enum([`hive`])
 
 const args = Command
   .create()
@@ -33,7 +33,7 @@ const args = Command
     `version`,
     z.string().optional().describe(`Version of Polen to use. Defaults to latest release. Ignored if --link is used.`),
   )
-  .parameter(`example`, Examples.default(`pokemon`).describe(`The example to use to scaffold your project.`))
+  .parameter(`example`, Examples.default(`hive`).describe(`The example to use to scaffold your project.`))
   .settings({
     parameters: {
       environment: {
@@ -49,10 +49,9 @@ const args = Command
 
 const getProjectRoot = async (): Promise<string> => {
   if (args.path) {
-    const stat = await Fs.stat(args.path)
-    if (Fs.isNotFoundError(stat)) return args.path
-    if (stat.isDirectory() && await Fs.isEmptyDir(args.path)) return args.path
-    consola.error(`The given path ${args.path} already exists and is not an empty directory`)
+    if (await Api.Project.validateProjectDirectory(args.path, { mustExist: false, mustBeEmpty: true })) {
+      return args.path
+    }
     process.exit(1)
   }
 

package/src/cli/commands/dev.ts

@@ -1,10 +1,10 @@
-/* eslint-disable */
 // @ts-nocheck
 import { Api } from '#api/index'
+import { projectParameter } from '#cli/_/parameters'
 import { Vite } from '#dep/vite/index'
-import { ensureOptionalAbsolute, ensureOptionalAbsoluteWithCwd } from '#lib/kit-temp'
+import { ensureOptionalAbsoluteWithCwd } from '#lib/kit-temp'
 import { Command } from '@molt/command'
-import { Err, Path } from '@wollybeard/kit'
+import { Err } from '@wollybeard/kit'
 import { z } from 'zod'
 
 const args = Command.create()
@@ -12,12 +12,16 @@ const args = Command.create()
   .parameter(
     `--project -p`,
     // @ts-expect-error
-    z.string().optional().describe(`The path to the project directory. Default is CWD (current working directory).`),
+    projectParameter,
   )
   .parameter(
     `--base -b`,
     z.string().optional().describe('Base public path for deployment (e.g., /my-project/)'),
   )
+  .parameter(
+    `--port`,
+    z.number().optional().describe('Port to run the development server on'),
+  )
   .settings({
     parameters: {
       environment: {
@@ -31,12 +35,21 @@ const args = Command.create()
   })
   .parse()
 
-const dir = ensureOptionalAbsoluteWithCwd(args.project) as string
+const dir = ensureOptionalAbsoluteWithCwd(args.project)
+
+if (!await Api.Project.validateProjectDirectory(dir)) {
+  process.exit(1)
+}
 
 const viteUserConfig = await Api.ConfigResolver.fromFile({
   dir,
   overrides: {
-    ...(args.base ? { build: { base: args.base } } : {}),
+    build: {
+      base: args.base,
+    },
+    server: {
+      port: args.port,
+    },
     advanced: {
       debug: args.debug,
     },

package/src/cli/commands/open.ts

@@ -1,4 +1,3 @@
-/* eslint-disable */
 // @ts-nocheck
 /*
  * Examples

package/src/cli/commands/static/rebase.ts

@@ -1,4 +1,3 @@
-/* eslint-disable */
 // @ts-nocheck
 import { Api } from '#api/index'
 import { Task } from '#lib/task'

package/src/cli/commands/static.ts

@@ -2,5 +2,5 @@
 
 import { Cli, Path } from '@wollybeard/kit'
 
-const commandsDir = Path.join(import.meta.dirname, 'static')
+const commandsDir = Path.join(import.meta.dirname, `static`)
 await Cli.dispatch(commandsDir)

package/src/dep/graphql-inspector/index.ts

@@ -1 +1 @@
-export * as GraphqlInspector from './graphql-inspector.ts'
+export * as GraphqlInspector from './graphql-inspector.js'

package/src/dep/hono/hono.ts

@@ -1,2 +1,2 @@
 export * from 'hono'
-export * from './ssg.ts'
+export * from './ssg.js'

package/src/dep/hono/index.ts

@@ -1 +1 @@
-export * as Hono from './hono.ts'
+export * as Hono from './hono.js'

package/src/dep/superjson/index.ts

@@ -1 +1 @@
-export * as Superjson from './superjson.ts'
+export * as Superjson from './superjson.js'

package/src/dep/tiny-globby/index.ts

@@ -1 +1 @@
-export * as TinyGlobby from './tiny-globby.ts'
+export * as TinyGlobby from './tiny-globby.js'

package/src/dep/vite/index.ts

@@ -1 +1 @@
-export * as Vite from './vite.ts'
+export * as Vite from './vite.js'

package/src/exports/index.ts

@@ -1 +1 @@
-export * as Polen from './polen.ts'
+export * as Polen from './polen.js'

package/src/exports/mdx.ts

@@ -0,0 +1 @@
+export { MDXProvider, useMDXComponents } from '@mdx-js/react'

package/src/lib/apple-touch-icon/index.ts

@@ -1 +1 @@
-export * as AppleTouchIcon from './apple-touch-icon.ts'
+export * as AppleTouchIcon from './apple-touch-icon.js'

package/src/lib/errors/ContextualAggregateError.ts

@@ -1,5 +1,5 @@
 import { Arr } from '@wollybeard/kit'
-import { ContextualError } from './ContextualError.ts'
+import { ContextualError } from './ContextualError.js'
 
 /**
  * Aggregation Error enhanced with a context object and types members.

package/src/lib/errors/ContextualError.ts

@@ -1,4 +1,4 @@
-import type { Cause, Context } from './types.ts'
+import type { Cause, Context } from './types.js'
 
 /**
  * Error enhanced with a context object.

package/src/lib/errors/ErrorInternal.ts

@@ -1,5 +1,5 @@
-import { ContextualError } from './ContextualError.ts'
-import type { Cause, Context } from './types.ts'
+import { ContextualError } from './ContextualError.js'
+import type { Cause, Context } from './types.js'
 
 export class ErrorInternal<
   $Name extends string = `ErrorInternal`,

package/src/lib/errors/errors.ts

@@ -1,4 +1,4 @@
-export * from './ContextualAggregateError.ts'
-export * from './ContextualError.ts'
-export * from './ErrorInternal.ts'
-export * from './types.ts'
+export * from './ContextualAggregateError.js'
+export * from './ContextualError.js'
+export * from './ErrorInternal.js'
+export * from './types.js'

package/src/lib/errors/index.ts

@@ -1 +1 @@
-export * as Errors from './errors.ts'
+export * as Errors from './errors.js'

package/src/lib/errors/types.ts

@@ -1,4 +1,4 @@
-import type { ContextualError } from './ContextualError.ts'
+import type { ContextualError } from './ContextualError.js'
 
 export type Cause = Error | ContextualError
 export type Context = object

package/src/lib/extensible-data/index.ts

@@ -1 +1 @@
-export * as ExtensibleData from './extensible-data.ts'
+export * as ExtensibleData from './extensible-data.js'

package/src/lib/favicon/index.ts

@@ -1 +1 @@
-export * as Favicon from './favicon.ts'
+export * as Favicon from './favicon.js'

package/src/lib/file-router/diagnostic-reporter.ts

@@ -1,22 +1,22 @@
-import type { Diagnostic } from './linter.ts'
+import type { Diagnostic } from './linter.js'
 
 export const reportDiagnostics = (diagnostics: Diagnostic[]) => {
   if (diagnostics.length === 0) return
 
-  const errors = diagnostics.filter(d => d.severity === 'error')
-  const warnings = diagnostics.filter(d => d.severity === 'warning')
-  const infos = diagnostics.filter(d => d.severity === 'info')
+  const errors = diagnostics.filter(d => d.severity === `error`)
+  const warnings = diagnostics.filter(d => d.severity === `warning`)
+  const infos = diagnostics.filter(d => d.severity === `info`)
 
   const summary = [
-    errors.length > 0 && `${errors.length} error${errors.length === 1 ? '' : 's'}`,
-    warnings.length > 0 && `${warnings.length} warning${warnings.length === 1 ? '' : 's'}`,
-    infos.length > 0 && `${infos.length} info${infos.length === 1 ? '' : 's'}`,
-  ].filter(Boolean).join(', ')
+    errors.length > 0 && `${errors.length} error${errors.length === 1 ? `` : `s`}`,
+    warnings.length > 0 && `${warnings.length} warning${warnings.length === 1 ? `` : `s`}`,
+    infos.length > 0 && `${infos.length} info${infos.length === 1 ? `` : `s`}`,
+  ].filter(Boolean).join(`, `)
 
-  console.warn(`\n🔍 Polen found ${summary}:\n`)
+  console.warn(`\nPolen found ${summary}:\n`)
 
   diagnostics.forEach((diagnostic, index) => {
-    const icon = diagnostic.severity === 'error' ? '❌' : diagnostic.severity === 'warning' ? '⚠️ ' : 'ℹ️ '
+    const icon = diagnostic.severity === `error` ? `✗` : diagnostic.severity === `warning` ? `⚠` : `ⓘ`
     console.warn(`${icon} ${index + 1}. ${diagnostic.message}\n`)
   })
 }

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

@@ -1,3 +1,3 @@
-export * from './linter.ts'
-export * from './route.ts'
-export * from './scan.ts'
+export * from './linter.js'
+export * from './route.js'
+export * from './scan.js'

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

@@ -1,7 +1,7 @@
 import { Fn } from '@wollybeard/kit'
 import { describe, expect } from 'vitest'
-import { test } from '../../../tests/unit/helpers/test.ts'
-import { FileRouter } from './index.ts'
+import { test } from '../../../tests/unit/helpers/test.js'
+import { FileRouter } from './index.js'
 
 /* Note
 

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

@@ -1 +1 @@
-export * as FileRouter from './file-router.ts'
+export * as FileRouter from './file-router.js'

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

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest'
-import { lint } from './linter.ts'
-import type { Route } from './route.ts'
+import { lint } from './linter.js'
+import type { Route } from './route.js'
 
 const createRoute = (path: string[], order?: number, isIndex = false): Route => {
   const name = isIndex ? 'index' : path[path.length - 1]!

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

@@ -1,12 +1,12 @@
 import { Idx, Path } from '@wollybeard/kit'
-import { type Route, type RouteFile, routeIsFromIndexFile, routeToPathExpression } from './route.ts'
+import { type Route, type RouteFile, routeIsFromIndexFile, routeToPathExpression } from './route.js'
 
-export type DiagnosticSeverity = 'error' | 'warning' | 'info'
+export type DiagnosticSeverity = `error` | `warning` | `info`
 
 export type Diagnostic = DiagnosticIndexConflict | DiagnosticNumberedPrefixConflict | DiagnosticNumberedPrefixOnIndex
 
 export interface DiagnosticIndexConflict {
-  type: 'index-conflict'
+  type: `index-conflict`
   severity: DiagnosticSeverity
   message: string
   literal: {
@@ -18,7 +18,7 @@ export interface DiagnosticIndexConflict {
 }
 
 export interface DiagnosticNumberedPrefixConflict {
-  type: 'numbered-prefix-conflict'
+  type: `numbered-prefix-conflict`
   severity: DiagnosticSeverity
   message: string
   kept: {
@@ -32,7 +32,7 @@ export interface DiagnosticNumberedPrefixConflict {
 }
 
 export interface DiagnosticNumberedPrefixOnIndex {
-  type: 'numbered-prefix-on-index'
+  type: `numbered-prefix-on-index`
   severity: DiagnosticSeverity
   message: string
   file: RouteFile
@@ -53,8 +53,8 @@ export const lint = (routes: Route[]): LintResult => {
   for (const route of routes) {
     if (routeIsFromIndexFile(route) && route.logical.order !== undefined) {
       const diagnostic: DiagnosticNumberedPrefixOnIndex = {
-        type: 'numbered-prefix-on-index',
-        severity: 'warning',
+        type: `numbered-prefix-on-index`,
+        severity: `warning`,
         message: `Numbered prefix on index file has no effect. The file:\n  ${
           Path.format(route.file.path.relative)
         }\n\nhas a numbered prefix (${route.logical.order}_) which doesn't affect ordering since index files represent their parent directory.`,
@@ -85,8 +85,8 @@ export const lint = (routes: Route[]): LintResult => {
           : `The file with lower order number (${dropped.logical.order}) is being dropped in favor of the one with higher order (${kept.logical.order}).`
 
         const diagnostic: DiagnosticNumberedPrefixConflict = {
-          type: 'numbered-prefix-conflict',
-          severity: 'error',
+          type: `numbered-prefix-conflict`,
+          severity: `error`,
           // dprint-ignore
           message: `Your files represent conflicting routes due to numbered prefixes. This file:\n  ${Path.format(kept.file.path.relative)}\n\nconflicts with this file:\n\n  ${Path.format(dropped.file.path.relative)}.\n\n${orderMessage}`,
           kept: {
@@ -110,8 +110,8 @@ export const lint = (routes: Route[]): LintResult => {
 
       // Report
       const diagnostic: DiagnosticIndexConflict = {
-        type: 'index-conflict',
-        severity: 'error',
+        type: `index-conflict`,
+        severity: `error`,
         // dprint-ignore
         message: `Your files represent conflicting routes. This index file route:\n  ${Path.format(index.file.path.relative)}\n\nconflicts with this literal file route:\n\n  ${Path.format(literal.file.path.relative)}.\n\nYour index route is being ignored.`,
         literal: {

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

@@ -1,7 +1,7 @@
 import { TinyGlobby } from '#dep/tiny-globby/index'
 import { Path, Str } from '@wollybeard/kit'
-import { type Diagnostic, lint } from './linter.ts'
-import { type Route, type RouteFile, type RouteLogical } from './route.ts'
+import { type Diagnostic, lint } from './linter.js'
+import { type Route, type RouteFile, type RouteLogical } from './route.js'
 
 //
 //
@@ -16,7 +16,7 @@ const conventions = {
     name: `index`,
   },
   numberedPrefix: {
-    pattern: Str.pattern<{ groups: ['order', 'name'] }>(/^(?<order>\d+)[_-](?<name>.+)$/),
+    pattern: Str.pattern<{ groups: [`order`, `name`] }>(/^(?<order>\d+)[_-](?<name>.+)$/),
   },
 }
 
@@ -76,7 +76,7 @@ export const filePathToRoute = (filePathExpression: string, rootDir: string): Ro
   const id = filePathExpression // Use absolute path as unique ID
   const relativePath = Path.relative(rootDir, filePathExpression)
   const parentDir = Path.dirname(relativePath)
-  const parentId = parentDir === '.' ? null : Path.join(rootDir, parentDir)
+  const parentId = parentDir === `.` ? null : Path.join(rootDir, parentDir)
 
   return {
     logical,

package/src/lib/grafaid/_Nodes.ts

@@ -1 +1 @@
-export * as Nodes from './document.ts'
+export * as Nodes from './document.js'