use import instead of require in Installer

Author: selfint

src/FileTree.ts

@@ -1,10 +1,9 @@
 import * as vscode from "vscode";
 
 import { Block, getQueryBlocks } from "./BlockTree";
-import Parser, { Query, SyntaxNode, Tree } from "tree-sitter";
+import Parser, { type Language, Query, SyntaxNode, Tree } from "tree-sitter";
 import { Result, err, ok } from "./result";
 
-import { Language } from "./Installer";
 import { Selection } from "./Selection";
 import { getLanguageConfig } from "./configuration";
 import { getLogger } from "./outputChannel";

src/Installer.ts

@@ -5,15 +5,13 @@ import * as vscode from "vscode";
 import { ExecException, ExecOptions, exec } from "child_process";
 import { Result, err, ok } from "./result";
 import { existsSync, rmSync } from "fs";
-import Parser from "tree-sitter";
+import type { Language } from "tree-sitter";
 import { getLogger } from "./outputChannel";
 import { mkdir } from "fs/promises";
 import which from "which";
 
 const NPM_INSTALL_URL = "https://nodejs.org/en/download";
 
-export type Language = Parser.Language;
-
 export function getAbsoluteParserDir(parsersDir: string, parserName: string): string {
     return path.resolve(path.join(parsersDir, parserName));
 }
@@ -22,11 +20,11 @@ export function getAbsoluteBindingsDir(parsersDir: string, parserName: string):
     return path.resolve(path.join(parsersDir, parserName, "bindings", "node", "index.js"));
 }
 
-export function loadParser(
+export async function loadParser(
     parsersDir: string,
     parserName: string,
     subdirectory?: string
-): Result<Language, string> {
+): Promise<Result<Language, string>> {
     const logger = getLogger();
 
     const bindingsDir = getAbsoluteBindingsDir(parsersDir, parserName);
@@ -39,13 +37,14 @@ export function loadParser(
     try {
         logger.log(`Loading parser from ${bindingsDir}`);
 
-        // using dynamic import causes issues on windows
-        // make sure to test well on windows before changing this
-        // TODO(02/11/24): change to dynamic import
-        // let { default: language } = (await import(bindingsDir)) as { default: Language };
-
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        let language = require(bindingsDir) as Language;
+        let language: Language;
+        try {
+            language = ((await import(bindingsDir)) as { default: Language }).default;
+        } catch (error) {
+            // TODO(1/11/25): Always use import and remove this backup
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            language = require(bindingsDir) as Language;
+        }
 
         logger.log(`Got language: ${JSON.stringify(Object.keys(language))}`);
 
@@ -118,7 +117,7 @@ export async function downloadAndBuildParser(
     }
 
     // try to load parser optimistically
-    const loadResult = loadParser(parsersDir, parserName);
+    const loadResult = await loadParser(parsersDir, parserName);
     if (loadResult.status === "ok") {
         return ok(undefined);
     }
@@ -137,7 +136,7 @@ export async function downloadAndBuildParser(
     }
 
     // if it fails, try to build it
-    const buildResult = await runCmd(`${treeSitterCli} generate`, { cwd: parserDir }, (d) =>
+    const buildResult = await runCmd(`${treeSitterCli} build`, { cwd: parserDir }, (d) =>
         onData?.(d.toString())
     );
     if (buildResult.status === "err") {
@@ -273,7 +272,7 @@ export async function getLanguage(
         }
     }
 
-    const loadResult = loadParser(parsersDir, parserName, subdirectory);
+    const loadResult = await loadParser(parsersDir, parserName, subdirectory);
     if (loadResult.status === "err") {
         const msg = `Failed to load parser for language ${languageId} > ${loadResult.result}`;
 

src/test/suite/Installer.test.ts

@@ -4,10 +4,12 @@ import * as vscode from "vscode";
 import Parser from "tree-sitter";
 import { TreeViewer } from "../../TreeViewer";
 import { openDocument } from "./testUtils";
+import path from "path";
 
 export async function testParser(language: string, content?: string): Promise<void> {
     // fail the test if the parser could not be installed
-    const result = await Installer.getLanguage("test-parsers", language, true);
+    const testParsersDir = path.resolve(__dirname, "..", "..", "..", "test-parsers");
+    const result = await Installer.getLanguage(testParsersDir, language, true);
     if (result.status === "err") {
         throw new Error(`Failed to install language: ${JSON.stringify(result.result)}`);
     }
@@ -49,15 +51,15 @@ suite("Installer integration tests", function () {
         ["Ruby", "ruby", "def foo\nend\ndef bar\nend"],
         // ["SQL", "sql"],
         ["HTML", "html", "<html></html>"],
-        // ["CSS", "css", "body { color: red; }"],
+        ["CSS", "css", "body { color: red; }"],
         ["YAML", "yaml", "key: value"],
         ["JSON", "json", '{ "key": "value" }'],
         ["XML", "xml"],
         ["Markdown", "markdown", "# Title"],
         // ["LaTeX", "latex"],
         ["Bash", "shellscript", "echo 'Hello, World!'"],
         ["TOML", "toml"],
-        // ["Swift", "swift"],
+        ["Swift", "swift"],
         ["Kotlin", "kotlin", "fun main() { }"],
         ["Zig", "zig", 'const std = @import("std");\n\npub fn main() void { }'],
     ];

tsconfig.json

@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "ES2022",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "target": "ES2020",
     "outDir": "out",
     "lib": [
       "ES2022",