Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

dist/
__fixtures__

3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"prefer-const": "off",
"require-yield": "off"
},
"env": {
"es6": true
},
"overrides": [
{
"files": ["*.js", "*.cjs", "*.mjs"],
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"repository": "https://github.com/typed-ember/glint",
"scripts": {
"build": "tsc --build",
"build:vscode": "pnpm --filter '@glint/core' --filter '@glint/tsserver-plugin' build && pnpm --filter 'glint-vscode' build",
"build:watch": "tsc --build --watch",
"format": "prettier --write .",
"link:build": "node ./bin/link-build.mjs",
Expand Down Expand Up @@ -32,7 +33,12 @@
"glob": "^10.2.4",
"prettier": "^3.3.2",
"release-plan": "^0.16.0",
"typescript": ">=5.6.0"
"typescript": ">=5.6.0",
"aria-attributes": "^2.0.1",
"html-element-attributes": "^3.3.0",
"html-event-attributes": "^2.2.0",
"svg-element-attributes": "^2.1.0",
"svg-event-attributes": "^2.0.2"
},
"packageManager": "pnpm@10.6.2",
"volta": {
Expand Down
66 changes: 39 additions & 27 deletions packages/core/src/transform/template/template-to-typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export function templateToTypescript(
return mapTemplateContents(originalTemplate, { embeddingSyntax }, (ast, mapper) => {
let { rangeForNode } = mapper;
let scope = new ScopeStack([]);
let inHtmlContext: 'svg' | 'math' | 'default' = 'default';

emitTemplateBoilerplate(() => {
for (let statement of ast?.body ?? []) {
Expand Down Expand Up @@ -184,6 +185,12 @@ export function templateToTypescript(
} else if (kind === 'nocheck') {
// Push to the directives array on the record
mapper.directive(node, 'nocheck');
} else if (kind === 'in-svg') {
Comment thread
NullVoxPopuli marked this conversation as resolved.
inHtmlContext = 'svg';
} else if (kind === 'in-mathml') {
inHtmlContext = 'math';
} else if (kind === 'out-svg' || kind === 'out-mathml') {
inHtmlContext = 'default';
} else {
// Push an error on the record
mapper.error(`Unknown directive @glint-${kind}`, location);
Expand Down Expand Up @@ -878,15 +885,29 @@ export function templateToTypescript(
mapper.forNode(node, () => {
const directivesWeakMap = assignDirectivesToElementOpenTagPieces(node);

if (node.tag === 'svg') {
inHtmlContext = 'svg';
}

if (node.tag === 'math') {
inHtmlContext = 'math';
}

mapper.text('{');
mapper.newline();
mapper.indent();

mapper.text('const __glintY__ = __glintDSL__.emitElement(');
if (inHtmlContext === 'default') {
mapper.text('const __glintY__ = __glintDSL__.emitElement("');
} else if (inHtmlContext === 'svg') {
mapper.text('const __glintY__ = __glintDSL__.emitSVGElement("');
} else if (inHtmlContext === 'math') {
mapper.text('const __glintY__ = __glintDSL__.emitMathMlElement("');
}
mapper.forNode(node.path, () => {
mapper.text(JSON.stringify(node.tag));
mapper.text(node.tag);
});
mapper.text(');');
mapper.text('");');
mapper.newline();

emitAttributesAndModifiers(node, directivesWeakMap);
Expand All @@ -899,6 +920,10 @@ export function templateToTypescript(
emitTopLevelStatement(child);
}

if (node.tag === 'svg' || node.tag === 'math') {
inHtmlContext = 'default';
}

mapper.dedent();
mapper.text('}');
mapper.newline();
Expand All @@ -909,19 +934,9 @@ export function templateToTypescript(
node: AST.ElementNode,
directivesWeakMap: WeakMap<AST.Node, DirectiveKind>,
): void {
let nonArgAttributes = node.attributes.filter((attr) => !attr.name.startsWith('@'));
if (!nonArgAttributes.length && !node.modifiers.length) {
// Avoid unused-symbol diagnostics
// TODO: With Volar you can simply disable `verification` on the CodeInformation
// to prevent diagnostics from mapping back upwards. Perhaps we should use that
// instead of preserving these empty statements/expressions.
mapper.text('__glintY__;');
mapper.newline();
} else {
emitSplattributes(node);
emitPlainAttributes(node, directivesWeakMap);
emitModifiers(node, directivesWeakMap);
}
emitSplattributes(node);
emitPlainAttributes(node, directivesWeakMap);
emitModifiers(node, directivesWeakMap);
}

function emitPlainAttributes(
Expand All @@ -933,8 +948,10 @@ export function templateToTypescript(
);

mapper.text('__glintDSL__.applyAttributes(__glintY__.element, {');

mapper.forNodeWithSpan(node, node.openTag, () => {
const attrsSpan = node.openTag
.withStart(node.path.loc.getEnd())
.withEnd(node.openTag.getEnd().move(-1));
mapper.forNodeWithSpan(node, attrsSpan, () => {
mapper.newline();
mapper.indent();

Expand All @@ -961,17 +978,12 @@ export function templateToTypescript(

mapper.terminateDirectiveAreaOfEffect('emitPlainAttributes');
}

// in case there are no attributes, this would allow completions to trigger
if (attributes.length === 0) {
mapper.text(' ');
mapper.newline();
}

mapper.dedent();
mapper.text('});');
mapper.newline();
});
mapper.newline();
mapper.dedent();
mapper.text('});');
mapper.newline();
}

function emitSplattributes(node: AST.ElementNode): void {
Expand Down
Loading