Migrate to Deno 2

- Use deno.jsonc instead of import map - Replace deprecated functions Deno.emit() with the original typescript compiler - Replace deprecated Deno.run() with Deno.Command()

Author: jhnns

.src/README.md

@@ -11,15 +11,15 @@ moment.
 ## Building
 
 ```sh
-deno run -A --import-map=import_map.json --unstable ./.src/build.ts
+deno run -A .src/build.ts
 ```
 
 By default, the build script will skip building drafts that have no
 modifications to their `definition.ts` file. If you need to force a rebuild, add
 `--force` onto the end of the build command:
 
 ```sh
-deno run -A --import-map=import_map.json --unstable ./.src/build.ts --force
+deno run -A .src/build.ts --force
 ```
 
 ## Adding a new draft

.src/build.ts

@@ -1,13 +1,14 @@
-import * as fs from "std/fs/mod.ts";
-import * as path from "std/path/mod.ts";
+import * as fs from "@std/fs";
+import * as path from "@std/path";
 import type * as types from "./types.ts";
 import { expandSourcePlaceholders } from "./utils/source_code.ts";
 import { formatMarkdown } from "./utils/format_markdown.ts";
 import { formatDefinitionDescriptions } from "./utils/format_definition_descriptions.ts";
 import { fileChecksum } from "./utils/checksum.ts";
-import checksums from "./checksums.json" assert { type: "json" };
+import { compileTypeScript } from "./tsc.ts";
+import checksums from "./checksums.json" with { type: "json" };
 import { VERSION } from "./version.ts";
-import packageJson from "../dist/node/package.json" assert { type: "json" };
+import packageJson from "../dist/node/package.json" with { type: "json" };
 
 // -----------------------------------------------------------------------------
 
@@ -50,7 +51,6 @@ drafts.sort((a, b) => a.localeCompare(b));
 // Process each draft
 
 for (const draftId of drafts) {
- const nodeDraftId = draftId.replaceAll("_", "-");
  const draftDir = path.join(SRC_DIR, "draft", draftId);
  const draftDefFilename = path.join(draftDir, "definition.ts");
  const draftDefChecksum = await fileChecksum(draftDefFilename);
@@ -105,7 +105,7 @@ for (const draftId of drafts) {
  draftSpec as unknown as types.ValidationSpecDefinition,
  );
 
- const outputFilename = path.join(NODE_DIR, `draft-${nodeDraftId}.ts`);
+ const outputFilename = path.join(DENO_DIR, `draft_${draftId}.ts`);
  await Deno.writeTextFile(
  outputFilename,
  [
@@ -115,43 +115,17 @@ for (const draftId of drafts) {
  modCode,
  ].join("\n"),
  );
- await Deno.run({ cmd: ["deno", "fmt", "--quiet", outputFilename] }).status();
-
- // Copy to the deno directory
- await fs.copy(
- outputFilename,
- path.join(DENO_DIR, `draft_${draftId}.ts`),
- { overwrite: true },
- );
+ const fmtCommand = new Deno.Command("deno", {
+ args: ["fmt", "--quiet", outputFilename],
+ });
+ await fmtCommand.output();
 
  // -------------------------------------------------------------------------
  // Compile to JS
  // -------------------------------------------------------------------------
- const { files } = await Deno.emit(outputFilename, {
- bundle: "module",
- compilerOptions: { target: "es6" },
- });
-
- const js = files["deno:///bundle.js"];
- const map = files["deno:///bundle.js.map"];
-
- // Write to the node directory
- const mapJson = JSON.parse(map) as { sources: string[] };
- mapJson.sources = mapJson.sources.map((source) => path.basename(source));
-
- await Deno.writeTextFile(
- path.join(NODE_DIR, `draft-${nodeDraftId}.js`),
- [
- `/// <reference types="./draft-${nodeDraftId}.ts" />`,
- "// @generated",
- js,
- `//# sourceMappingURL=draft-${nodeDraftId}.js.map`,
- ].join("\n"),
- );
-
- await Deno.writeTextFile(
- path.join(NODE_DIR, `draft-${nodeDraftId}.js.map`),
- JSON.stringify(mapJson),
+ await compileTypeScript(
+ outputFilename,
+ NODE_DIR,
  );
 
  console.log(`draft_${draftId}: complete`);
@@ -185,8 +159,6 @@ if (latestDraft === undefined) {
  throw new Error("TODO");
 }
 
-const nodeLatestDraft = latestDraft.replaceAll("_", "-");
-
 await Deno.writeTextFile(
  path.join(DENO_DIR, "draft_latest.ts"),
  `export * from "./draft_${latestDraft}.ts";`,
@@ -224,11 +196,10 @@ for (const readmeFilename of readmeFilenames) {
  })
  .replaceAll("{LATEST_DRAFT}", latestDraft),
  );
- const p = Deno.run({
- cmd: ["deno", "fmt", "--quiet", readmeFilename.output],
+ const fmtCommand = new Deno.Command("deno", {
+ args: ["fmt", "--quiet", readmeFilename.output],
  });
- await p.status();
- p.close();
+ await fmtCommand.output();
 }
 
 // -----------------------------------------------------------------------------
@@ -276,16 +247,26 @@ for (const dir of ALL_DIST_DIRS) {
 // -----------------------------------------------------------------------------
 {
  packageJson.version = VERSION;
- packageJson.main = `./draft-${nodeLatestDraft}.js`;
+ packageJson.main = `./draft_${latestDraft}.js`;
+ packageJson.types = `./draft_${latestDraft}.d.ts`;
  // @ts-expect-error this is valid
  packageJson.exports = {
- ".": `./draft-${nodeLatestDraft}.js`,
+ ".": {
+ types: `./draft_${latestDraft}.d.ts`,
+ default: `./draft_${latestDraft}.js`,
+ },
  ...Object.fromEntries(
  drafts.map((
  draftId,
  ) => {
  const nodeDraftId = draftId.replaceAll("_", "-");
- return [`./draft-${nodeDraftId}`, `./draft-${nodeDraftId}.js`];
+ return [
+ `./draft-${nodeDraftId}`,
+ {
+ types: `./draft_${draftId}.d.ts`,
+ default: `./draft_${draftId}.js`,
+ },
+ ];
  }),
  ),
  };

.src/tsc.ts

@@ -0,0 +1,54 @@
+import * as ts from "npm:typescript";
+
+/**
+ * Compiles a TypeScript file to JavaScript using the TypeScript compiler API.
+ * 
+ * @param sourceFile - Path to the TypeScript source file
+ * @param outputDir - Directory where the compiled files should be written
+ */
+export async function compileTypeScript(
+ sourceFile: string,
+ outputDir: string,
+): Promise<void> {
+ // Use TypeScript compiler API programmatically
+ const compilerOptions: ts.CompilerOptions = {
+ target: ts.ScriptTarget.ES2015,
+ module: ts.ModuleKind.ES2015,
+ declaration: true,
+ outDir: outputDir,
+ };
+
+ const host = ts.createCompilerHost(compilerOptions);
+ const program = ts.createProgram([sourceFile], compilerOptions, host);
+
+ // Emit the compiled code
+ const emitResult = program.emit();
+
+ // Check for compilation errors
+ const allDiagnostics = ts
+ .getPreEmitDiagnostics(program)
+ .concat(emitResult.diagnostics);
+
+ if (allDiagnostics.length > 0) {
+ const errors = allDiagnostics.map((diagnostic) => {
+ if (diagnostic.file) {
+ const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(
+ diagnostic.start!,
+ );
+ const message = ts.flattenDiagnosticMessageText(
+ diagnostic.messageText,
+ "\n",
+ );
+ return `${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`;
+ } else {
+ return ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
+ }
+ });
+ throw new Error(`TypeScript compilation failed:\n${errors.join("\n")}`);
+ }
+
+ if (emitResult.emitSkipped) {
+ throw new Error("TypeScript compilation was skipped");
+ }
+}
+

.src/utils/checksum.ts

@@ -1,20 +1,19 @@
-import { crypto } from "std/crypto/mod.ts";
-import { iterateReader } from "std/streams/conversion.ts";
+import { crypto } from "@std/crypto";
 
 export const algorithm = "MD5" as const;
 
 export const fileChecksum = async (
  file: URL | string | Deno.FsFile,
 ): Promise<string> => {
- const f = file instanceof Deno.FsFile ? file : await Deno.open(file);
- const arrayBuffer = await crypto.subtle.digest(algorithm, iterateReader(f));
-
- f.close();
- return toHexString(arrayBuffer);
-};
-
-const toHexString = (bytes: ArrayBuffer): string =>
- new Uint8Array(bytes).reduce(
-  (str, byte) => str + byte.toString(16).padStart(2, "0"),
-  "",
- );
+ const fileContent = file instanceof Deno.FsFile 
+  ? await Deno.readAll(file) 
+ : await Deno.readFile(file);
+ 
+ const hashBuffer = await crypto.subtle.digest(algorithm, fileContent);
+ 
+ // Convert to hex string
+ const hashArray = Array.from(new Uint8Array(hashBuffer));
+ const hashHex = hashArray.map(byte => byte.toString(16).padStart(2, '0')).join('');
+ 
+ return hashHex;
+};

LICENSE.md

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Original source code is copyright (c) 2019-2022 Jeremy Rylan
+Original source code is copyright (c) 2019-2025 Jeremy Rylan
 <https://github.com/jrylan>
 
 All JSON Schema documentation and descriptions are copyright (c):

deno.jsonc

@@ -3,5 +3,13 @@
  "files": {
  "exclude": ["dist/"]
  }
+ },
+ "imports": {
+ "@std/crypto": "jsr:@std/crypto@^1.0.5",
+ "@std/fs": "jsr:@std/fs@^1.0.19",
+ "@std/io": "jsr:@std/io@^0.225.2",
+ "@std/path": "jsr:@std/path@^1.1.2",
+ "@std/streams": "jsr:@std/streams@^1.0.13",
+ "typescript": "npm:typescript@^5.9.3"
  }
 }

deno.lock

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Original source code is copyright (c) 2019-2022 Jeremy Rylan
+Original source code is copyright (c) 2019-2025 Jeremy Rylan
 <https://github.com/jrylan>
 
 All JSON Schema documentation and descriptions are copyright (c):

dist/deno/LICENSE.md

@@ -725,12 +725,11 @@ export type JSONSchema<
 // -----------------------------------------------------------------------------
 
 export namespace JSONSchema {
- export type TypeValue = (
+ export type TypeValue =
  | ValueOf<TypeName>
  | TypeName
  | Array<ValueOf<TypeName> | TypeName>
- | ReadonlyArray<ValueOf<TypeName> | TypeName>
- );
+ | ReadonlyArray<ValueOf<TypeName> | TypeName>;
 
  /**
  * JSON Schema interface

dist/deno/draft_07.ts

@@ -1095,12 +1095,11 @@ export type JSONSchema<
 // -----------------------------------------------------------------------------
 
 export namespace JSONSchema {
- export type TypeValue = (
+ export type TypeValue =
  | ValueOf<TypeName>
  | TypeName
  | Array<ValueOf<TypeName> | TypeName>
- | ReadonlyArray<ValueOf<TypeName> | TypeName>
- );
+ | ReadonlyArray<ValueOf<TypeName> | TypeName>;
 
  /**
  * JSON Schema interface