@glint/tsserver-plugin 2.2.2 → 2.2.4

package/README.md

@@ -15,3 +15,4 @@ install the extension from here: https://open-vsx.org/extension/typed-ember/glin
 ### neovim
 
 This plugin is part of [ember.nvim](https://github.com/NullVoxPopuli/ember.nvim), but can be configured manually via similar setup to [here](https://github.com/NullVoxPopuli/ember.nvim/blob/0cec0eb3641e10df0a32e1e81206efaff22f1974/lua/ember/lsp/typescript.lua#L49)
+

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":"AAuHA,QAAA,MAAM,MAAM,KAkMX,CAAC;AAEF,SAAS,MAAM,CAAC;AAoIhB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG"}

package/lib/typescript-server-plugin.js

@@ -0,0 +1,351 @@
+"use strict";
+const node_module_1 = require("node:module");
+const path = require("node:path");
+const { createJiti } = require('jiti');
+const jiti = createJiti(__filename);
+const { createLanguageServicePlugin, } = require('@volar/typescript/lib/quickstart/createLanguageServicePlugin.js');
+let emberTsc;
+let VirtualGtsCode;
+let augmentDiagnostics;
+function normalizeEmberTscSource(value) {
+    if (value === 'workspace' || value === 'bundled' || value === 'auto') {
+        return value;
+    }
+    return 'auto';
+}
+function getBundledEmberTscPath() {
+    try {
+        // @ts-expect-error esbuild define
+        return EMBER_TSC_PATH;
+    }
+    catch {
+        return undefined;
+    }
+}
+function loadEmberTscFromWorkspace(resolutionDir, logInfo) {
+    try {
+        const requireFrom = (0, node_module_1.createRequire)(path.join(resolutionDir, 'package.json'));
+        const resolvedPath = requireFrom.resolve('@glint/ember-tsc');
+        const workspaceJiti = createJiti(path.join(resolutionDir, 'package.json'));
+        return { module: workspaceJiti(resolvedPath), resolvedPath };
+    }
+    catch (error) {
+        logInfo(`Unable to resolve @glint/ember-tsc from ${resolutionDir}: ${error instanceof Error ? error.message : String(error)}`);
+        return null;
+    }
+}
+function loadEmberTscFromBundled(bundledPath, logInfo) {
+    if (!bundledPath) {
+        logInfo('Bundled ember-tsc path was not provided by the build.');
+        return null;
+    }
+    try {
+        return { module: jiti(bundledPath), resolvedPath: bundledPath };
+    }
+    catch (error) {
+        logInfo(`Unable to load bundled ember-tsc at ${bundledPath}: ${error instanceof Error ? error.message : String(error)}`);
+        return null;
+    }
+}
+function loadEmberTscFromWorkspaceDirs(resolutionDirs, logInfo) {
+    for (const resolutionDir of resolutionDirs) {
+        const resolved = loadEmberTscFromWorkspace(resolutionDir, logInfo);
+        if (resolved) {
+            return resolved;
+        }
+    }
+    return null;
+}
+function getWorkspaceResolutionDirs(workspaceRoot, libraryPath, info) {
+    const candidates = [path.resolve(workspaceRoot, libraryPath)];
+    const project = info.project;
+    const projectName = project.getProjectName?.();
+    if (typeof projectName === 'string' && path.isAbsolute(projectName)) {
+        const projectDir = projectName.endsWith('.json') ? path.dirname(projectName) : projectName;
+        candidates.push(path.resolve(projectDir, libraryPath));
+    }
+    const projectDir = project.getCurrentDirectory?.();
+    if (typeof projectDir === 'string' && path.isAbsolute(projectDir)) {
+        candidates.push(path.resolve(projectDir, libraryPath));
+    }
+    return Array.from(new Set(candidates));
+}
+const plugin = createLanguageServicePlugin((ts, info) => {
+    const logger = info.project.projectService.logger;
+    const logInfo = (message) => logger.info(`[Glint] ${message}`);
+    // Early bail-out: if no tsconfig.json or jsconfig.json exists, don't even
+    // attempt to load ember-tsc. This prevents expensive module loading (jiti,
+    // WASM content-tag, etc.) for projects that have no TypeScript config.
+    const cwd = info.languageServiceHost.getCurrentDirectory();
+    const hasTsConfig = ts.findConfigFile(cwd, ts.sys.fileExists, 'tsconfig.json');
+    const hasJsConfig = ts.findConfigFile(cwd, ts.sys.fileExists, 'jsconfig.json');
+    if (!hasTsConfig && !hasJsConfig) {
+        logInfo(`No tsconfig.json or jsconfig.json found from ${cwd}. ` +
+            'Glint TS Plugin will not activate.');
+        return { languagePlugins: [] };
+    }
+    const config = info.config ?? {};
+    const emberTscSource = normalizeEmberTscSource(config.emberTscSource);
+    const workspaceRoot = typeof config.workspaceRoot === 'string' ? config.workspaceRoot : cwd;
+    const libraryPath = typeof config.libraryPath === 'string' ? config.libraryPath : '.';
+    const resolutionDirs = getWorkspaceResolutionDirs(workspaceRoot, libraryPath, info);
+    let resolved = null;
+    if (emberTscSource === 'bundled') {
+        const bundled = loadEmberTscFromBundled(getBundledEmberTscPath(), logInfo);
+        if (bundled) {
+            resolved = { ...bundled, source: 'bundled' };
+        }
+        else {
+            const workspace = loadEmberTscFromWorkspaceDirs(resolutionDirs, logInfo);
+            if (workspace) {
+                logInfo('Bundled ember-tsc unavailable; falling back to workspace package.');
+                resolved = { ...workspace, source: 'workspace' };
+            }
+        }
+    }
+    else {
+        const workspace = loadEmberTscFromWorkspaceDirs(resolutionDirs, logInfo);
+        if (workspace) {
+            resolved = { ...workspace, source: 'workspace' };
+        }
+        else {
+            const bundled = loadEmberTscFromBundled(getBundledEmberTscPath(), logInfo);
+            if (bundled) {
+                logInfo('Workspace ember-tsc not found; falling back to bundled package.');
+                resolved = { ...bundled, source: 'bundled' };
+            }
+        }
+    }
+    if (!resolved) {
+        logInfo('Unable to load ember-tsc; Glint TS Plugin will not start.');
+        return { languagePlugins: [] };
+    }
+    emberTsc = resolved.module;
+    VirtualGtsCode = emberTsc.VirtualGtsCode;
+    augmentDiagnostics = emberTsc.augmentDiagnostics;
+    logInfo(`Using ${resolved.source} ember-tsc from ${resolved.resolvedPath}.`);
+    const { findConfig, createEmberLanguagePlugin } = emberTsc;
+    const glintConfig = findConfig(cwd);
+    if (glintConfig) {
+        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 {
+        logInfo('Glint TS Plugin is not running: no Glint config was found.');
+        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.');
+    }
+});
+function proxyLanguageServiceForGlint(ts, language, // Language<T>,
+languageService, asScriptId) {
+    // eslint-lint-disable-next-line @typescript-eslint/no-unsafe-function-type
+    const proxyCache = new Map();
+    // eslint-lint-disable-next-line @typescript-eslint/no-unsafe-function-type
+    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);
+        if (!VirtualGtsCode || !augmentDiagnostics) {
+            return tsDiagnostics;
+        }
+        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;
+module.exports = 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.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,6 +1,6 @@
 {
   "name": "@glint/tsserver-plugin",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "type": "commonjs",
   "repository": "typed-ember/glint",
   "description": "TypeScript Server Plugin for Glint",
@@ -18,7 +18,7 @@
     "@volar/typescript": "~2.4.28",
     "jiti": "~2.6.1",
     "typescript": "^5.9.3",
-    "@glint/ember-tsc": "1.2.1"
+    "@glint/ember-tsc": "1.2.3"
   },
   "publishConfig": {
     "access": "public"