From 7d6a0f64f20004f89f5e2cbfcf7941f0a8dafd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E6=9D=89?= Date: Sun, 13 Jan 2019 02:07:18 +0800 Subject: refactor(mkdirp): reorg (denoland/deno_std#103) Original: https://github.com/denoland/deno_std/commit/41312ad39fe77cee7dd2cc4b48308eebb45f870a --- README.md | 2 +- fs/mkdirp.ts | 43 +++++++++++++++++++++++++++++++++++++++++++ fs/mkdirp_test.ts | 30 ++++++++++++++++++++++++++++++ mkdirp/mkdirp.ts | 24 ------------------------ mkdirp/readme.md | 17 ----------------- mkdirp/test.ts | 30 ------------------------------ test.ts | 2 +- 7 files changed, 75 insertions(+), 73 deletions(-) create mode 100644 fs/mkdirp.ts create mode 100644 fs/mkdirp_test.ts delete mode 100644 mkdirp/mkdirp.ts delete mode 100644 mkdirp/readme.md delete mode 100644 mkdirp/test.ts diff --git a/README.md b/README.md index c291b26cc..13a1bd0e8 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ A library for resolving media types (MIME types) and extensions. -- **[mkdirp](./mkdirp/)** +- **[mkdirp](./fs/)** Make directory branches. diff --git a/fs/mkdirp.ts b/fs/mkdirp.ts new file mode 100644 index 000000000..627166043 --- /dev/null +++ b/fs/mkdirp.ts @@ -0,0 +1,43 @@ +/** + * # deno-mkdirp + * + * `mkdir -p` 4 `deno`. + * + * ## Import + * + * ```ts + * import { mkdirp } from "https://deno.land/x/std/fs/mkdirp.ts"; + * ``` + * + * ## API + * + * Same as [`deno.mkdir`](https://deno.land/typedoc/index.html#mkdir). + * + * ### `mkdirp(path: string, mode?: number) : Promise` + * + * Creates directories if they do not already exist and makes parent directories as needed. + */ +import { ErrorKind, FileInfo, lstat, mkdir, platform } from "deno"; + +const PATH_SEPARATOR: string = platform.os === "win" ? "\\" : "/"; + +export async function mkdirp(path: string, mode?: number): Promise { + for ( + let parts: string[] = path.split(/\/|\\/), + parts_len: number = parts.length, + level: string, + info: FileInfo, + i: number = 0; + i < parts_len; + i++ + ) { + level = parts.slice(0, i + 1).join(PATH_SEPARATOR); + try { + info = await lstat(level); + if (!info.isDirectory()) throw Error(`${level} is not a directory`); + } catch (err) { + if (err.kind !== ErrorKind.NotFound) throw err; + await mkdir(level, mode); + } + } +} diff --git a/fs/mkdirp_test.ts b/fs/mkdirp_test.ts new file mode 100644 index 000000000..a3a4fac03 --- /dev/null +++ b/fs/mkdirp_test.ts @@ -0,0 +1,30 @@ +import { cwd, lstat, makeTempDirSync, removeAll, FileInfo } from "deno"; +import { test, assert } from "../testing/mod.ts"; +import { mkdirp } from "./mkdirp.ts"; + +let root: string = `${cwd()}/${Date.now()}`; //makeTempDirSync(); + +test(async function createsNestedDirs(): Promise { + const leaf: string = `${root}/levelx/levely`; + await mkdirp(leaf); + const info: FileInfo = await lstat(leaf); + assert(info.isDirectory()); + await removeAll(root); +}); + +test(async function handlesAnyPathSeparator(): Promise { + const leaf: string = `${root}\\levelx\\levely`; + await mkdirp(leaf); + const info: FileInfo = await lstat(leaf.replace(/\\/g, "/")); + assert(info.isDirectory()); + await removeAll(root); +}); + +test(async function failsNonDir(): Promise { + try { + await mkdirp("./test.ts/fest.fs"); + } catch (err) { + // TODO: assert caught DenoError of kind NOT_A_DIRECTORY or similar + assert(err); + } +}); diff --git a/mkdirp/mkdirp.ts b/mkdirp/mkdirp.ts deleted file mode 100644 index 9d27c751a..000000000 --- a/mkdirp/mkdirp.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ErrorKind, FileInfo, lstat, mkdir, platform } from "deno"; - -const PATH_SEPARATOR: string = platform.os === "win" ? "\\" : "/"; - -export async function mkdirp(path: string, mode?: number): Promise { - for ( - let parts: string[] = path.split(/\/|\\/), - parts_len: number = parts.length, - level: string, - info: FileInfo, - i: number = 0; - i < parts_len; - i++ - ) { - level = parts.slice(0, i + 1).join(PATH_SEPARATOR); - try { - info = await lstat(level); - if (!info.isDirectory()) throw Error(`${level} is not a directory`); - } catch (err) { - if (err.kind !== ErrorKind.NotFound) throw err; - await mkdir(level, mode); - } - } -} diff --git a/mkdirp/readme.md b/mkdirp/readme.md deleted file mode 100644 index 48269aa28..000000000 --- a/mkdirp/readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# deno-mkdirp - -`mkdir -p` 4 `deno`. - -## Import - -```ts -import { mkdirp } from "https://deno.land/x/std/mkdirp/mkdirp.ts"; -``` - -## API - -Same as [`deno.mkdir`](https://deno.land/typedoc/index.html#mkdir). - -### `mkdirp(path: string, mode?: number) : Promise` - -Creates directories if they do not already exist and makes parent directories as needed. diff --git a/mkdirp/test.ts b/mkdirp/test.ts deleted file mode 100644 index a3a4fac03..000000000 --- a/mkdirp/test.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { cwd, lstat, makeTempDirSync, removeAll, FileInfo } from "deno"; -import { test, assert } from "../testing/mod.ts"; -import { mkdirp } from "./mkdirp.ts"; - -let root: string = `${cwd()}/${Date.now()}`; //makeTempDirSync(); - -test(async function createsNestedDirs(): Promise { - const leaf: string = `${root}/levelx/levely`; - await mkdirp(leaf); - const info: FileInfo = await lstat(leaf); - assert(info.isDirectory()); - await removeAll(root); -}); - -test(async function handlesAnyPathSeparator(): Promise { - const leaf: string = `${root}\\levelx\\levely`; - await mkdirp(leaf); - const info: FileInfo = await lstat(leaf.replace(/\\/g, "/")); - assert(info.isDirectory()); - await removeAll(root); -}); - -test(async function failsNonDir(): Promise { - try { - await mkdirp("./test.ts/fest.fs"); - } catch (err) { - // TODO: assert caught DenoError of kind NOT_A_DIRECTORY or similar - assert(err); - } -}); diff --git a/test.ts b/test.ts index dd08cd141..8a3534457 100755 --- a/test.ts +++ b/test.ts @@ -7,10 +7,10 @@ import "examples/test.ts"; import "flags/test.ts"; import "logging/test.ts"; import "media_types/test.ts"; -import "mkdirp/test.ts"; import "net/bufio_test.ts"; import "net/http_test.ts"; import "net/textproto_test.ts"; +import "fs/mkdirp_test.ts"; import "fs/path/basename_test.ts"; import "fs/path/dirname_test.ts"; import "fs/path/extname_test.ts"; -- cgit v1.2.3