@nowline/browser 0.0.0-dev.20261016125632.gcdc768a → 0.0.0-dev.20261016135659.g7e263e2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/diagnostic-row.d.ts
CHANGED
|
@@ -27,7 +27,9 @@ export declare function fromLexerError(err: LexerErrorLike, file: string): Diagn
|
|
|
27
27
|
* is 0-based in the resolver (it comes from a CST range) and may be
|
|
28
28
|
* undefined for whole-file diagnostics like circular include — fall
|
|
29
29
|
* back to line 1 so a click-to-jump still puts the cursor near the top
|
|
30
|
-
* of the offending file.
|
|
30
|
+
* of the offending file. A routed diagnostic with a `range` takes its
|
|
31
|
+
* column from it, the validator's column for the same finding; without
|
|
32
|
+
* one the column is 1.
|
|
31
33
|
*
|
|
32
34
|
* A wave-rule diagnostic (specs/waves.md §6.1) keeps its stable code
|
|
33
35
|
* (`NL.Exxxx`), and its message is rendered in `locale` when the caller
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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
|
|
1
|
+
{"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;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,CAwB7F;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
CHANGED
|
@@ -45,7 +45,9 @@ export function fromLexerError(err, file) {
|
|
|
45
45
|
* is 0-based in the resolver (it comes from a CST range) and may be
|
|
46
46
|
* undefined for whole-file diagnostics like circular include — fall
|
|
47
47
|
* back to line 1 so a click-to-jump still puts the cursor near the top
|
|
48
|
-
* of the offending file.
|
|
48
|
+
* of the offending file. A routed diagnostic with a `range` takes its
|
|
49
|
+
* column from it, the validator's column for the same finding; without
|
|
50
|
+
* one the column is 1.
|
|
49
51
|
*
|
|
50
52
|
* A wave-rule diagnostic (specs/waves.md §6.1) keeps its stable code
|
|
51
53
|
* (`NL.Exxxx`), and its message is rendered in `locale` when the caller
|
|
@@ -53,7 +55,8 @@ export function fromLexerError(err, file) {
|
|
|
53
55
|
* copy. Every other resolver diagnostic is an `include` row, verbatim.
|
|
54
56
|
*/
|
|
55
57
|
export function fromResolveDiagnostic(diag, locale) {
|
|
56
|
-
const line = diag.line
|
|
58
|
+
const line = (diag.range?.start.line ?? diag.line ?? 0) + 1;
|
|
59
|
+
const column = (diag.range?.start.character ?? 0) + 1;
|
|
57
60
|
if (!isRoutedResolveDiagnostic(diag)) {
|
|
58
61
|
return {
|
|
59
62
|
severity: diag.severity,
|
|
@@ -73,7 +76,7 @@ export function fromResolveDiagnostic(diag, locale) {
|
|
|
73
76
|
...(suggestion === undefined ? {} : { suggestion }),
|
|
74
77
|
file: diag.sourcePath,
|
|
75
78
|
line,
|
|
76
|
-
column
|
|
79
|
+
column,
|
|
77
80
|
};
|
|
78
81
|
}
|
|
79
82
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-row.js","sourceRoot":"","sources":["../src/diagnostic-row.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EACjB,oBAAoB,EACpB,yBAAyB,EAGzB,yBAAyB,EAGzB,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
|
|
1
|
+
{"version":3,"file":"diagnostic-row.js","sourceRoot":"","sources":["../src/diagnostic-row.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nowline/browser",
|
|
3
|
-
"version": "0.0.0-dev.
|
|
3
|
+
"version": "0.0.0-dev.20261016135659.g7e263e2",
|
|
4
4
|
"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.",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"engines": {
|
|
@@ -38,9 +38,9 @@
|
|
|
38
38
|
"pipeline"
|
|
39
39
|
],
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@nowline/core": "0.0.0-dev.
|
|
42
|
-
"@nowline/layout": "0.0.0-dev.
|
|
43
|
-
"@nowline/renderer": "0.0.0-dev.
|
|
41
|
+
"@nowline/core": "0.0.0-dev.20261016135659.g7e263e2",
|
|
42
|
+
"@nowline/layout": "0.0.0-dev.20261016135659.g7e263e2",
|
|
43
|
+
"@nowline/renderer": "0.0.0-dev.20261016135659.g7e263e2",
|
|
44
44
|
"langium": "~4.4.0"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
package/src/diagnostic-row.ts
CHANGED
|
@@ -79,7 +79,9 @@ export function fromLexerError(err: LexerErrorLike, file: string): DiagnosticRow
|
|
|
79
79
|
* is 0-based in the resolver (it comes from a CST range) and may be
|
|
80
80
|
* undefined for whole-file diagnostics like circular include — fall
|
|
81
81
|
* back to line 1 so a click-to-jump still puts the cursor near the top
|
|
82
|
-
* of the offending file.
|
|
82
|
+
* of the offending file. A routed diagnostic with a `range` takes its
|
|
83
|
+
* column from it, the validator's column for the same finding; without
|
|
84
|
+
* one the column is 1.
|
|
83
85
|
*
|
|
84
86
|
* A wave-rule diagnostic (specs/waves.md §6.1) keeps its stable code
|
|
85
87
|
* (`NL.Exxxx`), and its message is rendered in `locale` when the caller
|
|
@@ -87,7 +89,8 @@ export function fromLexerError(err: LexerErrorLike, file: string): DiagnosticRow
|
|
|
87
89
|
* copy. Every other resolver diagnostic is an `include` row, verbatim.
|
|
88
90
|
*/
|
|
89
91
|
export function fromResolveDiagnostic(diag: ResolveDiagnostic, locale?: string): DiagnosticRow {
|
|
90
|
-
const line = diag.line
|
|
92
|
+
const line = (diag.range?.start.line ?? diag.line ?? 0) + 1;
|
|
93
|
+
const column = (diag.range?.start.character ?? 0) + 1;
|
|
91
94
|
if (!isRoutedResolveDiagnostic(diag)) {
|
|
92
95
|
return {
|
|
93
96
|
severity: diag.severity,
|
|
@@ -107,7 +110,7 @@ export function fromResolveDiagnostic(diag: ResolveDiagnostic, locale?: string):
|
|
|
107
110
|
...(suggestion === undefined ? {} : { suggestion }),
|
|
108
111
|
file: diag.sourcePath,
|
|
109
112
|
line,
|
|
110
|
-
column
|
|
113
|
+
column,
|
|
111
114
|
};
|
|
112
115
|
}
|
|
113
116
|
|