refactor

Author: gameroman

packages/usts/src/core/build/build.ts

@@ -1,7 +1,6 @@
-import * as fs from "node:fs/promises";
 import * as path from "node:path";
 
-import { rolldown } from "rolldown";
+import * as rolldown from "rolldown";
 
 import type { ResolvedUserscriptConfig } from "~/config/schema";
 
@@ -17,35 +16,29 @@ async function buildUserscript(
 
   const header = serializeMetaHeader(config.header);
 
-  const bundle = await rolldown({ input: config.entryPoint, tsconfig: true });
-  const result = await bundle.generate({
-    format: "iife",
-    sourcemap: false,
-    minify: "dce-only",
+  const outDir = config.outDir;
+  const outFile = path.join(outDir, USERSCRIPT_OUTPUT_FILE_NAME);
+
+  const result = await rolldown.build({
+    input: config.entryPoint,
+    tsconfig: true,
+    plugins: [config.plugins],
+    output: {
+      format: "iife",
+      sourcemap: false,
+      minify: "dce-only",
+      postBanner: `${header}\n`,
+      cleanDir: config.clean,
+      file: outFile,
+    },
+    write: options?.write,
   });
 
   if (result.output.length !== 1) {
     throw new Error(`❌ Unexpected userscript build output`);
   }
 
-  const bundledCode = result.output[0].code;
-  const fullCode = `${header}\n\n${bundledCode}`;
-
-  if (!options?.write) {
-    return fullCode;
-  }
-
-  const outDir = config.outDir;
-  if (config.clean) {
-    console.log("\n🧹 Cleaning output directory");
-    await fs.rm(outDir, { recursive: true, force: true });
-  }
-  await fs.mkdir(outDir, { recursive: true });
-  const outFile = path.join(outDir, USERSCRIPT_OUTPUT_FILE_NAME);
-  await fs.writeFile(outFile, fullCode, "utf-8");
-  console.log("\n🎉 Build process complete!");
-
-  return fullCode;
+  return result.output[0].code;
 }
 
 export { buildUserscript };

packages/usts/src/core/build/meta-header.ts

@@ -1,8 +1,5 @@
 import type { UserscriptMetaHeaderConfig } from "~/config/schema";
 
-const headerStart = "// ==UserScript==" as const;
-const headerEnd = "// ==/UserScript==" as const;
-
 function getHeaderLine(
   key: string,
   val: string | boolean | readonly [string, string],
@@ -34,6 +31,9 @@ export function serializeMetaHeader(
   const headerLines = headerConfigEntries.flatMap(([kwy, val]) =>
     getHeaderLines(kwy, val),
   );
+
+  const headerStart = "// ==UserScript==";
+  const headerEnd = "// ==/UserScript==";
   const serializedHeaderLines = headerLines.join("\n");
   const serializedHeader =
     `${headerStart}\n${serializedHeaderLines}\n${headerEnd}` as const;

packages/usts/tests/__snapshots__/basic.test.ts.snap

@@ -1,6 +1,6 @@
 // Bun Snapshot v1, https://bun.sh/docs/test/snapshots
 
-exports[`Basic userscript Correctly bundles a basic userscript 1`] = `
+exports[`Basic userscript correctly bundles a basic userscript 1`] = `
 "// ==UserScript==
 // @name             Userscript name
 // @namespace        fixtures
@@ -14,3 +14,19 @@ exports[`Basic userscript Correctly bundles a basic userscript 1`] = `
 })();
 "
 `;
+
+exports[`Basic userscript correctly bundles a basic userscript with more options 1`] = `
+"// ==UserScript==
+// @name             Userscript name
+// @namespace        fixtures
+// @match            https://example.com/*
+// @version          1.0.0
+// @description      Userscript description
+// @resource         myStyle  https://example.com/myStyle.css
+// ==/UserScript==
+
+(function() {
+	console.log("Hello world!");
+})();
+"
+`;

packages/usts/tests/basic.test.ts

@@ -4,9 +4,19 @@ import { buildUserscript } from "../src/core/build/build";
 import { resolveFixture } from "./helpers/resolve";
 
 describe("Basic userscript", () => {
-  it("Correctly bundles a basic userscript", async () => {
+  it("correctly bundles a basic userscript", async () => {
     const fixture = resolveFixture("fixtures/basic/index.ts");
     const result = await buildUserscript(fixture);
     expect(result).toMatchSnapshot();
   });
+
+  it("correctly bundles a basic userscript with more options", async () => {
+    const fixture = resolveFixture("fixtures/basic/index.ts", {
+      resource: {
+        myStyle: "https://example.com/myStyle.css",
+      },
+    });
+    const result = await buildUserscript(fixture);
+    expect(result).toMatchSnapshot();
+  });
 });