@golar/svelte 0.0.9 → 0.0.11

package/dist/bin.js

@@ -1,39 +1,57 @@
 import { createRequire } from "node:module";
-import { internalHelpers, svelte2tsx } from "svelte2tsx";
 import { createPlugin } from "@golar/plugin";
 import path from "node:path";
 import process from "node:process";
 import util from "node:util";
 import { sourceMapToMappings } from "@golar/sourcemap";
+import { pathToFileURL } from "node:url";
 
 //#region src/bin.ts
 const require = createRequire(process.cwd());
 const svelteTsxFilesByProject = /* @__PURE__ */ new Map();
-async function importSvelteTsxFiles(cwd, configFileName) {
+let packages = null;
+async function importPackages(cwd, configFileName) {
+	if (packages != null) return packages;
 	const resolvePaths = [];
 	if (configFileName != null) resolvePaths.push(path.dirname(configFileName));
 	resolvePaths.push(cwd);
 	const sveltePackageJsonPath = require.resolve("svelte/package.json", { paths: resolvePaths });
-	const { default: svelteCompilerPackageJson } = await import(sveltePackageJsonPath, { with: { type: "json" } });
+	const { default: svelteCompilerPackageJson } = await import(pathToFileURL(sveltePackageJsonPath).toString(), { with: { type: "json" } });
 	const majorVersion = Number.parseInt(svelteCompilerPackageJson.version.split(".")[0]);
-	const ts = await import("typescript");
-	return internalHelpers.get_global_types(ts.sys, majorVersion === 3, path.dirname(sveltePackageJsonPath), path.dirname(require.resolve("svelte2tsx", { paths: [...resolvePaths, import.meta.dirname] })), configFileName ?? cwd);
+	const svelte2tsxPath = require.resolve("svelte2tsx", { paths: [...resolvePaths, import.meta.dirname] });
+	const [svelteCompiler, svelte2tsx, ts] = await Promise.all([
+		majorVersion >= 4 ? import(pathToFileURL(require.resolve("svelte/compiler", { paths: [...resolvePaths, import.meta.dirname] })).toString()) : void 0,
+		import(pathToFileURL(svelte2tsxPath).toString()),
+		import("typescript")
+	]);
+	return packages = {
+		svelte2tsx,
+		svelte2tsxPath: path.dirname(svelte2tsxPath),
+		svelteMajorVersion: majorVersion,
+		sveltePath: path.dirname(sveltePackageJsonPath),
+		svelteCompiler,
+		ts
+	};
 }
 createPlugin({
 	filename: import.meta.filename,
 	extraExtensions: [".svelte"],
 	async createServiceCode(cwd, configFileName, fileName, sourceText) {
+		const imported = await importPackages(cwd, configFileName).catch((e) => util.inspect(e));
+		if (typeof imported === "string") return { errors: [{
+			start: 0,
+			end: 0,
+			message: imported
+		}] };
+		const { svelte2tsx, svelte2tsxPath, svelteMajorVersion, sveltePath, svelteCompiler, ts } = imported;
 		const project = `${cwd}::${configFileName}`;
-		let svelteTsxFiles;
-		{
-			let files = svelteTsxFilesByProject.get(project);
-			if (files == null) svelteTsxFilesByProject.set(project, files = importSvelteTsxFiles(cwd, configFileName));
-			svelteTsxFiles = await files;
-		}
+		let svelteTsxFiles = svelteTsxFilesByProject.get(project);
+		if (svelteTsxFiles == null) svelteTsxFilesByProject.set(project, svelteTsxFiles = svelte2tsx.internalHelpers.get_global_types(ts.sys, svelteMajorVersion === 3, sveltePath, svelte2tsxPath, configFileName ?? cwd));
 		try {
-			const tsx = svelte2tsx(sourceText, {
+			const tsx = svelte2tsx.svelte2tsx(sourceText, {
 				isTsFile: true,
-				mode: "ts"
+				mode: "ts",
+				parse: svelteCompiler.parse
 			});
 			return {
 				serviceText: tsx.code + "\n\n" + svelteTsxFiles.map((p) => `import ${JSON.stringify(p)}`).join("\n"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@golar/svelte",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "type": "module",
   "exports": {
     "./golar-entry": "./dist/golar-entry.js"
@@ -22,8 +22,8 @@
   },
   "dependencies": {
     "svelte2tsx": "^0.7.46",
-    "@golar/plugin": "0.0.9",
-    "@golar/sourcemap": "0.0.9"
+    "@golar/sourcemap": "0.0.11",
+    "@golar/plugin": "0.0.11"
   },
   "peerDependencies": {
     "svelte": "^4.0.0 || ^5.0.0",