.github/funding.yml

@@ -0,0 +1,4 @@
+github: sindresorhus
+open_collective: sindresorhus
+tidelift: npm/make-dir
+custom: https://sindresorhus.com/donate

.github/security.md

@@ -0,0 +1,3 @@
+# Security Policy
+
+To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.

.github/workflows/main.yml

@@ -0,0 +1,30 @@
+name: CI
+on:
+  - push
+  - pull_request
+jobs:
+  test:
+    name: Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version:
+          - 14
+          - 12
+          - 10
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm test
+      - uses: codecov/codecov-action@v1
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == 14
+        with:
+          fail_ci_if_error: true

index.d.ts

@@ -1,39 +1,66 @@
 /// <reference types="node"/>
 import * as fs from 'fs';
 
-export interface Options {
+declare namespace makeDir {
+	interface Options {
+		/**
+		Directory [permissions](https://x-team.com/blog/file-system-permissions-umask-node-js/).
+
+		@default 0o777
+		*/
+		readonly mode?: number;
+
+		/**
+		Use a custom `fs` implementation. For example [`graceful-fs`](https://github.com/isaacs/node-graceful-fs).
+
+		Using a custom `fs` implementation will block the use of the native `recursive` option if `fs.mkdir` or `fs.mkdirSync` is not the native function.
+
+		@default require('fs')
+		*/
+		readonly fs?: typeof fs;
+	}
+}
+
+declare const makeDir: {
 	/**
-	 * Directory [permissions](https://x-team.com/blog/file-system-permissions-umask-node-js/).
-	 *
-	 * @default 0o777 & (~process.umask())
-	 */
-	readonly mode?: number;
+	Make a directory and its parents if needed - Think `mkdir -p`.
+
+	@param path - Directory to create.
+	@returns The path to the created directory.
+
+	@example
+	```
+	import makeDir = require('make-dir');
+
+	(async () => {
+		const path = await makeDir('unicorn/rainbow/cake');
+
+		console.log(path);
+		//=> '/Users/sindresorhus/fun/unicorn/rainbow/cake'
+
+		// Multiple directories:
+		const paths = await Promise.all([
+			makeDir('unicorn/rainbow'),
+			makeDir('foo/bar')
+		]);
+
+		console.log(paths);
+		// [
+		// 	'/Users/sindresorhus/fun/unicorn/rainbow',
+		// 	'/Users/sindresorhus/fun/foo/bar'
+		// ]
+	})();
+	```
+	*/
+	(path: string, options?: makeDir.Options): Promise<string>;
 
 	/**
-	 * Use a custom `fs` implementation. For example [`graceful-fs`](https://github.com/isaacs/node-graceful-fs).
-	 *
-	 * Using a custom `fs` implementation will block the use of the native `recursive` option if `fs.mkdir` or `fs.mkdirSync` is not the native function.
-	 *
-	 * @default require('fs')
-	 */
-	readonly fs?: typeof fs;
-}
+	Synchronously make a directory and its parents if needed - Think `mkdir -p`.
+
+	@param path - Directory to create.
+	@returns The path to the created directory.
+	*/
+	sync(path: string, options?: makeDir.Options): string;
+};
 
-/**
- * Make a directory and its parents if needed - Think `mkdir -p`.
- *
- * @param path - Directory to create.
- * @returns A `Promise` for the path to the created directory.
- */
-export default function makeDir(
-	path: string,
-	options?: Options
-): Promise<string>;
-
-/**
- * Synchronously make a directory and its parents if needed - Think `mkdir -p`.
- *
- * @param path - Directory to create.
- * @returns The path to the created directory.
- */
-export function sync(path: string, options?: Options): string;
+export = makeDir;

index.js

@@ -1,15 +1,10 @@
 'use strict';
 const fs = require('fs');
 const path = require('path');
-const pify = require('pify');
-const semver = require('semver');
+const {promisify} = require('util');
+const semverGte = require('semver/functions/gte');
 
-const defaults = {
-	mode: 0o777 & (~process.umask()),
-	fs
-};
-
-const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
+const useNativeRecursiveOption = semverGte(process.version, '10.12.0');
 
 // https://github.com/nodejs/node/issues/8987
 // https://github.com/libuv/libuv/pull/1088
@@ -25,6 +20,18 @@ const checkPath = pth => {
 	}
 };
 
+const processOptions = options => {
+	const defaults = {
+		mode: 0o777,
+		fs
+	};
+
+	return {
+		...defaults,
+		...options
+	};
+};
+
 const permissionError = pth => {
 	// This replicates the exception of `fs.mkdir` with native the
 	// `recusive` option when run on an invalid drive under Windows.
@@ -36,60 +43,69 @@ const permissionError = pth => {
 	return error;
 };
 
-const makeDir = (input, options) => Promise.resolve().then(() => {
+const makeDir = async (input, options) => {
 	checkPath(input);
-	options = Object.assign({}, defaults, options);
+	options = processOptions(options);
 
-	// TODO: Use util.promisify when targeting Node.js 8
-	const mkdir = pify(options.fs.mkdir);
-	const stat = pify(options.fs.stat);
+	const mkdir = promisify(options.fs.mkdir);
+	const stat = promisify(options.fs.stat);
 
 	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
 		const pth = path.resolve(input);
 
-		return mkdir(pth, {
+		await mkdir(pth, {
 			mode: options.mode,
 			recursive: true
-		}).then(() => pth);
+		});
+
+		return pth;
 	}
 
-	const make = pth => {
-		return mkdir(pth, options.mode)
-			.then(() => pth)
-			.catch(error => {
-				if (error.code === 'EPERM') {
+	const make = async pth => {
+		try {
+			await mkdir(pth, options.mode);
+
+			return pth;
+		} catch (error) {
+			if (error.code === 'EPERM') {
+				throw error;
+			}
+
+			if (error.code === 'ENOENT') {
+				if (path.dirname(pth) === pth) {
+					throw permissionError(pth);
+				}
+
+				if (error.message.includes('null bytes')) {
 					throw error;
 				}
 
-				if (error.code === 'ENOENT') {
-					if (path.dirname(pth) === pth) {
-						throw permissionError(pth);
-					}
+				await make(path.dirname(pth));
 
-					if (error.message.includes('null bytes')) {
-						throw error;
-					}
+				return make(pth);
+			}
 
-					return make(path.dirname(pth)).then(() => make(pth));
+			try {
+				const stats = await stat(pth);
+				if (!stats.isDirectory()) {
+					throw new Error('The path is not a directory');
 				}
+			} catch {
+				throw error;
+			}
 
-				return stat(pth)
-					.then(stats => stats.isDirectory() ? pth : Promise.reject())
-					.catch(() => {
-						throw error;
-					});
-			});
+			return pth;
+		}
 	};
 
 	return make(path.resolve(input));
-});
+};
 
 module.exports = makeDir;
-module.exports.default = makeDir;
 
 module.exports.sync = (input, options) => {
 	checkPath(input);
-	options = Object.assign({}, defaults, options);
+	options = processOptions(options);
 
 	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
 		const pth = path.resolve(input);
@@ -127,7 +143,7 @@ module.exports.sync = (input, options) => {
 				if (!options.fs.statSync(pth).isDirectory()) {
 					throw new Error('The path is not a directory');
 				}
-			} catch (_) {
+			} catch {
 				throw error;
 			}
 		}

index.test-d.ts

@@ -1,13 +1,14 @@
-import {expectType} from 'tsd-check';
-import makeDir, {sync as makeDirSync} from '.';
+import {expectType} from 'tsd';
+import makeDir = require('.');
+import {sync as makeDirSync} from '.';
 import * as fs from 'fs';
 import * as gfs from 'graceful-fs';
 
 // MakeDir
 expectType<Promise<string>>(makeDir('path/to/somewhere'));
 
 expectType<Promise<string>>(
-	makeDir('path/to/somewhere', {mode: parseInt('777', 8)})
+	makeDir('path/to/somewhere', {mode: 0o777})
 );
 expectType<Promise<string>>(makeDir('path/to/somewhere', {fs}));
 expectType<Promise<string>>(makeDir('path/to/somewhere', {fs: gfs}));
@@ -16,7 +17,7 @@ expectType<Promise<string>>(makeDir('path/to/somewhere', {fs: gfs}));
 expectType<string>(makeDirSync('path/to/somewhere'));
 
 expectType<string>(
-	makeDirSync('path/to/somewhere', {mode: parseInt('777', 8)})
+	makeDirSync('path/to/somewhere', {mode: 0o777})
 );
 expectType<string>(makeDirSync('path/to/somewhere', {fs}));
 expectType<string>(makeDirSync('path/to/somewhere', {fs: gfs}));

license

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: