Skip to content

Account for multiple potential sources in @glint/transform #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 3, 2020
Merged

Account for multiple potential sources in @glint/transform #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c397c0d
Account for multiple potential sources in @glint/transform
dfreeman Dec 3, 2020
f01a83b
Update cli and tsserver-plugin for multi-source transform API
dfreeman Dec 3, 2020
00e070a
Fix trailing whitespace in debug output so prettier stops creating diffs
dfreeman Dec 3, 2020
7dba1a0
Merge branch 'master' into separate-templates
dfreeman Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 13 additions & 24 deletions packages/cli/src/transform-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,32 @@ export default class TransformManager {
let file = diagnostic.file;
let transformedModule = file && this.transformedModules.get(file.fileName);
if (diagnostic.code && file && transformedModule) {
let sourceFile = this.ts.createSourceFile(
file.fileName,
transformedModule.originalSource,
file.languageVersion
);

diagnostic = rewriteDiagnostic(diagnostic, transformedModule, sourceFile);
diagnostic = rewriteDiagnostic(this.ts, diagnostic, transformedModule);
}

return this.ts.formatDiagnosticsWithColorAndContext([diagnostic], this.formatDiagnosticHost);
}

public readFile(filename: string, encoding?: string): string | undefined {
let source = this.ts.sys.readFile(filename, encoding);
let contents = this.ts.sys.readFile(filename, encoding);
let config = this.glintConfig;

if (
source &&
contents &&
filename.endsWith('.ts') &&
!filename.endsWith('.d.ts') &&
config.includesFile(filename) &&
config.environment.moduleMayHaveTagImports(source)
config.environment.moduleMayHaveTagImports(contents)
) {
let transformedModule = rewriteModule(filename, source, config.environment);
let script = { filename, contents };
let transformedModule = rewriteModule({ script }, config.environment);
if (transformedModule) {
this.transformedModules.set(filename, transformedModule);
return transformedModule.transformedSource;
return transformedModule.transformedContents;
}
}

return source;
return contents;
}

private readonly formatDiagnosticHost: ts.FormatDiagnosticsHost = {
Expand All @@ -62,20 +57,14 @@ export default class TransformManager {
};

private buildDiagnostics(transformedModule: TransformedModule): Array<ts.DiagnosticWithLocation> {
if (!transformedModule.errors.length) {
return [];
}

let sourceFile = this.ts.createSourceFile(
transformedModule.filename,
transformedModule.originalSource,
this.ts.ScriptTarget.ESNext
);

return transformedModule.errors.map((error) => ({
category: this.ts.DiagnosticCategory.Error,
code: 0,
file: sourceFile,
file: this.ts.createSourceFile(
error.source.filename,
error.source.contents,
this.ts.ScriptTarget.Latest
),
start: error.location.start,
length: error.location.end - error.location.start,
messageText: `[glint] ${error.message}`,
Expand Down
89 changes: 46 additions & 43 deletions packages/transform/__tests__/debug.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,103 +4,106 @@ import { GlintEnvironment } from '@glint/config';

describe('Debug utilities', () => {
test('TransformedModule#toDebugString', () => {
let code = stripIndent`
import Component, { hbs } from '@glimmerx/component';
let script = {
filename: 'test.ts',
contents: stripIndent`
import Component, { hbs } from '@glimmerx/component';

export default class MyComponent extends Component {
private bar = 'hi';
export default class MyComponent extends Component {
private bar = 'hi';

static template = hbs\`
<HelperComponent @foo={{this.bar}} />
\`;
}
static template = hbs\`
<HelperComponent @foo={{this.bar}} />
\`;
}

class HelperComponent extends Component<{ foo: string }> {
static template = hbs\`
Hello, {{@foo}}
\`;
}
`;
class HelperComponent extends Component<{ foo: string }> {
static template = hbs\`
Hello, {{@foo}}
\`;
}
`,
};

let transformedModule = rewriteModule('test.ts', code, GlintEnvironment.load('glimmerx'));
let transformedModule = rewriteModule({ script }, GlintEnvironment.load('glimmerx'));

expect(transformedModule?.toDebugString()).toMatchInlineSnapshot(`
"TransformedModule test.ts
"TransformedModule

| Mapping: Template
| hbs(0:50): hbs\`\\\\n <HelperComponent @foo={{this.bar}} />\\\\n \`
| ts(0:277): (() => {\\\\n hbs;\\\\n let χ!: typeof import(\\"@glint/environment-glimmerx/types\\");\\\\n return χ.template(function(𝚪: import(\\"@glint/environment-glimmerx/types\\").ResolveContext<MyComponent>) {\\\\n χ.invokeBlock(χ.resolve(HelperComponent)({ foo: 𝚪.this.bar }), {});\\\\n 𝚪;\\\\n });\\\\n})()
|
|
| | Mapping: Identifier
| | hbs(0:0):
| | hbs(0:0):
| | ts(170:181): MyComponent
| |
| |
| | Mapping: ElementNode
| | hbs(9:46): <HelperComponent @foo={{this.bar}} />
| | ts(186:259): χ.invokeBlock(χ.resolve(HelperComponent)({ foo: 𝚪.this.bar }), {});
| |
| |
| | | Mapping: ElementNode
| | | hbs(9:46): <HelperComponent @foo={{this.bar}} />
| | | ts(186:259): χ.invokeBlock(χ.resolve(HelperComponent)({ foo: 𝚪.this.bar }), {});
| | |
| | |
| | | | Mapping: Identifier
| | | | hbs(10:25): HelperComponent
| | | | ts(214:229): HelperComponent
| | | |
| | | |
| | | | Mapping: AttrNode
| | | | hbs(26:43): @foo={{this.bar}}
| | | | ts(233:249): foo: 𝚪.this.bar
| | | |
| | | |
| | | | | Mapping: Identifier
| | | | | hbs(27:30): foo
| | | | | ts(233:236): foo
| | | | |
| | | | |
| | | | | Mapping: MustacheStatement
| | | | | hbs(31:43): {{this.bar}}
| | | | | ts(238:249): 𝚪.this.bar
| | | | |
| | | | |
| | | | | | Mapping: PathExpression
| | | | | | hbs(33:41): this.bar
| | | | | | ts(238:249): 𝚪.this.bar
| | | | | |
| | | | | |
| | | | | | | Mapping: Identifier
| | | | | | | hbs(33:37): this
| | | | | | | ts(241:245): this
| | | | | | |
| | | | | | |
| | | | | | | Mapping: Identifier
| | | | | | | hbs(38:41): bar
| | | | | | | ts(246:249): bar
| | | | | | |
| | | | | |
| | | | |
| | | |
| | |
| |
|
| | | | | | |
| | | | | |
| | | | |
| | | |
| | |
| |
|

| Mapping: Template
| hbs(0:28): hbs\`\\\\n Hello, {{@foo}}\\\\n \`
| ts(0:262): (() => {\\\\n hbs;\\\\n let χ!: typeof import(\\"@glint/environment-glimmerx/types\\");\\\\n return χ.template(function(𝚪: import(\\"@glint/environment-glimmerx/types\\").ResolveContext<HelperComponent>) {\\\\n χ.invokeEmit(χ.resolveOrReturn(𝚪.args.foo)({}));\\\\n 𝚪;\\\\n });\\\\n})()
|
|
| | Mapping: Identifier
| | hbs(0:0):
| | hbs(0:0):
| | ts(170:185): HelperComponent
| |
| |
| | Mapping: MustacheStatement
| | hbs(16:24): {{@foo}}
| | ts(190:242): χ.invokeEmit(χ.resolveOrReturn(𝚪.args.foo)({}))
| |
| |
| | | Mapping: PathExpression
| | | hbs(18:22): @foo
| | | ts(225:236): 𝚪.args.foo
| | |
| | |
| | | | Mapping: Identifier
| | | | hbs(19:22): foo
| | | | ts(233:236): foo
| | | |
| | |
| |
| "
| | | |
| | |
| |
|"
`);
});
});
Loading