@glint/ember-tsc 1.7.0 → 1.7.1

package/lib/cli/run-volar-tsc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-volar-tsc.d.ts","sourceRoot":"","sources":["../../src/cli/run-volar-tsc.ts"],"names":[],"mappings":"AAOA,wBAAgB,GAAG,IAAI,IAAI,CA6B1B"}
+{"version":3,"file":"run-volar-tsc.d.ts","sourceRoot":"","sources":["../../src/cli/run-volar-tsc.ts"],"names":[],"mappings":"AAWA,wBAAgB,GAAG,IAAI,IAAI,CA+B1B"}

package/lib/cli/run-volar-tsc.js

@@ -3,7 +3,12 @@ import { createEmberLanguagePlugin } from '../volar/ember-language-plugin.js';
 import { findConfig } from '../config/index.js';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
+// Loaded via CJS require so we can monkey-patch readFileSync; the ESM namespace
+// object would be frozen.
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const fs = require('node:fs');
 export function run() {
+    patchVolarProxyForExtensionlessImports();
     let cwd = process.cwd();
     const options = {
         extraSupportedExtensions: ['.gjs', '.gts'],
@@ -29,4 +34,43 @@ export function run() {
     });
     main();
 }
+// Volar's proxyCreateProgram fast-paths module resolution back to the
+// original compiler host when no import literal ends in a `.gts`/`.gjs`
+// extension. In one-shot `tsc` the original host has no resolver, so volar's
+// wrapper (which makes `Bang.gts` look like `Bang.d.ts` to tsc's extensionless
+// resolver via `resolveHiddenExtensions`) runs and extensionless imports work.
+// But `tsc --watch` installs a cached resolver on the host before volar's
+// proxy runs, so extensionless `.gts` imports skip the wrapper and fail with
+// TS2307. Patch the compiled volar source so the fast-path is also disabled
+// whenever any plugin sets `resolveHiddenExtensions: true`.
+//
+// Upstream fix: https://github.com/volarjs/volar.js/pull/309 — once that ships
+// in a `@volar/typescript` release we depend on, this monkey-patch can go.
+// Tracking: https://github.com/typed-ember/glint/issues/806
+function patchVolarProxyForExtensionlessImports() {
+    const originalReadFileSync = fs.readFileSync;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    fs.readFileSync = function (...args) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const result = originalReadFileSync.apply(fs, args);
+        const filePath = args[0];
+        if (typeof filePath === 'string' && filePath.endsWith('/proxyCreateProgram.js')) {
+            const text = typeof result === 'string' ? result : result.toString('utf8');
+            const patched = applyProxyPatches(text);
+            return typeof result === 'string' ? patched : Buffer.from(patched);
+        }
+        return result;
+    };
+}
+function applyProxyPatches(source) {
+    const guard = '!languagePlugins.some(p => p.typescript?.resolveHiddenExtensions) && ';
+    const literalsPattern = /(if \(resolveModuleNameLiterals\s+&& )(moduleLiterals\.every\(name => !pluginExtensions\.some\(ext => name\.text\.endsWith\(ext\)\)\)\) \{)/;
+    const namesPattern = /(if \(resolveModuleNames && )(moduleNames\.every\(name => !pluginExtensions\.some\(ext => name\.endsWith\(ext\)\)\)\) \{)/;
+    if (!literalsPattern.test(source) || !namesPattern.test(source)) {
+        throw new Error('[glint] failed to patch @volar/typescript proxyCreateProgram.js: ' +
+            'fast-path conditions not found in expected shape. ' +
+            'The volar dep may have changed; update applyProxyPatches() in run-volar-tsc.ts.');
+    }
+    return source.replace(literalsPattern, `$1${guard}$2`).replace(namesPattern, `$1${guard}$2`);
+}
 //# sourceMappingURL=run-volar-tsc.js.map

package/lib/cli/run-volar-tsc.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-volar-tsc.js","sourceRoot":"","sources":["../../src/cli/run-volar-tsc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4CAA4C,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,UAAU,GAAG;IACjB,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAExB,MAAM,OAAO,GAAG;QACd,wBAAwB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QAE1C,+EAA+E;QAC/E,6DAA6D;QAC7D,8HAA8H;QAC9H,EAAE;QACF,uFAAuF;QACvF,EAAE;QACF,kLAAkL;QAClL,yFAAyF;QACzF,uBAAuB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;KAC1C,CAAC;IAEF,MAAM,IAAI,GAAG,GAAS,EAAE,CACtB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE;QACrE,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAEpC,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC;YACjE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC,CAAC,CAAC;IACL,IAAI,EAAE,CAAC;AACT,CAAC"}
+{"version":3,"file":"run-volar-tsc.js","sourceRoot":"","sources":["../../src/cli/run-volar-tsc.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/cli/run-volar-tsc.ts

@@ -4,8 +4,14 @@ import { findConfig } from '../config/index.js';
 
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
+// Loaded via CJS require so we can monkey-patch readFileSync; the ESM namespace
+// object would be frozen.
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const fs = require('node:fs') as typeof import('node:fs');
 
 export function run(): void {
+  patchVolarProxyForExtensionlessImports();
+
   let cwd = process.cwd();
 
   const options = {
@@ -35,3 +41,51 @@ export function run(): void {
     });
   main();
 }
+
+// Volar's proxyCreateProgram fast-paths module resolution back to the
+// original compiler host when no import literal ends in a `.gts`/`.gjs`
+// extension. In one-shot `tsc` the original host has no resolver, so volar's
+// wrapper (which makes `Bang.gts` look like `Bang.d.ts` to tsc's extensionless
+// resolver via `resolveHiddenExtensions`) runs and extensionless imports work.
+// But `tsc --watch` installs a cached resolver on the host before volar's
+// proxy runs, so extensionless `.gts` imports skip the wrapper and fail with
+// TS2307. Patch the compiled volar source so the fast-path is also disabled
+// whenever any plugin sets `resolveHiddenExtensions: true`.
+//
+// Upstream fix: https://github.com/volarjs/volar.js/pull/309 — once that ships
+// in a `@volar/typescript` release we depend on, this monkey-patch can go.
+// Tracking: https://github.com/typed-ember/glint/issues/806
+function patchVolarProxyForExtensionlessImports(): void {
+  const originalReadFileSync = fs.readFileSync;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  (fs as any).readFileSync = function (...args: unknown[]) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const result = (originalReadFileSync as any).apply(fs, args);
+    const filePath = args[0];
+    if (typeof filePath === 'string' && filePath.endsWith('/proxyCreateProgram.js')) {
+      const text = typeof result === 'string' ? result : (result as Buffer).toString('utf8');
+      const patched = applyProxyPatches(text);
+      return typeof result === 'string' ? patched : Buffer.from(patched);
+    }
+    return result;
+  };
+}
+
+function applyProxyPatches(source: string): string {
+  const guard = '!languagePlugins.some(p => p.typescript?.resolveHiddenExtensions) && ';
+
+  const literalsPattern =
+    /(if \(resolveModuleNameLiterals\s+&& )(moduleLiterals\.every\(name => !pluginExtensions\.some\(ext => name\.text\.endsWith\(ext\)\)\)\) \{)/;
+  const namesPattern =
+    /(if \(resolveModuleNames && )(moduleNames\.every\(name => !pluginExtensions\.some\(ext => name\.endsWith\(ext\)\)\)\) \{)/;
+
+  if (!literalsPattern.test(source) || !namesPattern.test(source)) {
+    throw new Error(
+      '[glint] failed to patch @volar/typescript proxyCreateProgram.js: ' +
+        'fast-path conditions not found in expected shape. ' +
+        'The volar dep may have changed; update applyProxyPatches() in run-volar-tsc.ts.',
+    );
+  }
+
+  return source.replace(literalsPattern, `$1${guard}$2`).replace(namesPattern, `$1${guard}$2`);
+}