self review

Author: dsherret

lib/commands/build_command.ts

@@ -15,8 +15,8 @@ import type { Path } from "@david/path";
 export async function runBuildCommand(args: BuildCommand) {
   const output = await runPreBuild(args);
 
-  await args.outDir.ensureDir();
-  await writeSnippets();
+  args.outDir.ensureDirSync();
+  writeSnippets();
 
   const files = args.inline
     ? await inlinePreBuild(output, args)
@@ -25,17 +25,17 @@ export async function runBuildCommand(args: BuildCommand) {
   for (const file of files) {
     console.log(`  write ${colors.yellow(file.path.toString())}`);
     if (typeof file.data === "string") {
-      await file.path.writeText(file.data);
+      file.path.writeTextSync(file.data);
     } else {
-      await file.path.write(file.data);
+      file.path.writeSync(file.data);
     }
   }
 
   console.log(
     `${colors.bold(colors.green("Finished"))} WebAssembly output`,
   );
 
-  async function writeSnippets() {
+  function writeSnippets() {
     const localModules = Array.from(output.bindgen.localModules);
     const snippets = Array.from(output.bindgen.snippets);
 
@@ -46,25 +46,25 @@ export async function runBuildCommand(args: BuildCommand) {
     const snippetsDest = args.outDir.join("snippets");
     // start with a fresh directory in order to clear out any previously
     // created snippets which might have a different name
-    await snippetsDest.emptyDir();
+    snippetsDest.emptyDirSync();
 
     for (const [name, text] of localModules) {
       const filePath = snippetsDest.join(name);
       const dirPath = filePath.parentOrThrow();
-      await dirPath.mkdir({ recursive: true });
-      await filePath.writeText(text);
+      dirPath.mkdirSync({ recursive: true });
+      filePath.writeTextSync(text);
     }
 
     for (const [identifier, list] of snippets) {
       if (list.length === 0) {
         continue;
       }
       const dirPath = snippetsDest.join(identifier);
-      await dirPath.mkdir({ recursive: true });
+      dirPath.mkdirSync({ recursive: true });
       for (const [i, text] of list.entries()) {
         const name = `inline${i}.js`;
         const filePath = dirPath.join(name);
-        await filePath.writeText(text);
+        filePath.writeTextSync(text);
       }
     }
   }
@@ -85,8 +85,8 @@ async function handleWasmModuleOutput(
     ),
     data: await getFormattedText(`${generatedHeader}
 // @ts-self-types="./${output.bindingDts.path.basename()}"
-// source-hash: ${output.sourceHash}
 
+// source-hash: ${output.sourceHash}
 import * as wasm from "./${output.wasmFileName}";
 export * from "./${output.bindingJsBg.path.basename()}";
 import { __wbg_set_wasm } from "./${output.bindingJsBg.path.basename()}";
@@ -116,18 +116,8 @@ async function inlinePreBuild(
     ),
     data: await getFormattedText(`${generatedHeader}
 // @ts-self-types="./${output.bindingDts.path.basename()}"
-// source-hash: ${output.sourceHash}
-
-function base64decode(b64) {
-  const binString = atob(b64);
-  const size = binString.length;
-  const bytes = new Uint8Array(size);
-  for (let i = 0; i < size; i++) {
-    bytes[i] = binString.charCodeAt(i);
-  }
-  return bytes;
-}
 
+// source-hash: ${output.sourceHash}
 import * as imports from "./${output.bindingJsBg.path.basename()}";
 const bytes = base64decode("\\\n${
       base64.encodeBase64(wasmBytes).replace(/.{78}/g, "$&\\\n")
@@ -140,6 +130,16 @@ const wasm = new WebAssembly.Instance(wasmModule, {
 export * from "./${output.bindingJsBg.path.basename()}";
 import { __wbg_set_wasm } from "./${output.bindingJsBg.path.basename()}";
 __wbg_set_wasm(wasm.exports);
+
+function base64decode(b64) {
+  const binString = atob(b64);
+  const size = binString.length;
+  const bytes = new Uint8Array(size);
+  for (let i = 0; i < size; i++) {
+    bytes[i] = binString.charCodeAt(i);
+  }
+  return bytes;
+}
 `),
   }, {
     path: output.bindingJsBg.path,

lib/commands/check_command.ts

@@ -6,7 +6,7 @@ import { runPreBuild } from "../pre_build.ts";
 
 export async function runCheckCommand(args: CheckCommand) {
   const output = await runPreBuild(args);
-  const originalHash = await getOriginalSourceHash();
+  const originalHash = getOriginalSourceHash();
   if (originalHash === output.sourceHash) {
     console.log(
       `${colors.bold(colors.green("Success"))} ` +
@@ -20,14 +20,12 @@ export async function runCheckCommand(args: CheckCommand) {
     Deno.exit(1);
   }
 
-  async function getOriginalSourceHash() {
+  function getOriginalSourceHash() {
     const filePath = args.outDir.join(
       `${output.crateName}.${args.bindingJsFileExt}`,
     );
     try {
-      return getSourceHashFromText(
-        await filePath.readText(),
-      );
+      return getSourceHashFromText(filePath.readTextSync());
     } catch (err) {
       if (err instanceof Deno.errors.NotFound) {
         console.warn(`${colors.yellow("Warning")} could not find ${filePath}`);

lib/commands/new_command.ts

@@ -47,14 +47,15 @@ edition = "2021"
 `,
   );
 
-  let gitIgnoreText = await getFileTextIfExists("./.gitignore") ?? "";
+  const gitIgnoreFile = rootDir.join(".gitignore");
+  let gitIgnoreText = gitIgnoreFile.readMaybeTextSync() ?? "";
   if (!/^\/target$/m.test(gitIgnoreText)) {
     gitIgnoreText = gitIgnoreText.trim();
     if (gitIgnoreText.length > 0) {
       gitIgnoreText = gitIgnoreText + "\n";
     }
     gitIgnoreText += "/target\n";
-    await Deno.writeTextFile("./.gitignore", gitIgnoreText);
+    gitIgnoreFile.writeTextSync(gitIgnoreText);
   }
 
   const srcDir = rsLibDir.join("src");
@@ -143,18 +144,6 @@ function writeIfNotExists(path: Path, text: string) {
   path.writeTextSync(text);
 }
 
-async function getFileTextIfExists(path: string) {
-  try {
-    return await Deno.readTextFile(path);
-  } catch (err) {
-    if (err instanceof Deno.errors.NotFound) {
-      return undefined;
-    } else {
-      throw err;
-    }
-  }
-}
-
 async function checkIfRequiredToolsExist() {
   const requiredTools = ["deno", "cargo"];
   const notInstalled: string[] = [];

lib/manifest.ts

@@ -162,7 +162,7 @@ export class WasmCrate {
     paths.sort();
     const hasher = new Sha1();
     for (const path of paths) {
-      const fileText = await Deno.readTextFile(path);
+      const fileText = path.readTextSync();
       // standardize file paths so this is not subject to
       // however git is configured to checkout files
       hasher.update(fileText.replace(/\r?\n/g, "\n"));
@@ -179,7 +179,7 @@ export class WasmCrate {
       })
     ) {
       if (entry.isFile) {
-        paths.push(entry.path);
+        paths.push(new Path(entry.path));
       }
     }
     return paths;

tests/cli_test.ts

@@ -5,7 +5,7 @@ const rootFolder = new Path(import.meta.dirname!).parentOrThrow();
 
 Deno.test("should create a new wasmbuild project, build it, and run it", async () => {
   using tempDir = createTempDirSync();
-  await tempDir.join("deno.json").writeText(
+  tempDir.join("deno.json").writeTextSync(
     `{ "tasks": { "wasmbuild": "${
       Deno.execPath().replace(/\\/g, "\\\\")
     } run -A ${
@@ -14,7 +14,7 @@ Deno.test("should create a new wasmbuild project, build it, and run it", async (
   );
   await runCommand("deno", "task", "wasmbuild", "new");
   await runCommand("deno", "task", "wasmbuild");
-  await tempDir.join("test.ts").writeText(`
+  tempDir.join("test.ts").writeTextSync(`
 import { add } from "./lib/rs_lib.js";
 
 Deno.test("should add values", async () => {