reduce files at top level

Author: dsherret

app.ts

@@ -10,8 +10,8 @@ import {
   type GitHubApiClient,
   RealGitHubApiClient,
 } from "./lib/github-api-client.ts";
-import { ConfigProvider } from "./config.ts";
-import { LoggerFactory } from "./logger.ts";
+import { ConfigProvider } from "./lib/config.ts";
+import { LoggerFactory } from "./lib/logger.ts";
 import { InsightsPageController } from "./routes/insights.tsx";
 import { HomePageController } from "./routes/index.tsx";
 import { RunPageController } from "./routes/results/[runId].tsx";
@@ -20,6 +20,7 @@ import {
   type ArtifactParser,
   ZipArtifactParser,
 } from "./lib/artifact-parser.ts";
+import { App, staticFiles } from "fresh";
 
 export interface AppState {
   store: AppStore;
@@ -28,7 +29,6 @@ export interface AppState {
 export type AppStore = ReturnType<typeof createRequestStore>;
 
 const configProvider = new ConfigProvider();
-
 // services that live for the duration of the application
 const appStore = defineStore()
   .add("loggerFactory", () => {
@@ -58,7 +58,7 @@ const appStore = defineStore()
   })
   .finalize();
 
-export function createRequestStore() {
+function createRequestStore() {
   // services that live for the duration of a request
   return appStore.createChild()
     .add("logger", (store) => {
@@ -85,3 +85,14 @@ export function createRequestStore() {
     })
     .finalize();
 }
+
+export const app = new App<AppState>();
+
+app
+  .use(staticFiles())
+  .use(async (ctx) => {
+    using scopedStore = createRequestStore();
+    ctx.state.store = scopedStore;
+    return await ctx.next();
+  })
+  .fsRoutes();

config.ts lib/config.tsconfig.ts renamed to lib/config.ts

@@ -1,4 +1,4 @@
-import type { ExtractInterface } from "./lib/types.ts";
+import type { ExtractInterface } from "./types.ts";
 
 export class LoggerFactory {
   #requestId = 0;

logger.ts lib/logger.tslogger.ts renamed to lib/logger.ts

@@ -1,7 +1,7 @@
 import { Head } from "fresh/runtime";
 import { define } from "@/define.ts";
 import type { RunsFetcher } from "@/lib/runs-fetcher.ts";
-import { formatDate, getStatusBadge } from "@/render.tsx";
+import { formatDate, getStatusBadge } from "@/lib/render.tsx";
 
 export const handler = define.handlers({
   GET(ctx) {

render.tsx lib/render.tsxrender.tsx renamed to lib/render.tsx

@@ -5,7 +5,7 @@ import type {
   JobTestResults,
   TestResultsDownloader,
 } from "@/lib/test-results-downloader.ts";
-import { NullLogger } from "@/logger.ts";
+import { NullLogger } from "@/lib/logger.ts";
 
 interface RunsWithCount {
   totalCount: number;

main.ts

@@ -5,7 +5,7 @@ import type {
   TestResultsDownloader,
 } from "@/lib/test-results-downloader.ts";
 import type { GitHubApiClient, WorkflowRun } from "@/lib/github-api-client.ts";
-import type { Logger } from "@/logger.ts";
+import type { Logger } from "@/lib/logger.ts";
 
 export const handler = define.handlers({
   GET(ctx) {

routes/index.tsx

@@ -5,7 +5,7 @@ import type {
   TestResultsDownloader,
 } from "@/lib/test-results-downloader.ts";
 import type { GitHubApiClient } from "@/lib/github-api-client.ts";
-import { formatDuration } from "@/render.tsx";
+import { formatDuration } from "@/lib/render.tsx";
 
 export const handler = define.handlers({
   GET(ctx) {

routes/insights.test.tsx

@@ -4,7 +4,9 @@ import tailwindcss from "@tailwindcss/vite";
 
 export default defineConfig({
   plugins: [
-    fresh(),
+    fresh({
+      serverEntry: "app.ts",
+    }),
     tailwindcss(),
   ],
 });