@flint.fyi/svelte-language 0.0.4 → 0.1.0

package/dist/index.d.mts

@@ -0,0 +1,12 @@
+import { AST } from "svelte/compiler";
+
+//#region src/language.d.ts
+interface SvelteServices {
+  svelte: {
+    ast: AST.Root;
+    sourceText: string;
+  };
+}
+declare const svelteLanguage: import("@flint.fyi/core").Language<import("@flint.fyi/typescript-language").TypeScriptNodesByName, Partial<SvelteServices> & import("@flint.fyi/typescript-language").TypeScriptFileServices>;
+//#endregion
+export { svelteLanguage };

package/{lib/volarLanguagePlugin.js → dist/index.mjs}

@@ -1,20 +1,46 @@
-import { getPositionOfColumnAndLine } from "@flint.fyi/core";
+import { parse } from "svelte/compiler";
+import { setTSExtraSupportedExtensions } from "@flint.fyi/ts-patch";
+import { createVolarBasedLanguage } from "@flint.fyi/volar-language";
+import { getColumnAndLineOfPosition, getPositionOfColumnAndLine } from "@flint.fyi/core";
+import { nullThrows } from "@flint.fyi/utils";
 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/extractDirectives.ts
+function extractDirectives(ast, source) {
+	const directives = [];
+	function visit(node) {
+		if ("fragment" in node) for (const child of node.fragment.nodes) visit(child);
+		if (node.type !== "Comment") return;
+		const match = /\s*flint-(\S+)(?:\s+(.+))?/.exec(node.data);
+		if (match == null) return;
+		const [, type, selection] = match;
+		directives.push({
+			range: {
+				begin: getColumnAndLineOfPosition(source, node.start),
+				end: getColumnAndLineOfPosition(source, node.end)
+			},
+			selection: nullThrows(selection, "Expected RegExp to provide second capturing group"),
+			type: nullThrows(type, "Expected RegExp to provide first capturing group")
+		});
+	}
+	for (const child of ast.fragment.nodes) visit(child);
+	return directives;
+}
+//#endregion
 //#region src/volarLanguagePlugin.ts
 const sveltePath = path.dirname(url.fileURLToPath(import.meta.resolve("svelte/package.json")));
 const svelte2tsxPath = path.dirname(url.fileURLToPath(import.meta.resolve("svelte2tsx/package.json")));
-function volarLanguagePlugin(ts, options) {
-	const cwd = typeof options.options.configFilePath === "string" ? path.dirname(options.options.configFilePath) : (options.host ?? ts.sys).getCurrentDirectory();
+function volarLanguagePlugin(typescript, options) {
+	const cwd = typeof options.options.configFilePath === "string" ? path.dirname(options.options.configFilePath) : (options.host ?? typescript.sys).getCurrentDirectory();
 	return {
 		createVirtualCode(fileName, languageId, snapshot) {
 			if (languageId !== "svelte") return;
 			return {
 				codegenStacks: [],
-				embeddedCodes: [getEmbeddedTsCode(ts, cwd, fileName, snapshot.getText(0, snapshot.getLength()))],
+				embeddedCodes: [getEmbeddedTsCode(typescript, cwd, fileName, snapshot.getText(0, snapshot.getLength()))],
 				id: "root",
 				languageId,
 				mappings: [],
@@ -40,7 +66,7 @@ function volarLanguagePlugin(ts, options) {
 		},
 		updateVirtualCode(fileName, virtualCode, snapshot) {
 			virtualCode.snapshot = snapshot;
-			virtualCode.embeddedCodes = [getEmbeddedTsCode(ts, cwd, fileName, snapshot.getText(0, snapshot.getLength()))];
+			virtualCode.embeddedCodes = [getEmbeddedTsCode(typescript, cwd, fileName, snapshot.getText(0, snapshot.getLength()))];
 			return virtualCode;
 		}
 	};
@@ -66,8 +92,8 @@ function errorToLanguageReport(fileName, error) {
 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);
+function getEmbeddedTsCode(typescript, cwd, fileName, text) {
+	const svelteTsxFiles = internalHelpers.get_global_types(typescript.sys, false, sveltePath, svelte2tsxPath, cwd);
 	try {
 		const tsx = svelte2tsx(text, {
 			isTsFile: true,
@@ -158,6 +184,61 @@ function getEmbeddedTsCode(ts, cwd, fileName, text) {
 	}
 }
 //#endregion
-export { errorToLanguageReport, virtualCodeReports, volarLanguagePlugin };
-
-//# sourceMappingURL=volarLanguagePlugin.js.map
+//#region src/language.ts
+setTSExtraSupportedExtensions([".svelte"]);
+const svelteLanguage = createVolarBasedLanguage((ts, options) => {
+	return {
+		createFile({ sourceFile, sourceScript }) {
+			const sourceText = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength());
+			const source = { text: sourceText };
+			const virtualCode = sourceScript.generated.root;
+			let ast;
+			const reports = [];
+			try {
+				ast = parse(sourceText, {
+					loose: true,
+					modern: true
+				});
+			} catch (error) {
+				reports.push(errorToLanguageReport(sourceFile.fileName, error));
+				ast = {
+					comments: [],
+					css: null,
+					end: 0,
+					fragment: {
+						nodes: [],
+						type: "Fragment"
+					},
+					instance: null,
+					module: null,
+					options: null,
+					start: 0,
+					type: "Root"
+				};
+			}
+			const codegenReport = virtualCodeReports.get(virtualCode);
+			if (codegenReport != null) reports.push(codegenReport);
+			return {
+				directives: extractDirectives(ast, source),
+				extraContext: { svelte: {
+					ast,
+					sourceText
+				} },
+				firstStatementPosition: Math.min(...[
+					ast.fragment.nodes.find((node) => node.type !== "Text" || !!node.data.trim().length)?.start,
+					ast.module?.start,
+					ast.instance?.start,
+					ast.css?.start,
+					ast.options?.start,
+					sourceText.length
+				].filter((pos) => typeof pos === "number")),
+				getLanguageReports() {
+					return reports;
+				}
+			};
+		},
+		languagePlugins: [volarLanguagePlugin(ts, options)]
+	};
+});
+//#endregion
+export { svelteLanguage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flint.fyi/svelte-language",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "[Experimental] Svelte language for Flint.",
   "homepage": "https://flint.fyi",
   "repository": {
@@ -16,27 +16,27 @@
   "sideEffects": true,
   "type": "module",
   "exports": {
-    ".": "./lib/index.js"
+    ".": "./dist/index.mjs"
   },
   "files": [
-    "lib/",
-    "!lib/**/*.map"
+    "dist/"
   ],
   "dependencies": {
     "@jridgewell/sourcemap-codec": "^1.5.5",
     "@volar/language-core": "2.4.28",
     "svelte": "^5.0.0",
-    "svelte2tsx": "^0.7.52",
+    "svelte2tsx": "^0.7.55",
     "typescript": "^5.9.0 || ^6.0.0",
-    "@flint.fyi/typescript-language": "^0.18.3",
-    "@flint.fyi/ts-patch": "^0.13.5",
-    "@flint.fyi/core": "^0.23.0",
-    "@flint.fyi/utils": "^0.14.1",
-    "@flint.fyi/volar-language": "^0.1.2"
+    "@flint.fyi/core": "^0.24.0",
+    "@flint.fyi/ts-patch": "^0.15.0",
+    "@flint.fyi/typescript-language": "^0.19.0",
+    "@flint.fyi/volar-language": "^0.2.0",
+    "@flint.fyi/utils": "^0.15.0"
   },
   "devDependencies": {
-    "tsdown": "0.21.0",
-    "vitest": "4.1.0"
+    "tsdown": "0.22.3",
+    "vitest": "4.1.0",
+    "@flint.fyi/build": "^0.1.0"
   },
   "engines": {
     "node": ">=24.0.0"

package/lib/extractDirectives.d.ts

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

package/lib/extractDirectives.js

@@ -1,27 +0,0 @@
-import { getColumnAndLineOfPosition } from "@flint.fyi/core";
-import { nullThrows } from "@flint.fyi/utils";
-//#region src/extractDirectives.ts
-function extractDirectives(ast, source) {
-	const directives = [];
-	function visit(node) {
-		if ("fragment" in node) for (const child of node.fragment.nodes) visit(child);
-		if (node.type !== "Comment") return;
-		const match = /\s*flint-(\S+)(?:\s+(.+))?/.exec(node.data);
-		if (match == null) return;
-		const [, type, selection] = match;
-		directives.push({
-			range: {
-				begin: getColumnAndLineOfPosition(source, node.start),
-				end: getColumnAndLineOfPosition(source, node.end)
-			},
-			selection: nullThrows(selection, "Expected RegExp to provide second capturing group"),
-			type: nullThrows(type, "Expected RegExp to provide first capturing group")
-		});
-	}
-	for (const child of ast.fragment.nodes) visit(child);
-	return directives;
-}
-//#endregion
-export { extractDirectives };
-
-//# sourceMappingURL=extractDirectives.js.map

package/lib/index.d.ts

@@ -1,2 +0,0 @@
-import { svelteLanguage } from "./language.js";
-export { svelteLanguage };

package/lib/index.js

@@ -1,2 +0,0 @@
-import { svelteLanguage } from "./language.js";
-export { svelteLanguage };

package/lib/language.d.ts

@@ -1,15 +0,0 @@
-import { AST } from "svelte/compiler";
-import * as _flint_fyi_core0 from "@flint.fyi/core";
-import * as _flint_fyi_typescript_language0 from "@flint.fyi/typescript-language";
-
-//#region src/language.d.ts
-interface SvelteServices {
-  svelte: {
-    ast: AST.Root;
-    sourceText: string;
-  };
-}
-declare const svelteLanguage: _flint_fyi_core0.Language<_flint_fyi_typescript_language0.TypeScriptNodesByName, Partial<SvelteServices> & _flint_fyi_typescript_language0.TypeScriptFileServices>;
-//#endregion
-export { svelteLanguage };
-//# sourceMappingURL=language.d.ts.map

package/lib/language.js

@@ -1,65 +0,0 @@
-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";
-//#region src/language.ts
-setTSExtraSupportedExtensions([".svelte"]);
-const svelteLanguage = createVolarBasedLanguage((ts, options) => {
-	return {
-		createFile({ sourceFile, sourceScript }) {
-			const sourceText = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength());
-			const source = { text: sourceText };
-			const virtualCode = sourceScript.generated.root;
-			let ast;
-			const reports = [];
-			try {
-				ast = parse(sourceText, {
-					loose: true,
-					modern: true
-				});
-			} catch (error) {
-				reports.push(errorToLanguageReport(sourceFile.fileName, error));
-				ast = {
-					comments: [],
-					css: null,
-					end: 0,
-					fragment: {
-						nodes: [],
-						type: "Fragment"
-					},
-					instance: null,
-					module: null,
-					options: null,
-					start: 0,
-					type: "Root"
-				};
-			}
-			const codegenReport = virtualCodeReports.get(virtualCode);
-			if (codegenReport != null) reports.push(codegenReport);
-			return {
-				directives: extractDirectives(ast, source),
-				extraContext: { svelte: {
-					ast,
-					sourceText
-				} },
-				firstStatementPosition: Math.min(...[
-					ast.fragment.nodes.find((node) => node.type !== "Text" || !!node.data.trim().length)?.start,
-					ast.module?.start,
-					ast.instance?.start,
-					ast.css?.start,
-					ast.options?.start,
-					sourceText.length
-				].filter((pos) => typeof pos === "number")),
-				getLanguageReports() {
-					return reports;
-				}
-			};
-		},
-		languagePlugins: [volarLanguagePlugin(ts, options)]
-	};
-});
-//#endregion
-export { svelteLanguage };
-
-//# sourceMappingURL=language.js.map

package/lib/volarLanguagePlugin.d.ts

@@ -1,7 +0,0 @@
-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;
-//# sourceMappingURL=volarLanguagePlugin.d.ts.map