Build(deps-dev): bump @types/node from 13.13.5 to 14.0.1 (#446)

* Build(deps-dev): bump @types/node from 13.13.5 to 14.0.1 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 13.13.5 to 14.0.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update writeFileAtomic.ts * fix some types * process.umask() is deprecated * Update mkdirs.ts * Update mkdirs.ts * fix umask issue Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: bdistin <bdistin@gmail.com>
bdistin · May 13, 2020 · bbe11c6 · bbe11c6
1 parent f6401fc
commit bbe11c6
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@types/node": "^13.13.5",
+    "@types/node": "^14.0.1",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
     "ava": "^3.8.2",

diff --git a/src/nextra/mkdirs.ts b/src/nextra/mkdirs.ts
@@ -1,7 +1,7 @@
 import { resolve, dirname } from 'path';
 import { promises as fsp } from 'fs';
 
-import { isWindows, invalidWin32Path } from '../utils/util';
+import { isWindows, invalidWin32Path, umask } from '../utils/util';
 
 /**
  * @typedef {Object} MkdirsOptions
@@ -63,7 +63,7 @@ export async function mkdirs(path: string, options?: MkdirsOptions | number): Pr
 function resolveOptions(options: MkdirsOptions | number = {}): MkdirsOptions {
 	return {
 		// eslint-disable-next-line no-bitwise
-		mode: typeof options === 'number' ? options : options.mode || 0o0777
+		mode: typeof options === 'number' ? options : options.mode || 0o0777 & ~umask
 	};
 }
 

diff --git a/src/nextra/outputFile.ts b/src/nextra/outputFile.ts
@@ -1,7 +1,7 @@
 import { dirname } from 'path';
 import { promises as fsp } from 'fs';
 
-import { writeFileAtomic, WriteOptions } from './writeFileAtomic';
+import { writeFileAtomic, WriteOptions, BaseEncodingOptions } from './writeFileAtomic';
 import { mkdirs } from './mkdirs';
 
 /**
@@ -14,8 +14,8 @@ import { mkdirs } from './mkdirs';
  * @param atomic {description}
  */
 export async function outputFile(file: string, data: string | Buffer | Uint8Array, atomic?: boolean): Promise<void>;
-export async function outputFile(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | string, atomic?: boolean): Promise<void>;
-export async function outputFile(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | string | boolean, atomic = false): Promise<void> {
+export async function outputFile(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | BaseEncodingOptions, atomic?: boolean): Promise<void>;
+export async function outputFile(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | BaseEncodingOptions | boolean, atomic = false): Promise<void> {
 	if (typeof options === 'boolean') [atomic, options] = [options, {}];
 
 	await mkdirs(dirname(file));

diff --git a/src/nextra/outputFileAtomic.ts b/src/nextra/outputFileAtomic.ts
@@ -1,5 +1,5 @@
 import { outputFile } from './outputFile';
-import { WriteOptions } from './writeFileAtomic';
+import { WriteOptions, BaseEncodingOptions } from './writeFileAtomic';
 
 /**
  * Writes a file to disk, creating all directories needed to meet the filepath provided atomically.
@@ -10,6 +10,6 @@ import { WriteOptions } from './writeFileAtomic';
  * @param options The write options or the encoding string.
  * @returns {Promise<void>}
  */
-export function outputFileAtomic(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | string): Promise<void> {
+export function outputFileAtomic(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | BaseEncodingOptions): Promise<void> {
 	return outputFile(file, data, options, true);
 }
diff --git a/src/nextra/writeFileAtomic.ts b/src/nextra/writeFileAtomic.ts
@@ -3,6 +3,8 @@ import { promises as fsp } from 'fs';
 import { tempFile } from '../utils/util';
 import { move } from './move';
 
+export type BaseEncodingOptions = 'ascii' | 'utf8' | 'utf-8' | 'utf16le' | 'ucs2' | 'ucs-2' | 'base64' | 'latin1' | 'binary' | 'hex' | null | undefined;
+
 /**
  * @typedef {Object} WriteOptions
  * @memberof fsn/nextra
@@ -11,7 +13,7 @@ import { move } from './move';
  * @property {string} [flag = 'w'] The flag
  */
 export interface WriteOptions {
-	encoding?: string;
+	encoding?: BaseEncodingOptions;
 	mode?: number;
 	flag?: string;
 }
@@ -23,7 +25,7 @@ export interface WriteOptions {
  * @param data The data to write to file
  * @param options The write options or the encoding string.
  */
-export async function writeFileAtomic(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | string): Promise<void> {
+export async function writeFileAtomic(file: string, data: string | Buffer | Uint8Array, options?: WriteOptions | BaseEncodingOptions): Promise<void> {
 	const tempPath = tempFile();
 	await fsp.writeFile(tempPath, data, options);
 	await move(tempPath, file, { overwrite: true });

diff --git a/src/nextra/writeJSON.ts b/src/nextra/writeJSON.ts
@@ -1,6 +1,6 @@
 import { promises as fsp } from 'fs';
 
-import { writeFileAtomic } from './writeFileAtomic';
+import { writeFileAtomic, BaseEncodingOptions } from './writeFileAtomic';
 
 /**
  * @typedef {Object} JsonOptions
@@ -14,7 +14,7 @@ import { writeFileAtomic } from './writeFileAtomic';
 export interface JsonOptions {
 	replacer?: (key: string, value: any) => any;
 	spaces?: string | number;
-	encoding?: string;
+	encoding?: BaseEncodingOptions;
 	mode?: number;
 	flag?: string;
 }

diff --git a/src/utils/util.ts b/src/utils/util.ts
@@ -4,6 +4,11 @@ import { randomBytes } from 'crypto';
 import { tmpdir } from 'os';
 import { pipeline } from 'stream';
 
+export const umask = process.umask(0o022);
+
+// Fix umask back to original value
+process.umask(umask);
+
 export const isWindows: boolean = process.platform === 'win32';
 
 export const invalidWin32Path = (myPath: string): boolean => {

diff --git a/test/lib/index.ts b/test/lib/index.ts
@@ -3,6 +3,11 @@ import { randomBytes } from 'crypto';
 import { join } from 'path';
 import * as fs from 'fs';
 
+export const umask = process.umask(0o022);
+
+// Fix umask back to original value
+process.umask(umask);
+
 export const isWindows: boolean = process.platform === 'win32';
 
 export const uuid = (): string => {

diff --git a/test/mkdirs.ts b/test/mkdirs.ts
@@ -1,6 +1,6 @@
 import ava from 'ava';
 import { promises as fs } from 'fs';
-import { tempDirLoc, tempDir, tempFile, isWindows } from './lib';
+import { tempDirLoc, tempDir, tempFile, isWindows, umask } from './lib';
 import * as nextra from '../dist';
 
 ava('Pre-Existing Directory', async (test): Promise<void> => {
@@ -35,7 +35,7 @@ ava('Standard Usage with full permissions', async (test): Promise<void> => {
 	test.is(retVal, undefined);
 	test.true(stats.isDirectory());
 	// eslint-disable-next-line no-bitwise
-	test.is(stats.mode & 0o0777, 0o0666 & ~process.umask());
+	test.is(stats.mode & 0o0777, 0o0666 & ~umask);
 });
 
 ava('Recursive', async (test): Promise<void> => {

diff --git a/yarn.lock b/yarn.lock
@@ -214,10 +214,10 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/node@*", "@types/node@^13.13.5":
-  version "13.13.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz#96ec3b0afafd64a4ccea9107b75bf8489f0e5765"
-  integrity sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g==
+"@types/node@*", "@types/node@^14.0.1":
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
+  integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"