refactor Adapt as a function (with OSPaths property)

rivy · Jan 31, 2021 · 04509bb · 04509bb
1 parent faab2ac
commit 04509bb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 43 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,9 +1,9 @@
 // spell-checker:ignore maint rivy
-import { OSPathsAdaptionBuilder_ } from './lib/OSPaths';
+import { Adapt, OSPaths } from './lib/OSPaths';
 import { adapter } from './platform-adapters/node';
 
-const default_ = OSPathsAdaptionBuilder_(adapter);
-export default default_;
+const default_ = Adapt(adapter).OSPaths as OSPaths;
+export { OSPaths, default_ as default };
 
 const haveModuleExports_ = typeof module === 'object' && module.exports;
 // ## maint ~ [2020-12-23; rivy] `else` clause *is* tested, but coverage is not visible via `nyc` (currently unable to instrument ESM/.mjs correctly)

diff --git a/src/lib/OSPaths.ts b/src/lib/OSPaths.ts
@@ -20,23 +20,16 @@ function isEmpty(s: string | null | undefined): boolean {
 	return !s; // reminder: JS "falsey" == [undefined, null, NaN, 0, '', false]
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
-namespace Adapt {
-	export function isWinOS(adapter_: Platform.Adapter) {
-		return /^win/i.test(adapter_.process.platform);
-	}
+export function Adapt(adapter_: Platform.Adapter) {
+	const { env, os, path } = adapter_;
 
-	export function normalizePath(adapter_: Platform.Adapter) {
-		return (path_: string | undefined): string | undefined => {
-			return path_ ? adapter_.path.normalize(adapter_.path.join(path_, '.')) : void 0;
-		};
-	}
+	const isWinOS = /^win/i.test(adapter_.process.platform);
 
-	export function home(adapter_: Platform.Adapter) {
-		const { env, os, path } = adapter_;
-
-		const normalizePath = Adapt.normalizePath(adapter_);
+	function normalizePath(path_: string | undefined): string | undefined {
+		return path_ ? adapter_.path.normalize(adapter_.path.join(path_, '.')) : void 0;
+	}
 
+	function home() {
 		const posix = () =>
 			normalizePath((typeof os.homedir === 'function' ? os.homedir() : void 0) || env.get('HOME'));
 
@@ -52,19 +45,15 @@ namespace Adapt {
 			return normalizePath(priorityList.find((v) => !isEmpty(v)));
 		};
 
-		return Adapt.isWinOS(adapter_) ? windows : posix;
+		return isWinOS ? windows() : posix();
 	}
 
-	export function temp(adapter_: Platform.Adapter) {
-		const { env, os, path } = adapter_;
-
-		const normalizePath = Adapt.normalizePath(adapter_);
-
+	function temp() {
 		function joinPathToBase(base: string | undefined, segments: readonly string[]) {
 			return base ? path.join(base, ...segments) : void 0;
 		}
 
-		const posix = () => {
+		function posix() {
 			const fallback = '/tmp';
 			const priorityList = [
 				typeof os.tmpdir === 'function' ? os.tmpdir() : void 0,
@@ -73,39 +62,41 @@ namespace Adapt {
 				env.get('TMP'),
 			];
 			return normalizePath(priorityList.find((v) => !isEmpty(v))) || fallback;
-		};
+		}
 
-		const windows = () => {
+		function windows() {
 			const fallback = 'C:\\Temp';
 			const priorityListLazy = [
 				os.tmpdir,
 				() => env.get('TEMP'),
 				() => env.get('TMP'),
 				() => joinPathToBase(env.get('LOCALAPPDATA'), ['Temp']),
-				() => joinPathToBase(Adapt.home(adapter_)(), ['AppData', 'Local', 'Temp']),
+				() => joinPathToBase(home(), ['AppData', 'Local', 'Temp']),
 				() => joinPathToBase(env.get('ALLUSERSPROFILE'), ['Temp']),
 				() => joinPathToBase(env.get('SystemRoot'), ['Temp']),
 				() => joinPathToBase(env.get('windir'), ['Temp']),
 				() => joinPathToBase(env.get('SystemDrive'), ['\\', 'Temp']),
 			];
 			const v = priorityListLazy.find((v) => v && !isEmpty(v()));
 			return (v && normalizePath(v())) || fallback;
-		};
+		}
 
-		return Adapt.isWinOS(adapter_) ? windows : posix;
+		return isWinOS ? windows() : posix();
 	}
-}
 
-export function OSPathsAdaptionBuilder_(adapter_: Platform.Adapter): OSPaths {
-	function OSPaths(): OSPaths {
-		return obj as OSPaths;
+	// eslint-disable-next-line functional/no-class
+	class OSPaths_ {
+		constructor() {
+			function OSPaths(): OSPaths {
+				return new OSPaths_() as OSPaths;
+			}
+
+			OSPaths.home = home;
+			OSPaths.temp = temp;
+
+			return OSPaths;
+		}
 	}
-	const home = Adapt.home(adapter_);
-	const temp = Adapt.temp(adapter_);
-
-	const obj = Object.assign(OSPaths, {
-		home,
-		temp,
-	}) as OSPaths;
-	return obj as OSPaths;
+
+	return { OSPaths: new OSPaths_() as OSPaths };
 }
diff --git a/src/mod.deno.ts b/src/mod.deno.ts
@@ -1,11 +1,11 @@
 // spell-checker:ignore Deno
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import { OSPathsAdaptionBuilder_ } from '../dist/esm/lib/OSPaths.mjs';
+import { Adapt } from '../dist/esm/lib/OSPaths.mjs';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { adapter } from './platform-adapters/deno.deno.ts';
 
-const default_ = OSPathsAdaptionBuilder_(adapter);
+const default_ = Adapt(adapter).OSPaths;
 export default default_;