@glint/ember-tsc 1.7.5 → 1.8.0

package/lib/environment-ember-template-imports/-private/environment/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/environment-ember-template-imports/-private/environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAA0B,MAAM,+BAA+B,CAAC;AAI/F,MAAM,CAAC,OAAO,UAAU,+BAA+B,CACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,sBAAsB,CAwGxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/environment-ember-template-imports/-private/environment/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAA0B,MAAM,+BAA+B,CAAC;AAqC/F,MAAM,CAAC,OAAO,UAAU,+BAA+B,CACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,sBAAsB,CAwGxB"}

package/lib/environment-ember-template-imports/-private/environment/index.js

@@ -1,5 +1,41 @@
+import { createRequire } from 'node:module';
 import { preprocess } from './preprocess.js';
 import { transform } from './transform.js';
+/**
+ * Probe for the ember-source >= 7.1 built-in keyword set at config-load time.
+ *
+ * The 7.1 keywords (and, or, eq, fn, hash, not, gt/gte/lt/lte/neq, on, element,
+ * array) ship with ember-source 7.1 (RFCs 389, 470, 560, 561, 562, 997, 998,
+ * 999, 1000). On older versions consumers must import them from
+ * `ember-truth-helpers` / `@ember/helper`. Including these names in the strict
+ * mode `globals` set unconditionally suppresses TypeScript's
+ * "Cannot find name 'X'" diagnostic on <7.1 (because the transform emits
+ * `__glintDSL__.Globals.X` instead of a bare `X`), which in turn disables the
+ * `Add import from '...'` quick-fix and IDE autocomplete from user imports.
+ *
+ * Resolving from this module's URL means the probe walks the consumer's
+ * `node_modules` tree, so it reflects the host project's installed
+ * `ember-source`. Any failure (missing package, unreadable JSON, malformed
+ * version) collapses to `false` so the safe default is to assume the
+ * consumer is on a pre-7.1 build and let users import explicitly.
+ */
+function hasEmber71BuiltIns() {
+    try {
+        const require_ = createRequire(import.meta.url);
+        const pkg = require_('ember-source/package.json');
+        if (typeof pkg.version !== 'string')
+            return false;
+        const [majorStr, minorStr] = pkg.version.split('.', 2);
+        const major = Number(majorStr);
+        const minor = Number(minorStr);
+        if (!Number.isFinite(major) || !Number.isFinite(minor))
+            return false;
+        return major > 7 || (major === 7 && minor >= 1);
+    }
+    catch {
+        return false;
+    }
+}
 export default function emberTemplateImportsEnvironment(options) {
     let additionalSpecialForms = typeof options['additionalSpecialForms'] === 'object'
         ? options['additionalSpecialForms']
@@ -78,7 +114,7 @@ export default function emberTemplateImportsEnvironment(options) {
                     },
                     globals: [
                         ...globalsForEmber,
-                        ...globalsForEmber71,
+                        ...(hasEmber71BuiltIns() ? globalsForEmber71 : []),
                         ...Object.keys(additionalGlobalSpecialForms),
                         ...additionalGlobals,
                     ],

package/lib/environment-ember-template-imports/-private/environment/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/environment-ember-template-imports/-private/environment/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,OAAO,UAAU,+BAA+B,CACrD,OAAgC;IAEhC,IAAI,sBAAsB,GACxB,OAAO,OAAO,CAAC,wBAAwB,CAAC,KAAK,QAAQ;QACnD,CAAC,CAAE,OAAO,CAAC,wBAAwB,CAA4B;QAC/D,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,4BAA4B,GAAG,sBAAsB,CAAC,OAAO,IAAI,EAAE,CAAC;IAE1E,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACnE,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAC9B,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,eAAe,GAAG;QACtB,QAAQ;QACR,WAAW;QACX,UAAU;QACV,MAAM;QACN,SAAS;QACT,WAAW;QACX,kBAAkB;QAClB,QAAQ;QACR,IAAI;QACJ,YAAY;QACZ,KAAK;QACL,KAAK;QACL,UAAU;QACV,OAAO;QACP,KAAK;QACL,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,MAAM;QACN,OAAO;KACR,CAAC;IAEF;;;;;MAKE;IACF,MAAM,iBAAiB,GAAG;QACxB,KAAK;QACL,OAAO;QACP,SAAS;QACT,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,KAAK;QACL,MAAM;QACN,IAAI;QACJ,KAAK;QACL,KAAK;QACL,KAAK;QACL,IAAI;QACJ,IAAI;KACL,CAAC;IAEF,OAAO;QACL,IAAI,EAAE;YACJ,kEAAkE,EAAE;gBAClE,GAAG,EAAE;oBACH,WAAW,EAAE,+BAA+B;oBAC5C,YAAY,EAAE;wBACZ,OAAO,EAAE;4BACP,EAAE,EAAE,IAAI;4BACR,MAAM,EAAE,QAAQ;4BAChB,KAAK,EAAE,OAAO;4BACd,SAAS,EAAE,gBAAgB;4BAC3B,QAAQ,EAAE,gBAAgB;4BAC1B,MAAM,EAAE,gBAAgB;4BACxB,GAAG,4BAA4B;yBAChC;wBACD,OAAO,EAAE;4BACP,eAAe,EAAE;gCACf,KAAK,EAAE,eAAe;gCACtB,IAAI,EAAE,gBAAgB;gCACtB,GAAG,sBAAsB,CAAC,OAAO,EAAE,CAAC,eAAe,CAAC;6BACrD;4BACD,GAAG,sBAAsB,CAAC,OAAO;yBAClC;qBACF;oBACD,OAAO,EAAE;wBACP,GAAG,eAAe;wBAClB,GAAG,iBAAiB;wBACpB,GAAG,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC;wBAC5C,GAAG,iBAAiB;qBACrB;iBACF;aACF;SACF;QACD,UAAU,EAAE;YACV,MAAM,EAAE;gBACN,IAAI,EAAE,cAAc;gBACpB,UAAU;gBACV,SAAS;aACV;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,gBAAgB;gBACtB,UAAU;gBACV,SAAS;aACV;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/environment-ember-template-imports/-private/environment/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glint/ember-tsc",
-  "version": "1.7.5",
+  "version": "1.8.0",
   "repository": "typed-ember/glint",
   "description": "A CLI for performing typechecking on Glimmer templates",
   "license": "MIT",

package/src/environment-ember-template-imports/-private/environment/index.ts

@@ -1,7 +1,41 @@
+import { createRequire } from 'node:module';
 import { GlintEnvironmentConfig, GlintSpecialFormConfig } from '@glint/ember-tsc/config-types';
 import { preprocess } from './preprocess.js';
 import { transform } from './transform.js';
 
+/**
+ * Probe for the ember-source >= 7.1 built-in keyword set at config-load time.
+ *
+ * The 7.1 keywords (and, or, eq, fn, hash, not, gt/gte/lt/lte/neq, on, element,
+ * array) ship with ember-source 7.1 (RFCs 389, 470, 560, 561, 562, 997, 998,
+ * 999, 1000). On older versions consumers must import them from
+ * `ember-truth-helpers` / `@ember/helper`. Including these names in the strict
+ * mode `globals` set unconditionally suppresses TypeScript's
+ * "Cannot find name 'X'" diagnostic on <7.1 (because the transform emits
+ * `__glintDSL__.Globals.X` instead of a bare `X`), which in turn disables the
+ * `Add import from '...'` quick-fix and IDE autocomplete from user imports.
+ *
+ * Resolving from this module's URL means the probe walks the consumer's
+ * `node_modules` tree, so it reflects the host project's installed
+ * `ember-source`. Any failure (missing package, unreadable JSON, malformed
+ * version) collapses to `false` so the safe default is to assume the
+ * consumer is on a pre-7.1 build and let users import explicitly.
+ */
+function hasEmber71BuiltIns(): boolean {
+  try {
+    const require_ = createRequire(import.meta.url);
+    const pkg = require_('ember-source/package.json') as { version?: unknown };
+    if (typeof pkg.version !== 'string') return false;
+    const [majorStr, minorStr] = pkg.version.split('.', 2);
+    const major = Number(majorStr);
+    const minor = Number(minorStr);
+    if (!Number.isFinite(major) || !Number.isFinite(minor)) return false;
+    return major > 7 || (major === 7 && minor >= 1);
+  } catch {
+    return false;
+  }
+}
+
 export default function emberTemplateImportsEnvironment(
   options: Record<string, unknown>,
 ): GlintEnvironmentConfig {
@@ -88,7 +122,7 @@ export default function emberTemplateImportsEnvironment(
           },
           globals: [
             ...globalsForEmber,
-            ...globalsForEmber71,
+            ...(hasEmber71BuiltIns() ? globalsForEmber71 : []),
             ...Object.keys(additionalGlobalSpecialForms),
             ...additionalGlobals,
           ],

package/types/-private/dsl/globals.d.ts

@@ -31,9 +31,12 @@ import { UniqueIdHelper } from '../intrinsics/unique-id';
 // 389 are only available at runtime when consumers are on ember-source >= 7.1.
 // We probe for the `eq` value re-export added by RFC 561 to decide whether to
 // expose the new keyword types. On older versions the probe collapses to the
-// empty type, so referencing e.g. `{{eq}}` falls back to whatever the user
-// has imported (or surfaces as an "unknown identifier" diagnostic), keeping
-// behaviour identical to today.
+// empty type, so the 7.1 keyword members are entirely absent from `Globals` —
+// referencing e.g. `{{eq}}` then surfaces TypeScript's standard
+// "Property 'eq' does not exist on type 'Globals'" diagnostic, which triggers
+// auto-import quick-fixes (`import { eq } from 'ember-truth-helpers'`) and
+// lets user-scoped imports flow through completion and hover without being
+// shadowed by a `never`-typed builtin.
 //
 // We probe a value export (`eq`) rather than the matching `EqHelper`
 // interface because `typeof import(...)` only surfaces the module's value
@@ -49,9 +52,6 @@ type EmberHelperExports = typeof import('@ember/helper');
 
 type HasEmber71BuiltIns = [EmberHelperExports] extends [{ eq: unknown }] ? true : false;
 
-/** Resolves to `T` only when ember-source >= 7.1 ships the new keyword set. */
-type Ember71Only<T> = HasEmber71BuiltIns extends true ? T : never;
-
 // The keyword vs global breakdown here is loosely matched with
 // the listing in http://emberjs.github.io/rfcs/0496-handlebars-strict-mode.html
 
@@ -243,12 +243,16 @@ interface KeywordsForEmber {
 
 /**
  * Built-in template keywords introduced by ember-source 7.1
- * (RFCs 389, 470, 560, 561, 562, 997, 998, 999, 1000). Each entry is gated by
- * `Ember71Only<T>` so the keyword resolves to `never` (and is therefore
- * effectively absent) when the consumer is on ember-source < 7.1. See the
- * `HasEmber71BuiltIns` probe at the top of this file.
+ * (RFCs 389, 470, 560, 561, 562, 997, 998, 999, 1000). The whole member set is
+ * gated by `HasEmber71BuiltIns` at the `Globals` intersection below, so when
+ * the consumer is on ember-source < 7.1 these property keys are absent from
+ * `Globals` entirely (rather than present as `never`). That lets TypeScript
+ * report `{{eq}}` / `{{and}}` / etc. as unknown properties and offer the
+ * "Add import from 'ember-truth-helpers'" / `@ember/helper` quick-fix, and
+ * keeps user-imported helpers from being shadowed by a `never`-typed builtin
+ * in completion and hover.
  */
-interface KeywordsForEmber71 {
+interface KeywordsForEmber71Members {
   /**
    * The `{{and}}` helper evaluates arguments left to right, returning the first
    * falsy value (using Handlebars truthiness) or the right-most value if all
@@ -265,7 +269,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/and
    */
-  and: Ember71Only<AndHelper>;
+  and: AndHelper;
 
   /**
    * Using the `{{array}}` helper, you can pass arrays directly from the
@@ -286,7 +290,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/array
    */
-  array: Ember71Only<ArrayHelper>;
+  array: ArrayHelper;
 
   /**
    * The `{{element}}` helper lets you dynamically set the tag name of an
@@ -310,7 +314,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/element
    */
-  element: Ember71Only<ElementHelper>;
+  element: ElementHelper;
 
   /**
    * The `{{eq}}` helper returns `true` if its two arguments are strictly equal
@@ -327,7 +331,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/eq
    */
-  eq: Ember71Only<EqHelper>;
+  eq: EqHelper;
 
   /**
    * `{{fn}}` is a helper that receives a function and some arguments, and
@@ -351,7 +355,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/fn
    */
-  fn: Ember71Only<FnHelper>;
+  fn: FnHelper;
 
   /**
    * The `{{gt}}` helper returns `true` if the first argument is greater than
@@ -368,7 +372,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/gt
    */
-  gt: Ember71Only<GtHelper>;
+  gt: GtHelper;
 
   /**
    * The `{{gte}}` helper returns `true` if the first argument is greater than
@@ -385,7 +389,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/gte
    */
-  gte: Ember71Only<GteHelper>;
+  gte: GteHelper;
 
   /**
    * Using the `{{hash}}` helper, you can pass objects directly from the
@@ -404,7 +408,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/hash
    */
-  hash: Ember71Only<HashHelper>;
+  hash: HashHelper;
 
   /**
    * The `{{lt}}` helper returns `true` if the first argument is less than the
@@ -421,7 +425,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/lt
    */
-  lt: Ember71Only<LtHelper>;
+  lt: LtHelper;
 
   /**
    * The `{{lte}}` helper returns `true` if the first argument is less than or
@@ -438,7 +442,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/lte
    */
-  lte: Ember71Only<LteHelper>;
+  lte: LteHelper;
 
   /**
    * The `{{neq}}` helper returns `true` if its two arguments are strictly not
@@ -455,7 +459,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/neq
    */
-  neq: Ember71Only<NeqHelper>;
+  neq: NeqHelper;
 
   /**
    * The `{{not}}` helper returns the logical negation of its argument using
@@ -472,7 +476,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/not
    */
-  not: Ember71Only<NotHelper>;
+  not: NotHelper;
 
   /**
    * The `{{on}}` element modifier attaches an event listener to an element.
@@ -493,7 +497,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fmodifier/on
    */
-  on: Ember71Only<OnModifier>;
+  on: OnModifier;
 
   /**
    * The `{{or}}` helper evaluates arguments left to right, returning the first
@@ -511,7 +515,7 @@ interface KeywordsForEmber71 {
    *
    * @see https://api.emberjs.com/ember/release/functions/@ember%2Fhelper/or
    */
-  or: Ember71Only<OrHelper>;
+  or: OrHelper;
 }
 
 /**
@@ -576,6 +580,12 @@ interface KeywordAliasesForEmber {
   unique_id: UniqueIdHelper;
 }
 
-interface Keywords extends KeywordsForEmber, KeywordsForEmber71, KeywordAliasesForEmber {}
+interface Keywords extends KeywordsForEmber, KeywordAliasesForEmber {}
+
+// When `HasEmber71BuiltIns` is `true`, the 7.1 keyword members are included on
+// `Globals`; otherwise the conditional collapses to `{}` and the keys are
+// absent so TypeScript surfaces "unknown identifier" diagnostics / auto-import
+// quick-fixes for `{{and}}`, `{{eq}}`, etc.
+type KeywordsForEmber71 = HasEmber71BuiltIns extends true ? KeywordsForEmber71Members : {};
 
-export const Globals: Keywords & Globals;
+export const Globals: Keywords & KeywordsForEmber71 & Globals;

package/types/-private/intrinsics/on.d.ts

@@ -10,12 +10,18 @@ export type EventForName<Name extends string> = Name extends keyof HTMLElementEv
   ? HTMLElementEventMap[Name]
   : Event;
 
-export type OnModifier = abstract new <Name extends string>() => InstanceType<
+export type OnModifier = abstract new <
+  Name extends string,
+  El extends Element = Element,
+>() => InstanceType<
   ModifierLike<{
-    Element: Element;
+    Element: El;
     Args: {
       Named: OnModifierArgs;
-      Positional: [name: Name, callback: (event: EventForName<Name>) => void];
+      Positional: [
+        name: Name,
+        callback: (event: EventForName<Name> & { currentTarget: El }) => void,
+      ];
     };
   }>
 >;