feat: support bytes for esbuild

Author: sxzz

src/index.ts

@@ -19,17 +19,16 @@ const unplugin: UnpluginInstance<Options | undefined, false> = createUnplugin(
       enforce: options.enforce,
 
       resolveId:
-        meta.framework === 'rollup'
+        meta.framework === 'rollup' || meta.framework === 'rolldown'
           ? async function (this, id, importer, opt) {
-              if ((opt as any)?.attributes?.type === 'text') {
-                if (id.includes('?')) {
-                  id += '&raw'
-                } else {
-                  id += '?raw'
-                }
+              const attributeType = (opt as any)?.attributes?.type
+              if (attributeType === 'text') {
+                id += `${id.includes('?') ? '&' : '?'}raw`
+              } else if (attributeType === 'bytes') {
+                id += `${id.includes('?') ? '&' : '?'}bytes`
               }
-
               if (!rawRE.test(id)) return
+
               const file = cleanUrl(id)
               const resolved = await (this as PluginContext).resolve(
                 file,
@@ -43,32 +42,39 @@ const unplugin: UnpluginInstance<Options | undefined, false> = createUnplugin(
 
       load: {
         filter: { id: { include: rawRE } },
-        handler(id) {
+        async handler(id) {
           const file = cleanUrl(id)
           const context = this.getNativeBuildContext?.()
           const transform =
             context?.framework === 'esbuild'
               ? context.build.esbuild.transform
               : undefined
-          return transformRaw(
+          const contents = await transformRaw(
             file,
             transformFilter,
+            false,
             options.transform.options,
             transform,
           )
+          return contents as string
         },
       },
       esbuild: {
         setup(build) {
           build.onLoad({ filter: /.*/ }, async (args) => {
-            if (args.with.type === 'text') {
+            const isBytes = args.with.type === 'bytes'
+            if (args.with.type === 'text' || isBytes) {
               const contents = await transformRaw(
                 args.path,
                 transformFilter,
+                isBytes,
                 options.transform.options,
                 build.esbuild.transform,
               )
-              return { contents, loader: 'js' }
+              return {
+                contents,
+                loader: typeof contents === 'string' ? 'js' : 'binary',
+              }
             }
           })
         },
@@ -79,6 +85,7 @@ const unplugin: UnpluginInstance<Options | undefined, false> = createUnplugin(
 export default unplugin
 
 const rawRE = /[&?]raw(?:&|$)/
+// const bytesRE = /[&?]bytes(?:&|$)/
 const postfixRE = /[#?].*$/s
 function cleanUrl(url: string) {
   return url.replace(postfixRE, '')
@@ -109,16 +116,17 @@ export function guessLoader(id: string): Loader {
 async function transformRaw(
   file: string,
   transformFilter: (id: string | unknown) => boolean,
+  isBytes: boolean,
   options: TransformOptions,
   transform?: typeof import('esbuild').transform,
 ) {
-  let contents = await readFile(file, 'utf-8')
+  let contents = await readFile(file, isBytes ? undefined : 'utf8')
 
-  if (transformFilter(file)) {
+  if (!isBytes && transformFilter(file)) {
     transform ||= (await import('esbuild')).transform
     contents = (
       await transform(contents, { loader: guessLoader(file), ...options })
     ).code
   }
-  return `export default ${JSON.stringify(contents)}`
+  return isBytes ? contents : `export default ${JSON.stringify(contents)}`
 }

tests/__snapshots__/basic.test.ts.snap

@@ -1,7 +1,23 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`esbuild 1`] = `
-"// tests/fixtures/ts.ts?raw
+"var __toBinary = /* @__PURE__ */ (() => {
+  var table = new Uint8Array(128);
+  for (var i = 0; i < 64; i++) table[i < 26 ? i + 65 : i < 52 ? i + 71 : i < 62 ? i - 4 : i * 4 - 205] = i;
+  return (base64) => {
+    var n = base64.length, bytes = new Uint8Array((n - (base64[n - 1] == "=") - (base64[n - 2] == "=")) * 3 / 4 | 0);
+    for (var i2 = 0, j = 0; i2 < n; ) {
+      var c0 = table[base64.charCodeAt(i2++)], c1 = table[base64.charCodeAt(i2++)];
+      var c2 = table[base64.charCodeAt(i2++)], c3 = table[base64.charCodeAt(i2++)];
+      bytes[j++] = c0 << 2 | c1 >> 4;
+      bytes[j++] = c1 << 4 | c2 >> 2;
+      bytes[j++] = c2 << 6 | c3;
+    }
+    return bytes;
+  };
+})();
+
+// tests/fixtures/ts.ts?raw
 var ts_default = 'export const msg = "hello ts";\\n';
 
 // tests/fixtures/js.js?raw
@@ -13,8 +29,11 @@ var jsx_default = 'export const msg = /* @__PURE__ */ React.createElement("div",
 // tests/fixtures/with.js
 var with_default = 'export const msg = "hello with";\\n';
 
+// tests/fixtures/abc.txt
+var abc_default = __toBinary("YWJjCg==");
+
 // <stdin>
-console.log(ts_default, js_default, jsx_default, with_default);
+console.log(ts_default, js_default, jsx_default, with_default, abc_default);
 "
 `;
 

tests/basic.test.ts

@@ -6,15 +6,16 @@ import Raw from '../src'
 
 const resolveDir = path.resolve(__dirname, 'fixtures')
 
-const contents = `
-import text from "./ts.ts?raw"
-import text2 from "./js.js?raw"
-import text3 from "./jsx.jsx?raw"
-import text4 from "./with.js" with { type: "text" }
-console.log(text, text2, text3, text4)
-`
-
 test('esbuild', async () => {
+  const contents = `
+  import text from "./ts.ts?raw"
+  import text2 from "./js.js?raw"
+  import text3 from "./jsx.jsx?raw"
+  import text4 from "./with.js" with { type: "text" }
+  import bytes1 from "./abc.txt" with { type: "bytes" }
+  console.log(text, text2, text3, text4, bytes1)
+  `
+
   const result = await build({
     stdin: {
       contents,
@@ -29,6 +30,13 @@ test('esbuild', async () => {
 })
 
 test('rollup', async () => {
+  const contents = `
+  import text from "./ts.ts?raw"
+  import text2 from "./js.js?raw"
+  import text3 from "./jsx.jsx?raw"
+  import text4 from "./with.js" with { type: "text" }
+  console.log(text, text2, text3, text4)
+  `
   const entryFile = path.resolve(resolveDir, 'main.js')
   const bundle = await rollup({
     input: [entryFile],

tests/fixtures/abc.txt

@@ -0,0 +1 @@
+abc