Use broader template-lint range

src/template-linter.ts

@@ -12,6 +12,8 @@ import Server from './server';
 import { Project } from './project';
 import { getRequireSupport } from './utils/layout-helpers';
 import { getFileRanges, RangeWalker } from './utils/glimmer-script';
+import * as semver from 'semver';
+import { type SemVer } from 'semver';
 
 type FindUp = (name: string, opts: { cwd: string; type: string }) => Promise<string | undefined>;
 type LinterVerifyArgs = { source: string; moduleId: string; filePath: string };
@@ -88,7 +90,7 @@ export default class TemplateLinter {
     return this.server.projectRoots.projectForUri(textDocument.uri);
   }
 
-  private sourcesForDocument(textDocument: TextDocument, templateLintVersion: string): string[] {
+  private sourcesForDocument(textDocument: TextDocument, templateLintVersion: SemVer | null): string[] {
     const ext = getExtension(textDocument);
 
     if (ext !== null && !extensionsToLint.includes(ext)) {
@@ -98,8 +100,11 @@ export default class TemplateLinter {
     const documentContent = textDocument.getText();
 
     // we assume that ember-template-lint v5 could handle js/ts/gts/gjs files
+    if (!templateLintVersion) {
+      return [documentContent];
+    }
 
-    if (templateLintVersion === '5') {
+    if (semver.gte(templateLintVersion, '5.0.0')) {
       return [documentContent];
     }
 
@@ -151,12 +156,24 @@ export default class TemplateLinter {
       return;
     }
 
-    const linterMeta = project.dependenciesMeta.find((dep) => dep.name === 'ember-template-lint');
-    const linterVersion = linterMeta?.version.split('.')[0] || 'unknown';
+    const linterMeta = project.dependencyMap.get('ember-template-lint');
+
+    if (!linterMeta) {
+      return;
+    }
 
     let sources = [];
 
     try {
+      /**
+       * Semver parsing can throw errors, if the version is invalid,
+       * we want behave as if there was no version specified.
+       *
+       * (same as when errors are thrown from sourcesForDocument)
+       */
+      const version = linterMeta?.package.version;
+      const linterVersion = version ? semver.parse(version) : null;
+
       sources = this.sourcesForDocument(textDocument, linterVersion);
     } catch (e) {
       return;

src/utils/layout-helpers.ts

@@ -2,7 +2,6 @@ import * as memoize from 'memoizee';
 import * as path from 'path';
 import { CompletionItem, CompletionItemKind } from 'vscode-languageserver/node';
 import { addToRegistry, normalizeMatchNaming } from './registry-api';
-import { clean, coerce, valid } from 'semver';
 import { BaseProject } from '../base-project';
 import { fsProvider } from '../fs-provider';
 import walkAsync from './walk-async';
@@ -42,6 +41,7 @@ type StringConfig = Record<string, string>;
 export interface PackageInfo {
   keywords?: string[];
   name?: string;
+  version?: string;
   'ember-language-server'?: UnknownConfig;
   peerDependencies?: StringConfig;
   devDependencies?: StringConfig;
@@ -297,9 +297,7 @@ export function getDepIfExists(pack: PackageInfo, depName: string): string | nul
 
   const version: string = pack?.dependencies?.[depName] ?? pack?.devDependencies?.[depName] ?? pack?.peerDependencies?.[depName] ?? '';
 
-  const cleanVersion = clean(version);
-
-  return valid(coerce(cleanVersion));
+  return version;
 }
 
 export async function isGlimmerXProject(root: string) {

test/template-linter-test.ts

@@ -0,0 +1,59 @@
+import * as semver from 'semver';
+
+import TemplateLinter from '../src/template-linter';
+import { type Server } from '../src';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+
+describe('template-linter', function () {
+  describe('sourcesForDocument', function () {
+    const linter = new TemplateLinter({
+      options: {
+        type: 'node',
+      },
+    } as Server);
+
+    it('supports empty template-lint version', function () {
+      const doc: TextDocument = {
+        uri: 'test.gjs',
+        getText() {
+          return 'let a = 12;<template>1</template>';
+        },
+      } as TextDocument;
+
+      expect(linter['sourcesForDocument'](doc, null)).toEqual(['let a = 12;<template>1</template>']);
+    });
+    it('process gjs for template-lint v4 with ~', function () {
+      const doc: TextDocument = {
+        uri: 'test.gjs',
+        getText() {
+          return 'let a = 12;<template>1</template>';
+        },
+      } as TextDocument;
+
+      console.log(semver.parse('~4.3.1')); // should be counted as 4.3.1
+      expect(linter['sourcesForDocument'](doc, semver.parse('~4.3.1'))).toEqual(['                     1']);
+    });
+    it('process gjs for template-lint v4 with ^', function () {
+      const doc: TextDocument = {
+        uri: 'test.gjs',
+        getText() {
+          return 'let a = 12;<template>1</template>';
+        },
+      } as TextDocument;
+
+      console.log(semver.parse('^4.3.1')); // should be counted as 4.3.1
+      expect(linter['sourcesForDocument'](doc, semver.parse('^4.3.1'))).toEqual(['                     1']);
+    });
+    it('process gjs for template-lint v4 with strict dependency', function () {
+      const doc: TextDocument = {
+        uri: 'test.gjs',
+        getText() {
+          return 'let a = 12;<template>1</template>';
+        },
+      } as TextDocument;
+
+      console.log(semver.parse('4.3.1')); // should be counted as 4.3.1
+      expect(linter['sourcesForDocument'](doc, semver.parse('4.3.1'))).toEqual(['                     1']);
+    });
+  });
+});