@flint.fyi/svelte-language 0.0.2 → 0.0.4

package/lib/extractDirectives.d.ts

@@ -1,5 +1,5 @@
+import type { AST } from "svelte/compiler";
 import { type SourceFileWithLineMap } from "@flint.fyi/core";
 import type { ExtractedDirective } from "@flint.fyi/typescript-language";
-import type { AST } from "svelte/compiler";
 export declare function extractDirectives(ast: AST.Root, source: SourceFileWithLineMap): ExtractedDirective[];
 //# sourceMappingURL=extractDirectives.d.ts.map

package/lib/language.js

@@ -1,8 +1,8 @@
 import { extractDirectives } from "./extractDirectives.js";
 import { errorToLanguageReport, virtualCodeReports, volarLanguagePlugin } from "./volarLanguagePlugin.js";
+import { parse } from "svelte/compiler";
 import { setTSExtraSupportedExtensions } from "@flint.fyi/ts-patch";
 import { createVolarBasedLanguage } from "@flint.fyi/volar-language";
-import { parse } from "svelte/compiler";
 //#region src/language.ts
 setTSExtraSupportedExtensions([".svelte"]);
 const svelteLanguage = createVolarBasedLanguage((ts, options) => {

package/lib/volarLanguagePlugin.d.ts

@@ -1,6 +1,6 @@
-import { type LanguageReport } from "@flint.fyi/core";
 import { type LanguagePlugin, type VirtualCode } from "@volar/language-core";
 import type * as ts from "typescript";
+import { type LanguageReport } from "@flint.fyi/core";
 export declare function volarLanguagePlugin(ts: typeof import("typescript"), options: ts.CreateProgramOptions): LanguagePlugin<string>;
 export declare const virtualCodeReports: WeakMap<VirtualCode, LanguageReport>;
 export declare function errorToLanguageReport(fileName: string, error: unknown): LanguageReport;

package/lib/volarLanguagePlugin.js

@@ -1,8 +1,8 @@
 import { getPositionOfColumnAndLine } from "@flint.fyi/core";
-import { decode } from "@jridgewell/sourcemap-codec";
-import { forEachEmbeddedCode } from "@volar/language-core";
 import path from "node:path";
 import url from "node:url";
+import { decode } from "@jridgewell/sourcemap-codec";
+import { forEachEmbeddedCode } from "@volar/language-core";
 import { internalHelpers, svelte2tsx } from "svelte2tsx";
 //#region src/volarLanguagePlugin.ts
 const sveltePath = path.dirname(url.fileURLToPath(import.meta.resolve("svelte/package.json")));
@@ -47,11 +47,25 @@ function volarLanguagePlugin(ts, options) {
 }
 const virtualCodeReports = /* @__PURE__ */ new WeakMap();
 function errorToLanguageReport(fileName, error) {
-	if (typeof error !== "object" || error == null) return { text: `${fileName} - Unknown error` };
-	const res = { text: `${fileName}${"position" in error && Array.isArray(error.position) ? `:${error.position[0]}:${error.position[1]}` : ""} - ${"message" in error && typeof error.message === "string" ? error.message : "Codegen error"}` };
+	if (typeof error !== "object" || error == null) return {
+		source: "svelte",
+		text: `${fileName} - Unknown error`
+	};
+	const svelteError = isSvelteCompileError(error) ? error : null;
+	const res = {
+		source: "svelte",
+		text: `${fileName}${svelteError?.start != null ? `:${svelteError.start.line}:${svelteError.start.column}` : ""} - ${"message" in error && typeof error.message === "string" ? error.message : "Codegen error"}`
+	};
+	if (svelteError?.start != null) res.range = {
+		begin: svelteError.start.character,
+		end: svelteError.end?.character ?? svelteError.start.character
+	};
 	if ("code" in error && typeof error.code === "string") res.code = error.code;
 	return res;
 }
+function isSvelteCompileError(error) {
+	return "start" in error && typeof error.start === "object" && error.start !== null && "character" in error.start && typeof error.start.character === "number";
+}
 function getEmbeddedTsCode(ts, cwd, fileName, text) {
 	const svelteTsxFiles = internalHelpers.get_global_types(ts.sys, false, sveltePath, svelte2tsxPath, cwd);
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flint.fyi/svelte-language",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "[Experimental] Svelte language for Flint.",
   "homepage": "https://flint.fyi",
   "repository": {
@@ -10,8 +10,8 @@
   },
   "license": "MIT",
   "author": {
-    "name": "JoshuaKGoldberg",
-    "email": "npm@joshuakgoldberg.com"
+    "name": "Flint Team",
+    "url": "https://flint.fyi/team"
   },
   "sideEffects": true,
   "type": "module",
@@ -28,11 +28,11 @@
     "svelte": "^5.0.0",
     "svelte2tsx": "^0.7.52",
     "typescript": "^5.9.0 || ^6.0.0",
-    "@flint.fyi/core": "^0.21.0",
+    "@flint.fyi/typescript-language": "^0.18.3",
     "@flint.fyi/ts-patch": "^0.13.5",
-    "@flint.fyi/typescript-language": "^0.18.0",
-    "@flint.fyi/volar-language": "^0.1.0",
-    "@flint.fyi/utils": "^0.14.1"
+    "@flint.fyi/core": "^0.23.0",
+    "@flint.fyi/utils": "^0.14.1",
+    "@flint.fyi/volar-language": "^0.1.2"
   },
   "devDependencies": {
     "tsdown": "0.21.0",