feat: minor path updates

Author: yowainwright

src/__tests__/utils.test.ts

@@ -4,7 +4,6 @@ import { ImportMap } from "@jspm/import-map";
 
 import {
   constructPath,
-  constructUrlPath,
   constructImportMap,
   createCacheMap,
   parseNodeModuleCachePath,
@@ -36,7 +35,7 @@ jest.mock("@jspm/import-map", () => {
 });
 
 test("constructPath minimal", () => {
-  const result = constructPath("foo");
+  const result = constructPath("foo", './');
   expect(result).toStrictEqual("./foo");
 });
 
@@ -45,22 +44,6 @@ test("constructPath with root", () => {
   expect(result).toStrictEqual("./bar/foo");
 });
 
-test("constructUrlPath minimal", () => {
-  const result = constructUrlPath();
-  expect(result).toStrictEqual("");
-});
-
-test("constructUrlPath with base url", () => {
-  const result = constructUrlPath("bar.txt", "file:///bin/foo/biz");
-  expect(result).toStrictEqual("/bin/foo/bar.txt");
-});
-
-test("constructUrlPath with base url and no debug", () => {
-  const spy = jest.spyOn(console, "error").mockImplementation(() => undefined);
-  constructUrlPath("bar.txt", "bin/foo/biz");
-  expect(spy).toHaveBeenCalled();
-});
-
 test("constructImportMap minimal", () => {
   const result = constructImportMap();
   expect(result).toBeInstanceOf(ImportMap);
@@ -81,7 +64,7 @@ test("constructImportMap should return ImportMap instance if path exists", () =>
 test("constructImportMap should use cwd if no path provided", () => {
   constructImportMap();
   expect(ImportMap).toHaveBeenCalledWith({
-    rootUrl: process.cwd(),
+    rootUrl: `file://${process.cwd()}`,
     map: {},
   });
 });
@@ -101,7 +84,7 @@ test("createCacheMap.get should return cachePath if defined", () => {
 
 test("createCacheMap.get should return undefined if cachePath is not defined", () => {
   const cacheMap = createCacheMap();
-  expect(cacheMap.get("foo")).toBeUndefined();
+  expect(cacheMap.get("foo")).toEqual("foo");
 });
 
 test("createCacheMap.set should set cachePath and modulePath", () => {

src/config.ts

@@ -1,5 +1,5 @@
 import { IS_DEBUGGING } from "src/constants";
-import { constructPath, constructUrlPath, createCacheMap } from "src/utils";
+import { constructPath, createCacheMap } from "src/utils";
 
 /**
  * ******************************************************
@@ -12,5 +12,5 @@ import { constructPath, constructUrlPath, createCacheMap } from "src/utils";
  */
 const root = process.cwd();
 export const cacheMap = createCacheMap(IS_DEBUGGING);
-export const cache = constructPath('.cache', root);
+export const cache = constructPath(".cache", root);
 export const nodeImportMapPath = constructPath("node.importmap", root);

src/utils.ts

@@ -1,6 +1,5 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
 import fetch from "node-fetch";
 import { ImportMap } from "@jspm/import-map";
 import { CreateCacheMapFactory } from "src/types";
@@ -33,25 +32,6 @@ const cwd = process.cwd();
 export const constructPath = (path: string, root = cwd) => {
   const out = join(root, path);
   return out;
-}
-
-/**
- * constructUrlPath
- * @description a convenience function to construct a url path
- * @param {string} file
- * @param {string} url
- * @param {boolean} debug
- * @returns {string}
- */
-export const constructUrlPath = (file = '', url: string = cwd) => {
-  try {
-    const path = new URL(`file://${url}/${file}`);
-    const out = fileURLToPath(path.href);
-    return out;
-  } catch (err) {
-    log.error("constructUrlPath:error:", { err });
-    return "";
-  }
 };
 
 /**
@@ -118,7 +98,6 @@ export const parseNodeModuleCachePath = async (modulePath: string, cachePath: st
   try {
     if (existsSync(cachePath)) return cachePath;
     const resp = await fetch(modulePath);
-    console.log({ resp });
     if (!resp.ok) throw Error(`404: Module not found: ${modulePath}`);
     const nodeModuleCode = await resp.text();
     const dirPath = dirname(cachePath);