refactor: add object hook filter to compile module plugin

Author: dominikg

packages/vite-plugin-svelte/src/index.js

@@ -4,7 +4,12 @@ import { svelteInspector } from '@sveltejs/vite-plugin-svelte-inspector';
 import { handleHotUpdate } from './handle-hot-update.js';
 import { log, logCompilerWarnings } from './utils/log.js';
 import { createCompileSvelte } from './utils/compile.js';
-import { buildIdFilter, buildIdParser, buildModuleIdParser } from './utils/id.js';
+import {
+	buildIdFilter,
+	buildIdParser,
+	buildModuleIdFilter,
+	buildModuleIdParser
+} from './utils/id.js';
 import {
 	buildExtraViteConfig,
 	validateInlineOptions,
@@ -47,6 +52,9 @@ export function svelte(inlineOptions) {
 	/** @type {import('./types/id.d.ts').IdFilter} */
 	let filter = { id: { include: [], exclude: [] } }; // set with correct values in configResolved
 
+	/** @type {import('./types/id.d.ts').IdFilter} */
+	let moduleFilter = { id: { include: [], exclude: [] } }; // set with correct values in configResolved
+
 	/** @type {import('./types/plugin-api.d.ts').PluginAPI} */
 	const api = {};
 
@@ -217,24 +225,28 @@ export function svelte(inlineOptions) {
 			name: 'vite-plugin-svelte-module',
 			enforce: 'post',
 			async configResolved() {
+				moduleFilter = buildModuleIdFilter(options);
 				moduleRequestParser = buildModuleIdParser(options);
 			},
-			async transform(code, id, opts) {
-				const ssr = !!opts?.ssr;
-				const moduleRequest = moduleRequestParser(id, ssr);
-				if (!moduleRequest) {
-					return;
-				}
-				try {
-					const compileResult = svelteCompiler.compileModule(code, {
-						dev: !viteConfig.isProduction,
-						generate: ssr ? 'server' : 'client',
-						filename: moduleRequest.filename
-					});
-					logCompilerWarnings(moduleRequest, compileResult.warnings, options);
-					return compileResult.js;
-				} catch (e) {
-					throw toRollupError(e, options);
+			transform: {
+				filter: moduleFilter,
+				async handler(code, id, opts) {
+					const ssr = !!opts?.ssr;
+					const moduleRequest = moduleRequestParser(id, ssr);
+					if (!moduleRequest) {
+						return;
+					}
+					try {
+						const compileResult = svelteCompiler.compileModule(code, {
+							dev: !viteConfig.isProduction,
+							generate: ssr ? 'server' : 'client',
+							filename: moduleRequest.filename
+						});
+						logCompilerWarnings(moduleRequest, compileResult.warnings, options);
+						return compileResult.js;
+					} catch (e) {
+						throw toRollupError(e, options);
+					}
 				}
 			}
 		},

packages/vite-plugin-svelte/src/utils/id.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import process from 'node:process';
 import { log } from './log.js';
 import {
+	DEFAULT_SVELTE_EXT,
 	DEFAULT_SVELTE_MODULE_EXT,
 	DEFAULT_SVELTE_MODULE_INFIX,
 	SVELTE_VIRTUAL_STYLE_ID_REGEX
@@ -214,15 +215,13 @@ function escapeRE(s) {
  * @returns {import('../types/id.d.ts').IdFilter}
  */
 export function buildIdFilter(options) {
-	const { include, exclude, extensions } = options;
-	const extensionsRE = extensions
-		? new RegExp(
-				`\\.(?:${extensions
-					.map((e) => (e.startsWith('.') ? e.slice(1) : e))
-					.map(escapeRE)
-					.join('|')})$`
-			)
-		: /\.svelte$/;
+	const { include = [], exclude = [], extensions = DEFAULT_SVELTE_EXT } = options;
+	const extensionsRE = new RegExp(
+		`\\.(?:${extensions
+			.map((e) => (e.startsWith('.') ? e.slice(1) : e))
+			.map(escapeRE)
+			.join('|')})$`
+	);
 	return {
 		id: {
 			include: [
@@ -251,6 +250,31 @@ export function buildIdParser(options) {
 	};
 }
 
+/**
+ * @param {import('../types/options.d.ts').ResolvedOptions} options
+ * @returns {import('../types/id.d.ts').IdFilter}
+ */
+export function buildModuleIdFilter(options) {
+	const {
+		infixes = DEFAULT_SVELTE_MODULE_INFIX,
+		include = [],
+		exclude = [],
+		extensions = DEFAULT_SVELTE_MODULE_EXT
+	} = options.experimental?.compileModule ?? {};
+	const infixWithExtRE = new RegExp(
+		`(?:${infixes.map(escapeRE).join('|')})(?:[^.\\\\/]+\\.)*(?:${extensions
+			.map((e) => (e.startsWith('.') ? e.slice(1) : e))
+			.map(escapeRE)
+			.join('|')})$`
+	);
+	return {
+		id: {
+			include: [infixWithExtRE, .../**@type {Array<string|RegExp>}*/ asArray(include)],
+			exclude: /**@type {Array<string|RegExp>}*/ asArray(exclude)
+		}
+	};
+}
+
 /**
  * @param {import('../types/options.d.ts').ResolvedOptions} options
  * @returns {import('../types/id.d.ts').ModuleIdParser}

packages/vite-plugin-svelte/types/index.d.ts.map

@@ -26,6 +26,6 @@
 		null,
 		null
 	],
-	"mappings": ";;;;aAIYA,OAAOA;;WAETC,mBAAmBA;;;;;;;;;;;kBAWZC,aAAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAgGbC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAiDnBC,mBAAmBA;;;;;;;;;;;;;;;;WAgBnBC,oBAAoBA;;;;;;;;;;;;;;;MAezBC,SAASA;;kBAEGC,qBAAqBA;;;;;;;;;;;;;iBCvKtBC,MAAMA;iBCZNC,cAAcA;iBCgBRC,gBAAgBA",
+	"mappings": ";;;;aAIYA,OAAOA;;WAETC,mBAAmBA;;;;;;;;;;;kBAWZC,aAAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAgGbC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAiDnBC,mBAAmBA;;;;;;;;;;;;;;;;WAgBnBC,oBAAoBA;;;;;;;;;;;;;;;MAezBC,SAASA;;kBAEGC,qBAAqBA;;;;;;;;;;;;;iBClKtBC,MAAMA;iBCjBNC,cAAcA;iBCgBRC,gBAAgBA",
 	"ignoreList": []
 }