@abide/abide 0.123.2 → 0.123.3

package/src/compiler/TypeSession.ts

@@ -36,9 +36,13 @@ import {
     moduleConfigShadow,
 } from './checkedShadow.ts'
 import { type CheckerAnswer, UNCHECKED } from './CheckerAnswer.ts'
-import type { Finding } from './Finding.ts'
-import { isIgnored } from './isIgnored.ts'
-import { diagnosisAt, lineOf } from './lineOf.ts'
+import {
+    byPlace,
+    type Diagnosis,
+    type Finding,
+    placedFindings,
+} from './Diagnostics.ts'
+import { lineOf } from './lineOf.ts'
 import { CHECKED_VALUES } from './Lowering.ts'
 import type { AbideFile } from './parseAbide.ts'
 import { projectShadow, type Span } from './projectShadow.ts'
@@ -104,9 +108,11 @@ export class TypeSession {
         api: API,
         tsconfig: string,
         keyOf: (path: string) => string,
+        root: string,
     ) {
         this.api = api
         this.tsconfig = tsconfig
+        this.root = root
         this.opened = `${dirname(tsconfig)}/${SESSION_CONFIG}`
         this.keyOf = keyOf
     }
@@ -152,8 +158,8 @@ export class TypeSession {
      */
     private stoodIn = new Set<string>()
 
-    /** The app's root, real — set by `openChecker`. */
-    root = ''
+    /** The app's root, real. */
+    readonly root: string
 
     /**
      * `path` below the app's root, where it lies under it.
@@ -228,8 +234,11 @@ export class TypeSession {
         return COMPONENT_MODULE
     }
 
-    /** Opens a session on the project `tsconfig` configures. */
-    static async open(tsconfig: string): Promise<TypeSession> {
+    /**
+     * Opens a session on the project `tsconfig` configures, for the app at `root` — real, and empty
+     * for a session asked about no app's routes.
+     */
+    static async open(tsconfig: string, root = ''): Promise<TypeSession> {
         const api = new API({
             cwd: dirname(tsconfig),
             fs: {
@@ -261,7 +270,7 @@ export class TypeSession {
             throw new Error(
                 'abide: the TypeScript API no longer keeps `toPath` where the type session reads it, so a path cannot be keyed as the checker keys it.',
             )
-        const session = new TypeSession(api, tsconfig, toPath)
+        const session = new TypeSession(api, tsconfig, toPath, root)
         return session
     }
 
@@ -757,27 +766,14 @@ export class TypeSession {
             )
             answers[at] = read.answer
             suspects[at] = read.suspects
-            const placed: Diagnosis[] = []
-            for (const warning of read.warnings) {
-                const offset = query.map.toSource(
-                    query.map.shadowPath,
-                    warning.at,
-                )
-                if (
-                    source.text === undefined ||
-                    !isIgnored(source.text, offset, warning.message)
-                )
-                    placed.push(
-                        diagnosisAt(
-                            source.path,
-                            source.text,
-                            offset,
-                            'warning',
-                            warning.message,
-                        ),
-                    )
-            }
-            warned[at] = placed
+            warned[at] = placedFindings(
+                source.path,
+                source.text,
+                read.warnings,
+                (offset) => query.map.toSource(query.map.shadowPath, offset),
+                'warning',
+                true,
+            )
         }
         const every = queries.map((_, at) => at)
         const first = project
@@ -868,11 +864,13 @@ export class TypeSession {
      * 11.30 — `unkeyed`: every `args` defaulting a member its body's parameter does not, as warnings.
      * Both over every `.ts` under `within` and each of `sources` as the shadow `readsFor` registered
      * for it, because a keyed value is declared in a `.ts` as often as in a `.abide` — one walk of
-     * the files for the two, each finding on its own line of the file an author wrote.
+     * the files for the two, each finding on its own line of the file an author wrote. `scripts`
+     * as `diagnose` reads it: an editor asking about one page does not walk the app's `.ts`.
      */
     async lints(
         within: string,
         sources: readonly Omit<ParsedSource, 'quiet'>[],
+        scripts = true,
     ): Promise<{ ambient: Diagnosis[]; unkeyed: Diagnosis[] }> {
         using _held = this.hold()
         const ambient: Diagnosis[] = []
@@ -905,10 +903,13 @@ export class TypeSession {
         // A file of this session's own is one of `sources`' shadows or not walked at all: a
         // checked module is the lowering's, and placed nowhere an author wrote.
         const files: string[] = []
-        for (const path of this.rootsUnder(project, within)) {
-            const key = this.keyOf(path)
-            if (authored.has(key) || !this.shadows.has(key)) files.push(path)
-        }
+        if (scripts)
+            for (const path of this.rootsUnder(project, within)) {
+                const key = this.keyOf(path)
+                if (authored.has(key) || !this.shadows.has(key))
+                    files.push(path)
+            }
+        else for (const { map } of authored.values()) files.push(map.shadowPath)
         await Promise.all(
             files.map(async (path) => {
                 const sourceFile = await project.program.getSourceFile(path)
@@ -928,26 +929,25 @@ export class TypeSession {
                         : source.text
                 const place = (at: number): number =>
                     shadow === undefined ? at : shadow.map.toSource(path, at)
+                const named = source?.path ?? path
+                const ambientReads: Finding[] = []
                 for (const read of reads)
-                    ambient.push(
-                        diagnosisAt(
-                            source?.path ?? path,
-                            text,
-                            place(read.at),
-                            'error',
-                            `abide: a \`global\` value's body reads \`${read.ambient}\`, which belongs to the request it was built in — every later request would be answered with this one's. Take it out of the body, or drop \`global\`. RULEBOOK 11.37.`,
-                        ),
-                    )
-                for (const finding of defaults)
-                    unkeyed.push(
-                        diagnosisAt(
-                            source?.path ?? path,
-                            text,
-                            place(finding.at),
-                            'warning',
-                            finding.message,
-                        ),
-                    )
+                    ambientReads.push({
+                        at: read.at,
+                        message: `abide: a \`global\` value's body reads \`${read.ambient}\`, which belongs to the request it was built in — every later request would be answered with this one's. Take it out of the body, or drop \`global\`. RULEBOOK 11.37.`,
+                    })
+                ambient.push(
+                    ...placedFindings(
+                        named,
+                        text,
+                        ambientReads,
+                        place,
+                        'error',
+                    ),
+                )
+                unkeyed.push(
+                    ...placedFindings(named, text, defaults, place, 'warning'),
+                )
             }),
         )
         ambient.sort(byPlace)
@@ -1081,16 +1081,15 @@ export class TypeSession {
             })
             if (source.quiet) continue
             // A refusal is at a projection offset (`Lowering.refusals`).
-            for (const refusal of refusals)
-                refused.push(
-                    diagnosisAt(
-                        source.path,
-                        source.text,
-                        map.toSource(map.shadowPath, refusal.at),
-                        'error',
-                        refusal.message,
-                    ),
-                )
+            refused.push(
+                ...placedFindings(
+                    source.path,
+                    source.text,
+                    refusals,
+                    (at) => map.toSource(map.shadowPath, at),
+                    'error',
+                ),
+            )
             reports.push(
                 report(map.checkedPath, source.path, (position) =>
                     lineOf(
@@ -1621,20 +1620,6 @@ declare module '*.md' {
 }
 `
 
-/**
- * One thing the checker said, placed in the file the author wrote.
- *
- * 38.3 — line and column from 1.
- */
-export type Diagnosis = {
-    path: string
-    line: number
-    column: number
-    code: number
-    category: 'error' | 'warning' | 'suggestion' | 'message'
-    message: string
-}
-
 /**
  * Where something is in a file the author wrote, line and column from 1.
  *
@@ -1792,14 +1777,6 @@ async function describe(
     return `${keyword} ${name}: ${spelled}`
 }
 
-function byPlace(one: Diagnosis, two: Diagnosis): number {
-    return (
-        one.path.localeCompare(two.path) ||
-        one.line - two.line ||
-        one.column - two.column
-    )
-}
-
 /** Indexed by the API's `DiagnosticCategory`. */
 const CATEGORIES = ['warning', 'error', 'suggestion', 'message'] as const
 

package/src/compiler/appLayout.ts

@@ -16,16 +16,15 @@ import {
 } from '#shared/routePattern.ts'
 
 import { abideImportsOf, componentGraph } from './componentGraph.ts'
+import { type Diagnosis, Diagnostics } from './Diagnostics.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 { 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'
 
 // THE APP, LAID OUT ONCE PER COMPILE OR CHECK: every `.abide` and handler file it holds — its own, a
 // dependency's it imports, a package's it mounts — each with where it sits and what that makes it
@@ -110,15 +109,15 @@ export type AppLayout = {
  */
 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)
+    // what it found (`Diagnostics.adopt`).
+    const refusals = new Diagnostics(root, true)
     const { abide, handlers, params, modules, published } = appFiles(
         root,
         refusals,
     )
     await refuseModuleHooks(root, modules, refusals)
     const resolve = resolverIn()
-    const unparsed = new Refusals(root, true)
+    const unparsed = new Diagnostics(root, true)
     const own = parseSources(
         await textsAt(abide.map((path) => `${root}/${path}`)),
         unparsed,
@@ -140,13 +139,7 @@ export async function appLayout(root: string): Promise<AppLayout> {
             found.positions.get(source.path) ?? relative,
         )
         refusePlace(source, placed, resolve, refusals)
-        sources.push({
-            ...source,
-            ...placed,
-            paints: paints(source.file),
-            invoked: invoked.has(source.path),
-            hooks: hooksIn(scriptBodies(source.file)),
-        })
+        sources.push(placedSource(source, placed, invoked.has(source.path)))
     }
     const texts = await textsAt(found.handlers.map((file) => file.path))
     const placedHandlers: PlacedHandler[] = []
@@ -209,8 +202,8 @@ export async function appLayout(root: string): Promise<AppLayout> {
         errors,
         published,
         addresses: [...addresses].sort(),
-        refused: refusals.found,
-        unparsed: unparsed.found,
+        refused: refusals.refused,
+        unparsed: unparsed.refused,
         resolve,
     }
 }
@@ -250,9 +243,9 @@ export async function withDependencies(
     parsed: readonly ParsedSource[],
     own: readonly string[],
     resolve: (specifier: string, from: string) => string | undefined,
-    refusals: Refusals,
+    refusals: Diagnostics,
     /** Where what the parser refuses of a file reached here goes, where apart from `refusals`. */
-    unparsed: Refusals = refusals,
+    unparsed: Diagnostics = refusals,
 ): Promise<{
     sources: ParsedSource[]
     handlers: HandlerFile[]
@@ -347,6 +340,21 @@ export async function withDependencies(
 }
 
 /** Whether a page or an error page has anything to paint: a template, or a head. 23.3, 35.14. */
+/** `source` at `placed`, with what its own text says it paints and calls. */
+export function placedSource(
+    source: ParsedSource,
+    placed: Placement,
+    invoked: boolean,
+): PlacedSource {
+    return {
+        ...source,
+        ...placed,
+        paints: paints(source.file),
+        invoked,
+        hooks: hooksIn(scriptBodies(source.file)),
+    }
+}
+
 export function paints(file: AbideFile): boolean {
     return file.template.length > 0 || file.head.length > 0
 }
@@ -362,7 +370,7 @@ function refusePlace(
     source: ParsedSource,
     placed: Placement,
     resolve: (specifier: string, from: string) => string | undefined,
-    refusals: Refusals,
+    refusals: Diagnostics,
 ): void {
     const { relative, place, kind } = placed
     if (source.file.servers.length > 0 && place === 'public')
@@ -404,7 +412,7 @@ function refusePlace(
 async function refuseModuleHooks(
     root: string,
     modules: readonly string[],
-    refusals: Refusals,
+    refusals: Diagnostics,
 ): Promise<void> {
     const texts = await textsAt(modules.map((module) => `${root}/${module}`))
     for (let at = 0; at < modules.length; at += 1) {
@@ -428,7 +436,7 @@ async function refuseModuleHooks(
 function refuseStrayLauncher(
     sources: readonly PlacedSource[],
     handlers: readonly PlacedHandler[],
-    refusals: Refusals,
+    refusals: Diagnostics,
 ): void {
     const stray = (relative: string): void =>
         refusals.at(
@@ -457,7 +465,7 @@ function refuseStrayLauncher(
  */
 function routesOf(
     sources: readonly PlacedSource[],
-    refusals: Refusals,
+    refusals: Diagnostics,
 ): { routes: AppRoute[]; errors: AppRoute[] } {
     const layouts: { source: string; segments: Segment[] }[] = []
     const layoutAt = new Map<string, string>()

package/src/compiler/argsDefaultsIn.ts

@@ -17,7 +17,7 @@ import {
 } from 'typescript/unstable/ast/is'
 import { type Checker, SymbolFlags, type Type } from 'typescript/unstable/async'
 
-import type { Finding } from './Finding.ts'
+import type { Finding } from './Diagnostics.ts'
 import { optionNamed, reactiveOptions } from './reactiveOptions.ts'
 
 // 11.30 — AN `args` SCHEMA DEFAULTING A MEMBER THE BODY'S PARAMETER DOES NOT. The key is taken before

package/src/compiler/checkApp.ts

@@ -1,15 +1,14 @@
 import { relative } from 'node:path' // bun exposes no path helpers of its own
 
-import { type Placement, placement } from '#server/placement.ts'
+import { placement } from '#server/placement.ts'
 
-import type { PlacedSource } from './appLayout.ts'
-import { type AppChecker, compiled } from './compileApp.ts'
+import { type PlacedSource, placedSource } from './appLayout.ts'
+import { type AppChecker, compiled, compiledSources } from './compileApp.ts'
 import { abideImportsOf } from './componentGraph.ts'
+import { type Diagnosis, Diagnostics } from './Diagnostics.ts'
 import { hooksIn } from './hookCalls.ts'
 import { parseAbide, scriptBodies } from './parseAbide.ts'
 import { parseSources, readSources } from './readSources.ts'
-import { Refusals } from './Refusals.ts'
-import type { Diagnosis } from './TypeSession.ts'
 
 /**
  * Every finding `abide check` reports for the app at `appRoot`.
@@ -50,74 +49,71 @@ export async function checkSource(
 ): Promise<Diagnosis[]> {
     const { session, root } = checker
     const layout = await checker.layout()
+    const diagnostics = new Diagnostics(root, true)
     // 38.33 — WHAT THE TREE REFUSES OF IT, off the layout the checker keeps until a move is heard.
     // What the parser refuses is the held text's, below, never the disk's (`layout.unparsed`).
-    const tree: Diagnosis[] = []
-    for (const refused of layout.refused)
-        if (refused.path === path) tree.push(refused)
-    const refusals = new Refusals(root, true)
-    const [page] = parseSources([{ path, text }], refusals)
-    if (page === undefined) return [...tree, ...refusals.found]
+    diagnostics.adopt(layout.refused)
+    const [page] = parseSources([{ path, text }], diagnostics)
     // 23.19 — WHERE THE APP PLACES IT, so a mounted page's `route.params` is typed by the route its
     // mount gives it, as `checkApp` types it; a file the layout has not seen is placed at its path.
-    const placed: Pick<Placement, 'kind' | 'route'> =
-        layout.sources.find((source) => source.path === path) ??
-        placement(relative(root, path))
-    const imports: { path: string; text: string; quiet: boolean }[] = []
-    for (const imported of abideImportsOf(
-        path,
-        page.file,
-        layout.resolve,
-    ).values())
-        try {
-            imports.push({
-                path: imported,
-                text: held(imported) ?? (await Bun.file(imported).text()),
-                quiet: true,
-            })
-        } catch {
-            // A component that cannot be read takes anything here.
-        }
-    // 27.13 — AND EVERY FILE FILING `onConfig`, quietly, so a page that only reads `config()` is
-    // typed by defaults it never imported — as `checkApp`'s whole-app program types it. The calls
-    // only name candidates; the checker decides which file.
-    const lowered = new Set(imports.map((one) => one.path))
-    for (const other of layout.sources) {
-        if (other.path === path || lowered.has(other.path)) continue
-        const editing = held(other.path)
-        if (
-            editing === undefined || editing === other.text
-                ? other.hooks.includes('onConfig')
-                : filesConfig(editing)
+    const own: PlacedSource[] = []
+    const beside: { path: string; text: string; quiet: boolean }[] = []
+    if (page !== undefined) {
+        const laid = layout.sources.find((source) => source.path === path)
+        own.push(
+            laid === undefined
+                ? placedSource(page, placement(relative(root, path)), false)
+                : { ...laid, ...page },
         )
-            imports.push({
-                path: other.path,
-                text: editing ?? other.text,
-                quiet: true,
-            })
+        for (const imported of abideImportsOf(
+            path,
+            page.file,
+            layout.resolve,
+        ).values())
+            try {
+                beside.push({
+                    path: imported,
+                    text: held(imported) ?? (await Bun.file(imported).text()),
+                    quiet: true,
+                })
+            } catch {
+                // A component that cannot be read takes anything here.
+            }
+        // 27.13 — AND EVERY FILE FILING `onConfig`, quietly, so a page that only reads `config()`
+        // is typed by defaults it never imported — as `checkApp`'s whole-app program types it. The
+        // calls only name candidates; the checker decides which file.
+        const lowered = new Set(beside.map((one) => one.path))
+        for (const other of layout.sources) {
+            if (other.path === path || lowered.has(other.path)) continue
+            const editing = held(other.path)
+            if (
+                editing === undefined || editing === other.text
+                    ? other.hooks.includes('onConfig')
+                    : filesConfig(editing)
+            )
+                beside.push({
+                    path: other.path,
+                    text: editing ?? other.text,
+                    quiet: true,
+                })
+        }
     }
     // A component that does not parse, or that the checker refuses, is its own file's finding and
     // takes anything here: a quiet source's refusal is reported by nobody.
-    const { read, warnings } = await readSources(
-        session,
-        [page, ...parseSources(imports, refusals)],
-        refusals,
-    )
-    if (refusals.found.length > 0) return [...tree, ...refusals.found]
-    const own: Diagnosis[] = []
-    for (const warning of warnings) if (warning.path === path) own.push(warning)
-    const [checked, ...beside] = read
-    const { diagnoses } = await session.diagnose(
-        checked === undefined
-            ? beside
-            : [
-                  { ...checked, kind: placed.kind, route: placed.route },
-                  ...beside,
-              ],
-        layout,
-        false,
-    )
-    return [...tree, ...own, ...diagnoses]
+    if (own.length > 0)
+        await compiledSources(
+            layout,
+            session,
+            own,
+            parseSources(beside, diagnostics),
+            diagnostics,
+            true,
+            false,
+        )
+    const found: Diagnosis[] = []
+    for (const finding of diagnostics.findings)
+        if (finding.path === path) found.push(finding)
+    return found
 }
 
 /**
@@ -132,7 +128,7 @@ export async function lowerApp(
     held: (path: string) => string | undefined,
 ): Promise<void> {
     const layout = await checker.layout()
-    const refusals = new Refusals(checker.root, true)
+    const diagnostics = new Diagnostics(checker.root, true)
     const sources: (PlacedSource & { quiet: true })[] = []
     for (const source of layout.sources) {
         const editing = held(source.path)
@@ -142,12 +138,12 @@ export async function lowerApp(
         }
         const [parsed] = parseSources(
             [{ path: source.path, text: editing, quiet: true }],
-            refusals,
+            diagnostics,
         )
         if (parsed !== undefined)
             sources.push({ ...source, ...parsed, quiet: true })
     }
-    const { read } = await readSources(checker.session, sources, refusals)
+    const read = await readSources(checker.session, sources, diagnostics)
     await checker.session.diagnose(read, layout, false)
 }
 

package/src/compiler/checkedShadow.ts

@@ -1,7 +1,7 @@
 import { SERVER_SPECIFIER } from '#shared/SPECIFIERS.ts'
 
 import type { CheckerAnswer } from './CheckerAnswer.ts'
-import type { Finding } from './Finding.ts'
+import type { Finding } from './Diagnostics.ts'
 import { hookCalls } from './hookCalls.ts'
 import {
     CHECKED_CONFIG,