Skip to content

Commit 76a0759

Browse files
Merge pull request #903 from typed-ember/nvp/failing-test
@glint/template: Fix Element extends comparison
2 parents 4151d64 + 7d35471 commit 76a0759

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

bin/build-augmentations.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ traverse(ast, {
3333

3434
let augmentations = [];
3535
for (const element of elements) {
36+
if (element === 'HTMLElement') continue;
37+
3638
augmentations.push(`
3739
interface ${element} {
3840
[GlintSymbol]: '${element}';

packages/template/-private/dsl/lib.dom.augmentation.d.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ declare global {
1111
}
1212

1313

14-
interface HTMLElement {
15-
[GlintSymbol]: 'HTMLElement';
16-
}
17-
18-
1914
interface HTMLAreaElement {
2015
[GlintSymbol]: 'HTMLAreaElement';
2116
}

packages/template/__tests__/keywords/component.test.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ import TestComponent from '../test-component';
55

66
const componentKeyword = resolve({} as ComponentKeyword);
77

8+
class WithElement extends TestComponent<{
9+
Element: HTMLElement;
10+
}> {}
11+
12+
// https://www.typescriptlang.org/play/?#code/JYWwDg9gTgLgBAbzgUwB5mQYxgFQJ4YDyAZnAL5zFQQhwDkaG2AtDAcnQNwBQ3jWudiQA8ACRwBZADIBRADbIQyAHYwAfAAoAlADoYEGahgqAJmMlSAIsABu8xSvXae-bPiLFz063YVLVmrr6hsbKZuLS9v5OWpxAA
13+
expectTypeOf<HTMLDivElement>().toExtend<HTMLElement>();
14+
15+
const ElementType = emitComponent(resolve(WithElement)()).element;
16+
expectTypeOf<HTMLDivElement>().toExtend<typeof ElementType>();
17+
818
class StringComponent extends TestComponent<{
919
Args: { value: string };
1020
Blocks: { default: [string] };

packages/template/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
],
2727
"devDependencies": {
2828
"@glimmer/component": "^1.1.2",
29-
"expect-type": "^0.15.0",
29+
"expect-type": "^1.2.1",
3030
"sums-up": "^2.1.0",
3131
"ember-source": "^6.2.0",
3232
"typescript": ">=5.6.0",

pnpm-lock.yaml

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)