@timber-js/app 0.2.0-alpha.192 → 0.2.0-alpha.194

package/src/plugins/dev-server.ts

@@ -15,25 +15,31 @@
 import type { Plugin, ViteDevServer, DevEnvironment } from 'vite';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { TLSSocket } from 'node:tls';
-import { existsSync, statSync } from 'node:fs';
-import { join } from 'node:path';
+import { existsSync, realpathSync, statSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
 import { sendNodeResponse } from 'srvx/node';
-import type { PluginContext } from '../plugin-context.js';
+import type { PluginContext } from '../plugin-context.ts';
 import {
   sendErrorToOverlay,
   classifyErrorPhase,
   fixErrorStacktrace,
   parseFirstAppFrame,
   type ErrorPhase,
-} from '../dev-tools/overlay.js';
-import { generateDevErrorPage } from '../dev-tools/error-page.js';
-import { extractHmrOptions, type DevErrorHmrOptions } from '../dev-tools/dev-page-shell.js';
-import { addVirtualModuleContext } from '../config-validation.js';
-import { compressResponse } from '../server/compress.js';
-import { isMetadataRouteServePath } from '../server/metadata-routes.js';
-import { canonicalize } from '../server/canonicalize.js';
-import { matchUrlParts } from '../server/tree-match.js';
-import type { RouteTree } from '../routing/types.js';
+} from '../dev-tools/overlay.ts';
+import { generateDevErrorPage } from '../dev-tools/error-page.ts';
+import { extractHmrOptions, type DevErrorHmrOptions } from '../dev-tools/dev-page-shell.ts';
+import { addVirtualModuleContext } from '../config-validation.ts';
+import { registerDevDiscovery } from './dev-discovery.ts';
+import {
+  createGraphEndpointMiddleware,
+  makeGraphUpdateChannel,
+  type GraphUpdateChannel,
+} from './graph-endpoint.ts';
+import { compressResponse } from '../server/compress.ts';
+import { isMetadataRouteServePath } from '../server/metadata-routes.ts';
+import { canonicalize } from '../server/canonicalize.ts';
+import { matchUrlParts } from '../server/tree-match.ts';
+import type { RouteTree } from '../routing/types.ts';
 
 // ─── Constants ────────────────────────────────────────────────────────────
 
@@ -70,6 +76,10 @@ const ASSET_EXTENSIONS =
  * Hook: configureServer (returns post-hook to register after Vite's middleware)
  */
 export function timberDevServer(ctx: PluginContext): Plugin {
+  // Set in configureServer, consumed by hotUpdate/transform — the
+  // graph push channel emits through the server's HMR transport.
+  let graphChannel: GraphUpdateChannel | null = null;
+
   return {
     name: 'timber-dev-server',
 
@@ -77,6 +87,28 @@ export function timberDevServer(ctx: PluginContext): Plugin {
     // See 21-dev-server.md §Plugin Registration.
     apply: 'serve',
 
+    /**
+     * Push channel for the graph endpoint, phase 1: `invalidated`, one
+     * per (file, environment). Emitted from hotUpdate — which runs
+     * AFTER Vite invalidates the environment module graphs — never
+     * from a raw watcher listener, which would race consumers into
+     * querying pre-invalidation memberships (design/47 §"Dev-server
+     * endpoint").
+     */
+    hotUpdate({ file, type }) {
+      graphChannel?.onHotUpdate({ file, type, environment: this.environment.name });
+    },
+
+    /**
+     * Push channel phase 2: `transformed`, when a pending-invalidated
+     * module's import edges are actually rebuilt. A Set lookup for
+     * everything without a pending invalidation — free on the hot
+     * path. Returning nothing leaves the code untouched.
+     */
+    transform(_code, id) {
+      graphChannel?.onTransform(id, this.environment.name);
+    },
+
     /**
      * Register the dev server middleware and config file watcher.
      *
@@ -103,9 +135,62 @@ export function timberDevServer(ctx: PluginContext): Plugin {
       // as Vite's '{ type: "error" }' payload to trigger the overlay.
       listenForClientErrors(server, ctx.root);
 
+      // GET /__timber/graph — module-environment classification from the
+      // live env graphs, plus the timber:graph-update HMR push channel.
+      // Registered before the timber middleware so /__timber/* requests
+      // never reach the app pipeline. Dev-only by construction (this
+      // plugin is apply: 'serve'). See design/47 §"Dev-server endpoint".
+      server.middlewares.use(createGraphEndpointMiddleware(server, ctx));
+      graphChannel = makeGraphUpdateChannel(
+        ctx,
+        (payload) => server.hot.send(payload),
+        // "Edges rebuilt" signal: Vite sets a node's transformResult at
+        // the END of the transform request, after vite:import-analysis
+        // has updated the importer edges. Virtual ids (the route
+        // manifest's structural updates) have no file index — resolve
+        // them by id.
+        (file, environment) => {
+          const graph = server.environments[environment]?.moduleGraph;
+          if (!graph) return false;
+          const nodes = graph.getModulesByFile(file);
+          if (nodes) {
+            for (const node of nodes) {
+              if (node.transformResult != null) return true;
+            }
+            return false;
+          }
+          return graph.getModuleById(file)?.transformResult != null;
+        },
+        // Canonicalize watcher/hook paths into the module graphs' path
+        // space: under the default preserveSymlinks:false the graphs
+        // carry realpaths while watcher events can carry symlink paths
+        // — unkeyed by one canonical form, a pending entry would never
+        // match its own transform. Deleted files realpath their parent
+        // directory instead; virtual ids pass through untouched.
+        (file) => {
+          // Optional-chained: mock servers in unit tests carry a bare
+          // config object without resolve options.
+          if (server.config?.resolve?.preserveSymlinks || file.includes('virtual:')) return file;
+          try {
+            return realpathSync(file);
+          } catch {
+            try {
+              return join(realpathSync(dirname(file)), basename(file));
+            } catch {
+              return file;
+            }
+          }
+        }
+      );
+
       // Pre-hook — registers middleware before Vite's internals
       server.middlewares.use(createTimberMiddleware(server, ctx));
 
+      // Write this server's .timber/dev/<pid>-<port>-<token>.json record once
+      // the server is listening so the graph CLI / VS Code extension can
+      // discover it. See design/47-module-environment-tooling.md §5.
+      registerDevDiscovery(server.httpServer, ctx.root, server.config);
+
       // Wrap server.listen() to close the holding server immediately
       // before Vite binds the port — no gap where nothing is listening.
       // The holding server was started in rootSync's config() hook to

package/src/plugins/entries.ts

@@ -15,7 +15,7 @@ import type { Plugin } from 'vite';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { existsSync } from 'node:fs';
-import type { PluginContext } from '../plugin-context.js';
+import type { PluginContext } from '../plugin-context.ts';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 

package/src/plugins/fonts.ts

@@ -20,17 +20,17 @@
 
 import { parseAst } from 'vite';
 import type { Plugin, ResolvedConfig, ViteDevServer } from 'vite';
-import type { PluginContext } from '../plugin-context.js';
+import type { PluginContext } from '../plugin-context.ts';
 import {
   downloadAndCacheFonts,
   generateProductionFontFaces,
   resolveDevFontFaces,
-} from '../fonts/google.js';
-import { fontUrlPrefix } from '../fonts/paths.js';
-import { FontPipeline } from '../fonts/pipeline.js';
-import { runFontsTransform } from '../fonts/transform.js';
-import { installFontDevMiddleware } from '../fonts/dev-middleware.js';
-import { emitFontAssets, writeFontManifest, groupCachedFontsByFamily } from '../fonts/bundle.js';
+} from '../fonts/google.ts';
+import { fontUrlPrefix } from '../fonts/paths.ts';
+import { FontPipeline } from '../fonts/pipeline.ts';
+import { runFontsTransform } from '../fonts/transform.ts';
+import { installFontDevMiddleware } from '../fonts/dev-middleware.ts';
+import { emitFontAssets, writeFontManifest, groupCachedFontsByFamily } from '../fonts/bundle.ts';
 import {
   RESOLVED_GOOGLE,
   RESOLVED_LOCAL,
@@ -38,7 +38,7 @@ import {
   VIRTUAL_LOCAL,
   generateGoogleVirtualModule,
   generateLocalVirtualModule,
-} from '../fonts/virtual-modules.js';
+} from '../fonts/virtual-modules.ts';
 
 // ── Public re-exports ────────────────────────────────────────────────────
 //
@@ -47,7 +47,7 @@ import {
 // updating every caller. New helpers should be added to the per-concern
 // module first and re-exported here only if external code needs them.
 
-export { FontPipeline } from '../fonts/pipeline.js';
+export { FontPipeline } from '../fonts/pipeline.ts';
 export {
   generateFontId,
   extractFontConfig,
@@ -55,7 +55,7 @@ export {
   parseGoogleFontImports,
   parseGoogleFontFamilies,
   parseLocalFontImportName,
-} from '../fonts/transform.js';
+} from '../fonts/transform.ts';
 
 /**
  * Create the timber-fonts Vite plugin.
@@ -171,6 +171,13 @@ export function timberFonts(ctx: PluginContext): Plugin {
           return '';
         }
 
+        // The analyze crawl only needs import edges, not actual font
+        // CSS. Return an empty stylesheet so transforms resolve
+        // without triggering network fetches or cache writes.
+        if (process.env.TIMBER_ANALYZE === '1') {
+          return '';
+        }
+
         const skipFonts = process.env.TIMBER_SKIP_FONTS === '1';
 
         for (const font of pipeline.googleFonts()) {