volar-2.4.0-alpha.14 (#747)

Author: machty

.github/workflows/ci.yml

@@ -68,38 +68,39 @@ jobs:
 
   # The Windows runner can be super flaky both with Yarn installs and
   # when launching browser tests, so we allow for retries in those steps.
-  test-windows:
-    name: Test Windows
-    runs-on: windows-2022
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Install Dependencies
-        uses: nick-fields/retry@v2
-        with:
-          max_attempts: 2
-          timeout_minutes: 10
-          command: yarn install --frozen-lockfile
-      - name: Build
-        run: yarn build
-      - name: Test @glint/core
-        uses: nick-fields/retry@v2
-        with:
-          max_attempts: 2
-          timeout_minutes: 20
-          command: yarn workspace @glint/core test
-      - name: Test glint-vscode
-        uses: nick-fields/retry@v2
-        with:
-          max_attempts: 2
-          timeout_minutes: 10
-          command: yarn workspace glint-vscode test
-      - name: Test @glint/scripts
-        run: yarn workspace @glint/scripts test
+  # tracking for re-enablement here: https://github.com/typed-ember/glint/issues/728
+  # test-windows:
+  #   name: Test Windows
+  #   runs-on: windows-2022
+  #   steps:
+  #     - name: Checkout Code
+  #       uses: actions/checkout@v3
+  #     - name: Install Node
+  #       uses: actions/setup-node@v3
+  #       with:
+  #         node-version: 18
+  #     - name: Install Dependencies
+  #       uses: nick-fields/retry@v2
+  #       with:
+  #         max_attempts: 2
+  #         timeout_minutes: 10
+  #         command: yarn install --frozen-lockfile
+  #     - name: Build
+  #       run: yarn build
+  #     - name: Test @glint/core
+  #       uses: nick-fields/retry@v2
+  #       with:
+  #         max_attempts: 2
+  #         timeout_minutes: 20
+  #         command: yarn workspace @glint/core test
+  #     - name: Test glint-vscode
+  #       uses: nick-fields/retry@v2
+  #       with:
+  #         max_attempts: 2
+  #         timeout_minutes: 10
+  #         command: yarn workspace glint-vscode test
+  #     - name: Test @glint/scripts
+  #       run: yarn workspace @glint/scripts test
 
   # tracking for re-enablement here: https://github.com/typed-ember/glint/issues/728
   # test-floating-deps:

packages/core/__tests__/cli/build.test.ts

@@ -1095,7 +1095,7 @@ describe('CLI: single-pass build mode typechecking', () => {
   });
 });
 
-describe.skip('CLI: --build --clean', () => {
+describe('CLI: --build --clean', () => {
   test('for basic projects', async () => {
     let project = await Project.createExact(BASE_TS_CONFIG);
 
@@ -1121,11 +1121,11 @@ describe.skip('CLI: --build --clean', () => {
 
     let buildResult = await project.buildDeclaration();
     expect(buildResult.exitCode).toBe(0);
-    expect(existsSync(project.filePath(INDEX_D_TS))).toBe(true);
+    expect(existsSync(project.filePath('dist/index.gts.d.ts'))).toBe(true);
 
     let buildCleanResult = await project.buildClean();
     expect(buildCleanResult.exitCode).toBe(0);
-    expect(existsSync(project.filePath(INDEX_D_TS))).toBe(false);
+    expect(existsSync(project.filePath('dist/index.gts.d.ts'))).toBe(false);
   });
 
   test('for composite projects', async () => {

packages/core/package.json

@@ -35,19 +35,19 @@
   },
   "dependencies": {
     "@glimmer/syntax": "^0.84.3",
-    "@volar/kit": "~2.3.0",
-    "@volar/language-core": "~2.3.0",
-    "@volar/language-server": "~2.3.0",
-    "@volar/language-service": "~2.3.0",
-    "@volar/source-map": "~2.3.0",
-    "@volar/test-utils": "~2.3.0",
-    "@volar/typescript": "~2.3.0",
+    "@volar/kit": "2.4.0-alpha.14",
+    "@volar/language-core": "2.4.0-alpha.14",
+    "@volar/language-server": "2.4.0-alpha.14",
+    "@volar/language-service": "2.4.0-alpha.14",
+    "@volar/source-map": "2.4.0-alpha.14",
+    "@volar/test-utils": "2.4.0-alpha.14",
+    "@volar/typescript": "2.4.0-alpha.14",
     "computeds": "^0.0.1",
     "escape-string-regexp": "^4.0.0",
     "semver": "^7.5.2",
     "silent-error": "^1.1.1",
     "uuid": "^8.3.2",
-    "volar-service-typescript": "0.0.51",
+    "volar-service-typescript": "volar-2.4",
     "vscode-languageserver-textdocument": "^1.0.5",
     "vscode-uri": "^3.0.8",
     "yargs": "^17.5.1"

packages/core/src/cli/run-volar-tsc.ts

@@ -6,11 +6,23 @@ import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
 export function run(): void {
-  let runExtensions = ['.js', '.ts', '.gjs', '.gts', '.hbs'];
   let cwd = process.cwd();
 
+  const options = {
+    extraSupportedExtensions: ['.gjs', '.gts', '.hbs'],
+
+    extraExtensionsToRemove: [],
+
+    // With the above configuration, `{basename}.gts` will produce `{basename}.gts.d.ts`.
+    // If we would prefer `{basename}.d.ts`, we could use the following configuration instead:
+    //
+    // extraExtensionsToRemove: ['.gts', '.gjs'],
+    //
+    // See discussion here: https://github.com/typed-ember/glint/issues/628
+  };
+
   const main = (): void =>
-    runTsc(require.resolve('typescript/lib/tsc'), runExtensions, (ts, options) => {
+    runTsc(require.resolve('typescript/lib/tsc'), options, (ts, options) => {
       const glintConfig = findConfig(cwd);
 
       // NOTE: this code used to assert in the failure of finding Glint config; I'm

packages/core/src/transform/template/transformed-module.ts

@@ -239,6 +239,30 @@ export default class TransformedModule {
     const generatedOffsets: number[] = [];
     const lengths: number[] = [];
 
+    const push = (sourceOffset: number, generatedOffset: number, length: number): void => {
+      if (sourceOffsets.length > 0) {
+        // TODO: these assertions are firing for certain files/transformations, which means
+        // we're emitting unsorted mappings, which means volar has to fall back to an inefficient
+        // source mapping algorithm rather than using binary search:
+        // https://github.com/volarjs/volar.js/blob/3798f27684f5c671f06bf7a19e32bc489e652e14/packages/source-map/lib/translateOffset.ts#L18
+        //
+        // The fix for this is probably somewhere in the `template-to-typescript.ts` file, but I
+        // don't have a sense for how complicated that'll be.
+        // assert(
+        //   sourceOffset >= sourceOffsets[sourceOffsets.length - 1],
+        //   'Source offsets should be monotonically increasing',
+        // );
+        // assert(
+        //   generatedOffset >= generatedOffsets[generatedOffsets.length - 1],
+        //   'Generated offsets should be monotonically increasing',
+        // );
+      }
+
+      sourceOffsets.push(sourceOffset);
+      generatedOffsets.push(generatedOffset);
+      lengths.push(length);
+    };
+
     let recurse = (span: CorrelatedSpan, mapping: MappingTree): void => {
       const children = mapping.children;
       let { originalRange, transformedRange } = mapping;
@@ -254,32 +278,22 @@ export default class TransformedModule {
         if (hbsLength === tsLength) {
           // (Hacky?) assumption: because TS and HBS span lengths are equivalent,
           // then this is a simple leafmost mapping, e.g. `{{this.[foo]}}` -> `this.[foo]`
-          sourceOffsets.push(hbsStart);
-          generatedOffsets.push(tsStart);
-          lengths.push(hbsLength);
+          push(hbsStart, tsStart, hbsLength);
         } else {
           // Disregard the "null zone" mappings, i.e. cases where TS code maps to empty HBS code
           if (hbsLength > 0 && tsLength > 0) {
-            sourceOffsets.push(hbsStart);
-            generatedOffsets.push(tsStart);
-            lengths.push(0);
-            sourceOffsets.push(hbsEnd);
-            generatedOffsets.push(tsEnd);
-            lengths.push(0);
+            push(hbsStart, tsStart, 0);
+            push(hbsEnd, tsEnd, 0);
           }
         }
       } else {
-        sourceOffsets.push(hbsStart);
-        generatedOffsets.push(tsStart);
-        lengths.push(0);
+        push(hbsStart, tsStart, 0);
 
         mapping.children.forEach((child) => {
           recurse(span, child);
         });
 
-        sourceOffsets.push(hbsEnd);
-        generatedOffsets.push(tsEnd);
-        lengths.push(0);
+        push(hbsEnd, tsEnd, 0);
       }
     };
 
@@ -302,9 +316,7 @@ export default class TransformedModule {
         // );
 
         if (span.originalLength === span.transformedLength) {
-          sourceOffsets.push(span.originalStart);
-          generatedOffsets.push(span.transformedStart);
-          lengths.push(span.originalLength);
+          push(span.originalStart, span.transformedStart, span.originalLength);
         }
       }
     });
@@ -322,7 +334,8 @@ export default class TransformedModule {
           semantic: true,
           structure: true,
           verification: true,
-        },
+          transformedContents: this.transformedContents, // TODO REMOVE
+        } as any,
       },
     ];
   }

packages/core/src/volar/gts-virtual-code.ts

@@ -78,12 +78,13 @@ export class VirtualGtsCode implements VirtualCode {
     this.transformedModule = transformedModule;
 
     if (transformedModule) {
+      const mappings = transformedModule.toVolarMappings();
       this.embeddedCodes = [
         {
           embeddedCodes: [],
           id: 'ts',
           languageId: 'typescript',
-          mappings: transformedModule.toVolarMappings(),
+          mappings,
           snapshot: new ScriptSnapshot(transformedModule.transformedContents),
           directives: transformedModule.directives,
         },

packages/core/src/volar/language-server.ts

@@ -33,7 +33,8 @@ const server = createServer(connection);
  * other initialization params needed by the server.
  */
 connection.onInitialize((parameters) => {
-  const project = createTypeScriptProject(ts, undefined, (env, { configFileName }) => {
+  const project = createTypeScriptProject(ts, undefined, (projectContext) => {
+    const configFileName = projectContext.configFileName;
     const languagePlugins = [];
 
     // I don't remember why but there are some contexts where a configFileName is not known,
@@ -55,7 +56,13 @@ connection.onInitialize((parameters) => {
       }
     }
 
-    return languagePlugins;
+    return {
+      languagePlugins,
+      setup(_language) {
+        // Vue tooling takes this opportunity to stash compilerOptions on `language.vue`;
+        // do we need to be doing something here?
+      },
+    };
   });
   return server.initialize(
     parameters,
@@ -100,6 +107,7 @@ connection.onInitialize((parameters) => {
         return plugin;
       }
     }),
+    { pullModelDiagnostics: true },
   );
 });
 

packages/vscode/package.json

@@ -223,8 +223,8 @@
     "@glint/core": "^1.4.0",
     "@types/mocha": "^10.0.1",
     "@types/vscode": "^1.68.1",
-    "@volar/language-server": "~2.3.0",
-    "@volar/vscode": "~2.3.0",
+    "@volar/language-server": "2.4.0-alpha.14",
+    "@volar/vscode": "2.4.0-alpha.14",
     "@vscode/test-electron": "^2.3.8",
     "@vscode/vsce": "^2.22.0",
     "esbuild": "^0.15.16",