@nowline/browser 0.8.6 → 0.10.0

package/dist/diagnostic-row.d.ts

@@ -27,9 +27,17 @@ export declare function fromLexerError(err: LexerErrorLike, file: string): Diagn
  * is 0-based in the resolver (it comes from a CST range) and may be
  * undefined for whole-file diagnostics like circular include — fall
  * back to line 1 so a click-to-jump still puts the cursor near the top
- * of the offending file.
+ * of the offending file. A routed diagnostic with a `range` takes its
+ * column from it, the validator's column for the same finding; without
+ * one the column is 1.
+ *
+ * A wave-rule diagnostic (specs/waves.md §6.1) keeps its stable code
+ * (`NL.Exxxx`), and its message is rendered in `locale` when the caller
+ * knows one; WV8, the uncoded wave rule, is labelled like the validator's
+ * copy. An included file's syntax error is the row that file's own check
+ * gives. Every other resolver diagnostic is an `include` row, verbatim.
  */
-export declare function fromResolveDiagnostic(diag: ResolveDiagnostic): DiagnosticRow;
+export declare function fromResolveDiagnostic(diag: ResolveDiagnostic, locale?: string): DiagnosticRow;
 /**
  * Adapt a render-time warning message into a diagnostic row. Renderer
  * warnings are bare strings without a source location, so callers

package/dist/diagnostic-row.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostic-row.d.ts","sourceRoot":"","sources":["../src/diagnostic-row.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAQD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CAa9F;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CASjF;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CAS/E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,aAAa,CAS5E;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,aAAa,CAAC,UAAU,CAAa,GAChD,aAAa,CASf;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CASrF"}
+{"version":3,"file":"diagnostic-row.d.ts","sourceRoot":"","sources":["../src/diagnostic-row.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EAEnB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAQD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CAa9F;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CASjF;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CAS/E;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,CA4B7F;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,aAAa,CAAC,UAAU,CAAa,GAChD,aAAa,CASf;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CASrF"}

package/dist/diagnostic-row.js

@@ -1,4 +1,4 @@
-import { extractSuggestion, resolveDiagnosticCode, } from '@nowline/core';
+import { extractSuggestion, inferCodeFromMessage, isRoutedResolveDiagnostic, localizeResolveDiagnostic, resolveDiagnosticCode, } from '@nowline/core';
 function mapLangiumSeverity(severity) {
     if (severity === 2)
         return 'warning';
@@ -45,16 +45,44 @@ export function fromLexerError(err, file) {
  * is 0-based in the resolver (it comes from a CST range) and may be
  * undefined for whole-file diagnostics like circular include — fall
  * back to line 1 so a click-to-jump still puts the cursor near the top
- * of the offending file.
+ * of the offending file. A routed diagnostic with a `range` takes its
+ * column from it, the validator's column for the same finding; without
+ * one the column is 1.
+ *
+ * A wave-rule diagnostic (specs/waves.md §6.1) keeps its stable code
+ * (`NL.Exxxx`), and its message is rendered in `locale` when the caller
+ * knows one; WV8, the uncoded wave rule, is labelled like the validator's
+ * copy. An included file's syntax error is the row that file's own check
+ * gives. Every other resolver diagnostic is an `include` row, verbatim.
  */
-export function fromResolveDiagnostic(diag) {
+export function fromResolveDiagnostic(diag, locale) {
+    if (diag.syntax?.origin === 'lexer')
+        return fromLexerError(diag.syntax.error, diag.sourcePath);
+    if (diag.syntax?.origin === 'parser') {
+        return fromParserError(diag.syntax.error, diag.sourcePath);
+    }
+    const line = (diag.range?.start.line ?? diag.line ?? 0) + 1;
+    const column = (diag.range?.start.character ?? 0) + 1;
+    if (!isRoutedResolveDiagnostic(diag)) {
+        return {
+            severity: diag.severity,
+            code: 'include',
+            message: diag.message,
+            file: diag.sourcePath,
+            line,
+            column: 1,
+        };
+    }
+    const message = locale ? localizeResolveDiagnostic(locale, diag) : diag.message;
+    const suggestion = extractSuggestion(message);
     return {
         severity: diag.severity,
-        code: 'include',
-        message: diag.message,
+        code: diag.code ?? inferCodeFromMessage(diag.message),
+        message,
+        ...(suggestion === undefined ? {} : { suggestion }),
         file: diag.sourcePath,
-        line: diag.line !== undefined ? diag.line + 1 : 1,
-        column: 1,
+        line,
+        column,
     };
 }
 /**

package/dist/diagnostic-row.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostic-row.js","sourceRoot":"","sources":["../src/diagnostic-row.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAKjB,qBAAqB,GACxB,MAAM,eAAe,CAAC;AAuBvB,SAAS,kBAAkB,CAAC,QAA4B;IACpD,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACrC,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAClC,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAA2B,EAAE,IAAY;IAC3E,OAAO;QACH,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC3C,qEAAqE;QACrE,oEAAoE;QACpE,wEAAwE;QACxE,IAAI,EAAE,qBAAqB,CAAC,IAAI,CAAC;QACjC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3C,IAAI;QACJ,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC;QACvC,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC;KACjD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAoB,EAAE,IAAY;IAC9D,OAAO;QACH,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,IAAI;QACJ,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC;QAC/B,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,IAAI,CAAC;KACtC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAmB,EAAE,IAAY;IAC5D,OAAO;QACH,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,IAAI;QACJ,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC;QACnB,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC;KAC1B,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAuB;IACzD,OAAO;QACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,IAAI,EAAE,IAAI,CAAC,UAAU;QACrB,IAAI,EAAE,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,EAAE,CAAC;KACZ,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAC7B,OAAe,EACf,IAAY,EACZ,QAAQ,GAA8B,SAAS;IAE/C,OAAO;QACH,QAAQ;QACR,IAAI,EAAE,gBAAgB;QACtB,OAAO;QACP,IAAI;QACJ,IAAI,EAAE,CAAC;QACP,MAAM,EAAE,CAAC;KACZ,CAAC;AACN,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,iBAAiB,CAAC,OAAsB,EAAE,IAAY;IAClE,OAAO;QACH,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI;QACJ,IAAI,EAAE,CAAC;QACP,MAAM,EAAE,CAAC;KACZ,CAAC;AACN,CAAC"}
+{"version":3,"file":"diagnostic-row.js","sourceRoot":"","sources":["../src/diagnostic-row.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export type { LangiumLikeDiagnostic } from '@nowline/core';
-export { civilDateInZone, type NormalizedZone, normalizeZone, type ResolveTodayOptions, resolveToday, TimezoneError, } from '@nowline/layout';
+export { civilDateInZone, isNonWorkingDisplay, NON_WORKING_DISPLAYS, type NonWorkingDisplay, type NormalizedZone, normalizeZone, parseNonWorkingDisplay, type ResolveTodayOptions, resolveToday, TimezoneError, } from '@nowline/layout';
 export { type DiagnosticRow, fromLangiumDiagnostic, fromLayoutInsight, fromLexerError, fromParserError, fromRenderWarning, fromResolveDiagnostic, } from './diagnostic-row.js';
 export { showcaseSource } from './generated/showcase.js';
 export { isNoOpIncludeDiagnosticMessage, NOWLINE_BROWSER_NOOP_INCLUDE_TAG, noOpIncludeReadFile, type SkippedInclude, } from './no-op-include-resolver.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EACH,eAAe,EACf,KAAK,cAAc,EACnB,aAAa,EACb,KAAK,mBAAmB,EACxB,YAAY,EACZ,aAAa,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACH,KAAK,aAAa,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,qBAAqB,GACxB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACH,8BAA8B,EAC9B,gCAAgC,EAChC,mBAAmB,EACnB,KAAK,cAAc,GACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACH,8BAA8B,EAC9B,sBAAsB,EACtB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,WAAW,EACX,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,YAAY,EACZ,4BAA4B,GAC/B,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EACH,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,aAAa,EACb,sBAAsB,EACtB,KAAK,mBAAmB,EACxB,YAAY,EACZ,aAAa,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACH,KAAK,aAAa,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,qBAAqB,GACxB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACH,8BAA8B,EAC9B,gCAAgC,EAChC,mBAAmB,EACnB,KAAK,cAAc,GACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACH,8BAA8B,EAC9B,sBAAsB,EACtB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,WAAW,EACX,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,YAAY,EACZ,4BAA4B,GAC/B,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -6,7 +6,7 @@
 // behaviour cannot drift between them. Surface-specific concerns (DOM
 // auto-scan, postMessage transport, save/copy commands) belong in the
 // consumer; this package stays a pure data transform.
-export { civilDateInZone, normalizeZone, resolveToday, TimezoneError, } from '@nowline/layout';
+export { civilDateInZone, isNonWorkingDisplay, NON_WORKING_DISPLAYS, normalizeZone, parseNonWorkingDisplay, resolveToday, TimezoneError, } from '@nowline/layout';
 export { fromLangiumDiagnostic, fromLayoutInsight, fromLexerError, fromParserError, fromRenderWarning, fromResolveDiagnostic, } from './diagnostic-row.js';
 // Showcase source string is generated from `examples/showcase.nowline`
 // by `scripts/bundle-showcase.mjs` (m4.7 slice F) and re-exported here

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,EAAE;AACF,qEAAqE;AACrE,qEAAqE;AACrE,uEAAuE;AACvE,sEAAsE;AACtE,sEAAsE;AACtE,sDAAsD;AAMtD,OAAO,EACH,eAAe,EAEf,aAAa,EAEb,YAAY,EACZ,aAAa,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEH,qBAAqB,EACrB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,qBAAqB,GACxB,MAAM,qBAAqB,CAAC;AAC7B,uEAAuE;AACvE,uEAAuE;AACvE,2CAA2C;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACH,8BAA8B,EAC9B,gCAAgC,EAChC,mBAAmB,GAEtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACH,8BAA8B,EAC9B,sBAAsB,EAItB,WAAW,EAGX,YAAY,EACZ,4BAA4B,GAC/B,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,EAAE;AACF,qEAAqE;AACrE,qEAAqE;AACrE,uEAAuE;AACvE,sEAAsE;AACtE,sEAAsE;AACtE,sDAAsD;AAMtD,OAAO,EACH,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EAGpB,aAAa,EACb,sBAAsB,EAEtB,YAAY,EACZ,aAAa,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEH,qBAAqB,EACrB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,qBAAqB,GACxB,MAAM,qBAAqB,CAAC;AAC7B,uEAAuE;AACvE,uEAAuE;AACvE,2CAA2C;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACH,8BAA8B,EAC9B,gCAAgC,EAChC,mBAAmB,GAEtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACH,8BAA8B,EAC9B,sBAAsB,EAItB,WAAW,EAGX,YAAY,EACZ,4BAA4B,GAC/B,MAAM,eAAe,CAAC"}

package/dist/pipeline.d.ts

@@ -1,5 +1,5 @@
 import { type NowlineFile } from '@nowline/core';
-import { type ThemeName } from '@nowline/layout';
+import { type NonWorkingDisplay, type ThemeName } from '@nowline/layout';
 import { type AssetResolver, type FontFamilies } from '@nowline/renderer';
 import { type DiagnosticRow } from './diagnostic-row.js';
 import { type SkippedInclude } from './no-op-include-resolver.js';
@@ -65,8 +65,15 @@ export interface RenderOptions extends ParseOptions {
     timezone?: string;
     /** BCP-47 locale forwarded to the layout engine for axis labels. */
     locale?: string;
-    /** Total canvas width in px. Layout's default is 1280. */
+    /** Best-effort maximum canvas width in px. Unset fits the content. */
     width?: number;
+    /**
+     * How a calendar's non-working days appear: `hide` collapses them,
+     * `show` draws them as shaded bands. Wins over the file's
+     * `default roadmap non-working:` key; leave it undefined to let the key
+     * apply, then `hide`.
+     */
+    nonWorking?: NonWorkingDisplay;
     /**
      * Override the deterministic id prefix used for in-SVG `<style>`
      * scoping. Multi-block surfaces (auto-scan) supply a fresh prefix

package/dist/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"AAmBA,OAAO,EAGH,KAAK,WAAW,EAGnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAMH,KAAK,SAAS,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAa,MAAM,mBAAmB,CAAC;AAErF,OAAO,EACH,KAAK,aAAa,EAOrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGH,KAAK,cAAc,EACtB,MAAM,6BAA6B,CAAC;AAErC;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAc3D,wBAAgB,4BAA4B,CACxC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,EACnC,KAAK,EAAE,eAAe,GACvB,OAAO,CAET;AAED,MAAM,WAAW,YAAY;IACzB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD;;;OAGG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACrC;AAED,MAAM,WAAW,WAAW;IACxB,GAAG,EAAE,WAAW,CAAC;IACjB,WAAW,EAAE,aAAa,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IAC/C,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;OAIG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,MAAM,MAAM,YAAY,GAClB;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC;AAqB5D;;;;;GAKG;AACH,wBAAsB,WAAW,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,YAAiB,GAC3B,OAAO,CAAC,WAAW,CAAC,CAqBtB;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAC9B,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,aAAkB,GAC5B,OAAO,CAAC,YAAY,CAAC,CA6FvB;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,IAAI,IAAI,CAGrD"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"AAmBA,OAAO,EAIH,KAAK,WAAW,EAGnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAEH,KAAK,iBAAiB,EAItB,KAAK,SAAS,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAA2B,MAAM,mBAAmB,CAAC;AAEnG,OAAO,EACH,KAAK,aAAa,EAOrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGH,KAAK,cAAc,EACtB,MAAM,6BAA6B,CAAC;AAErC;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAc3D,wBAAgB,4BAA4B,CACxC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,EACnC,KAAK,EAAE,eAAe,GACvB,OAAO,CAET;AAED,MAAM,WAAW,YAAY;IACzB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD;;;OAGG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACrC;AAED,MAAM,WAAW,WAAW;IACxB,GAAG,EAAE,WAAW,CAAC;IACjB,WAAW,EAAE,aAAa,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IAC/C,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;OAIG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,MAAM,MAAM,YAAY,GAClB;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC;AAqB5D;;;;;GAKG;AACH,wBAAsB,WAAW,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,YAAiB,GAC3B,OAAO,CAAC,WAAW,CAAC,CAQtB;AAoBD;;;;;GAKG;AACH,wBAAsB,YAAY,CAC9B,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,aAAkB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAiHvB;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,IAAI,IAAI,CAGrD"}

package/dist/pipeline.js

@@ -16,9 +16,9 @@
 //
 // The package itself imports zero `node:*` modules so the embed esbuild
 // bundle stays free of any Node literal even before tree-shaking.
-import { collectDocumentDiagnostics, createNowlineServices, resolveIncludes, } from '@nowline/core';
-import { collectLayoutInsights, layoutRoadmap, normalizeZone, resolveToday, TimezoneError, } from '@nowline/layout';
-import { renderSvg } from '@nowline/renderer';
+import { collectDocumentDiagnostics, createNowlineServices, isRoutedResolveDiagnostic, } from '@nowline/core';
+import { collectLayoutInsights, normalizeZone, resolveToday, TimezoneError, } from '@nowline/layout';
+import { renderSvg, stageRoadmap } from '@nowline/renderer';
 import { URI } from 'langium';
 import { fromLangiumDiagnostic, fromLayoutInsight, fromLexerError, fromParserError, fromRenderWarning, fromResolveDiagnostic, } from './diagnostic-row.js';
 import { isNoOpIncludeDiagnosticMessage, noOpIncludeReadFile, } from './no-op-include-resolver.js';
@@ -65,22 +65,25 @@ export async function parseSource(source, options = {}) {
     const docFactory = services.shared.workspace.LangiumDocumentFactory;
     const doc = docFactory.fromString(source, freshUri());
     await services.shared.workspace.DocumentBuilder.build([doc], { validation: true });
-    // collectDocumentDiagnostics owns the de-dup: Langium re-folds lexer +
-    // parser errors into doc.diagnostics, so the shared collector skips those
-    // copies and we map each origin to a row here.
-    const diagnostics = [];
-    for (const raw of collectDocumentDiagnostics(doc)) {
-        if (raw.origin === 'lexer') {
-            diagnostics.push(fromLexerError(raw.error, filePath));
-        }
-        else if (raw.origin === 'parser') {
-            diagnostics.push(fromParserError(raw.error, filePath));
-        }
-        else {
-            diagnostics.push(fromLangiumDiagnostic(raw.diagnostic, filePath));
-        }
-    }
-    return { ast: doc.parseResult.value, diagnostics };
+    return { ast: doc.parseResult.value, diagnostics: documentRows(doc, filePath) };
+}
+/**
+ * Parse and validation diagnostics of a built document as rows.
+ * collectDocumentDiagnostics owns the de-dup: Langium re-folds lexer +
+ * parser errors into doc.diagnostics, so the shared collector skips those
+ * copies and we map each origin to a row here.
+ */
+function documentRows(doc, filePath) {
+    return rawRows(collectDocumentDiagnostics(doc), filePath);
+}
+function rawRows(raws, filePath) {
+    return raws.map((raw) => {
+        if (raw.origin === 'lexer')
+            return fromLexerError(raw.error, filePath);
+        if (raw.origin === 'parser')
+            return fromParserError(raw.error, filePath);
+        return fromLangiumDiagnostic(raw.diagnostic, filePath);
+    });
 }
 /**
  * Run the full pipeline (parse + validate + resolveIncludes + layout
@@ -90,18 +93,50 @@ export async function parseSource(source, options = {}) {
  */
 export async function renderSource(source, options = {}) {
     const filePath = options.filePath ?? DEFAULT_SYNTHETIC_PATH;
-    const parsed = await parseSource(source, { filePath });
-    if (parsed.diagnostics.some((d) => d.severity === 'error')) {
-        return { kind: 'diagnostics', diagnostics: parsed.diagnostics };
-    }
     const services = getServices();
-    const readFile = options.readFile ?? noOpIncludeReadFile;
-    const resolved = await resolveIncludes(parsed.ast, filePath, {
-        services: services.Nowline,
-        readFile,
+    // A bad timezone is reported after validation and include errors, as it
+    // always was: stage with no now-line, then return the timezone row only
+    // if the roadmap staged.
+    let zone;
+    let zoneError;
+    if (options.timezone) {
+        try {
+            zone = normalizeZone(options.timezone);
+        }
+        catch (err) {
+            if (!(err instanceof TimezoneError))
+                throw err;
+            zoneError = err;
+        }
+    }
+    // Pass today as-is: null suppresses the now-line, undefined defaults to
+    // local today (or zone), a string is parsed, a Date is used directly.
+    const today = zoneError ? undefined : resolveToday({ now: options.today, zone });
+    const stage = await stageRoadmap({
+        source,
+        sourcePath: filePath,
+        services,
+        readSource: options.readFile ?? noOpIncludeReadFile,
+        assetResolver: options.assetResolver,
+        // The no-op reader's skipped includes are not errors in single-file
+        // mode: they are reported through `onSkippedInclude` instead.
+        isToleratedIncludeError: (d) => isNoOpIncludeDiagnosticMessage(d.message),
+        layout: {
+            theme: options.theme,
+            today,
+            locale: options.locale,
+            width: options.width,
+            nonWorking: options.nonWorking,
+        },
     });
-    const rows = [...parsed.diagnostics];
-    for (const diag of resolved.diagnostics) {
+    if (stage.kind === 'invalid') {
+        return { kind: 'diagnostics', diagnostics: rawRows(stage.diagnostics, filePath) };
+    }
+    // An uncoded include error takes precedence: when one is reported, the
+    // routed (wave-rule) diagnostics are dropped (specs/waves.md §6.1).
+    const hasLegacyError = stage.kind === 'include-error' && stage.legacy !== undefined;
+    const rows = documentRows(stage.document, filePath);
+    for (const diag of stage.resolved.diagnostics) {
         if (diag.severity === 'error' && isNoOpIncludeDiagnosticMessage(diag.message)) {
             options.onSkippedInclude?.({
                 sourcePath: diag.sourcePath,
@@ -109,46 +144,34 @@ export async function renderSource(source, options = {}) {
             });
             continue;
         }
+        if (hasLegacyError && isRoutedResolveDiagnostic(diag))
+            continue;
         rows.push(fromResolveDiagnostic(diag));
     }
-    if (rows.some((r) => r.severity === 'error')) {
+    if (stage.kind === 'include-error' || rows.some((r) => r.severity === 'error')) {
         return { kind: 'diagnostics', diagnostics: rows };
     }
-    let zone;
-    if (options.timezone) {
-        try {
-            zone = normalizeZone(options.timezone);
-        }
-        catch (err) {
-            if (err instanceof TimezoneError) {
-                // Surface timezone errors as a diagnostic row rather than throwing
-                // so the caller gets a structured result instead of an uncaught error.
-                return {
-                    kind: 'diagnostics',
-                    diagnostics: [
-                        {
-                            severity: 'error',
-                            code: 'invalid-timezone',
-                            message: err.message,
-                            file: filePath,
-                            line: 1,
-                            column: 1,
-                        },
-                    ],
-                };
-            }
-            throw err;
-        }
+    if (zoneError) {
+        // Surface timezone errors as a diagnostic row rather than throwing
+        // so the caller gets a structured result instead of an uncaught error.
+        return {
+            kind: 'diagnostics',
+            diagnostics: [
+                {
+                    severity: 'error',
+                    code: 'invalid-timezone',
+                    message: zoneError.message,
+                    file: filePath,
+                    line: 1,
+                    column: 1,
+                },
+            ],
+        };
     }
-    // Pass today as-is: null suppresses the now-line, undefined defaults to
-    // local today (or zone), a string is parsed, a Date is used directly.
-    const today = resolveToday({ now: options.today, zone });
-    const model = layoutRoadmap(parsed.ast, resolved, {
-        theme: options.theme,
-        today,
-        locale: options.locale,
-        width: options.width,
-    });
+    // Renderer warnings, starting with the logo load: a failed load lays out
+    // as if no logo were declared and reports like any render warning.
+    const warnMessages = [...stage.warnings];
+    const { logo, model } = stage;
     const diagnosticLevel = options.diagnosticLevel ?? 'error';
     // Filtered once below as part of the combined `warnings` array.
     const layoutInsightRows = collectLayoutInsights(model, {
@@ -157,10 +180,10 @@ export async function renderSource(source, options = {}) {
     }).map((insight) => fromLayoutInsight(insight, filePath));
     const showLinks = options.showLinks !== false;
     const strict = options.strict === true;
-    const warnMessages = [];
     const svg = await renderSvg(model, {
         idPrefix: options.idPrefix,
         assetResolver: options.assetResolver,
+        logo,
         noLinks: !showLinks,
         strict,
         warn: (msg) => warnMessages.push(msg),

package/dist/pipeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowline/browser",
-  "version": "0.8.6",
+  "version": "0.10.0",
   "description": "Runs the whole Nowline pipeline — parse, validate, resolve includes, lay out, and render — in the browser, with pluggable I/O hooks. Powers @nowline/embed and the VS Code preview.",
   "license": "Apache-2.0",
   "engines": {
@@ -38,16 +38,16 @@
     "pipeline"
   ],
   "dependencies": {
-    "@nowline/core": "0.8.6",
-    "@nowline/layout": "0.8.6",
-    "@nowline/renderer": "0.8.6",
+    "@nowline/core": "0.10.0",
+    "@nowline/layout": "0.10.0",
+    "@nowline/renderer": "0.10.0",
     "langium": "~4.4.0"
   },
   "devDependencies": {
-    "@types/node": "^26.6.3",
-    "happy-dom": "^20.14.5",
+    "@types/node": "^26.6.5",
+    "happy-dom": "^21.0.4",
     "typescript": "^7.0.2",
-    "vitest": "^5.0.2"
+    "vitest": "^5.0.5"
   },
   "scripts": {
     "prebuild": "node scripts/bundle-showcase.mjs",

package/src/diagnostic-row.ts

@@ -1,7 +1,10 @@
 import {
     extractSuggestion,
+    inferCodeFromMessage,
+    isRoutedResolveDiagnostic,
     type LangiumLikeDiagnostic,
     type LexerErrorLike,
+    localizeResolveDiagnostic,
     type ParserErrorLike,
     type ResolveDiagnostic,
     resolveDiagnosticCode,
@@ -76,16 +79,43 @@ export function fromLexerError(err: LexerErrorLike, file: string): DiagnosticRow
  * is 0-based in the resolver (it comes from a CST range) and may be
  * undefined for whole-file diagnostics like circular include — fall
  * back to line 1 so a click-to-jump still puts the cursor near the top
- * of the offending file.
+ * of the offending file. A routed diagnostic with a `range` takes its
+ * column from it, the validator's column for the same finding; without
+ * one the column is 1.
+ *
+ * A wave-rule diagnostic (specs/waves.md §6.1) keeps its stable code
+ * (`NL.Exxxx`), and its message is rendered in `locale` when the caller
+ * knows one; WV8, the uncoded wave rule, is labelled like the validator's
+ * copy. An included file's syntax error is the row that file's own check
+ * gives. Every other resolver diagnostic is an `include` row, verbatim.
  */
-export function fromResolveDiagnostic(diag: ResolveDiagnostic): DiagnosticRow {
+export function fromResolveDiagnostic(diag: ResolveDiagnostic, locale?: string): DiagnosticRow {
+    if (diag.syntax?.origin === 'lexer') return fromLexerError(diag.syntax.error, diag.sourcePath);
+    if (diag.syntax?.origin === 'parser') {
+        return fromParserError(diag.syntax.error, diag.sourcePath);
+    }
+    const line = (diag.range?.start.line ?? diag.line ?? 0) + 1;
+    const column = (diag.range?.start.character ?? 0) + 1;
+    if (!isRoutedResolveDiagnostic(diag)) {
+        return {
+            severity: diag.severity,
+            code: 'include',
+            message: diag.message,
+            file: diag.sourcePath,
+            line,
+            column: 1,
+        };
+    }
+    const message = locale ? localizeResolveDiagnostic(locale, diag) : diag.message;
+    const suggestion = extractSuggestion(message);
     return {
         severity: diag.severity,
-        code: 'include',
-        message: diag.message,
+        code: diag.code ?? inferCodeFromMessage(diag.message),
+        message,
+        ...(suggestion === undefined ? {} : { suggestion }),
         file: diag.sourcePath,
-        line: diag.line !== undefined ? diag.line + 1 : 1,
-        column: 1,
+        line,
+        column,
     };
 }
 

package/src/index.ts

@@ -13,8 +13,12 @@
 export type { LangiumLikeDiagnostic } from '@nowline/core';
 export {
     civilDateInZone,
+    isNonWorkingDisplay,
+    NON_WORKING_DISPLAYS,
+    type NonWorkingDisplay,
     type NormalizedZone,
     normalizeZone,
+    parseNonWorkingDisplay,
     type ResolveTodayOptions,
     resolveToday,
     TimezoneError,

package/src/pipeline.ts

@@ -20,21 +20,22 @@
 import {
     collectDocumentDiagnostics,
     createNowlineServices,
+    isRoutedResolveDiagnostic,
     type NowlineFile,
     type NowlineServices,
-    resolveIncludes,
+    type RawDiagnostic,
 } from '@nowline/core';
 import {
     collectLayoutInsights,
-    layoutRoadmap,
+    type NonWorkingDisplay,
     type NormalizedZone,
     normalizeZone,
     resolveToday,
     type ThemeName,
     TimezoneError,
 } from '@nowline/layout';
-import { type AssetResolver, type FontFamilies, renderSvg } from '@nowline/renderer';
-import { URI } from 'langium';
+import { type AssetResolver, type FontFamilies, renderSvg, stageRoadmap } from '@nowline/renderer';
+import { type LangiumDocument, URI } from 'langium';
 import {
     type DiagnosticRow,
     fromLangiumDiagnostic,
@@ -134,8 +135,15 @@ export interface RenderOptions extends ParseOptions {
     timezone?: string;
     /** BCP-47 locale forwarded to the layout engine for axis labels. */
     locale?: string;
-    /** Total canvas width in px. Layout's default is 1280. */
+    /** Best-effort maximum canvas width in px. Unset fits the content. */
     width?: number;
+    /**
+     * How a calendar's non-working days appear: `hide` collapses them,
+     * `show` draws them as shaded bands. Wins over the file's
+     * `default roadmap non-working:` key; leave it undefined to let the key
+     * apply, then `hide`.
+     */
+    nonWorking?: NonWorkingDisplay;
     /**
      * Override the deterministic id prefix used for in-SVG `<style>`
      * scoping. Multi-block surfaces (auto-scan) supply a fresh prefix
@@ -199,20 +207,25 @@ export async function parseSource(
     const doc = docFactory.fromString<NowlineFile>(source, freshUri());
     await services.shared.workspace.DocumentBuilder.build([doc], { validation: true });
 
-    // collectDocumentDiagnostics owns the de-dup: Langium re-folds lexer +
-    // parser errors into doc.diagnostics, so the shared collector skips those
-    // copies and we map each origin to a row here.
-    const diagnostics: DiagnosticRow[] = [];
-    for (const raw of collectDocumentDiagnostics(doc)) {
-        if (raw.origin === 'lexer') {
-            diagnostics.push(fromLexerError(raw.error, filePath));
-        } else if (raw.origin === 'parser') {
-            diagnostics.push(fromParserError(raw.error, filePath));
-        } else {
-            diagnostics.push(fromLangiumDiagnostic(raw.diagnostic, filePath));
-        }
-    }
-    return { ast: doc.parseResult.value, diagnostics };
+    return { ast: doc.parseResult.value, diagnostics: documentRows(doc, filePath) };
+}
+
+/**
+ * Parse and validation diagnostics of a built document as rows.
+ * collectDocumentDiagnostics owns the de-dup: Langium re-folds lexer +
+ * parser errors into doc.diagnostics, so the shared collector skips those
+ * copies and we map each origin to a row here.
+ */
+function documentRows(doc: LangiumDocument<NowlineFile>, filePath: string): DiagnosticRow[] {
+    return rawRows(collectDocumentDiagnostics(doc), filePath);
+}
+
+function rawRows(raws: readonly RawDiagnostic[], filePath: string): DiagnosticRow[] {
+    return raws.map((raw) => {
+        if (raw.origin === 'lexer') return fromLexerError(raw.error, filePath);
+        if (raw.origin === 'parser') return fromParserError(raw.error, filePath);
+        return fromLangiumDiagnostic(raw.diagnostic, filePath);
+    });
 }
 
 /**
@@ -226,20 +239,51 @@ export async function renderSource(
     options: RenderOptions = {},
 ): Promise<RenderResult> {
     const filePath = options.filePath ?? DEFAULT_SYNTHETIC_PATH;
-    const parsed = await parseSource(source, { filePath });
-    if (parsed.diagnostics.some((d) => d.severity === 'error')) {
-        return { kind: 'diagnostics', diagnostics: parsed.diagnostics };
+    const services = getServices();
+
+    // A bad timezone is reported after validation and include errors, as it
+    // always was: stage with no now-line, then return the timezone row only
+    // if the roadmap staged.
+    let zone: NormalizedZone | undefined;
+    let zoneError: TimezoneError | undefined;
+    if (options.timezone) {
+        try {
+            zone = normalizeZone(options.timezone);
+        } catch (err) {
+            if (!(err instanceof TimezoneError)) throw err;
+            zoneError = err;
+        }
     }
+    // Pass today as-is: null suppresses the now-line, undefined defaults to
+    // local today (or zone), a string is parsed, a Date is used directly.
+    const today = zoneError ? undefined : resolveToday({ now: options.today, zone });
 
-    const services = getServices();
-    const readFile = options.readFile ?? noOpIncludeReadFile;
-    const resolved = await resolveIncludes(parsed.ast, filePath, {
-        services: services.Nowline,
-        readFile,
+    const stage = await stageRoadmap({
+        source,
+        sourcePath: filePath,
+        services,
+        readSource: options.readFile ?? noOpIncludeReadFile,
+        assetResolver: options.assetResolver,
+        // The no-op reader's skipped includes are not errors in single-file
+        // mode: they are reported through `onSkippedInclude` instead.
+        isToleratedIncludeError: (d) => isNoOpIncludeDiagnosticMessage(d.message),
+        layout: {
+            theme: options.theme,
+            today,
+            locale: options.locale,
+            width: options.width,
+            nonWorking: options.nonWorking,
+        },
     });
+    if (stage.kind === 'invalid') {
+        return { kind: 'diagnostics', diagnostics: rawRows(stage.diagnostics, filePath) };
+    }
 
-    const rows: DiagnosticRow[] = [...parsed.diagnostics];
-    for (const diag of resolved.diagnostics) {
+    // An uncoded include error takes precedence: when one is reported, the
+    // routed (wave-rule) diagnostics are dropped (specs/waves.md §6.1).
+    const hasLegacyError = stage.kind === 'include-error' && stage.legacy !== undefined;
+    const rows: DiagnosticRow[] = documentRows(stage.document, filePath);
+    for (const diag of stage.resolved.diagnostics) {
         if (diag.severity === 'error' && isNoOpIncludeDiagnosticMessage(diag.message)) {
             options.onSkippedInclude?.({
                 sourcePath: diag.sourcePath,
@@ -247,46 +291,35 @@ export async function renderSource(
             });
             continue;
         }
+        if (hasLegacyError && isRoutedResolveDiagnostic(diag)) continue;
         rows.push(fromResolveDiagnostic(diag));
     }
-    if (rows.some((r) => r.severity === 'error')) {
+    if (stage.kind === 'include-error' || rows.some((r) => r.severity === 'error')) {
         return { kind: 'diagnostics', diagnostics: rows };
     }
 
-    let zone: NormalizedZone | undefined;
-    if (options.timezone) {
-        try {
-            zone = normalizeZone(options.timezone);
-        } catch (err) {
-            if (err instanceof TimezoneError) {
-                // Surface timezone errors as a diagnostic row rather than throwing
-                // so the caller gets a structured result instead of an uncaught error.
-                return {
-                    kind: 'diagnostics',
-                    diagnostics: [
-                        {
-                            severity: 'error' as const,
-                            code: 'invalid-timezone',
-                            message: err.message,
-                            file: filePath,
-                            line: 1,
-                            column: 1,
-                        },
-                    ],
-                };
-            }
-            throw err;
-        }
+    if (zoneError) {
+        // Surface timezone errors as a diagnostic row rather than throwing
+        // so the caller gets a structured result instead of an uncaught error.
+        return {
+            kind: 'diagnostics',
+            diagnostics: [
+                {
+                    severity: 'error' as const,
+                    code: 'invalid-timezone',
+                    message: zoneError.message,
+                    file: filePath,
+                    line: 1,
+                    column: 1,
+                },
+            ],
+        };
     }
-    // Pass today as-is: null suppresses the now-line, undefined defaults to
-    // local today (or zone), a string is parsed, a Date is used directly.
-    const today = resolveToday({ now: options.today, zone });
-    const model = layoutRoadmap(parsed.ast, resolved, {
-        theme: options.theme,
-        today,
-        locale: options.locale,
-        width: options.width,
-    });
+
+    // Renderer warnings, starting with the logo load: a failed load lays out
+    // as if no logo were declared and reports like any render warning.
+    const warnMessages: string[] = [...stage.warnings];
+    const { logo, model } = stage;
 
     const diagnosticLevel = options.diagnosticLevel ?? 'error';
     // Filtered once below as part of the combined `warnings` array.
@@ -297,11 +330,11 @@ export async function renderSource(
 
     const showLinks = options.showLinks !== false;
     const strict = options.strict === true;
-    const warnMessages: string[] = [];
 
     const svg = await renderSvg(model, {
         idPrefix: options.idPrefix,
         assetResolver: options.assetResolver,
+        logo,
         noLinks: !showLinks,
         strict,
         warn: (msg) => warnMessages.push(msg),