feat: support bytes and text imports (#18)

Author: dsherret

deno

@@ -1,4 +1,9 @@
-import { MediaType, ResolutionMode, Workspace } from "./mod.ts";
+import {
+  MediaType,
+  RequestedModuleType,
+  ResolutionMode,
+  Workspace,
+} from "./mod.ts";
 import { assert, assertEquals } from "@std/assert";
 
 Deno.test("should resolve and load", async () => {
@@ -16,7 +21,10 @@ Deno.test("should resolve and load", async () => {
   );
   assertEquals(resolvedUrl, import.meta.url);
   {
-    const loadResponse = await loader.load(import.meta.url);
+    const loadResponse = await loader.load(
+      import.meta.url,
+      RequestedModuleType.Default,
+    );
     if (loadResponse.kind !== "module") {
       throw new Error("Fail");
     }
@@ -26,7 +34,10 @@ Deno.test("should resolve and load", async () => {
   }
   // node: specifier
   {
-    const loadResponse = await loader.load("node:events");
+    const loadResponse = await loader.load(
+      "node:events",
+      RequestedModuleType.Default,
+    );
     if (loadResponse.kind !== "external") {
       throw new Error("Fail");
     }

src/mod.test.ts

@@ -5,7 +5,7 @@
  *
  * @example
  * ```ts
- * import { Workspace, ResolutionMode, type LoadResponse } from "@deno/loader";
+ * import { Workspace, ResolutionMode, type LoadResponse, RequestedModuleType } from "@deno/loader";
  *
  * const workspace = new Workspace({
  *   // optional options
@@ -18,7 +18,7 @@
  *   "https://deno.land/mod.ts", // referrer
  *   ResolutionMode.Import,
  * );
- * const response = await loader.load(resolvedUrl);
+ * const response = await loader.load(resolvedUrl, RequestedModuleType.Default);
  * if (response.kind === "module") {
  *   console.log(response.specifier);
  *   console.log(response.code);
@@ -52,16 +52,16 @@ export interface WorkspaceOptions {
   cachedOnly?: boolean;
   /** Enable debug logs. */
   debug?: boolean;
+  /** Whether to preserve JSX syntax in the loaded output. */
+  preserveJsx?: boolean;
+  /** Skip transpiling TypeScript and JSX. */
+  noTranspile?: boolean;
 }
 
 /** Options for loading. */
 export interface LoaderOptions {
   /** Entrypoints to create the loader for. */
   entrypoints: string[];
-  /** Whether to preserve JSX syntax in the loaded output. */
-  preserveJsx?: boolean;
-  /** Skip transpiling TypeScript and JSX. */
-  noTranspile?: boolean;
 }
 
 /** File type. */
@@ -154,12 +154,19 @@ export class Workspace implements Disposable {
         }`,
       );
     }
-    const wasmLoader = await this.#inner.create_loader(options);
+    const wasmLoader = await this.#inner.create_loader();
     await wasmLoader.add_roots(options.entrypoints);
     return new Loader(wasmLoader, this.#debug);
   }
 }
 
+export enum RequestedModuleType {
+  Default = 0,
+  Json = 1,
+  Text = 2,
+  Bytes = 3,
+}
+
 /** A loader for resolving and loading urls. */
 export class Loader implements Disposable {
   #inner: WasmLoader;
@@ -199,11 +206,35 @@ export class Loader implements Disposable {
   }
 
   /** Loads a specifier. */
-  load(specifier: string): Promise<LoadResponse> {
+  load(
+    specifier: string,
+    requestedModuleType: RequestedModuleType,
+  ): Promise<LoadResponse> {
     if (this.#debug) {
-      console.error(`Loading '${specifier}'`);
+      console.error(
+        `Loading '${specifier}' with type '${
+          requestedModuleTypeToString(requestedModuleType) ?? "<default>"
+        }'`,
+      );
+    }
+    return this.#inner.load(specifier, requestedModuleType);
+  }
+}
+
+function requestedModuleTypeToString(moduleType: RequestedModuleType) {
+  switch (moduleType) {
+    case RequestedModuleType.Bytes:
+      return "bytes";
+    case RequestedModuleType.Text:
+      return "text";
+    case RequestedModuleType.Json:
+      return "json";
+    case RequestedModuleType.Default:
+      return undefined;
+    default: {
+      const _never: never = moduleType;
+      return undefined;
     }
-    return this.#inner.load(specifier);
   }
 }
 

src/mod.ts

@@ -23,7 +23,7 @@ deno_semver = "=0.8.1"
 url = "2.5"
 
 [dependencies.deno_ast]
-version = "=0.48.0"
+version = "=0.48.1"
 features = ["transpiling"]
 
 [dependencies.deno_cache_dir]