@glint/ember-tsc 1.8.11 → 1.8.12
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/lib/cli/run-volar-tsc.js +12 -11
- package/lib/cli/run-volar-tsc.js.map +1 -1
- package/lib/transform/diagnostics/transform-errors.d.ts +6 -6
- package/lib/transform/diagnostics/transform-errors.js +6 -6
- package/lib/transform/template/rewrite-module.d.ts.map +1 -1
- package/lib/transform/template/rewrite-module.js +13 -20
- package/lib/transform/template/rewrite-module.js.map +1 -1
- package/lib/transform/template/transformed-module.d.ts.map +1 -1
- package/lib/transform/template/transformed-module.js +8 -0
- package/lib/transform/template/transformed-module.js.map +1 -1
- package/package.json +3 -3
- package/src/cli/run-volar-tsc.ts +12 -11
- package/src/transform/diagnostics/transform-errors.ts +6 -6
- package/src/transform/template/rewrite-module.ts +13 -22
- package/src/transform/template/transformed-module.ts +10 -0
package/lib/cli/run-volar-tsc.js
CHANGED
|
@@ -113,10 +113,11 @@ function patchTscJsExtensionForGts(source) {
|
|
|
113
113
|
}
|
|
114
114
|
// Volar's `runTsc` does not surface the content-tag parse errors that we attach
|
|
115
115
|
// to `TransformedModule.errors` when content-tag fails to parse a .gts/.gjs
|
|
116
|
-
// file.
|
|
117
|
-
//
|
|
118
|
-
//
|
|
119
|
-
// the
|
|
116
|
+
// file. In that case the transformed source is the raw .gts/.gjs source and
|
|
117
|
+
// every mapping carries `verification: false` (see `rewriteModule` /
|
|
118
|
+
// `toVolarMappings`), so volar drops the flood of misleading TS errors against
|
|
119
|
+
// the still-unparsed `<template>` tags; the trade-off is that the underlying
|
|
120
|
+
// parse failure is silently dropped.
|
|
120
121
|
//
|
|
121
122
|
// In language-server / tsserver-plugin contexts that silence is fine because
|
|
122
123
|
// the parse error is re-surfaced by separate diagnostic providers. But the
|
|
@@ -145,12 +146,12 @@ function injectContentTagDiagnostics(language, program) {
|
|
|
145
146
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
146
147
|
const lang = language;
|
|
147
148
|
// Cache of synthetic SourceFiles built from the original .gts/.gjs text,
|
|
148
|
-
// keyed by file name. We
|
|
149
|
+
// keyed by file name. We use our own SourceFile here because the one TS
|
|
149
150
|
// gives us via `program.getSourceFile` was built from the *transformed*
|
|
150
|
-
//
|
|
151
|
-
//
|
|
152
|
-
// https://github.com/typed-ember/glint/pull/1149#discussion_r... for
|
|
153
|
-
// bug report). The original text lives on volar's `sourceScript.snapshot`.
|
|
151
|
+
// text, which is not guaranteed to match the original — so `--pretty`
|
|
152
|
+
// rendering could print the wrong source line under the diagnostic header
|
|
153
|
+
// (see https://github.com/typed-ember/glint/pull/1149#discussion_r... for
|
|
154
|
+
// the bug report). The original text lives on volar's `sourceScript.snapshot`.
|
|
154
155
|
const originalSourceFiles = new Map();
|
|
155
156
|
const getOriginalSourceFile = (fileName) => {
|
|
156
157
|
const cached = originalSourceFiles.get(fileName);
|
|
@@ -188,8 +189,8 @@ function injectContentTagDiagnostics(language, program) {
|
|
|
188
189
|
return [];
|
|
189
190
|
}
|
|
190
191
|
// Render against the original .gts/.gjs text (not the SourceFile TS
|
|
191
|
-
// hands back, which holds the
|
|
192
|
-
//
|
|
192
|
+
// hands back, which holds the transformed contents) so `tsc --pretty`
|
|
193
|
+
// prints the actual offending source line.
|
|
193
194
|
const originalSourceFile = getOriginalSourceFile(sourceFile.fileName) ?? sourceFile;
|
|
194
195
|
return getTransformErrorDiagnostics(transformedModule, originalSourceFile);
|
|
195
196
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-volar-tsc.js","sourceRoot":"","sources":["../../src/cli/run-volar-tsc.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-volar-tsc.js","sourceRoot":"","sources":["../../src/cli/run-volar-tsc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4CAA4C,CAAC;AAEpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAE5F,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,gFAAgF;AAChF,0BAA0B;AAC1B,iEAAiE;AACjE,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;AAE1D,MAAM,UAAU,GAAG;IACjB,0BAA0B,EAAE,CAAC;IAC7B,4CAA4C,EAAE,CAAC;IAE/C,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAExB,MAAM,OAAO,GAAG;QACd,wBAAwB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QAE1C,+EAA+E;QAC/E,6DAA6D;QAC7D,8HAA8H;QAC9H,EAAE;QACF,uFAAuF;QACvF,EAAE;QACF,kLAAkL;QAClL,yFAAyF;QACzF,uBAAuB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;KAC1C,CAAC;IAEF,MAAM,IAAI,GAAG,GAAS,EAAE,CACtB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE;QACrE,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAEpC,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC;YACjE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC,CAAC,CAAC;IACL,IAAI,EAAE,CAAC;AACT,CAAC;AAED,sEAAsE;AACtE,wEAAwE;AACxE,6EAA6E;AAC7E,+EAA+E;AAC/E,+EAA+E;AAC/E,0EAA0E;AAC1E,6EAA6E;AAC7E,4EAA4E;AAC5E,4DAA4D;AAC5D,EAAE;AACF,+EAA+E;AAC/E,2EAA2E;AAC3E,4DAA4D;AAC5D,SAAS,0BAA0B;IACjC,MAAM,oBAAoB,GAAG,EAAE,CAAC,YAAY,CAAC;IAC7C,8DAA8D;IAC7D,EAAU,CAAC,YAAY,GAAG,UAAU,GAAG,IAAe;QACrD,8DAA8D;QAC9D,MAAM,MAAM,GAAI,oBAA4B,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,MAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACvF,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACxC,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrE,CAAC;QACD,oEAAoE;QACpE,IAAI,+BAA+B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,MAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACvF,IAAI,IAAI,CAAC,QAAQ,CAAC,oCAAoC,CAAC,EAAE,CAAC;gBACxD,MAAM,OAAO,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;gBAChD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc;IACvC,MAAM,KAAK,GAAG,uEAAuE,CAAC;IAEtF,MAAM,eAAe,GACnB,6IAA6I,CAAC;IAChJ,MAAM,YAAY,GAChB,2HAA2H,CAAC;IAE9H,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CACb,mEAAmE;YACjE,oDAAoD;YACpD,iFAAiF,CACpF,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC;AAC/F,CAAC;AAED,8EAA8E;AAC9E,iFAAiF;AACjF,uEAAuE;AACvE,uEAAuE;AACvE,gFAAgF;AAChF,iFAAiF;AACjF,4EAA4E;AAC5E,oDAAoD;AACpD,6EAA6E;AAC7E,uEAAuE;AACvE,2EAA2E;AAC3E,iFAAiF;AACjF,iFAAiF;AACjF,SAAS,yBAAyB,CAAC,MAAc;IAC/C,MAAM,OAAO,GAAG,kEAAkE,CAAC;IACnF,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,iEAAiE;YAC/D,kDAAkD;YAClD,8FAA8F,CACjG,CAAC;IACJ,CAAC;IACD,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC,OAAO,CACnB,OAAO,EACP,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,+BAA+B,aAAa,kBAAkB,CAC1E,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,4EAA4E;AAC5E,4EAA4E;AAC5E,qEAAqE;AACrE,+EAA+E;AAC/E,6EAA6E;AAC7E,qCAAqC;AACrC,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,gFAAgF;AAChF,8EAA8E;AAC9E,yBAAyB;AACzB,EAAE;AACF,iEAAiE;AACjE,6EAA6E;AAC7E,6EAA6E;AAC7E,2DAA2D;AAC3D,SAAS,4CAA4C;IACnD,qGAAqG;IACrG,MAAM,cAAc,GAAG,OAAO,CAAC,+CAA+C,CAE7E,CAAC;IACF,MAAM,uBAAuB,GAAG,cAAc,CAAC,eAAe,CAAC;IAE/D,cAAc,CAAC,eAAe,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;QACrD,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3C,2BAA2B,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,QAAiB,EAAE,OAAmB;IACzE,4EAA4E;IAC5E,8DAA8D;IAC9D,iEAAiE;IACjE,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAc,CAAC;IAErD,8DAA8D;IAC9D,MAAM,IAAI,GAAG,QAAiD,CAAC;IAE/D,yEAAyE;IACzE,wEAAwE;IACxE,wEAAwE;IACxE,sEAAsE;IACtE,0EAA0E;IAC1E,0EAA0E;IAC1E,+EAA+E;IAC/E,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE7D,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAA6B,EAAE;QAC5E,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,YAAY,EAAE,QAA0C,CAAC;QAC1E,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;QACvD,MAAM,EAAE,GAAG,SAAS,CAAC,gBAAgB,CACnC,QAAQ,EACR,IAAI,EACJ,SAAS,CAAC,YAAY,CAAC,MAAM;QAC7B,oBAAoB,CAAC,KAAK,CAC3B,CAAC;QACF,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,8EAA8E;IAC9E,sEAAsE;IACtE,4EAA4E;IAC5E,oDAAoD;IACpD,MAAM,aAAa,GAAG,CAAC,UAA0B,EAAmB,EAAE;QACpE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,MAAM,GAAoB,EAAE,CAAC;YACnC,KAAK,MAAM,EAAE,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC1C,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC;QAC3C,IAAI,CAAC,CAAC,IAAI,YAAY,cAAc,CAAC,EAAE,CAAC;YACtC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,oEAAoE;QACpE,sEAAsE;QACtE,2CAA2C;QAC3C,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC;QACpF,OAAO,4BAA4B,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC7E,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAG,CAC7B,GAAM,EACA,EAAE;QACR,yEAAyE;QACzE,oDAAoD;QACpD,8DAA8D;QAC9D,MAAM,QAAQ,GAAI,OAAe,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QACD,8DAA8D;QAC7D,OAAe,CAAC,GAAG,CAAC,GAAG,CACtB,UAA0B,EAC1B,iBAAwC,EACd,EAAE;YAC5B,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAC7B,OAAO,EACP,UAAU,EACV,iBAAiB,CACU,CAAC;YAC9B,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/D,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,sBAAsB,CAAC,yBAAyB,CAAC,CAAC;IAClD,sBAAsB,CAAC,wBAAwB,CAAC,CAAC;IACjD,6EAA6E;IAC7E,2EAA2E;IAC3E,sBAAsB,CAAC,4BAAoE,CAAC,CAAC;IAE7F,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAClC,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE;QACzB,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACjG,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -7,15 +7,15 @@ import { Diagnostic } from './index.js';
|
|
|
7
7
|
* tsserver-plugin path see the underlying error rather than nothing.
|
|
8
8
|
*
|
|
9
9
|
* Without this, when content-tag fails to parse a .gts/.gjs file we suppress
|
|
10
|
-
* the resulting flood of TS errors by
|
|
11
|
-
* `rewriteModule`). That leaves the tsserver
|
|
12
|
-
* inside VS Code, where the Volar language
|
|
13
|
-
* plugin surfaces the error, but unhelpful for
|
|
14
|
-
* the tsserver plugin.
|
|
10
|
+
* the resulting flood of TS errors by disabling `verification` on every
|
|
11
|
+
* mapping (see `rewriteModule` / `toVolarMappings`). That leaves the tsserver
|
|
12
|
+
* path silent on its own — fine inside VS Code, where the Volar language
|
|
13
|
+
* server's `g-compiler-errors` plugin surfaces the error, but unhelpful for
|
|
14
|
+
* any consumer running only the tsserver plugin.
|
|
15
15
|
*
|
|
16
16
|
* Offsets are in original (.gts) source coordinates; tsserver maps them to
|
|
17
17
|
* line/column using its own ScriptInfo for the source file, so the same
|
|
18
|
-
* value works regardless of
|
|
18
|
+
* value works regardless of what the transformed output contains.
|
|
19
19
|
*/
|
|
20
20
|
export declare function getTransformErrorDiagnostics(transformedModule: TransformedModule, sourceFile: ts.SourceFile): Diagnostic[];
|
|
21
21
|
//# sourceMappingURL=transform-errors.d.ts.map
|
|
@@ -4,15 +4,15 @@
|
|
|
4
4
|
* tsserver-plugin path see the underlying error rather than nothing.
|
|
5
5
|
*
|
|
6
6
|
* Without this, when content-tag fails to parse a .gts/.gjs file we suppress
|
|
7
|
-
* the resulting flood of TS errors by
|
|
8
|
-
* `rewriteModule`). That leaves the tsserver
|
|
9
|
-
* inside VS Code, where the Volar language
|
|
10
|
-
* plugin surfaces the error, but unhelpful for
|
|
11
|
-
* the tsserver plugin.
|
|
7
|
+
* the resulting flood of TS errors by disabling `verification` on every
|
|
8
|
+
* mapping (see `rewriteModule` / `toVolarMappings`). That leaves the tsserver
|
|
9
|
+
* path silent on its own — fine inside VS Code, where the Volar language
|
|
10
|
+
* server's `g-compiler-errors` plugin surfaces the error, but unhelpful for
|
|
11
|
+
* any consumer running only the tsserver plugin.
|
|
12
12
|
*
|
|
13
13
|
* Offsets are in original (.gts) source coordinates; tsserver maps them to
|
|
14
14
|
* line/column using its own ScriptInfo for the source file, so the same
|
|
15
|
-
* value works regardless of
|
|
15
|
+
* value works regardless of what the transformed output contains.
|
|
16
16
|
*/
|
|
17
17
|
export function getTransformErrorDiagnostics(transformedModule, sourceFile) {
|
|
18
18
|
return transformedModule.errors
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-module.d.ts","sourceRoot":"","sources":["../../../src/transform/template/rewrite-module.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAU,KAAK,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,iBAAiB,EAAE,EAGxB,UAAU,EAEX,MAAM,yBAAyB,CAAC;AAEjC;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAElD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,KAAK,EACT,EAAE,MAAM,EAAE,EAAE,YAAY,EACxB,WAAW,EAAE,gBAAgB,EAC7B,QAAQ,CAAC,EAAE,MAAM,GAChB,iBAAiB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"rewrite-module.d.ts","sourceRoot":"","sources":["../../../src/transform/template/rewrite-module.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAU,KAAK,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,iBAAiB,EAAE,EAGxB,UAAU,EAEX,MAAM,yBAAyB,CAAC;AAEjC;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAElD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,KAAK,EACT,EAAE,MAAM,EAAE,EAAE,YAAY,EACxB,WAAW,EAAE,gBAAgB,EAC7B,QAAQ,CAAC,EAAE,MAAM,GAChB,iBAAiB,GAAG,IAAI,CA6B1B"}
|
|
@@ -18,28 +18,21 @@ export function rewriteModule(ts, { script }, environment, clientId) {
|
|
|
18
18
|
}
|
|
19
19
|
let sparseSpans = completeCorrelatedSpans(partialSpans);
|
|
20
20
|
let { contents, correlatedSpans } = calculateTransformedSource(script, sparseSpans, directives);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}));
|
|
35
|
-
}
|
|
21
|
+
// When content-tag fails to parse the .gts/.gjs source (which happens
|
|
22
|
+
// constantly while the user is mid-keystroke, e.g. right after typing
|
|
23
|
+
// `foo.`), the "transformed" output above is just the raw source (still
|
|
24
|
+
// containing `<template>` tags etc.). We keep that raw source as the
|
|
25
|
+
// transformed contents so that TypeScript's error-tolerant parser can
|
|
26
|
+
// continue to power completions/hover/navigation in the script portions
|
|
27
|
+
// of the file. The flood of misleading syntax/type errors TS would report
|
|
28
|
+
// against the still-unparsed `<template>` tags is suppressed via the
|
|
29
|
+
// mappings instead: `toVolarMappings` disables `verification` for every
|
|
30
|
+
// mapping when a content-tag error is present, so Volar drops all TS
|
|
31
|
+
// diagnostics for the file. The content-tag error itself is preserved on
|
|
32
|
+
// `errors` and surfaced as the sole diagnostic by the `g-compiler-errors`
|
|
33
|
+
// language service plugin (and by the CLI's decorateProgram patch).
|
|
36
34
|
return new TransformedModule(contents, errors, directives, correlatedSpans, script.filename);
|
|
37
35
|
}
|
|
38
|
-
function blankNonNewlineChars(value) {
|
|
39
|
-
// Preserve newlines so that line/column tracking still works for any
|
|
40
|
-
// remaining offset-mapping queries; replace everything else with spaces.
|
|
41
|
-
return value.replace(/[^\n]/g, ' ');
|
|
42
|
-
}
|
|
43
36
|
/**
|
|
44
37
|
* Locates any embedded templates in the given AST and returns a corresponding
|
|
45
38
|
* `PartialCorrelatedSpan` for each, as well as any errors encountered. These
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-module.js","sourceRoot":"","sources":["../../../src/transform/template/rewrite-module.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,MAAM,EAAS,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,iBAKN,MAAM,yBAAyB,CAAC;AASjC;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAC3B,EAAS,EACT,EAAE,MAAM,EAAgB,EACxB,WAA6B,EAC7B,QAAiB;IAEjB,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,wBAAwB,CACjE,EAAE,EACF,MAAM,EACN,WAAW,EACX,QAAQ,CACT,CAAC;IAEF,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,WAAW,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAEhG,
|
|
1
|
+
{"version":3,"file":"rewrite-module.js","sourceRoot":"","sources":["../../../src/transform/template/rewrite-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformed-module.d.ts","sourceRoot":"","sources":["../../../src/transform/template/transformed-module.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transformed-module.d.ts","sourceRoot":"","sources":["../../../src/transform/template/transformed-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -146,6 +146,13 @@ export default class TransformedModule {
|
|
|
146
146
|
*/
|
|
147
147
|
toVolarMappings(filenameFilter) {
|
|
148
148
|
const codeMappings = [];
|
|
149
|
+
// When content-tag failed to parse the file, the "transformed" contents
|
|
150
|
+
// are the raw source (see `rewriteModule`). We still map it so that
|
|
151
|
+
// completions/hover/navigation keep working in the script portions while
|
|
152
|
+
// the user is mid-edit, but we disable `verification` so Volar drops the
|
|
153
|
+
// flood of TS diagnostics against the unparsed `<template>` tags; the
|
|
154
|
+
// content-tag parse error itself is surfaced separately.
|
|
155
|
+
const hasContentTagError = this.errors.some((error) => error.isContentTagError);
|
|
149
156
|
const push = (sourceOffset, generatedOffset, length, codeInformation) => {
|
|
150
157
|
// if (sourceOffsets.length > 0) {
|
|
151
158
|
// TODO: these assertions are firing for certain files/transformations, which means
|
|
@@ -297,6 +304,7 @@ export default class TransformedModule {
|
|
|
297
304
|
...codeFeatures.all,
|
|
298
305
|
// This enables symbol/outline info for the transformed TS to appear in for the .gts file.
|
|
299
306
|
structure: true,
|
|
307
|
+
...(hasContentTagError ? { verification: false } : null),
|
|
300
308
|
});
|
|
301
309
|
}
|
|
302
310
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformed-module.js","sourceRoot":"","sources":["../../../src/transform/template/transformed-module.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transformed-module.js","sourceRoot":"","sources":["../../../src/transform/template/transformed-module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@glint/ember-tsc",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.12",
|
|
4
4
|
"repository": "typed-ember/glint",
|
|
5
5
|
"description": "A CLI for performing typechecking on Glimmer templates",
|
|
6
6
|
"license": "MIT",
|
|
@@ -101,8 +101,8 @@
|
|
|
101
101
|
"execa": "^4.0.1",
|
|
102
102
|
"strip-ansi": "^6.0.0",
|
|
103
103
|
"typescript": "^5.9.3",
|
|
104
|
-
"glint-
|
|
105
|
-
"
|
|
104
|
+
"@glint/type-test": "2.0.1",
|
|
105
|
+
"glint-monorepo-test-utils": "0.0.0"
|
|
106
106
|
},
|
|
107
107
|
"publishConfig": {
|
|
108
108
|
"access": "public"
|
package/src/cli/run-volar-tsc.ts
CHANGED
|
@@ -137,10 +137,11 @@ function patchTscJsExtensionForGts(source: string): string {
|
|
|
137
137
|
|
|
138
138
|
// Volar's `runTsc` does not surface the content-tag parse errors that we attach
|
|
139
139
|
// to `TransformedModule.errors` when content-tag fails to parse a .gts/.gjs
|
|
140
|
-
// file.
|
|
141
|
-
//
|
|
142
|
-
//
|
|
143
|
-
// the
|
|
140
|
+
// file. In that case the transformed source is the raw .gts/.gjs source and
|
|
141
|
+
// every mapping carries `verification: false` (see `rewriteModule` /
|
|
142
|
+
// `toVolarMappings`), so volar drops the flood of misleading TS errors against
|
|
143
|
+
// the still-unparsed `<template>` tags; the trade-off is that the underlying
|
|
144
|
+
// parse failure is silently dropped.
|
|
144
145
|
//
|
|
145
146
|
// In language-server / tsserver-plugin contexts that silence is fine because
|
|
146
147
|
// the parse error is re-surfaced by separate diagnostic providers. But the
|
|
@@ -175,12 +176,12 @@ function injectContentTagDiagnostics(language: unknown, program: ts.Program): vo
|
|
|
175
176
|
const lang = language as { scripts: { get(id: string): any } };
|
|
176
177
|
|
|
177
178
|
// Cache of synthetic SourceFiles built from the original .gts/.gjs text,
|
|
178
|
-
// keyed by file name. We
|
|
179
|
+
// keyed by file name. We use our own SourceFile here because the one TS
|
|
179
180
|
// gives us via `program.getSourceFile` was built from the *transformed*
|
|
180
|
-
//
|
|
181
|
-
//
|
|
182
|
-
// https://github.com/typed-ember/glint/pull/1149#discussion_r... for
|
|
183
|
-
// bug report). The original text lives on volar's `sourceScript.snapshot`.
|
|
181
|
+
// text, which is not guaranteed to match the original — so `--pretty`
|
|
182
|
+
// rendering could print the wrong source line under the diagnostic header
|
|
183
|
+
// (see https://github.com/typed-ember/glint/pull/1149#discussion_r... for
|
|
184
|
+
// the bug report). The original text lives on volar's `sourceScript.snapshot`.
|
|
184
185
|
const originalSourceFiles = new Map<string, ts.SourceFile>();
|
|
185
186
|
|
|
186
187
|
const getOriginalSourceFile = (fileName: string): ts.SourceFile | undefined => {
|
|
@@ -222,8 +223,8 @@ function injectContentTagDiagnostics(language: unknown, program: ts.Program): vo
|
|
|
222
223
|
return [];
|
|
223
224
|
}
|
|
224
225
|
// Render against the original .gts/.gjs text (not the SourceFile TS
|
|
225
|
-
// hands back, which holds the
|
|
226
|
-
//
|
|
226
|
+
// hands back, which holds the transformed contents) so `tsc --pretty`
|
|
227
|
+
// prints the actual offending source line.
|
|
227
228
|
const originalSourceFile = getOriginalSourceFile(sourceFile.fileName) ?? sourceFile;
|
|
228
229
|
return getTransformErrorDiagnostics(transformedModule, originalSourceFile);
|
|
229
230
|
};
|
|
@@ -8,15 +8,15 @@ import { Diagnostic } from './index.js';
|
|
|
8
8
|
* tsserver-plugin path see the underlying error rather than nothing.
|
|
9
9
|
*
|
|
10
10
|
* Without this, when content-tag fails to parse a .gts/.gjs file we suppress
|
|
11
|
-
* the resulting flood of TS errors by
|
|
12
|
-
* `rewriteModule`). That leaves the tsserver
|
|
13
|
-
* inside VS Code, where the Volar language
|
|
14
|
-
* plugin surfaces the error, but unhelpful for
|
|
15
|
-
* the tsserver plugin.
|
|
11
|
+
* the resulting flood of TS errors by disabling `verification` on every
|
|
12
|
+
* mapping (see `rewriteModule` / `toVolarMappings`). That leaves the tsserver
|
|
13
|
+
* path silent on its own — fine inside VS Code, where the Volar language
|
|
14
|
+
* server's `g-compiler-errors` plugin surfaces the error, but unhelpful for
|
|
15
|
+
* any consumer running only the tsserver plugin.
|
|
16
16
|
*
|
|
17
17
|
* Offsets are in original (.gts) source coordinates; tsserver maps them to
|
|
18
18
|
* line/column using its own ScriptInfo for the source file, so the same
|
|
19
|
-
* value works regardless of
|
|
19
|
+
* value works regardless of what the transformed output contains.
|
|
20
20
|
*/
|
|
21
21
|
export function getTransformErrorDiagnostics(
|
|
22
22
|
transformedModule: TransformedModule,
|
|
@@ -49,31 +49,22 @@ export function rewriteModule(
|
|
|
49
49
|
let sparseSpans = completeCorrelatedSpans(partialSpans);
|
|
50
50
|
let { contents, correlatedSpans } = calculateTransformedSource(script, sparseSpans, directives);
|
|
51
51
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}));
|
|
66
|
-
}
|
|
67
|
-
|
|
52
|
+
// When content-tag fails to parse the .gts/.gjs source (which happens
|
|
53
|
+
// constantly while the user is mid-keystroke, e.g. right after typing
|
|
54
|
+
// `foo.`), the "transformed" output above is just the raw source (still
|
|
55
|
+
// containing `<template>` tags etc.). We keep that raw source as the
|
|
56
|
+
// transformed contents so that TypeScript's error-tolerant parser can
|
|
57
|
+
// continue to power completions/hover/navigation in the script portions
|
|
58
|
+
// of the file. The flood of misleading syntax/type errors TS would report
|
|
59
|
+
// against the still-unparsed `<template>` tags is suppressed via the
|
|
60
|
+
// mappings instead: `toVolarMappings` disables `verification` for every
|
|
61
|
+
// mapping when a content-tag error is present, so Volar drops all TS
|
|
62
|
+
// diagnostics for the file. The content-tag error itself is preserved on
|
|
63
|
+
// `errors` and surfaced as the sole diagnostic by the `g-compiler-errors`
|
|
64
|
+
// language service plugin (and by the CLI's decorateProgram patch).
|
|
68
65
|
return new TransformedModule(contents, errors, directives, correlatedSpans, script.filename);
|
|
69
66
|
}
|
|
70
67
|
|
|
71
|
-
function blankNonNewlineChars(value: string): string {
|
|
72
|
-
// Preserve newlines so that line/column tracking still works for any
|
|
73
|
-
// remaining offset-mapping queries; replace everything else with spaces.
|
|
74
|
-
return value.replace(/[^\n]/g, ' ');
|
|
75
|
-
}
|
|
76
|
-
|
|
77
68
|
/**
|
|
78
69
|
* Locates any embedded templates in the given AST and returns a corresponding
|
|
79
70
|
* `PartialCorrelatedSpan` for each, as well as any errors encountered. These
|
|
@@ -275,6 +275,14 @@ export default class TransformedModule {
|
|
|
275
275
|
public toVolarMappings(filenameFilter?: string): CodeMapping[] {
|
|
276
276
|
const codeMappings: CodeMapping[] = [];
|
|
277
277
|
|
|
278
|
+
// When content-tag failed to parse the file, the "transformed" contents
|
|
279
|
+
// are the raw source (see `rewriteModule`). We still map it so that
|
|
280
|
+
// completions/hover/navigation keep working in the script portions while
|
|
281
|
+
// the user is mid-edit, but we disable `verification` so Volar drops the
|
|
282
|
+
// flood of TS diagnostics against the unparsed `<template>` tags; the
|
|
283
|
+
// content-tag parse error itself is surfaced separately.
|
|
284
|
+
const hasContentTagError = this.errors.some((error) => error.isContentTagError);
|
|
285
|
+
|
|
278
286
|
const push = (
|
|
279
287
|
sourceOffset: number,
|
|
280
288
|
generatedOffset: number,
|
|
@@ -448,6 +456,8 @@ export default class TransformedModule {
|
|
|
448
456
|
|
|
449
457
|
// This enables symbol/outline info for the transformed TS to appear in for the .gts file.
|
|
450
458
|
structure: true,
|
|
459
|
+
|
|
460
|
+
...(hasContentTagError ? { verification: false } : null),
|
|
451
461
|
});
|
|
452
462
|
}
|
|
453
463
|
}
|