@glint/ember-tsc 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glint/ember-tsc",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "repository": "typed-ember/glint",
   "description": "A CLI for performing typechecking on Glimmer templates",
   "license": "MIT",
@@ -71,7 +71,7 @@
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
-    "@glint/template": "1.7.5"
+    "@glint/template": "1.7.7"
   },
   "devDependencies": {
     "@glimmer/component": "^2.0.0",
@@ -86,8 +86,8 @@
     "execa": "^4.0.1",
     "strip-ansi": "^6.0.0",
     "typescript": "^5.9.3",
-    "glint-monorepo-test-utils": "0.0.0",
-    "@glint/type-test": "2.0.0"
+    "@glint/type-test": "2.0.1",
+    "glint-monorepo-test-utils": "0.0.0"
   },
   "publishConfig": {
     "access": "public"

package/src/transform/template/template-to-typescript.ts

@@ -302,21 +302,32 @@ export function templateToTypescript(
           mapper.text('__glintDSL__.emitContent(');
         }
 
-        // Treat the first argument to a bind-invokable expression (`{{component}}`,
-        // `{{helper}}`, etc) as special: we wrap it in a `resolve` call so that the
-        // type machinery for those helpers can always operate against the resolved value.
-        // We wrap the `resolveForBind` call in an IIFE to prevent "backpressure" in
-        // type inference from the subsequent arguments that are being passed: the bound
-        // invokable is the source of record for its own type and we don't want inference
-        // from the `resolveForBind` call to be affected by other (potentially incorrect)
-        // parameter types.
-        mapper.text('__glintDSL__.resolve(');
-        emitExpression(node.path);
-        mapper.text(')((() => __glintDSL__.resolveForBind(');
-        emitExpression(node.params[0]);
-        mapper.text('))(), ');
-        emitArgs(node.params.slice(1), node.hash);
-        mapper.text(')');
+        // Emit the keyword call (with IIFE to isolate inference). This
+        // validates arg types via Named/Return decomposition.
+        function emitKeywordCall(): void {
+          mapper.text('__glintDSL__.resolve(');
+          emitExpression(node.path);
+          mapper.text(')((() => __glintDSL__.resolveForBind(');
+          emitExpression(node.params[0]);
+          mapper.text('))(), ');
+          emitArgs(node.params.slice(1), node.hash);
+          mapper.text(')');
+        }
+
+        if (node.hash.pairs.length > 0) {
+          // Two-stage comma expression (#1068): the keyword call validates
+          // arg types (result discarded), while bindInvokable preserves
+          // generic type parameters via Args/T holistic capture (result used).
+          mapper.text('(');
+          emitKeywordCall();
+          mapper.text(', __glintDSL__.bindInvokable(__glintDSL__.resolveForBind(');
+          emitExpression(node.params[0]);
+          mapper.text('), ');
+          emitArgs([], node.hash);
+          mapper.text('))');
+        } else {
+          emitKeywordCall();
+        }
 
         if (position === 'top-level') {
           mapper.text(')');
@@ -952,7 +963,14 @@ export function templateToTypescript(
             mapper.text(')');
           });
 
-          mapper.text('(__glintY__.element, ');
+          mapper.text('(');
+          // Map __glintY__.element to the modifier node so that element
+          // constraint diagnostics (e.g. applying a HTMLCanvasElement modifier
+          // to a <div>) surface on the modifier in the template.
+          mapper.forNode(modifier, () => {
+            mapper.text('__glintY__.element');
+          });
+          mapper.text(', ');
           emitArgs(modifier.params, modifier.hash);
           mapper.text('));');
           mapper.newline();