Fix types for TypeScript 5.7 (Deno 2.2)

Deno v2.2 upgraded to TypeScript 5.7.

There's a nice writeup of the relevant change in this PR:
microsoft/TypeScript#59417

In short, there are now two variants of Uint8Array:
Uint8Array<ArrayBuffer> and Uint8Array<SharedArrayBuffer>.

And their types have diverged. If you don't specify which one you're
returning, you get a union of the two, which is no longer
assignment-compatible with ArrayBuffer. 

Fix our types (and some Deno types) to be explicit there.

Author: NfNitLoop

deno.jsonc

@@ -1,6 +1,6 @@
 {
     "name": "@nfnitloop/deno-embedder",
-    "version": "1.6.1",
+    "version": "2.0.0-alpha-1",
     "exports": {
         ".": "./src/mod.ts",
         "./plugins/plugins": "./src/plugins/plugins.ts",
@@ -164,5 +164,5 @@
             // Pseudocode doc block example:
             "src/helpers/hono.ts"
         ]
-    }
+    },
 }

deno.lock

@@ -1 +1,8 @@
-export * from "jsr:@std/[email protected]/base64"
+import {decodeBase64 as upstream} from "jsr:@std/[email protected]/base64"
+export { encodeBase64 } from "jsr:@std/[email protected]/base64"
+
+// Fix type. (v1.0 has a breaking change to encoding/decoding.)
+export function decodeBase64(value: string): Uint8Array<ArrayBuffer> {
+    return upstream(value) as Uint8Array<ArrayBuffer>
+}
+

examples/hono/deno.lock

@@ -23,15 +23,32 @@ export type ImportMeta = {
 
 const decoder = new TextDecoder()
 
+/** A reference to an embedded file's data and metadata. */
+export type FileHandle = {
+    /** Size of the embedded file in bytes (uncomrpessed/unencoded) */
+    readonly size: number
+
+    /** Returns the raw bytes of the embedded file. */
+    bytes(): Promise<Uint8Array<ArrayBuffer>>;
+
+    /**
+     * Parse the bytes as utf-8 text.
+     */
+    text(): Promise<string>;
+}
+
 /**
  * Represents the contents of a file that's been embedded into TypeScript.
  */
-export class File {
+export class File implements FileHandle {
     /** Size of the embedded file in bytes (uncomrpessed/unencoded) */
     readonly size: number
 
     /** May be compressed */
-    #contents: {bytes: Uint8Array, compression: CompressionFormat | undefined }
+    #contents: {
+        bytes: Uint8Array<ArrayBuffer>, 
+        compression: CompressionFormat | undefined
+    }
 
 
     /** Called (indirectly) by each embedded file. */
@@ -46,7 +63,7 @@ export class File {
     }
 
     /** Returns the raw bytes of the embedded file. */
-    async bytes(): Promise<Uint8Array> {
+    async bytes(): Promise<Uint8Array<ArrayBuffer>> {
         let {bytes, compression} = this.#contents
 
         // Decompress on first use:
@@ -109,7 +126,7 @@ export type CompressionFormat = ConstructorParameters<typeof DecompressionStream
 /** Shortcut for `new File(opts)` */
 export function F(opts: FileMeta): File { return new File(opts) }
 
-async function decompress(data: Uint8Array, compression: CompressionFormat): Promise<Uint8Array> {
+async function decompress(data: Uint8Array, compression: CompressionFormat): Promise<Uint8Array<ArrayBuffer>> {
     let input = new Blob([data])
     let ds = new DecompressionStream(compression)
     let stream = input.stream().pipeThrough(ds)

examples/with-embedder/deno.lock

@@ -28,17 +28,12 @@ export function serveStatic<E extends Env = Env>(
     options: Omit<ServeStaticOptions<E>, "root"> & { root: Embeds }
 ): MiddlewareHandler {
     const { root, ...rest } = options;
-    return function serveStatic(c, next) {
-        const getContent = async (path: string) => {
-            try {
-                const file = await root.get(path);
-                return file ? file.bytes() : null;
-            } catch (e) {
-                console.warn(`${e}`);
-                return null;
-            }
-        };
-        
+    const getContent = async (path: string): Promise<ArrayBuffer | null> => {
+        const file = await root.get(path);
+        if (!file) { return null }
+        return (await file.bytes()).buffer
+    };
+    return function serveStaticImpl(c, next) {        
         // note: baseServeStatic gives us mime type headers automatically. Nice.
         return baseServeStatic({
             ...rest,