Merge branch 'sveltejs:master' into master

Author: andrevcaseiro

.changeset/clean-clocks-itch.md

@@ -0,0 +1,5 @@
+---
+'svelte-check': minor
+---
+
+feat: provide `--incremental` and `--tsgo` flags

.changeset/fix-unix-sockets.md

@@ -0,0 +1,5 @@
+---
+'svelte-check': patch
+---
+
+fix: ignore Unix domain sockets in file watcher to prevent crashes

.changeset/good-steaks-judge.md

@@ -0,0 +1,5 @@
+---
+'svelte-language-server': patch
+---
+
+feat: add links to diagnostic error codes via codeDescription

.changeset/silver-trees-act.md

@@ -0,0 +1,5 @@
+---
+'svelte2tsx': patch
+---
+
+chore: add option to output pure jsdoc-based JS files

.changeset/wild-crabs-rule.md

@@ -0,0 +1,5 @@
+---
+'svelte-language-server': patch
+---
+
+chore: provide utils for svelte-check

packages/language-server/src/index.ts

@@ -1,3 +1,8 @@
 export * from './server';
 export { offsetAt } from './lib/documents';
-export { SvelteCheck, SvelteCheckOptions, SvelteCheckDiagnosticSource } from './svelte-check';
+export {
+    mapSvelteCheckDiagnostics,
+    SvelteCheck,
+    SvelteCheckDiagnosticSource,
+    SvelteCheckOptions
+} from './svelte-check';

packages/language-server/src/plugins/svelte/features/getDiagnostics.ts

@@ -1,5 +1,6 @@
 import {
     CancellationToken,
+    CodeDescription,
     Diagnostic,
     DiagnosticSeverity,
     Position,
@@ -77,7 +78,7 @@ async function tryGetDiagnostics(
             .map((warning) => {
                 const start = warning.start || { line: 1, column: 0 };
                 const end = warning.end || start;
-                return {
+                const result: Diagnostic = {
                     range: Range.create(start.line - 1, start.column, end.line - 1, end.column),
                     message: warning.message,
                     severity:
@@ -87,6 +88,14 @@ async function tryGetDiagnostics(
                     source: 'svelte',
                     code: warning.code
                 };
+                const codeDescription = getCodeDescription(
+                    warning.code,
+                    'https://svelte.dev/docs/svelte/compiler-warnings#'
+                );
+                if (codeDescription) {
+                    result.codeDescription = codeDescription;
+                }
+                return result;
             })
             .map((diag) => mapObjWithRangeToOriginal(transpiled, diag))
             .map((diag) => adjustMappings(diag, document))
@@ -154,9 +163,34 @@ function createParserErrorDiagnostic(error: any, document: Document) {
         }
     }
 
+    const codeDescription = getCodeDescription(
+        error.code,
+        'https://svelte.dev/docs/svelte/compiler-errors#'
+    );
+    if (codeDescription) {
+        diagnostic.codeDescription = codeDescription;
+    }
+
     return [diagnostic];
 }
 
+function getCodeDescription(code: unknown, url: string): CodeDescription | undefined {
+    if (typeof code !== 'string') {
+        return undefined;
+    }
+
+    const firstChar = code.charCodeAt(0);
+    if (isLowerLetter(firstChar) && (code.includes('-') || code.includes('_'))) {
+        return {
+            href: url + code.replace(/-/g, '_')
+        };
+    }
+}
+
+function isLowerLetter(charCode: number) {
+    return charCode >= 97 && charCode <= 122;
+}
+
 /**
  * Try to infer a nice diagnostic error message from the transpilation error.
  */

packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts

@@ -1,4 +1,4 @@
-import ts from 'typescript';
+import ts, { flattenDiagnosticMessageText } from 'typescript';
 import { CancellationToken, Diagnostic, DiagnosticSeverity, Range } from 'vscode-languageserver';
 import {
     Document,
@@ -101,8 +101,25 @@ export class DiagnosticsProviderImpl implements DiagnosticsProvider {
             diagnostics.push(...checker.call(lang, tsDoc.filePath));
         }
 
+        return mapAndFilterDiagnostics(diagnostics, document, tsDoc, isTypescript, lang);
+    }
+
+    private async getLSAndTSDoc(document: Document) {
+        return this.lsAndTsDocResolver.getLSAndTSDoc(document);
+    }
+}
+
+export function mapAndFilterDiagnostics(
+    diagnostics: ts.Diagnostic[],
+    document: Document,
+    tsDoc: SvelteDocumentSnapshot,
+    isTypescript: boolean,
+    lang?: ts.LanguageService
+): Diagnostic[] {
+    const notGenerated = isNotGenerated(tsDoc.getFullText());
+
+    if (lang) {
         const additionalStoreDiagnostics: ts.Diagnostic[] = [];
-        const notGenerated = isNotGenerated(tsDoc.getFullText());
         for (const diagnostic of diagnostics) {
             if (
                 (diagnostic.code === DiagnosticCode.NO_OVERLOAD_MATCHES_CALL ||
@@ -132,46 +149,44 @@ export class DiagnosticsProviderImpl implements DiagnosticsProvider {
             }
         }
         diagnostics.push(...additionalStoreDiagnostics);
+    }
 
-        diagnostics = diagnostics
-            .filter(notGenerated)
-            .filter(not(isUnusedReactiveStatementLabel))
-            .filter((diagnostics) => !expectedTransitionThirdArgument(diagnostics, tsDoc, lang));
+    diagnostics = diagnostics
+        .filter(notGenerated)
+        .filter(not(isUnusedReactiveStatementLabel))
+        .filter((diagnostic) => !expectedTransitionThirdArgument(diagnostic, tsDoc, lang));
 
+    if (lang) {
         diagnostics = resolveNoopsInReactiveStatements(lang, diagnostics);
+    }
 
-        const mapRange = rangeMapper(tsDoc, document, lang);
-        const noFalsePositive = isNoFalsePositive(document, tsDoc);
-        const converted: Diagnostic[] = [];
-
-        for (const tsDiag of diagnostics) {
-            let diagnostic: Diagnostic = {
-                range: convertRange(tsDoc, tsDiag),
-                severity: mapSeverity(tsDiag.category),
-                source: isTypescript ? 'ts' : 'js',
-                message: ts.flattenDiagnosticMessageText(tsDiag.messageText, '\n'),
-                code: tsDiag.code,
-                tags: getDiagnosticTag(tsDiag)
-            };
-            diagnostic = mapRange(diagnostic);
-
-            moveBindingErrorMessage(tsDiag, tsDoc, diagnostic, document);
+    const mapRange = rangeMapper(tsDoc, document, lang);
+    const noFalsePositive = isNoFalsePositive(document, tsDoc);
+    const converted: Diagnostic[] = [];
+
+    for (const tsDiag of diagnostics) {
+        let diagnostic: Diagnostic = {
+            range: convertRange(tsDoc, tsDiag),
+            severity: mapSeverity(tsDiag.category),
+            source: isTypescript ? 'ts' : 'js',
+            message: ts.flattenDiagnosticMessageText(tsDiag.messageText, '\n'),
+            code: tsDiag.code,
+            tags: getDiagnosticTag(tsDiag)
+        };
+        diagnostic = mapRange(diagnostic);
 
-            if (!hasNoNegativeLines(diagnostic) || !noFalsePositive(diagnostic)) {
-                continue;
-            }
+        moveBindingErrorMessage(tsDiag, tsDoc, diagnostic, document);
 
-            diagnostic = adjustIfNecessary(diagnostic, tsDoc.isSvelte5Plus);
-            diagnostic = swapDiagRangeStartEndIfNecessary(diagnostic);
-            converted.push(diagnostic);
+        if (!hasNoNegativeLines(diagnostic) || !noFalsePositive(diagnostic)) {
+            continue;
         }
 
-        return converted;
+        diagnostic = adjustIfNecessary(diagnostic, tsDoc.isSvelte5Plus);
+        diagnostic = swapDiagRangeStartEndIfNecessary(diagnostic);
+        converted.push(diagnostic);
     }
 
-    private async getLSAndTSDoc(document: Document) {
-        return this.lsAndTsDocResolver.getLSAndTSDoc(document);
-    }
+    return converted;
 }
 
 function moveBindingErrorMessage(
@@ -231,17 +246,21 @@ function moveBindingErrorMessage(
 function rangeMapper(
     snapshot: SvelteDocumentSnapshot,
     document: Document,
-    lang: ts.LanguageService
+    lang?: ts.LanguageService
 ): (value: Diagnostic) => Diagnostic {
-    const get$$PropsDefWithCache = memoize(() => get$$PropsDef(lang, snapshot));
+    const get$$PropsDefWithCache = memoize(() =>
+        lang ? get$$PropsDef(lang, snapshot) : undefined
+    );
     const get$$PropsAliasInfoWithCache = memoize(() =>
-        get$$PropsAliasForInfo(get$$PropsDefWithCache, lang, document)
+        lang ? get$$PropsAliasForInfo(get$$PropsDefWithCache, lang, document) : undefined
     );
 
     return (diagnostic) => {
         let range = mapRangeToOriginal(snapshot, diagnostic.range);
 
-        if (range.start.line < 0) {
+        // When lang is unavailable (incremental CLI path), we can't remap negative-line
+        // diagnostics. This only affects deprecated $$Props syntax, so it's acceptable.
+        if (range.start.line < 0 && lang) {
             range =
                 movePropsErrorRangeBackIfNecessary(
                     diagnostic,
@@ -605,7 +624,7 @@ function movePropsErrorRangeBackIfNecessary(
 function expectedTransitionThirdArgument(
     diagnostic: ts.Diagnostic,
     tsDoc: SvelteDocumentSnapshot,
-    lang: ts.LanguageService
+    lang?: ts.LanguageService
 ) {
     if (
         diagnostic.code !== DiagnosticCode.EXPECTED_N_ARGUMENTS ||
@@ -631,6 +650,13 @@ function expectedTransitionThirdArgument(
                   ts.isCallExpression
               );
 
+    if (!lang) {
+        // Without a language service we can't resolve the signature to check parameter count.
+        // Fall back to checking the message text for " 3" (i.e. "Expected 3 arguments").
+        // This is only for the __sveltets_2_ensureTransition wrapper and unlikely to false-positive.
+        return flattenDiagnosticMessageText(diagnostic.messageText, '\n').includes(' 3');
+    }
+
     const signature =
         callExpression && lang.getProgram()?.getTypeChecker().getResolvedSignature(callExpression);
 

packages/language-server/src/svelte-check.ts

@@ -14,12 +14,35 @@ import {
 } from './plugins';
 import { FileSystemProvider } from './lib/FileSystemProvider';
 import { createLanguageServices } from './plugins/css/service';
-import { JSOrTSDocumentSnapshot } from './plugins/typescript/DocumentSnapshot';
+import {
+    DocumentSnapshot,
+    JSOrTSDocumentSnapshot,
+    SvelteDocumentSnapshot,
+    SvelteSnapshotOptions
+} from './plugins/typescript/DocumentSnapshot';
 import { isInGeneratedCode } from './plugins/typescript/features/utils';
+import { mapAndFilterDiagnostics } from './plugins/typescript/features/DiagnosticsProvider';
 import { convertRange, getDiagnosticTag, mapSeverity } from './plugins/typescript/utils';
 import { pathToUrl, urlToPath } from './utils';
 import { groupBy } from 'lodash';
 
+export function mapSvelteCheckDiagnostics(
+    sourcePath: string,
+    sourceText: string,
+    isTsFile: boolean,
+    tsDiagnostics: ts.Diagnostic[]
+): Diagnostic[] {
+    const document = new Document(pathToUrl(sourcePath), sourceText);
+    const snapshot = DocumentSnapshot.fromDocument(document, {
+        parse: document.compiler?.parse,
+        version: document.compiler?.VERSION,
+        transformOnTemplateError: false,
+        typingsNamespace: 'svelteHTML'
+    } satisfies SvelteSnapshotOptions) as SvelteDocumentSnapshot;
+
+    return mapAndFilterDiagnostics(tsDiagnostics, document, snapshot, isTsFile, undefined);
+}
+
 export type SvelteCheckDiagnosticSource = 'js' | 'css' | 'svelte';
 
 export interface SvelteCheckOptions {

packages/language-server/test/plugins/svelte/SveltePlugin.test.ts

@@ -45,6 +45,9 @@ describe('Svelte Plugin', () => {
             isSvelte5Plus ? 'a11y_missing_attribute' : 'a11y-missing-attribute',
             'svelte'
         );
+        diagnostic.codeDescription = {
+            href: 'https://svelte.dev/docs/svelte/compiler-warnings#a11y_missing_attribute'
+        };
 
         assert.deepStrictEqual(diagnostics, [diagnostic]);
     });
@@ -63,6 +66,13 @@ describe('Svelte Plugin', () => {
             'svelte'
         );
 
+        diagnostic.codeDescription = {
+            href: isSvelte5Plus
+                ? 'https://svelte.dev/docs/svelte/compiler-errors#bind_invalid_name'
+                : // doesn't actually exist but at least points to the page
+                  'https://svelte.dev/docs/svelte/compiler-errors#binding_undeclared'
+        };
+
         assert.deepStrictEqual(diagnostics, [diagnostic]);
     });