@glint/tsserver-plugin 0.2.1 → 1.0.1-unstable.845d5fa

package/README.md

@@ -1,6 +1,6 @@
-# `@glint/tsserver-plugin`
+# @glint/typescript-plugin
 
-This package contains a TypeScript [language service plugin] to present [glint] diagnostics for Glimmer templates, as well as enabling quick info, symbol renaming, jump-to-definition and limited autocomplete in template contexts.
+The TypeScript server plugin that performs type-checking.
+
+Old Glint used the LanguageServer to perform type-checking; Glint 2 uses a TypeScript server plugin to follow suit with Volar.
 
-[language service plugin]: https://github.com/microsoft/TypeScript/wiki/Writing-a-Language-Service-Plugin
-[glint]: https://github.com/typed-ember/glint

package/lib/typescript-server-plugin.d.ts

@@ -0,0 +1,34 @@
+declare const plugin: any;
+export = plugin;
+/**
+ * Return semantic tokens for semantic highlighting:
+ * https://code.visualstudio.com/api/language-extensions/semantic-highlight-guide
+function getEncodedSemanticClassifications<T>(
+  ts: typeof import('typescript'),
+  language: any, // Language<T>,
+  languageService: ts.LanguageService,
+  asScriptId: (fileName: string) => T,
+  getEncodedSemanticClassifications: ts.LanguageService['getEncodedSemanticClassifications'],
+): ts.LanguageService['getEncodedSemanticClassifications'] {
+  return (filePath, span, format) => {
+    const fileName = filePath.replace(windowsPathReg, '/');
+    const result = getEncodedSemanticClassifications(fileName, span, format);
+    const sourceScript = language.scripts.get(asScriptId(fileName));
+    const root = sourceScript?.generated?.root;
+    if (root instanceof VirtualGtsCode) {
+      // This would remove all semantic highlighting from .gts files, including the TS parts
+      // outside of the `<template>` tags, which is probably undesirable.
+      // result.spans = [];
+
+      // We can push span to the end of the array to override previous entries.
+      // result.spans.push(
+      //   0,
+      //   100,
+      //   256, // class
+      // );
+    }
+    return result;
+  };
+}
+ */
+//# sourceMappingURL=typescript-server-plugin.d.ts.map

package/lib/typescript-server-plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typescript-server-plugin.d.ts","sourceRoot":"","sources":["../src/typescript-server-plugin.ts"],"names":[],"mappings":"AA+BA,QAAA,MAAM,MAAM,KA4IX,CAAC;AAEF,SAAS,MAAM,CAAC;AA8HhB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG"}

package/lib/typescript-server-plugin.js

@@ -0,0 +1,251 @@
+const { createJiti } = require('jiti');
+const jiti = createJiti(__filename);
+const { createLanguageServicePlugin, } = require('@volar/typescript/lib/quickstart/createLanguageServicePlugin.js');
+/**
+ * We use the jiti (https://github.com/unjs/jiti) runtime to make it possible to
+ * synchronously load the ESM glint libraries from the current CommonJS context.
+ * It is a requirement that TypeScript plugins are written in CommonJS, which poses issues
+ * with having Glint be authored in ESM due to the requirement that typically `await import`
+ * is required to load ESM modules from CJS. But with jiti we can synchronously load the ESM
+ * modules from CJS which lets us avoid a ton of hacks and complexity we (or Volar)
+ * would otherwise have to write to bridge the sync/async APIs.
+ */
+let emberTscPath = '@glint/ember-tsc';
+try {
+    // @ts-expect-error esbuild define
+    emberTscPath = EMBER_TSC_PATH;
+}
+catch {
+    // Ignore; must not be running in esbuild context
+}
+const emberTsc = jiti(emberTscPath);
+const { VirtualGtsCode, augmentDiagnostics } = emberTsc;
+const plugin = createLanguageServicePlugin((ts, info) => {
+    const { findConfig, createEmberLanguagePlugin } = emberTsc;
+    const cwd = info.languageServiceHost.getCurrentDirectory();
+    const glintConfig = findConfig(cwd);
+    // Uncomment as a smoke test to see if the plugin is running
+    const enableLogging = false;
+    if (glintConfig) {
+        if (enableLogging) {
+            info.project.projectService.logger.info('Glint TS Plugin is running!');
+        }
+        const gtsLanguagePlugin = createEmberLanguagePlugin(glintConfig, {
+            clientId: 'tsserver-plugin',
+        });
+        return {
+            languagePlugins: [gtsLanguagePlugin],
+            setup: (language) => {
+                // project2Service.set(info.project, [
+                //   language,
+                //   info.languageServiceHost,
+                //   info.languageService,
+                // ]);
+                info.languageService = proxyLanguageServiceForGlint(ts, language, info.languageService, (fileName) => fileName);
+                const resolveModuleNameLiterals = info.languageServiceHost.resolveModuleNameLiterals?.bind(info.languageServiceHost);
+                if (resolveModuleNameLiterals) {
+                    // TS isn't aware of our custom .gts/.gjs extensions by default which causes
+                    // issues with resolving imports that omit extensions. We hackishly "teach"
+                    // TS about these extensions by overriding `resolveModuleNameLiterals` to
+                    // inject non-existent imports that cause TS to consider the extensions when
+                    // resolving.
+                    //
+                    // Origin of this hack:
+                    // https://github.com/typed-ember/glint/issues/806#issuecomment-2758616327
+                    info.languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, ...rest) => {
+                        let fakeImportNodes = [];
+                        if (moduleLiterals.length > 0) {
+                            fakeImportNodes.push({
+                                ...moduleLiterals[0],
+                                text: './__NONEXISTENT_GLINT_HACK__.gts',
+                            });
+                            fakeImportNodes.push({
+                                ...moduleLiterals[0],
+                                text: './__NONEXISTENT_GLINT_HACK__.gjs',
+                            });
+                        }
+                        const result = resolveModuleNameLiterals([...fakeImportNodes, ...moduleLiterals], containingFile, redirectedReference, options, ...rest);
+                        return result.slice(fakeImportNodes.length);
+                    };
+                }
+                // Add Glint-specific protocol handlers for tsserver communication
+                addGlintCommands();
+                // #3963
+                // const timer = setInterval(() => {
+                //   if (info.project['program']) {
+                //     clearInterval(timer);
+                //     info.project['program'].__glint__ = { language };
+                //   }
+                // }, 50);
+            },
+        };
+    }
+    else {
+        if (enableLogging) {
+            info.project.projectService.logger.info('Glint TS Plugin is NOT running!');
+        }
+        return {
+            languagePlugins: [],
+        };
+    }
+    // https://github.com/JetBrains/intellij-plugins/blob/6435723ad88fa296b41144162ebe3b8513f4949b/Angular/src-js/angular-service/src/index.ts#L69
+    function addGlintCommands() {
+        const projectService = info.project.projectService;
+        projectService.logger.info('Glint: called handler processing ' + info.project.projectKind);
+        const session = info.session;
+        if (session == undefined) {
+            projectService.logger.info('Glint: there is no session in info.');
+            return;
+        }
+        if (session.addProtocolHandler == undefined) {
+            // addProtocolHandler was introduced in TS 4.4 or 4.5 in 2021, see https://github.com/microsoft/TypeScript/issues/43893
+            projectService.logger.info('Glint: there is no addProtocolHandler method.');
+            return;
+        }
+        if (session.handlers.has('_glint:projectInfo')) {
+            return;
+        }
+        // Map _glint: prefixed commands to their corresponding TypeScript server commands
+        session.addProtocolHandler('_glint:projectInfo', ({ arguments: args }) => {
+            return session.handlers.get('projectInfo')?.({ arguments: args });
+        });
+        session.addProtocolHandler('_glint:documentHighlights-full', ({ arguments: args }) => {
+            return session.handlers.get('documentHighlights-full')?.({ arguments: args });
+        });
+        session.addProtocolHandler('_glint:encodedSemanticClassifications-full', ({ arguments: args }) => {
+            return session.handlers.get('encodedSemanticClassifications-full')?.({
+                arguments: args,
+            });
+        });
+        session.addProtocolHandler('_glint:quickinfo', ({ arguments: args }) => {
+            return session.handlers.get('quickinfo')?.({ arguments: args });
+        });
+        projectService.logger.info('Glint specific commands are successfully added.');
+    }
+});
+module.exports = plugin;
+function proxyLanguageServiceForGlint(ts, language, // Language<T>,
+languageService, asScriptId) {
+    const proxyCache = new Map();
+    const getProxyMethod = (target, p) => {
+        switch (p) {
+            case 'getCompletionsAtPosition':
+                return getCompletionsAtPosition(ts, language, languageService, asScriptId, target[p]);
+            // case 'getCompletionEntryDetails': return getCompletionEntryDetails(language, asScriptId, target[p]);
+            // case 'getCodeFixesAtPosition': return getCodeFixesAtPosition(target[p]);
+            // case 'getDefinitionAndBoundSpan': return getDefinitionAndBoundSpan(ts, language, languageService, glintOptions, asScriptId, target[p]);
+            // case 'getQuickInfoAtPosition': return getQuickInfoAtPosition(ts, target, target[p]);
+            // TS plugin only
+            // Left as an example in case we want to augment semantic classification in .gts files.
+            // e.g. Vue does this to semantically classify Component names as `class` tokens.
+            // case 'getEncodedSemanticClassifications':
+            //   return getEncodedSemanticClassifications(ts, language, target, asScriptId, target[p]);
+            case 'getSemanticDiagnostics':
+                return getSemanticDiagnostics(ts, language, languageService, asScriptId, target[p]);
+        }
+    };
+    return new Proxy(languageService, {
+        get(target, p, receiver) {
+            if (getProxyMethod) {
+                if (!proxyCache.has(p)) {
+                    proxyCache.set(p, getProxyMethod(target, p));
+                }
+                const proxyMethod = proxyCache.get(p);
+                if (proxyMethod) {
+                    return proxyMethod;
+                }
+            }
+            return Reflect.get(target, p, receiver);
+        },
+        set(target, p, value, receiver) {
+            return Reflect.set(target, p, value, receiver);
+        },
+    });
+}
+function getCompletionsAtPosition(ts, language, // Language<T>,
+languageService, asScriptId, getCompletionsAtPosition) {
+    return (fileName, position, options, formattingSettings) => {
+        try {
+            const sourceScript = language.scripts.get(asScriptId(fileName));
+            const root = sourceScript?.generated?.root;
+            const transformedModule = root?.transformedModule;
+            const completions = getCompletionsAtPosition(fileName, position, options, formattingSettings);
+            const transformedRange = transformedModule?.getTransformedRange(transformedModule.originalFileName, position, position);
+            if (completions && transformedRange) {
+                // for attribute names on elements, we do not want the wrapping `"`.
+                if (transformedRange.mapping?.parent?.sourceNode.type === 'ElementNode') {
+                    completions.entries = completions.entries.map((e) => ({
+                        ...e,
+                        name: e.name.replace(/^"/, '').replace(/"$/, ''),
+                        sortText: e.sortText.replace(/\\"/g, ''),
+                    }));
+                }
+            }
+            console.log(completions);
+            return completions;
+        }
+        catch (e) {
+            console.log('error', e?.message);
+            console.log(e);
+            throw e;
+        }
+    };
+}
+function getSemanticDiagnostics(ts, language, // Language<T>,
+languageService, asScriptId, getSemanticDiagnostics) {
+    return (fileName) => {
+        const tsDiagnostics = getSemanticDiagnostics(fileName);
+        const program = languageService.getProgram();
+        const sourceScript = language.scripts.get(asScriptId(fileName));
+        if (!sourceScript?.generated) {
+            return tsDiagnostics;
+        }
+        const root = sourceScript.generated.root;
+        if (!(root instanceof VirtualGtsCode)) {
+            return tsDiagnostics;
+        }
+        const transformedModule = root.transformedModule;
+        if (!transformedModule) {
+            return tsDiagnostics;
+        }
+        const sourceFile = program.getSourceFile(fileName);
+        if (!sourceFile) {
+            return tsDiagnostics;
+        }
+        const augmentedTsDiagnostics = augmentDiagnostics(transformedModule, tsDiagnostics);
+        return augmentedTsDiagnostics;
+    };
+}
+const windowsPathReg = /\\/g;
+/**
+ * Return semantic tokens for semantic highlighting:
+ * https://code.visualstudio.com/api/language-extensions/semantic-highlight-guide
+function getEncodedSemanticClassifications<T>(
+  ts: typeof import('typescript'),
+  language: any, // Language<T>,
+  languageService: ts.LanguageService,
+  asScriptId: (fileName: string) => T,
+  getEncodedSemanticClassifications: ts.LanguageService['getEncodedSemanticClassifications'],
+): ts.LanguageService['getEncodedSemanticClassifications'] {
+  return (filePath, span, format) => {
+    const fileName = filePath.replace(windowsPathReg, '/');
+    const result = getEncodedSemanticClassifications(fileName, span, format);
+    const sourceScript = language.scripts.get(asScriptId(fileName));
+    const root = sourceScript?.generated?.root;
+    if (root instanceof VirtualGtsCode) {
+      // This would remove all semantic highlighting from .gts files, including the TS parts
+      // outside of the `<template>` tags, which is probably undesirable.
+      // result.spans = [];
+
+      // We can push span to the end of the array to override previous entries.
+      // result.spans.push(
+      //   0,
+      //   100,
+      //   256, // class
+      // );
+    }
+    return result;
+  };
+}
+ */
+//# sourceMappingURL=typescript-server-plugin.js.map

package/lib/typescript-server-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typescript-server-plugin.js","sourceRoot":"","sources":["../src/typescript-server-plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,32 +1,45 @@
 {
   "name": "@glint/tsserver-plugin",
-  "version": "0.2.1",
+  "version": "1.0.1-unstable.845d5fa",
+  "type": "commonjs",
   "repository": "typed-ember/glint",
-  "description": "A TypeScript language service plugin to provide typechecking and editor support for working with Glimmer templates",
+  "description": "TypeScript Server Plugin for Glint",
   "license": "MIT",
-  "author": "Dan Freeman (https://github.com/dfreeman)",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "lib/typescript-server-plugin.js",
+  "authors": [
+    "Alex Matchneer (https://github.com/machty)"
+  ],
   "files": [
     "README.md",
     "lib"
   ],
   "scripts": {
-    "lint": "eslint . --ext ts --max-warnings 0 && prettier --check src",
-    "test": "jest",
+    "test": "echo 'no standalone tests within this project'",
+    "test:typecheck": "echo 'no standalone typecheck within this project'",
+    "test:tsc": "echo 'no standalone typecheck within this project'",
     "build": "tsc --build",
-    "prepack": "yarn build"
+    "prepack": "pnpm build"
   },
   "dependencies": {
-    "@glint/config": "^0.2.1",
-    "@glint/transform": "^0.2.1"
+    "@glint/ember-tsc": "1.0.1-unstable.845d5fa",
+    "@volar/language-core": "2.4.23",
+    "@volar/typescript": "2.4.23",
+    "jiti": "~2.4.2",
+    "typescript": ">=5.6.0"
   },
-  "devDependencies": {
-    "@types/jest": "^25.2.1",
-    "jest": "^25.5.4",
-    "ts-jest": "^25.4.0"
+  "release-plan": {
+    "semverIncrementAs": {
+      "major": "prerelease",
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "@types/node": "^22.13.11"
   }
 }

package/lib/index.d.ts

@@ -1,3 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-declare const init: ts.server.PluginModuleFactory;
-export = init;

package/lib/index.js

@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const path_1 = __importDefault(require("path"));
-const config_1 = require("@glint/config");
-const virtual_module_manager_1 = __importDefault(require("./virtual-module-manager"));
-const lib_1 = require("./patch/lib");
-const language_service_host_1 = require("./patch/language-service-host");
-const logging_1 = require("./util/logging");
-const language_service_1 = __importDefault(require("./language-service"));
-const init = ({ typescript: ts }) => {
-    const modules = new virtual_module_manager_1.default(ts);
-    lib_1.patchLib(ts, modules);
-    return {
-        create(info) {
-            let logger = logging_1.loggerFor(info);
-            let config = config_1.loadConfig(path_1.default.dirname(info.project.projectName));
-            logger.log('\nStarting @glint/tsserver-plugin at', new Date().toString());
-            language_service_host_1.patchLanguageServiceHost(config, info);
-            modules.addProject(config, info.project);
-            let glintService = new language_service_1.default(ts, modules, info);
-            let fullService = makeProxy(info.languageService, glintService);
-            if (info.config.logLanguageServiceMethodCalls) {
-                installMethodLogging(logger, fullService);
-            }
-            return fullService;
-        },
-    };
-};
-function makeProxy(base, glint) {
-    return new Proxy(base, {
-        get(_, key) {
-            if (key in glint) {
-                return glint[key];
-            }
-            return base[key];
-        },
-        set(_, key, value) {
-            glint[key] = value;
-            return true;
-        },
-    });
-}
-function installMethodLogging(logger, service) {
-    for (let _key in service) {
-        let key = _key;
-        let f = service[key];
-        if (typeof f === 'function') {
-            service[key] = ((...params) => {
-                logger.log(key, params[0]);
-                return f.apply(service, params);
-            });
-        }
-    }
-}
-module.exports = init;

package/lib/language-service.d.ts

@@ -1,32 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import VirtualModuleManager from './virtual-module-manager';
-export default class GlintLanguageService implements Partial<ts.LanguageService> {
-    private readonly ts;
-    private readonly modules;
-    private readonly ls;
-    private readonly logger;
-    constructor(ts: typeof import('typescript/lib/tsserverlibrary'), modules: VirtualModuleManager, info: ts.server.PluginCreateInfo);
-    private getTransformInfoForOriginalPath;
-    private getTransformInfoForTransformedPath;
-    private getTransformInfo;
-    getSyntacticDiagnostics(fileName: string): ts.DiagnosticWithLocation[];
-    getSemanticDiagnostics(fileName: string): ts.Diagnostic[];
-    getSuggestionDiagnostics(fileName: string): ts.DiagnosticWithLocation[];
-    getEncodedSyntacticClassifications(fileName: string, span: ts.TextSpan): ts.Classifications;
-    getEncodedSemanticClassifications(fileName: string, span: ts.TextSpan): ts.Classifications;
-    getCompletionsAtPosition(fileName: string, offset: number, options: ts.GetCompletionsAtPositionOptions | undefined): ts.WithMetadata<ts.CompletionInfo> | undefined;
-    getCompletionEntryDetails(fileName: string, offset: number, name: string, formatOptions: ts.FormatCodeOptions | ts.FormatCodeSettings | undefined, source: string | undefined, preferences: ts.UserPreferences | undefined): ts.CompletionEntryDetails | undefined;
-    getCompletionEntrySymbol(fileName: string, offset: number, name: string, source: string | undefined): ts.Symbol | undefined;
-    getQuickInfoAtPosition(fileName: string, offset: number): ts.QuickInfo | undefined;
-    getRenameInfo(fileName: string, offset: number, options?: ts.RenameInfoOptions | undefined): ts.RenameInfo;
-    findRenameLocations(fileName: string, offset: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename?: boolean | undefined): readonly ts.RenameLocation[] | undefined;
-    getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: ts.FormatCodeSettings, preferences: ts.UserPreferences | undefined): readonly ts.FileTextChanges[];
-    getDefinitionAtPosition(fileName: string, offset: number): readonly ts.DefinitionInfo[] | undefined;
-    getDefinitionAndBoundSpan(fileName: string, offset: number): ts.DefinitionInfoAndBoundSpan | undefined;
-    getReferencesAtPosition(fileName: string, offset: number): ts.ReferenceEntry[] | undefined;
-    findReferences(fileName: string, offset: number): ts.ReferencedSymbol[] | undefined;
-    private rewriteDefinition;
-    private rewriteReferenceEntries;
-    private rewriteDocumentSpan;
-    private rewriteCodeAction;
-}