refactor(BREAKING): remove entrypoints option (#42)

Author: dsherret

src/mod.test.ts

@@ -11,9 +11,8 @@ Deno.test("should resolve, load and get graph", async () => {
     nodeConditions: undefined, // ensure doesn't error
   });
   const modFileUrl = import.meta.resolve("./mod.ts");
-  const { loader, diagnostics } = await workspace.createLoader({
-    entrypoints: [modFileUrl],
-  });
+  const loader = await workspace.createLoader();
+  const diagnostics = await loader.addEntrypoints([modFileUrl]);
   assertEquals(diagnostics.length, 0);
   const graph = loader.getGraphUnstable();
   assertEquals((graph as any).roots[0], modFileUrl);
@@ -52,9 +51,8 @@ Deno.test("should resolve, load and get graph", async () => {
 Deno.test("resolving a jsr specifier should fail with explanatory message", async () => {
   const workspace = new Workspace({});
   const modFileUrl = import.meta.resolve("./mod.ts");
-  const { loader, diagnostics } = await workspace.createLoader({
-    entrypoints: [modFileUrl],
-  });
+  const loader = await workspace.createLoader();
+  const diagnostics = await loader.addEntrypoints([modFileUrl]);
   assertEquals(diagnostics.length, 0);
   assertRejects(
     async () => {

src/mod.ts

@@ -10,9 +10,8 @@
  * const workspace = new Workspace({
  *   // optional options
  * });
- * const { loader, diagnostics } = await workspace.createLoader({
- *   entrypoints: ["./mod.ts"]
- * });
+ * const loader = await workspace.createLoader();
+ * const diagnostics = await loader.addEntrypoints(["./mod.ts"])
  * if (diagnostics.length > 0) {
  *   throw new Error(diagnostics[0].message);
  * }
@@ -68,12 +67,6 @@ export interface WorkspaceOptions {
   noTranspile?: boolean;
 }
 
-/** Options for loading. */
-export interface LoaderOptions {
-  /** Entrypoints to create the loader for. */
-  entrypoints: string[];
-}
-
 /** File type. */
 export enum MediaType {
   JavaScript = 0,
@@ -156,20 +149,9 @@ export class Workspace implements Disposable {
   }
 
   /** Creates a loader that uses this this workspace. */
-  async createLoader(
-    options: LoaderOptions,
-  ): Promise<{ loader: Loader; diagnostics: EntrypointDiagnostic[] }> {
-    if (this.#debug) {
-      console.error(
-        `Creating loader for entrypoints:\n  ${
-          options.entrypoints.join("\n  ")
-        }`,
-      );
-    }
+  async createLoader(): Promise<Loader> {
     const wasmLoader = await this.#inner.create_loader();
-    const loader = new Loader(wasmLoader, this.#debug);
-    const diagnostics = await loader.addEntrypoints(options.entrypoints);
-    return { loader, diagnostics };
+    return new Loader(wasmLoader, this.#debug);
   }
 }
 
@@ -202,11 +184,11 @@ export class Loader implements Disposable {
     this.#inner.free();
   }
 
-  /** Adds additional entrypoints to the loader after the fact.
+  /** Adds entrypoints to the loader.
    *
-   * This may be useful for having a JSR specifier asynchronously
-   * stored in the internal module graph on the fly, which will allow
-   * it to be synchronously resolved.
+   * It's useful to specify entrypoints so that the loader can resolve
+   * npm: and jsr: specifiers the same way that Deno does when not using
+   * a lockfile.
    */
   async addEntrypoints(
     entrypoints: string[],

tests/helpers.ts

@@ -1,5 +1,4 @@
 import {
-  type LoaderOptions,
   type LoadResponse,
   type ModuleLoadResponse,
   Workspace,
@@ -11,7 +10,7 @@ export * from "@deno/loader";
 
 export async function createLoader(
   workspaceOptions: WorkspaceOptions,
-  loaderOptions: LoaderOptions,
+  loaderOptions: { entrypoints: string[] },
 ) {
   const { loader, workspace, diagnostics } = await createLoaderWithDiagnostics(
     workspaceOptions,
@@ -26,10 +25,11 @@ export async function createLoader(
 
 export async function createLoaderWithDiagnostics(
   workspaceOptions: WorkspaceOptions,
-  loaderOptions: LoaderOptions,
+  loaderOptions: { entrypoints: string[] },
 ) {
   const workspace = new Workspace(workspaceOptions);
-  const { loader, diagnostics } = await workspace.createLoader(loaderOptions);
+  const loader = await workspace.createLoader();
+  const diagnostics = await loader.addEntrypoints(loaderOptions.entrypoints);
   return {
     loader,
     workspace,

tests/jsx/main.test.ts

@@ -55,9 +55,8 @@ ${mainJsxSourceMappingURL}`,
 
   {
     const { workspace } = await createWorkspace({ preserveJsx: true });
-    const { loader: newLoader, diagnostics } = await workspace.createLoader({
-      entrypoints: [mainJsx, mainTsxUrl],
-    });
+    const newLoader = await workspace.createLoader();
+    const diagnostics = await newLoader.addEntrypoints([mainJsx, mainTsxUrl]);
     assertEquals(diagnostics, []);
     assertResponseText(
       await newLoader.load(mainJsxUrl, RequestedModuleType.Default),
@@ -70,9 +69,8 @@ ${mainJsxSourceMappingURL}`,
   }
   {
     const { workspace } = await createWorkspace({ noTranspile: true });
-    const { loader: newLoader, diagnostics } = await workspace.createLoader({
-      entrypoints: [mainJsx, mainTsx],
-    });
+    const newLoader = await workspace.createLoader();
+    const diagnostics = await newLoader.addEntrypoints([mainJsx, mainTsx]);
     assertEquals(diagnostics, []);
     assertResponseText(
       await newLoader.load(mainJsxUrl, RequestedModuleType.Default),