fix: Deno.mkdir should conform to style guide (denoland/deno#3617)

caspervonb · Jan 31, 2021 · 534c0a6 · 534c0a6
1 parent afdb6ae
commit 534c0a6
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 27 deletions.
diff --git a/fs/empty_dir.ts b/fs/empty_dir.ts
@@ -33,7 +33,7 @@ export async function emptyDir(dir: string): Promise<void> {
     }
 
     // if not exist. then create it
-    await mkdir(dir, true);
+    await mkdir(dir, { recursive: true });
   }
 }
 
@@ -61,7 +61,7 @@ export function emptyDirSync(dir: string): void {
       throw err;
     }
     // if not exist. then create it
-    mkdirSync(dir, true);
+    mkdirSync(dir, { recursive: true });
     return;
   }
 }
diff --git a/fs/ensure_dir.ts b/fs/ensure_dir.ts
@@ -18,7 +18,7 @@ export async function ensureDir(dir: string): Promise<void> {
   } catch (err) {
     if (err instanceof Deno.DenoError && err.kind === ErrorKind.NotFound) {
       // if dir not exists. then create it.
-      await mkdir(dir, true);
+      await mkdir(dir, { recursive: true });
       return;
     }
     throw err;
@@ -41,7 +41,7 @@ export function ensureDirSync(dir: string): void {
   } catch (err) {
     if (err instanceof Deno.DenoError && err.kind == ErrorKind.NotFound) {
       // if dir not exists. then create it.
-      mkdirSync(dir, true);
+      mkdirSync(dir, { recursive: true });
       return;
     }
     throw err;

diff --git a/fs/ensure_dir_test.ts b/fs/ensure_dir_test.ts
@@ -40,7 +40,7 @@ test(async function ensureDirIfItExist(): Promise<void> {
   const testDir = path.join(baseDir, "test");
 
   // create test directory
-  await Deno.mkdir(testDir, true);
+  await Deno.mkdir(testDir, { recursive: true });
 
   await ensureDir(testDir);
 
@@ -60,7 +60,7 @@ test(function ensureDirSyncIfItExist(): void {
   const testDir = path.join(baseDir, "test");
 
   // create test directory
-  Deno.mkdirSync(testDir, true);
+  Deno.mkdirSync(testDir, { recursive: true });
 
   ensureDirSync(testDir);
 

diff --git a/fs/ensure_file_test.ts b/fs/ensure_file_test.ts
@@ -41,7 +41,7 @@ test(async function ensureFileIfItExist(): Promise<void> {
   const testDir = path.join(testdataDir, "ensure_file_3");
   const testFile = path.join(testDir, "test.txt");
 
-  await Deno.mkdir(testDir, true);
+  await Deno.mkdir(testDir, { recursive: true });
   await Deno.writeFile(testFile, new Uint8Array());
 
   await ensureFile(testFile);
@@ -61,7 +61,7 @@ test(function ensureFileSyncIfItExist(): void {
   const testDir = path.join(testdataDir, "ensure_file_4");
   const testFile = path.join(testDir, "test.txt");
 
-  Deno.mkdirSync(testDir, true);
+  Deno.mkdirSync(testDir, { recursive: true });
   Deno.writeFileSync(testFile, new Uint8Array());
 
   ensureFileSync(testFile);
@@ -77,7 +77,7 @@ test(function ensureFileSyncIfItExist(): void {
 test(async function ensureFileIfItExistAsDir(): Promise<void> {
   const testDir = path.join(testdataDir, "ensure_file_5");
 
-  await Deno.mkdir(testDir, true);
+  await Deno.mkdir(testDir, { recursive: true });
 
   await assertThrowsAsync(
     async (): Promise<void> => {
@@ -93,7 +93,7 @@ test(async function ensureFileIfItExistAsDir(): Promise<void> {
 test(function ensureFileSyncIfItExistAsDir(): void {
   const testDir = path.join(testdataDir, "ensure_file_6");
 
-  Deno.mkdirSync(testDir, true);
+  Deno.mkdirSync(testDir, { recursive: true });
 
   assertThrows(
     (): void => {

diff --git a/fs/ensure_link_test.ts b/fs/ensure_link_test.ts
@@ -43,7 +43,7 @@ test(async function ensureLinkIfItExist(): Promise<void> {
   const testFile = path.join(testDir, "test.txt");
   const linkFile = path.join(testDir, "link.txt");
 
-  await Deno.mkdir(testDir, true);
+  await Deno.mkdir(testDir, { recursive: true });
   await Deno.writeFile(testFile, new Uint8Array());
 
   await ensureLink(testFile, linkFile);
@@ -90,7 +90,7 @@ test(function ensureLinkSyncIfItExist(): void {
   const testFile = path.join(testDir, "test.txt");
   const linkFile = path.join(testDir, "link.txt");
 
-  Deno.mkdirSync(testDir, true);
+  Deno.mkdirSync(testDir, { recursive: true });
   Deno.writeFileSync(testFile, new Uint8Array());
 
   ensureLinkSync(testFile, linkFile);
@@ -138,7 +138,7 @@ test(async function ensureLinkDirectoryIfItExist(): Promise<void> {
   const linkDir = path.join(testdataDir, "ensure_link_link_3");
   const testFile = path.join(testDir, "test.txt");
 
-  await Deno.mkdir(testDir, true);
+  await Deno.mkdir(testDir, { recursive: true });
   await Deno.writeFile(testFile, new Uint8Array());
 
   await assertThrowsAsync(
@@ -158,7 +158,7 @@ test(function ensureLinkSyncDirectoryIfItExist(): void {
   const linkDir = path.join(testdataDir, "ensure_link_link_3");
   const testFile = path.join(testDir, "test.txt");
 
-  Deno.mkdirSync(testDir, true);
+  Deno.mkdirSync(testDir, { recursive: true });
   Deno.writeFileSync(testFile, new Uint8Array());
 
   assertThrows(

diff --git a/fs/ensure_symlink_test.ts b/fs/ensure_symlink_test.ts
@@ -50,7 +50,7 @@ test(async function ensureSymlinkIfItExist(): Promise<void> {
   const testFile = path.join(testDir, "test.txt");
   const linkFile = path.join(testDir, "link.txt");
 
-  await Deno.mkdir(testDir, true);
+  await Deno.mkdir(testDir, { recursive: true });
   await Deno.writeFile(testFile, new Uint8Array());
 
   if (isWindows) {
@@ -79,7 +79,7 @@ test(function ensureSymlinkSyncIfItExist(): void {
   const testFile = path.join(testDir, "test.txt");
   const linkFile = path.join(testDir, "link.txt");
 
-  Deno.mkdirSync(testDir, true);
+  Deno.mkdirSync(testDir, { recursive: true });
   Deno.writeFileSync(testFile, new Uint8Array());
 
   if (isWindows) {
@@ -109,7 +109,7 @@ test(async function ensureSymlinkDirectoryIfItExist(): Promise<void> {
   const linkDir = path.join(testdataDir, "link_file_link_3");
   const testFile = path.join(testDir, "test.txt");
 
-  await Deno.mkdir(testDir, true);
+  await Deno.mkdir(testDir, { recursive: true });
   await Deno.writeFile(testFile, new Uint8Array());
 
   if (isWindows) {
@@ -141,7 +141,7 @@ test(function ensureSymlinkSyncDirectoryIfItExist(): void {
   const linkDir = path.join(testdataDir, "link_file_link_3");
   const testFile = path.join(testDir, "test.txt");
 
-  Deno.mkdirSync(testDir, true);
+  Deno.mkdirSync(testDir, { recursive: true });
   Deno.writeFileSync(testFile, new Uint8Array());
 
   if (isWindows) {

diff --git a/fs/move_test.ts b/fs/move_test.ts
@@ -28,7 +28,7 @@ test(async function moveDirectoryIfDestNotExists(): Promise<void> {
   const srcDir = path.join(testdataDir, "move_test_src_2");
   const destDir = path.join(testdataDir, "move_test_dest_2");
 
-  await Deno.mkdir(srcDir, true);
+  await Deno.mkdir(srcDir, { recursive: true });
 
   // if dest directory not exist
   await assertThrowsAsync(
@@ -112,7 +112,7 @@ test(async function moveDirectory(): Promise<void> {
   const destFile = path.join(destDir, "test.txt");
   const srcContent = new TextEncoder().encode("src");
 
-  await Deno.mkdir(srcDir, true);
+  await Deno.mkdir(srcDir, { recursive: true });
   assertEquals(await exists(srcDir), true);
   await Deno.writeFile(srcFile, srcContent);
 
@@ -140,7 +140,10 @@ test(async function moveIfSrcAndDestDirectoryExistsAndOverwrite(): Promise<
   const srcContent = new TextEncoder().encode("src");
   const destContent = new TextEncoder().encode("dest");
 
-  await Promise.all([Deno.mkdir(srcDir, true), Deno.mkdir(destDir, true)]);
+  await Promise.all([
+    Deno.mkdir(srcDir, { recursive: true }),
+    Deno.mkdir(destDir, { recursive: true })
+  ]);
   assertEquals(await exists(srcDir), true);
   assertEquals(await exists(destDir), true);
   await Promise.all([
@@ -191,7 +194,7 @@ test(function moveSyncDirectoryIfDestNotExists(): void {
   const srcDir = path.join(testdataDir, "move_sync_test_src_2");
   const destDir = path.join(testdataDir, "move_sync_test_dest_2");
 
-  Deno.mkdirSync(srcDir, true);
+  Deno.mkdirSync(srcDir, { recursive: true });
 
   // if dest directory not exist
   assertThrows(
@@ -270,7 +273,7 @@ test(function moveSyncDirectory(): void {
   const destFile = path.join(destDir, "test.txt");
   const srcContent = new TextEncoder().encode("src");
 
-  Deno.mkdirSync(srcDir, true);
+  Deno.mkdirSync(srcDir, { recursive: true });
   assertEquals(existsSync(srcDir), true);
   Deno.writeFileSync(srcFile, srcContent);
 
@@ -294,8 +297,8 @@ test(function moveSyncIfSrcAndDestDirectoryExistsAndOverwrite(): void {
   const srcContent = new TextEncoder().encode("src");
   const destContent = new TextEncoder().encode("dest");
 
-  Deno.mkdirSync(srcDir, true);
-  Deno.mkdirSync(destDir, true);
+  Deno.mkdirSync(srcDir, { recursive: true });
+  Deno.mkdirSync(destDir, { recursive: true });
   assertEquals(existsSync(srcDir), true);
   assertEquals(existsSync(destDir), true);
   Deno.writeFileSync(srcFile, srcContent);

diff --git a/fs/walk_test.ts b/fs/walk_test.ts
@@ -105,7 +105,7 @@ testWalk(
 
 testWalk(
   async (d: string): Promise<void> => {
-    await mkdir(d + "/a/b/c/d", true);
+    await mkdir(d + "/a/b/c/d", { recursive: true });
     await touch(d + "/a/b/c/d/x");
   },
   async function depth(): Promise<void> {

diff --git a/io/util.ts b/io/util.ts
@@ -40,7 +40,7 @@ export async function tempFile(
   const filepath = path.resolve(
     `${dir}/${opts.prefix || ""}${r}${opts.postfix || ""}`
   );
-  await mkdir(path.dirname(filepath), true);
+  await mkdir(path.dirname(filepath), { recursive: true });
   const file = await open(filepath, "a");
   return { file, filepath };
 }