Small fixes

szmarczak · May 8, 2020 · 6daaea9 · 6daaea9
1 parent e912543
commit 6daaea9
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/source/hosts-resolver.js b/source/hosts-resolver.js
@@ -17,11 +17,11 @@ const fileOptions = {
 const whitespaceRegExp = /\s+/g;
 
 class HostsResolver {
-	constructor({watching, customHostsPath}) {
+	constructor({watching, customHostsPath = hostsPath}) {
 		this._hostsPath = customHostsPath;
 		this._error = null;
 		this._watcher = null;
-		this._watching = Boolean(watching);
+		this._watching = watching;
 		this._hosts = {};
 
 		this._init();
@@ -135,23 +135,22 @@ class HostsResolver {
 
 const resolvers = {};
 
-const getResolver = (options = {
-	watching: false,
-	customHostsPath: hostsPath
-}) => {
-	if (typeof options.customHostsPath !== 'string') {
-		options.customHostsPath = false;
+const getResolver = ({customHostsPath, watching}) => {
+	if (customHostsPath !== undefined && typeof customHostsPath !== 'string') {
+		customHostsPath = false;
 	}
 
-	const id = `${options.customHostsPath}:${Boolean(options.watching)}`;
+	watching = Boolean(watching);
+
+	const id = `${customHostsPath}:${watching}`;
 
 	let resolver = resolvers[id];
 
 	if (resolver) {
 		return resolver;
 	}
 
-	resolver = new HostsResolver(options);
+	resolver = new HostsResolver({customHostsPath, watching});
 	resolvers[id] = resolver;
 
 	return resolver;