@abide/abide 0.117.2 → 0.119.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abide/abide",
-    "version": "0.117.2",
+    "version": "0.119.0",
     "type": "module",
     "description": "Isomorphic type-safe framework for reactive async interfaces for humans and machines",
     "license": "MIT",

package/scaffold/AGENTS.md

@@ -36,7 +36,7 @@ before writing code, rather than guessing from Svelte, Vue or React. It installs
 - A file's path below `src/` is its address. `src/invoices/index.abide` answers `/invoices`,
   `src/invoices/[id].abide` answers `/invoices/123`, and `layout.abide` wraps the pages below it;
   the outermost one writes `<html>`. Run `bun run routes` to see every address and the file behind it.
-- A `.ts` beside the pages is a handler: `src/invoices/getInvoice.ts` holds
+- A `<name>.handler.ts` beside the pages is a handler: `src/invoices/getInvoice.handler.ts` holds
   `export default GET(…)` and answers `/invoices/getInvoice`. It is the app's public API, for pages,
   scripts, the CLI and MCP alike.
 - A `.abide` cannot export. A `<script server>` in one holds that file's private handlers

package/scaffold/src/getGreeting.test.ts

@@ -1,5 +1,6 @@
 import { expect, test } from 'bun:test'
-import getGreeting from './getGreeting.ts'
+
+import getGreeting from './getGreeting.handler.ts'
 
 test('the handler answers with the name it is given', async () => {
     expect(await getGreeting({ name: 'Ada' })).toBe('Hello, Ada')

package/scaffold/src/index.abide

@@ -1,6 +1,7 @@
 <script>
 import { reactive } from '@abide/abide'
-import getGreeting from '#src/getGreeting.ts'
+
+import getGreeting from '#src/getGreeting.handler.ts'
 
 let count = reactive(0)
 const greeting = reactive(() => getGreeting({ name: 'world' }))
@@ -11,5 +12,7 @@ const greeting = reactive(() => getGreeting({ name: 'world' }))
 <main>
     <h1>{greeting}</h1>
     <p>Clicked {count} times.</p>
-    <button onclick={() => { count = count + 1 }}>Click</button>
+    <button onclick={() => {
+        count = count + 1
+    }}>Click</button>
 </main>

package/scaffold/src/index.test.ts

@@ -1,6 +1,8 @@
 import { expect, test } from 'bun:test'
+
 import { flushSync } from '@abide/abide'
 import { measure, mount } from '@abide/harness/abide'
+
 import Index from './index.abide'
 
 test('a click rewrites the count and builds nothing', async () => {

package/scaffold/src/layout.abide

@@ -8,11 +8,11 @@ onStart(async (start) => {
 </script>
 
 <html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-</head>
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+    </head>
 <body>
-    <slot/>
-</body>
+        <slot />
+    </body>
 </html>

package/src/compiler/Lowering.ts

@@ -1,15 +1,17 @@
 import { SyntaxKind } from 'typescript/unstable/ast'
+
 import type { CheckerAnswer } from './CheckerAnswer.ts'
 import type { Read } from './classifyRead.ts'
 import { holdsSlot } from './classifyTemplate.ts'
 import type { Finding } from './Finding.ts'
-import type { AbideFile } from './parseAbide.ts'
+import { type AbideFile, scriptBodies } from './parseAbide.ts'
 import {
     type Origin,
     type Projection,
     projectShadow,
     type Span,
 } from './projectShadow.ts'
+import { importedNames } from './splitImports.ts'
 import type { InlineComponent, Setup, TemplateNode } from './TemplateNode.ts'
 import { nesting, type Token, tokenize } from './tokenize.ts'
 
@@ -82,6 +84,11 @@ export class Lowering {
      * rather than called, whose forwarding arrow takes an untyped rest.
      */
     readonly checking: boolean
+    /**
+     * Whether a script imports abide's own `raw`, which a checked lowering then leaves a template's
+     * `raw(x)` calling — the same function, and the import read where the author reads it.
+     */
+    private readonly importsRaw: boolean
     /**
      * The names a checked lowering read, each with whether it was read through a props accessor.
      *
@@ -133,6 +140,7 @@ export class Lowering {
         this.answer = answer
         this.holdsSlot = holdsSlot(file.template)
         this.checking = checking
+        this.importsRaw = importsAbideRaw(file)
         this.chunks = chunks
         this.routed = routed
     }
@@ -804,7 +812,9 @@ export class Lowering {
             // template are the same object. The read exists only where a template expression held
             // the call (`expressionFacts`), so a `<script>`'s `raw` stays the file's.
             case 'raw':
-                return this.use('raw')
+                return this.checking && this.importsRaw
+                    ? undefined
+                    : this.use('raw')
             // 27.13 — the call bound to a name, for the checker to read the defaults' type off.
             case 'config':
                 return this.checking
@@ -897,6 +907,14 @@ export class Lowering {
     }
 }
 
+function importsAbideRaw(file: AbideFile): boolean {
+    for (const body of scriptBodies(file))
+        for (const { name, specifier } of importedNames(body))
+            if (name === 'raw' && specifier.startsWith('@abide/abide'))
+                return true
+    return false
+}
+
 function isRawCallee(read: Read): boolean {
     return read.shape === 'raw'
 }

package/src/compiler/PositionTable.ts

@@ -1,4 +1,5 @@
 import type { Node } from 'typescript/unstable/ast'
+
 import type { Span } from './projectShadow.ts'
 
 /**

package/src/compiler/Refusals.ts

@@ -1,4 +1,5 @@
 import { resolve } from 'node:path' // bun exposes no path helpers of its own
+
 import { formatDiagnosis } from './formatDiagnosis.ts'
 import { diagnosisAt } from './lineOf.ts'
 import { PositionedRefusal } from './PositionedRefusal.ts'

package/src/compiler/TypeSession.ts

@@ -1,5 +1,6 @@
 import { type Dirent, readdirSync, realpathSync, statSync } from 'node:fs' // Bun exposes no sync directory listing or realpath of its own
 import { basename, dirname, join, resolve } from 'node:path' // Bun exposes no path helpers of its own
+
 import {
     getTouchingPropertyName,
     type Node,
@@ -8,7 +9,6 @@ import {
 } from 'typescript/unstable/ast'
 import {
     API,
-    type Symbol as CheckedSymbol,
     type Checker,
     type CompletionEntry,
     type CompletionInfo,
@@ -17,30 +17,34 @@ import {
     type Project,
     SignatureKind,
     type Snapshot,
+    type Symbol as CheckedSymbol,
     SymbolFlags,
     type Type,
 } from 'typescript/unstable/async'
+
 import { placeOf } from '#server/placement.ts'
+import { parseRoutePattern } from '#shared/routePattern.ts'
+
 import { aliasedSymbol } from './aliasedSymbol.ts'
 import { AMBIENT_SOURCES, ambientReadsIn } from './ambientReadsIn.ts'
-import type { AppLayout, PlacedSource } from './appLayout.ts'
+import type { AppLayout, AppRoute, PlacedSource } from './appLayout.ts'
 import { argsDefaultsIn } from './argsDefaultsIn.ts'
-import { type CheckerAnswer, UNCHECKED } from './CheckerAnswer.ts'
 import {
+    checkedShadow,
     COMPONENT_MODULE,
     COMPONENT_STAND_IN,
-    checkedShadow,
     moduleConfigShadow,
 } from './checkedShadow.ts'
+import { type CheckerAnswer, UNCHECKED } from './CheckerAnswer.ts'
 import type { Finding } from './Finding.ts'
 import { isIgnored } from './isIgnored.ts'
-import { CHECKED_VALUES } from './Lowering.ts'
 import { diagnosisAt, lineOf } from './lineOf.ts'
+import { CHECKED_VALUES } from './Lowering.ts'
 import type { AbideFile } from './parseAbide.ts'
 import { projectShadow, type Span } from './projectShadow.ts'
 import { type Abide, abideIn, isReactiveType } from './reactiveTypes.ts'
-import type { ParsedSource, ReadSource } from './readSources.ts'
 import { readsIn, type ShadowSpans } from './readsIn.ts'
+import type { ParsedSource, ReadSource } from './readSources.ts'
 import {
     CHECKED_SUFFIX,
     mapForward,
@@ -974,7 +978,7 @@ export class TypeSession {
             Partial<Pick<PlacedSource, 'kind' | 'route'>> & {
                 quiet?: boolean
             })[],
-        app: Pick<AppLayout, 'root' | 'addresses' | 'handlers'>,
+        app: Pick<AppLayout, 'root' | 'addresses' | 'handlers' | 'routes'>,
         scripts = true,
     ): Promise<{ diagnoses: Diagnosis[]; refused: Set<string> }> {
         using _held = this.hold()
@@ -1033,7 +1037,7 @@ export class TypeSession {
         // module augments one.
         this.register(
             `${this.canonical(within)}/${ROUTES_DECLARATION}`,
-            routesDeclaration(app.addresses),
+            routesDeclaration(app.addresses, app.routes),
             created,
             changed,
         )
@@ -1570,13 +1574,46 @@ function isFile(path: string): boolean {
 const ROUTES_DECLARATION = 'abide-routes.d.ts'
 const URL_SOURCE = Bun.fileURLToPath(new URL('../shared/url', import.meta.url))
 
-/** 30.26 — each of `addresses` as a key of abide's `Routes`. */
-function routesDeclaration(addresses: readonly string[]): string {
+/**
+ * 30.26 — each of `addresses` as a key of abide's `Routes`, and 23.9, 30.3 — a page route's params
+ * narrowed where its matcher is an alternation of literals, which is the one matcher a type can say.
+ */
+function routesDeclaration(
+    addresses: readonly string[],
+    routes: readonly AppRoute[],
+): string {
+    const narrowed = new Map<string, string>()
+    for (const route of routes) {
+        let members = ''
+        for (const segment of parseRoutePattern(route.pattern)) {
+            if (segment.kind !== 'required' && segment.kind !== 'optional')
+                continue
+            const literals = literalsOf(
+                segment.matcher === undefined
+                    ? undefined
+                    : route.matchers[segment.matcher],
+            )
+            if (literals === undefined) continue
+            members += ` ${JSON.stringify(segment.name)}${segment.kind === 'optional' ? '?' : ''}: ${literals};`
+        }
+        if (members !== '') narrowed.set(route.pattern, `{${members} }`)
+    }
     let keys = ''
     for (const route of addresses)
-        keys += `        ${JSON.stringify(route)}: true\n`
+        keys += `        ${JSON.stringify(route)}: ${narrowed.get(route) ?? 'true'}\n`
     return `export {}\ndeclare module ${JSON.stringify(URL_SOURCE)} {\n    interface Routes {\n${keys}    }\n}\n`
 }
+
+/** The union of the literals an anchored matcher source alternates between, or `undefined`. */
+function literalsOf(source: string | undefined): string | undefined {
+    const body = source?.match(/^\^\(\?!\\\.\\\.\?\$\)\(\?:(.*)\)\$$/)?.[1]
+    if (body === undefined || !/^[\w~-]+(?:\|[\w~-]+)*$/.test(body))
+        return undefined
+    return body
+        .split('|')
+        .map((literal) => JSON.stringify(literal))
+        .join(' | ')
+}
 const AMBIENT_DECLARATIONS = `declare module '*.css' {}
 declare module '*.md' {
     const text: string
@@ -1769,8 +1806,7 @@ const CATEGORIES = ['warning', 'error', 'suggestion', 'message'] as const
 function flatten(diagnostic: {
     text: string
     messageChain?:
-        | readonly { text: string; messageChain?: unknown }[]
-        | undefined
+        readonly { text: string; messageChain?: unknown }[] | undefined
 }): string {
     let message = diagnostic.text
     const chain = diagnostic.messageChain ?? []

package/src/compiler/aliasedSymbol.ts

@@ -1,6 +1,6 @@
 import {
-    type Symbol as CheckedSymbol,
     type Checker,
+    type Symbol as CheckedSymbol,
     SymbolFlags,
 } from 'typescript/unstable/async'
 

package/src/compiler/ambientReadsIn.ts

@@ -10,6 +10,7 @@ import {
     isPropertyAssignment,
 } from 'typescript/unstable/ast/is'
 import type { Checker } from 'typescript/unstable/async'
+
 import { aliasedSymbol } from './aliasedSymbol.ts'
 import {
     isWrittenInPlace,

package/src/compiler/appLayout.ts

@@ -1,4 +1,5 @@
 import { relative as relativeTo } from 'node:path' // bun exposes no path helpers of its own
+
 import { appFiles } from '#server/appTree.ts'
 import { type Placement, placement, routeOf } from '#server/placement.ts'
 import {
@@ -13,13 +14,15 @@ import {
     parseRoutePattern,
     type Segment,
 } from '#shared/routePattern.ts'
+
 import { abideImportsOf, componentGraph } from './componentGraph.ts'
 import type { HandlerFile } from './handlersUnder.ts'
 import { hookCalls, hooksIn } from './hookCalls.ts'
+import { matchersOf, type MountedTree } from './matchersOf.ts'
 import { mountsOf } from './mountsOf.ts'
 import { type AbideFile, scriptBodies } from './parseAbide.ts'
-import { Refusals } from './Refusals.ts'
 import { type ParsedSource, parseSources } from './readSources.ts'
+import { Refusals } from './Refusals.ts'
 import { resolverIn } from './resolverIn.ts'
 import { attributedImports } from './splitImports.ts'
 import type { Diagnosis } from './TypeSession.ts'
@@ -49,6 +52,8 @@ export type PlacedHandler = HandlerFile & {
     scope: string
     text: string
     hooks: string[]
+    /** 23.26 — each matcher its route names, to the anchored source the route tables carry. */
+    matchers: Record<string, string>
 }
 
 /** A page or an error page and the layouts it renders inside. */
@@ -64,6 +69,8 @@ export type AppRoute = {
      * cannot be declared twice.
      */
     layouts: string[]
+    /** 23.26 — each matcher its pattern names, to the anchored source the route tables carry. */
+    matchers: Record<string, string>
 }
 
 /** The app at a root, laid out (`appLayout`). */
@@ -105,7 +112,10 @@ export async function appLayout(root: string): Promise<AppLayout> {
     // COLLECTED, whoever asks: a layout is kept across checks (`AppChecker`), and a build adopts
     // what it found (`Refusals.adopt`).
     const refusals = new Refusals(root, true)
-    const { abide, handlers, modules, published } = appFiles(root, refusals)
+    const { abide, handlers, params, modules, published } = appFiles(
+        root,
+        refusals,
+    )
     await refuseModuleHooks(root, modules, refusals)
     const resolve = resolverIn()
     const unparsed = new Refusals(root, true)
@@ -149,10 +159,43 @@ export async function appLayout(root: string): Promise<AppLayout> {
             scope: placement(file.relative, file.position).scope,
             text,
             hooks: hooksIn([text]),
+            matchers: {},
         })
     }
     refuseStrayLauncher(sources, placedHandlers, refusals)
     const { routes, errors } = routesOf(sources, refusals)
+    // 23.26 — every routed file's matchers, a layout's among them for 23.27's sake though no table
+    // carries a layout's own.
+    const routed: {
+        path: string
+        relative: string
+        position: string
+        route: string
+    }[] = []
+    const relativeToPath = new Map<string, string>()
+    for (const source of sources) {
+        if (source.route === undefined) continue
+        relativeToPath.set(source.relative, source.path)
+        routed.push({
+            path: source.path,
+            relative: source.relative,
+            position: source.position,
+            route: source.route,
+        })
+    }
+    for (const handler of placedHandlers) routed.push(handler)
+    const matchers = await matchersOf(
+        root,
+        routed,
+        params.map((path) => `${root}/${path}`),
+        found.trees,
+        refusals,
+    )
+    for (const handler of placedHandlers)
+        handler.matchers = matchers.get(handler.path) ?? {}
+    for (const route of [...routes, ...errors])
+        route.matchers =
+            matchers.get(relativeToPath.get(route.source) ?? '') ?? {}
     const addresses = new Set<string>()
     for (const route of routes) addresses.add(route.pattern)
     for (const address of published.values()) addresses.add(address)
@@ -215,6 +258,8 @@ export async function withDependencies(
     handlers: HandlerFile[]
     /** 23.19 — each mounted `.abide`'s position, by its path; one at its own path is not here. */
     positions: Map<string, string>
+    /** 23.26 — each mounted directory, where it mounts, and the param files under it. */
+    trees: MountedTree[]
 }> {
     const all = [...parsed]
     const handlers: HandlerFile[] = []
@@ -231,6 +276,7 @@ export async function withDependencies(
     const positions = new Map<string, string>()
     // 23.20 — a directory mounts once, and by whom.
     const mountedBy = new Map<string, string>()
+    const trees: MountedTree[] = []
     const add = async (path: string): Promise<void> => {
         let text: string
         try {
@@ -268,6 +314,11 @@ export async function withDependencies(
                 continue
             }
             mountedBy.set(mount.directory, position)
+            trees.push({
+                directory: mount.directory,
+                at: mount.at,
+                params: mount.params,
+            })
             for (const placed of mount.handlers) {
                 // Two mounts can overlap, one directory inside the other; a file is placed once.
                 if (handled.has(placed.path)) continue
@@ -292,7 +343,7 @@ export async function withDependencies(
             if (!byPath.has(target)) await add(target)
         }
     }
-    return { sources: all, handlers, positions }
+    return { sources: all, handlers, positions, trees }
 }
 
 /** Whether a page or an error page has anything to paint: a template, or a head. 23.3, 35.14. */
@@ -450,6 +501,7 @@ function routesOf(
             pattern,
             source: source.relative,
             layouts: around,
+            matchers: {},
         })
     }
     return { routes, errors }

package/src/compiler/appMap.ts

@@ -14,6 +14,8 @@ type MappedRoute = {
     address: string
     file: string
     kind: 'page' | 'handler' | 'private'
+    /** 23.26 — each matcher its address names, to the anchored pattern it takes a part by. */
+    matchers: Record<string, string>
 }
 
 /** One hook call, the route it is filed at, and the file making it. */
@@ -39,6 +41,7 @@ export async function appMap(
             address: route.pattern,
             file: route.source,
             kind: 'page',
+            matchers: route.matchers,
         })
     for (const mount of app.mounts)
         routes.push({
@@ -46,6 +49,7 @@ export async function appMap(
             address: mount.address,
             file: mount.source,
             kind: mount.private ? 'private' : 'handler',
+            matchers: mount.matchers,
         })
     routes.sort((one, two) =>
         one.address === two.address
@@ -79,6 +83,17 @@ export function mapText(map: Awaited<ReturnType<typeof appMap>>): string {
         lines.push(
             `${route.method.padEnd(methods)}  ${route.address.padEnd(addresses)}  ${route.file}${route.kind === 'private' ? '  (private)' : ''}`,
         )
+    // 23.26 — each matcher once, whichever routes name it: what a part must match to be taken.
+    const matchers = new Map<string, string>()
+    for (const route of map.routes)
+        for (const name in route.matchers)
+            matchers.set(name, route.matchers[name] as string)
+    if (matchers.size > 0) {
+        lines.push('', 'matchers')
+        const names = width([...matchers.keys()])
+        for (const [name, pattern] of matchers)
+            lines.push(`  ${name.padEnd(names)}  /${pattern}/`)
+    }
     if (map.hooks.length > 0) {
         lines.push('', 'hooks')
         const hooks = width(map.hooks.map((hook) => hook.hook))

package/src/compiler/argsDefaultsIn.ts

@@ -16,6 +16,7 @@ import {
     isStringLiteral,
 } from 'typescript/unstable/ast/is'
 import { type Checker, SymbolFlags, type Type } from 'typescript/unstable/async'
+
 import type { Finding } from './Finding.ts'
 import { optionNamed, reactiveOptions } from './reactiveOptions.ts'
 

package/src/compiler/argsSchemaOf.ts

@@ -18,6 +18,7 @@ import {
     type TypeReference,
     type UnionOrIntersectionType,
 } from 'typescript/unstable/async'
+
 import type { JsonValue } from '#shared/JsonValue.ts'
 
 type Schema = { [keyword: string]: JsonValue }

package/src/compiler/checkApp.ts

@@ -1,12 +1,14 @@
 import { relative } from 'node:path' // bun exposes no path helpers of its own
+
 import { type Placement, placement } from '#server/placement.ts'
+
 import type { PlacedSource } from './appLayout.ts'
 import { type AppChecker, compiled } from './compileApp.ts'
 import { abideImportsOf } from './componentGraph.ts'
 import { hooksIn } from './hookCalls.ts'
 import { parseAbide, scriptBodies } from './parseAbide.ts'
-import { Refusals } from './Refusals.ts'
 import { parseSources, readSources } from './readSources.ts'
+import { Refusals } from './Refusals.ts'
 import type { Diagnosis } from './TypeSession.ts'
 
 /**

package/src/compiler/checkedShadow.ts

@@ -1,4 +1,5 @@
 import { SERVER_SPECIFIER } from '#shared/SPECIFIERS.ts'
+
 import type { CheckerAnswer } from './CheckerAnswer.ts'
 import type { Finding } from './Finding.ts'
 import { hookCalls } from './hookCalls.ts'
@@ -10,8 +11,8 @@ import {
     Lowering,
     type Routed,
 } from './Lowering.ts'
-import { holdsReactive } from './PositionTable.ts'
 import type { AbideFile } from './parseAbide.ts'
+import { holdsReactive } from './PositionTable.ts'
 import { NO_PROPS, type Origin, type Span } from './projectShadow.ts'
 import { CHECKED_SUFFIX } from './ShadowMap.ts'
 import { abideImports } from './splitImports.ts'

package/src/compiler/classifyRead.ts

@@ -17,6 +17,7 @@ import {
     isPropertyAccessExpression,
     isShorthandPropertyAssignment,
 } from 'typescript/unstable/ast/is'
+
 import type { Span } from './projectShadow.ts'
 import { REACTIVE_MEMBERS } from './REACTIVE_MEMBERS.ts'
 

package/src/compiler/classifyTemplate.ts

@@ -3,6 +3,7 @@ import { escapeAttribute, escapeQuote } from '#shared/escapeText.ts'
 import { isEventName } from '#shared/isEventName.ts'
 import { safeUrl } from '#shared/safeUrl.ts'
 import { URL_ATTRIBUTES } from '#shared/URL_ATTRIBUTES.ts'
+
 import { decodeCharacterReferences } from './decodeCharacterReferences.ts'
 import {
     type Attribute,

package/src/compiler/compileApp.ts

@@ -1,5 +1,6 @@
 import { realpathSync } from 'node:fs' // bun exposes no sync realpath of its own
 import { dirname, posix } from 'node:path' // bun exposes no path helpers of its own
+
 import {
     type Compilation,
     type CompiledFile,
@@ -13,10 +14,11 @@ import { VIRTUAL_DIRECTORY } from '#server/VIRTUAL_DIRECTORY.ts'
 import { CLIENT_ADDRESS } from '#shared/ADDRESSES.ts'
 import type { JsonValue } from '#shared/JsonValue.ts'
 import { ROUTING_SPECIFIER, WIRE_SPECIFIER } from '#shared/SPECIFIERS.ts'
+
 import {
     type AppLayout,
-    type AppRoute,
     appLayout,
+    type AppRoute,
     type PlacedSource,
     shapeOf,
 } from './appLayout.ts'
@@ -25,8 +27,8 @@ import { handlersUnder } from './handlersUnder.ts'
 import { isAbideSpecifier } from './hookCalls.ts'
 import { nearest } from './nearest.ts'
 import { projectShadow } from './projectShadow.ts'
-import { Refusals } from './Refusals.ts'
 import { type ReadSource, readSources } from './readSources.ts'
+import { Refusals } from './Refusals.ts'
 import { respecified } from './splitImports.ts'
 import { type Diagnosis, TypeSession } from './TypeSession.ts'
 import { writeDefaultProject } from './writeDefaultProject.ts'
@@ -514,7 +516,7 @@ function tableOf(
             (layout) => `() => import(${tableImport(layout)})`,
         )
         rows.push(
-            `    { pattern: ${JSON.stringify(route.pattern)}, load: () => import(${tableImport(route.source)}), layouts: [${wrapping.join(', ')}]${column(route)} },`,
+            `    { pattern: ${JSON.stringify(route.pattern)}, load: () => import(${tableImport(route.source)}), layouts: [${wrapping.join(', ')}], matchers: ${JSON.stringify(route.matchers)}${column(route)} },`,
         )
     }
     return rows.join('\n')

package/src/compiler/compiledEntry.ts

@@ -2,6 +2,7 @@ import { tablePath } from '#server/abideModules.ts'
 import type { AppPackage } from '#server/config.ts'
 import type { SourceMaps } from '#server/installSourceMaps.ts'
 import { SERVER_TABLE } from '#server/TABLES.ts'
+
 import abidePackage from '../../package.json' with { type: 'json' }
 
 // What the executable starts from: `abide compile`'s, and `abide bundle`'s window over it (38.70).
@@ -120,7 +121,7 @@ import * as table from ${JSON.stringify(tablePath(app.root, SERVER_TABLE))}
     return `// Written by \`abide compile\`. The whole app, as what one executable holds.
 ${imports}
 // 38.56 — a file declaring handlers as a script names it through the app's one alias:
-// \`#src/invoices/getInvoice.ts\`, to the module it is.
+// \`#src/invoices/getInvoice.handler.ts\`, to the module it is.
 const declared = {}
 for (const row of table.handlers) declared[\`#src/\${row.source}\`] = row.load
 

package/src/compiler/componentGraph.ts

@@ -1,4 +1,5 @@
 import { dirname } from 'node:path' // bun exposes no path helpers of its own
+
 import { type AbideFile, scriptBodies } from './parseAbide.ts'
 import { abideImports } from './splitImports.ts'
 

package/src/compiler/declaredExports.ts

@@ -14,18 +14,19 @@ import {
     isVariableDeclaration,
 } from 'typescript/unstable/ast/is'
 import {
-    type Symbol as CheckedSymbol,
     type Checker,
     ObjectFlags,
     type ObjectType,
     type Project,
     SignatureKind,
+    type Symbol as CheckedSymbol,
     SymbolFlags,
     type Type,
     TypeFlags,
     type TypeReference,
     type UnionOrIntersectionType,
 } from 'typescript/unstable/async'
+
 import type { Mount } from '#server/answerRpc.ts'
 import type { CopyOptions } from '#shared/CopyOptions.ts'
 import {
@@ -33,6 +34,7 @@ import {
     defaultsInSource,
 } from '#shared/reactive/parameterDefaults.ts'
 import type { Method } from '#shared/rpc.ts'
+
 import { aliasedSymbol } from './aliasedSymbol.ts'
 import { defaultedMembers, parameterPattern } from './argsDefaultsIn.ts'
 import {
@@ -42,7 +44,6 @@ import {
     type Walk,
 } from './argsSchemaOf.ts'
 import { diagnosisAt } from './lineOf.ts'
-import type { Refusals } from './Refusals.ts'
 import { isReactiveCall, METHODS, optionNamed } from './reactiveOptions.ts'
 import {
     abideIn,
@@ -50,6 +51,7 @@ import {
     isReactiveMember,
     valueTypeOf,
 } from './reactiveTypes.ts'
+import type { Refusals } from './Refusals.ts'
 import type { Diagnosis } from './TypeSession.ts'
 
 /**