Merge pull request #72 from mkobayashime/script-name

Pass `scriptName` as a prop to the plugin instead of calculating it in place

src/main.ts

@@ -16,19 +16,34 @@ export const main = async ({ mode }: { mode: Mode }) => {
 		in: filepath,
 	}));
 
-	const getCommonOptions = (): esbuild.BuildOptions => ({
-		bundle: true,
-		write: false,
-		charset: "utf8",
-		format: "esm",
-		legalComments: "inline",
-		plugins: [
-			userscriptsPlugin({
-				mode,
-				defaultMeta: config.defaultMeta,
-			}),
-		],
-	});
+	const getCommonOptions = (entryPoint: {
+		in: string;
+		out: string;
+	}): esbuild.BuildOptions => {
+		const scriptName = path.basename(path.dirname(entryPoint.in));
+
+		if (!scriptName) {
+			throw new Error(
+				`Failed to get scriptName from entryPoint path: ${entryPoint.in}`,
+			);
+		}
+
+		return {
+			entryPoints: [entryPoint],
+			bundle: true,
+			write: false,
+			charset: "utf8",
+			format: "esm",
+			legalComments: "inline",
+			plugins: [
+				userscriptsPlugin({
+					defaultMeta: config.defaultMeta,
+					mode,
+					scriptName,
+				}),
+			],
+		};
+	};
 
 	console.log(styleText("blue", `Bundlemonkey started in ${mode} mode\n`));
 
@@ -38,10 +53,9 @@ export const main = async ({ mode }: { mode: Mode }) => {
 			await mkdir(config.dist.dev, { recursive: true });
 
 			await Promise.all(
-				entryPoints.map(async (entrypoint) => {
+				entryPoints.map(async (entryPoint) => {
 					const context = await esbuild.context({
-						...getCommonOptions(),
-						entryPoints: [entrypoint],
+						...getCommonOptions(entryPoint),
 						outdir: config.dist.dev,
 					});
 
@@ -54,10 +68,9 @@ export const main = async ({ mode }: { mode: Mode }) => {
 			await mkdir(config.dist.production, { recursive: true });
 
 			await Promise.all(
-				entryPoints.map(async (entrypoint) => {
+				entryPoints.map(async (entryPoint) => {
 					await esbuild.build({
-						...getCommonOptions(),
-						entryPoints: [entrypoint],
+						...getCommonOptions(entryPoint),
 						outdir: config.dist.production,
 					});
 				}),

src/plugin/index.ts

@@ -16,11 +16,13 @@ export type Mode = "production" | "watch" | "watchRemote";
 const jiti = createJiti(import.meta.url, { moduleCache: false });
 
 export const userscriptsPlugin = ({
-	mode,
 	defaultMeta,
+	mode,
+	scriptName,
 }: {
-	mode: Mode;
 	defaultMeta: ParsedConfig["defaultMeta"];
+	mode: Mode;
+	scriptName: string;
 }): esbuild.Plugin => {
 	const metaStore: Record<string, ParsedMeta | null> = {};
 
@@ -31,14 +33,6 @@ export const userscriptsPlugin = ({
 		name: "userscripts",
 		setup: (build) => {
 			build.onLoad({ filter: /\.user\.(t|j)s$/ }, async (args) => {
-				const scriptName = path.basename(path.dirname(args.path));
-
-				if (!scriptName) {
-					throw new Error(
-						`Failed to get name of the script from path: ${args.path}`,
-					);
-				}
-
 				try {
 					const sourceWithMainExtracted = await extractMain(args.path);
 
@@ -100,13 +94,6 @@ export const userscriptsPlugin = ({
 
 			build.onEnd(async (result) => {
 				for (const file of result.outputFiles ?? []) {
-					const scriptName = path
-						.basename(file.path)
-						.replace(/\.user\.(j|t)s$/, "");
-					if (!scriptName) {
-						throw new Error(`Failed to get scriptName from path: ${file.path}`);
-					}
-
 					const meta = metaStore[scriptName];
 
 					if (meta === null) {