ignotum 0.0.18 → 0.0.19

package/src/cli/command.ts

@@ -1,6 +1,6 @@
 import { NodeHttpClient, NodeRuntime, NodeServices } from "@effect/platform-node";
-import { Effect, Layer, Option, Path, Schema, Terminal } from "effect";
-import { Argument, CliError, Command, Flag } from "effect/unstable/cli";
+import { Clock, Effect, Layer, Option, Path, Schema, Terminal } from "effect";
+import { Argument, CliError, Command, Flag } from "effect/cli";
 import { AppSlug } from "@ignotum/contracts/control";
 import { IdGenerator } from "@ignotum/shared/id";
 
@@ -13,7 +13,7 @@ import {
   status as readAuthStatus,
 } from "./auth-client.js";
 import { ControlClient } from "./control-client.js";
-import { deploy as runDeploy, resumeVersion } from "./deploy.js";
+import { DeployProgress, deploy as runDeploy, resumeVersion } from "./deploy.js";
 import { resetDevDatabase } from "../dev-runtime/dev-database.js";
 import { dev as runDev } from "./dev.js";
 import { createApp } from "./new-app.js";
@@ -118,9 +118,9 @@ const devDatabase = Command.make("db").pipe(
 const dev = Command.make(
   "dev",
   {
-    host: Flag.string("host").pipe(Flag.withDefault("127.0.0.1")),
-    open: Flag.boolean("open").pipe(Flag.withDefault(false)),
-    port: Flag.integer("port").pipe(Flag.withSchema(DevPort), Flag.withDefault(3210)),
+    host: Flag.String("host").pipe(Flag.withDefault("127.0.0.1")),
+    open: Flag.Boolean("open").pipe(Flag.withDefault(false)),
+    port: Flag.Int("port").pipe(Flag.withSchema(DevPort), Flag.withDefault(3210)),
   },
   Effect.fn("dev")(function* ({ host, open, port }) {
     const path = yield* Path.Path;
@@ -144,11 +144,11 @@ const dev = Command.make(
 const deploy = Command.make(
   "deploy",
   {
-    resume: Flag.boolean("resume").pipe(
+    resume: Flag.Boolean("resume").pipe(
       Flag.withDescription("Resume the saved upload or activation."),
       Flag.withDefault(false),
     ),
-    app: Flag.string("app").pipe(
+    app: Flag.String("app").pipe(
       Flag.withDescription("Create or link this app slug on the first deploy."),
       Flag.withSchema(AppSlug),
       Flag.optional,
@@ -157,8 +157,14 @@ const deploy = Command.make(
   Effect.fn("deploy")(function* ({ app, resume }) {
     const path = yield* Path.Path;
     const terminal = yield* Terminal.Terminal;
+    const startedAt = yield* Clock.currentTimeMillis;
+    const progress = Effect.fn("deploy.progress")(function* (message: string) {
+      const elapsed = ((yield* Clock.currentTimeMillis) - startedAt) / 1000;
+      yield* terminal.display(`${message} (${elapsed.toFixed(1)}s)\n`).pipe(Effect.orDie);
+    });
     if (resume) {
       const result = yield* resumeVersion(path.resolve("."), Option.getOrUndefined(app)).pipe(
+        Effect.provideService(DeployProgress, progress),
         // @effect-diagnostics-next-line strictEffectProvide:off This command owns the authenticated control client.
         Effect.provide(ControlClient.layer),
         Effect.mapError((error) =>
@@ -171,6 +177,7 @@ const deploy = Command.make(
       return;
     }
     const result = yield* runDeploy(path.resolve("."), Option.getOrUndefined(app)).pipe(
+      Effect.provideService(DeployProgress, progress),
       // @effect-diagnostics-next-line strictEffectProvide:off The deploy subcommand owns this client layer for its full lifetime.
       Effect.provide(ControlClient.layer),
       Effect.mapError((error) =>
@@ -201,14 +208,14 @@ const install = Command.make(
 const newApp = Command.make(
   "new",
   {
-    directory: Argument.string("directory").pipe(
+    directory: Argument.String("directory").pipe(
       Argument.withDescription('Directory to create. Use "." for the current directory.'),
     ),
-    git: Flag.boolean("git").pipe(
+    git: Flag.Boolean("git").pipe(
       Flag.withDescription("Initialize a Git repository. Use --no-git to skip it."),
       Flag.withDefault(true),
     ),
-    install: Flag.boolean("install").pipe(
+    install: Flag.Boolean("install").pipe(
       Flag.withDescription("Install dependencies. Use --no-install to skip it."),
       Flag.withDefault(true),
     ),

package/src/cli/control-client.ts

@@ -36,8 +36,8 @@ import {
   Schedule,
   Schema,
 } from "effect";
-import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
-import type { HttpClientRequest as HttpRequest } from "effect/unstable/http/HttpClientRequest";
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/http";
+import type { HttpClientRequest as HttpRequest } from "effect/http/HttpClientRequest";
 import { AuthCommandError, AuthCredentialStore } from "./auth-client.js";
 
 export interface HostedControlConfig {

package/src/cli/deploy.ts

@@ -1,9 +1,11 @@
-import { Effect, Path, Schema } from "effect";
+import { Context, Effect, Path, Schema } from "effect";
 import type { AppSlug, ControlVersion } from "@ignotum/contracts/control";
 import { VersionId, VersionNumber } from "@ignotum/contracts/runtime/identity";
 import { IdGenerator } from "@ignotum/shared/id";
 import { appUrl, configureApp, type AppConfiguration } from "./app-configuration.js";
 import { buildManagedVersion, type ManagedVersionBuildResult } from "./build/managed.js";
+import { generateClientRoutes } from "./route-codegen.js";
+import { checkAppTypes } from "./typecheck.js";
 import {
   ControlClient,
   ControlClientUnavailable,
@@ -13,6 +15,11 @@ import {
 
 import { saveUpload, loadUpload, restoreUploadBuild, clearUpload } from "./upload-journal.js";
 
+export const DeployProgress = Context.Reference<(message: string) => Effect.Effect<void>>(
+  "ignotum/cli/deploy/DeployProgress",
+  { defaultValue: () => () => Effect.void },
+);
+
 export class VersionUploadInterrupted extends Schema.TaggedError<VersionUploadInterrupted>()(
   "VersionUploadInterrupted",
   { cause: Schema.Defect(), versionId: VersionId, message: Schema.String },
@@ -65,7 +72,9 @@ export const uploadVersion = Effect.fn("Deploy.upload")(function* (
   savedVersionId?: VersionId,
 ) {
   const control = yield* ControlClient;
+  const progress = yield* DeployProgress;
   const versionId = savedVersionId ?? (yield* (yield* IdGenerator).generate(VersionId));
+  yield* progress("Preparing upload");
   const admission = yield* control
     .beginVersion(configuration.appId, versionId, build.declaration)
     .pipe(
@@ -112,9 +121,13 @@ export const uploadVersion = Effect.fn("Deploy.upload")(function* (
     }
     return Effect.succeed({ ...target, bytes } satisfies VersionUploadFile);
   });
+  yield* progress(`Uploading 0/${files.length} files`);
   yield* Effect.forEach(
     files,
-    (file) => control.uploadVersionFile(configuration.appId, versionId, file),
+    (file, index) =>
+      control
+        .uploadVersionFile(configuration.appId, versionId, file)
+        .pipe(Effect.andThen(() => progress(`Uploading ${index + 1}/${files.length} files`))),
     // The hosted control plane runs within Cloudflare's per-request CPU budget.
     // Serialize uploads so several validation-heavy requests cannot contend in
     // the same isolate and exhaust that budget together.
@@ -129,6 +142,7 @@ export const uploadVersion = Effect.fn("Deploy.upload")(function* (
         }),
     }),
   );
+  yield* progress("Validating version");
   const version = yield* control.finalizeVersion(configuration.appId, versionId).pipe(
     Effect.catchTags({
       ControlClientUnavailable: (cause) =>
@@ -140,6 +154,7 @@ export const uploadVersion = Effect.fn("Deploy.upload")(function* (
     }),
     Effect.flatMap(readyVersion),
   );
+  yield* progress(`Activating Version ${version.number}`);
   const selection = yield* control
     .activateVersion(configuration.appId, version.number)
     .pipe(Effect.mapError((cause) => activationError(version, cause)));
@@ -159,7 +174,14 @@ export const deploy = Effect.fn("Deploy.run")(function* (
   appDirectory: string,
   requestedSlug: AppSlug | undefined,
 ) {
+  const progress = yield* DeployProgress;
+  yield* progress("Generating bindings");
+  yield* generateClientRoutes(appDirectory);
+  yield* progress("Checking TypeScript");
+  yield* checkAppTypes(appDirectory);
+  yield* progress("Building app");
   const build = yield* buildVersionArtifact(appDirectory);
+  yield* progress("Linking app");
   const configuration = yield* configureApp(appDirectory, requestedSlug);
   const versionId = yield* (yield* IdGenerator).generate(VersionId);
   yield* saveUpload(appDirectory, configuration, versionId, build);
@@ -172,6 +194,8 @@ export const resumeVersion = Effect.fn("Deploy.resume")(function* (
   appDirectory: string,
   requestedSlug?: AppSlug,
 ) {
+  const progress = yield* DeployProgress;
+  yield* progress("Restoring saved deployment");
   const configuration = yield* configureApp(appDirectory, requestedSlug);
   const control = yield* ControlClient;
   const journal = yield* loadUpload(appDirectory, configuration);
@@ -189,6 +213,7 @@ export const resumeVersion = Effect.fn("Deploy.resume")(function* (
     return { ...activated, appUrl: appUrl(configuration.slug) };
   }
   const version = yield* readyVersion(existing);
+  yield* progress(`Activating Version ${version.number}`);
   const selection = yield* control
     .activateVersion(configuration.appId, version.number)
     .pipe(Effect.mapError((cause) => activationError(version, cause)));

package/src/cli/dev.ts

@@ -3,7 +3,7 @@ import prefresh from "@prefresh/vite";
 import tailwindcss from "@tailwindcss/vite";
 import { Crypto, Effect, FileSystem, Option, Path, Schema, Scope } from "effect";
 import { createServer, normalizePath, type Plugin, type ViteDevServer } from "vite";
-import { ChildProcessSpawner } from "effect/unstable/process";
+import { ChildProcessSpawner } from "effect/process";
 import {
   PlatformRequirement,
   revisionPrefix,

package/src/cli/managed-dev-platform.ts

@@ -1,12 +1,17 @@
 import { createHash } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import { Effect, FileSystem, Path, Schema } from "effect";
-import { ServingSelection, type PlatformRevision } from "@ignotum/contracts/deployment";
+import {
+  revisionPrefix,
+  ServingSelection,
+  type PlatformRevision,
+} from "@ignotum/contracts/deployment";
 import { VersionId } from "@ignotum/contracts/runtime/identity";
 import { bundledGuests } from "@ignotum/platform/guests";
 import type { BundledGuest } from "@ignotum/platform/artifacts";
 import { compilerExports } from "@ignotum/platform/compiler-exports";
 import { platformImportsPlugin } from "@ignotum/platform/compiler";
+import { revisions } from "@ignotum/platform/registry";
 import { runViteBuild } from "./build/artifact.js";
 
 export interface LocalPlatform {
@@ -15,9 +20,11 @@ export interface LocalPlatform {
   readonly guest: BundledGuest;
 }
 
+const localPlatformRevision = revisions[0];
+
 export const loadLocalPlatform = Effect.fn("ManagedDev.loadPlatform")(function* () {
   const fs = yield* FileSystem.FileSystem;
-  const revision = { major: 1, minor: 0 } as const;
+  const revision = localPlatformRevision;
   const guest = bundledGuests.find(
     (candidate) =>
       candidate.manifest.revision.major === revision.major &&
@@ -25,7 +32,9 @@ export const loadLocalPlatform = Effect.fn("ManagedDev.loadPlatform")(function*
   );
   if (guest === undefined) return yield* Effect.die("The local platform guest is missing.");
   const browser = yield* fs.readFile(
-    fileURLToPath(new URL("../../dist/platform/_ignotum/v1.0/client.js", import.meta.url)),
+    fileURLToPath(
+      new URL(`../../dist/platform${revisionPrefix(revision)}/client.js`, import.meta.url),
+    ),
   );
   return { revision, browser, guest } satisfies LocalPlatform;
 });
@@ -45,7 +54,7 @@ export const localServingSelection = (
     formatVersion: 1,
     appId: `app_${digest}`,
     versionNumber: 1,
-    platform: { major: 1, minor: 0 },
+    platform: localPlatformRevision,
     activationGeneration,
     deploymentEpoch,
     dataHistoryId: `hist_${digest}`,

package/src/cli/module-boundaries.ts

@@ -71,7 +71,7 @@ export const moduleBoundariesPlugin = Effect.fn("Deploy.moduleBoundariesPlugin")
   const fileSystem = yield* FileSystem.FileSystem;
   const runPromise = Effect.runPromiseWith(yield* Effect.context<never>());
   const isolatedDiscovery =
-    (yield* Config.string("IGNOTUM_ISOLATED_DISCOVERY").pipe(Config.withDefault("0"))) === "1";
+    (yield* Config.String("IGNOTUM_ISOLATED_DISCOVERY").pipe(Config.withDefault("0"))) === "1";
   const realAppDirectory = isolatedDiscovery
     ? normalizePath(cleanModuleId(appDirectory))
     : normalizePath(yield* fileSystem.realPath(cleanModuleId(appDirectory)));

package/src/cli/new-app.ts

@@ -1,5 +1,5 @@
 import { Effect, FileSystem, Path, Schema, String } from "effect";
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import { ChildProcess, ChildProcessSpawner } from "effect/process";
 import cliPackageJson from "../../package.json" with { type: "json" };
 
 import { agentAppFiles, type AppFile } from "./agent-files.js";
@@ -145,7 +145,7 @@ const icon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
 const utils = `export const counterIncrement = 1;
 `;
 
-const home = `import { Result, useMutation, useQuery } from "ignotum/client";
+const home = `import { Result, useMutation, useQuery, useState } from "ignotum/client";
 import { api } from "@/_generated/api.js";
 import { route } from "@/_generated/client.js";
 import { counterIncrement } from "@/shared/utils.js";
@@ -155,6 +155,24 @@ export default route({
   component: function Counter() {
     const count = useQuery(api.counter.get);
     const increment = useMutation(api.counter.increment);
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+    const incrementCounter = async () => {
+      if (busy) return;
+      setBusy(true);
+      setError("");
+      try {
+        Result.match(await increment(), {
+          value: () => {},
+          error: (failure) => setError("Increment failed: " + failure._tag),
+          internalError: (failure) => setError("Increment failed. Request ID: " + failure.requestId),
+        });
+      } catch {
+        setError("The increment could not be confirmed. Check the current counter before trying again.");
+      } finally {
+        setBusy(false);
+      }
+    };
 
     return (
       <section class="text-center">
@@ -165,15 +183,20 @@ export default route({
             <>
               <p class="my-6 text-5xl tabular-nums">{value}</p>
               <button
-                class="rounded bg-zinc-900 px-4 py-2 text-white"
+                class="rounded bg-zinc-900 px-4 py-2 text-white disabled:opacity-50"
                 type="button"
-                onClick={() => void increment()}
+                disabled={busy}
+                onClick={() => void incrementCounter()}
               >
-                Increment by {counterIncrement}
+                {busy ? "Incrementing..." : "Increment by " + counterIncrement}
               </button>
             </>
           ),
+          internalError: (failure) => (
+            <p role="alert" class="mt-6">Counter could not be loaded. Request ID: {failure.requestId}</p>
+          ),
         })}
+        {error !== "" && <p role="alert" class="mt-4">{error}</p>}
       </section>
     );
   },
@@ -254,7 +277,9 @@ After generating bindings, run \`npx tsc --noEmit\` to check the app.
 
 ## Deploy
 
-Sign in with \`npx ignotum auth login\`, then run \`npx ignotum deploy --app my-app\`.
+Sign in with \`npx ignotum auth login\`, then run \`npx ignotum deploy\`.
+The first deploy tries the app name saved when this project was created. Use
+\`npx ignotum deploy --app another-slug\` to choose a different slug.
 Later deployments use \`npx ignotum deploy\`. The command prints the hosted URL and confirms
 that the numbered App Version is live. If activation cannot be confirmed, follow the printed
 \`ignotum deploy --resume\` command to finish without creating another version.
@@ -278,6 +303,10 @@ export const appFiles = (appName: string): ReadonlyArray<AppFile> => [
   { content: schema, path: "server/schema.ts" },
   { content: utils, path: "shared/utils.ts" },
   { content: packageJson(appName), path: "package.json" },
+  {
+    content: `${JSON.stringify({ formatVersion: 1, suggestedSlug: appName }, null, 2)}\n`,
+    path: "ignotum.json",
+  },
   {
     content: `minimumReleaseAgeExclude:\n  - ignotum@${cliPackageJson.version}\nallowBuilds:\n  msgpackr-extract: false\n`,
     path: "pnpm-workspace.yaml",

package/src/cli/package-manager.ts

@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect";
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import { ChildProcess, ChildProcessSpawner } from "effect/process";
 
 export type PackageManager = "npm" | "pnpm";
 

package/src/cli/route-static.ts

@@ -589,7 +589,9 @@ export const createRouteExtractor = Effect.fn("Routes.createExtractor")(function
           `Unsupported URL validator '${method}' or argument count.`,
         );
     }
-    return yield* Schema.decodeUnknownEffect(UrlValueDescriptor)(output).pipe(
+    return yield* Schema.decodeUnknownEffect(UrlValueDescriptor, {
+      onExcessProperty: "error",
+    })(output).pipe(
       Effect.mapError((error) =>
         sourceError(module, node, field, `Invalid ${method} URL descriptor: ${String(error)}`),
       ),
@@ -660,7 +662,9 @@ export const createRouteExtractor = Effect.fn("Routes.createExtractor")(function
       const extracted = yield* value(expression, name);
       const validate =
         name === "meta"
-          ? Schema.decodeUnknownEffect(StaticMetadata.fields.meta)(extracted).pipe(Effect.asVoid)
+          ? Schema.decodeUnknownEffect(StaticMetadata.fields.meta, {
+              onExcessProperty: "error",
+            })(extracted).pipe(Effect.asVoid)
           : name === "titleTemplate"
             ? Schema.decodeUnknownEffect(LayoutMetadata.fields.titleTemplate)(extracted).pipe(
                 Effect.asVoid,
@@ -677,6 +681,7 @@ export const createRouteExtractor = Effect.fn("Routes.createExtractor")(function
     }
     const decodedMetadata = yield* Schema.decodeUnknownEffect(
       kind === "route" ? StaticMetadata : LayoutMetadata,
+      { onExcessProperty: "error" },
     )(Object.fromEntries(metadata)).pipe(
       Effect.mapError((error) => sourceError(module, call, "metadata", String(error))),
     );

package/src/cli/typecheck.ts

@@ -0,0 +1,66 @@
+import { createRequire } from "node:module";
+import process from "node:process";
+import { Effect, FileSystem, Path, Schema } from "effect";
+import { ChildProcess, ChildProcessSpawner } from "effect/process";
+
+const CompilerPackage = Schema.Struct({ bin: Schema.Struct({ tsc: Schema.String }) });
+
+export class AppTypecheckFailed extends Schema.TaggedError<AppTypecheckFailed>()(
+  "AppTypecheckFailed",
+  { message: Schema.String, cause: Schema.optional(Schema.Defect()) },
+) {}
+
+export const checkAppTypes = Effect.fn("Typecheck.checkAppTypes")(function* (appDirectory: string) {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const configuration = path.join(appDirectory, "tsconfig.json");
+  if (!(yield* fs.exists(configuration))) {
+    return yield* AppTypecheckFailed.make({
+      message: "Deployment requires a tsconfig.json in the app directory.",
+    });
+  }
+  const packagePath = yield* Effect.try({
+    try: () =>
+      createRequire(path.join(appDirectory, "package.json")).resolve("typescript/package.json"),
+    catch: (cause) =>
+      AppTypecheckFailed.make({
+        cause,
+        message:
+          "TypeScript is not installed for this app. Install TypeScript as a dev dependency, then deploy again.",
+      }),
+  });
+  const compiler = yield* fs.readFileString(packagePath).pipe(
+    Effect.flatMap(Schema.decodeEffect(Schema.fromJsonString(CompilerPackage))),
+    Effect.mapError((cause) =>
+      AppTypecheckFailed.make({
+        cause,
+        message: "Could not read the installed TypeScript compiler.",
+      }),
+    ),
+  );
+  const exitCode = yield* spawner
+    .exitCode(
+      ChildProcess.make(
+        process.execPath,
+        [
+          path.resolve(path.dirname(packagePath), compiler.bin.tsc),
+          "--project",
+          configuration,
+          "--noEmit",
+        ],
+        { cwd: appDirectory, stdin: "ignore", stdout: "inherit", stderr: "inherit" },
+      ),
+    )
+    .pipe(
+      Effect.mapError((cause) =>
+        AppTypecheckFailed.make({ cause, message: "Could not run the app's TypeScript compiler." }),
+      ),
+    );
+  if (exitCode !== ChildProcessSpawner.ExitCode(0)) {
+    return yield* AppTypecheckFailed.make({
+      message:
+        "TypeScript checking failed. Fix the errors above before deploying. No version was uploaded.",
+    });
+  }
+});

package/src/cli/upload-journal.ts

@@ -87,9 +87,9 @@ export const restoreUploadBuild = Effect.fn("UploadJournal.restoreBuild")(functi
   const outputDirectory = path.join(appDirectory, ".ignotum/build");
   const declarationBytes = yield* fs.readFile(path.join(outputDirectory, "declaration.json"));
   if ((yield* sha256(declarationBytes)) !== journal.declarationSha256) return yield* invalid();
-  const declaration = yield* Schema.decodeEffect(Schema.fromJsonString(UploadDeclaration))(
-    new TextDecoder().decode(declarationBytes),
-  ).pipe(Effect.mapError(invalid));
+  const declaration = yield* Schema.decodeEffect(Schema.fromJsonString(UploadDeclaration), {
+    onExcessProperty: "error",
+  })(new TextDecoder().decode(declarationBytes)).pipe(Effect.mapError(invalid));
   const entries = yield* Effect.forEach(
     declaration.definition.artifacts,
     Effect.fn(function* (artifact) {

package/src/dev-runtime/database.ts

@@ -1,5 +1,5 @@
 import { Context, DateTime, Effect, Layer, Option, Schema } from "effect";
-import { SqlClient, SqlError, SqlSchema } from "effect/unstable/sql";
+import { SqlClient, SqlError, SqlSchema } from "effect/sql";
 import {
   GeneratedId,
   TableId,

package/src/dev-runtime/files.ts

@@ -15,7 +15,7 @@ import { fileGrantUrlPrefix, fileUploadUrlPrefix } from "@ignotum/contracts/runt
 import type { InvocationId } from "@ignotum/contracts/runtime/identity";
 import { IdGenerator } from "@ignotum/shared/id";
 import { Context, Effect, FileSystem, Layer, Option, Path, Schema } from "effect";
-import { SqlClient } from "effect/unstable/sql";
+import { SqlClient } from "effect/sql";
 
 interface Preparation {
   readonly function: FunctionAddress;

package/src/dev-runtime/managed-functions.ts

@@ -1,5 +1,6 @@
+import { Base64 } from "effect/encoding";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { Crypto, Effect, Encoding, FileSystem, Path, Predicate, Schema } from "effect";
+import { Crypto, Effect, FileSystem, Path, Predicate, Schema } from "effect";
 import type { ViteDevServer } from "vite";
 import { parseSync } from "oxc-parser";
 import { prepareManagedExecution, type ManagedExecution } from "@ignotum/runtime/quickjs";
@@ -165,7 +166,7 @@ export const createManagedFunctionLoader = Effect.fn("ManagedFunctions.createLoa
         }
         if (module.sourceMap !== undefined) {
           rewritten = rewritten.replace(/^\/\/# sourceMappingURL=.*$/gm, "");
-          rewritten += `\n//# sourceMappingURL=data:application/json;base64,${Encoding.encodeBase64(module.sourceMap.bytes)}\n`;
+          rewritten += `\n//# sourceMappingURL=data:application/json;base64,${Base64.encode(module.sourceMap.bytes)}\n`;
         }
         yield* fs.writeFileString(fileURLToPath(urls.get(module.id)!), rewritten);
       }