@stryke/path 0.4.0 → 0.4.2

package/README.md

@@ -44,29 +44,31 @@ This package is part of Storm Software's **🌩️ Stryke** monorepo. Stryke pac
 
 <!-- END header -->
 
-# Stryke - Path Utilities
+# Stryke - Path Helpers
 
 A package containing various utilities that expand the functionality of
-NodeJs&#39;s \`path\` module
+NodeJs's built-in \`path\` module
 
 <!-- START doctoc -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 ## Table of Contents
 
-- [Installing](#installing)
-- [Reduced Package Size](#reduced-package-size)
-- [Development](#development)
-  - [Building](#building)
-  - [Running unit tests](#running-unit-tests)
-  - [Linting](#linting)
-- [Storm Workspaces](#storm-workspaces)
-- [Roadmap](#roadmap)
-- [Support](#support)
-- [License](#license)
-- [Changelog](#changelog)
-- [Contributing](#contributing)
-- [Contributors](#contributors)
+- [Stryke - Path Helpers](#stryke---path-helpers)
+  - [Table of Contents](#table-of-contents)
+  - [Installing](#installing)
+  - [Reduced Package Size](#reduced-package-size)
+  - [Development](#development)
+    - [Building](#building)
+    - [Running unit tests](#running-unit-tests)
+    - [Linting](#linting)
+  - [Storm Workspaces](#storm-workspaces)
+  - [Roadmap](#roadmap)
+  - [Support](#support)
+  - [License](#license)
+  - [Changelog](#changelog)
+  - [Contributing](#contributing)
+  - [Contributors](#contributors)
 
 <!-- END doctoc -->
 

package/dist/{normalize-path.cjs → correct-path.cjs}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.correctPaths = void 0;
+exports.correctPath = correctPath;
 exports.normalizeString = normalizeString;
 exports.normalizeWindowsPath = normalizeWindowsPath;
 exports.slash = slash;
@@ -13,23 +13,22 @@ function slash(e) {
 }
 const c = /^[A-Z]:\//i;
 function normalizeWindowsPath(e = "") {
-  return e && e.replace(/\\/g, "/").replace(c, i => i.toUpperCase());
+  return e && e.replace(/\\/g, "/").replace(c, s => s.toUpperCase());
 }
 const u = /^[/\\]{2}/,
   E = /^[A-Z]:$/i;
-const correctPaths = e => {
+function correctPath(e) {
   if (!e || e.length === 0) return ".";
   e = normalizeWindowsPath(e);
-  const i = e.match(u),
+  const s = e.match(u),
     n = (0, _isFile.isAbsolutePath)(e),
     t = e[e.length - 1] === "/";
-  return e = normalizeString(e, !n), e.length === 0 ? n ? "/" : t ? "./" : "." : (t && (e += "/"), E.test(e) && (e += "/"), i ? n ? `//${e}` : `//./${e}` : n && !(0, _isFile.isAbsolutePath)(e) ? `/${e}` : e);
-};
-exports.correctPaths = correctPaths;
-function normalizeString(e, i) {
+  return e = normalizeString(e, !n), e.length === 0 ? n ? "/" : t ? "./" : "." : (t && (e += "/"), E.test(e) && (e += "/"), s ? n ? `//${e}` : `//./${e}` : n && !(0, _isFile.isAbsolutePath)(e) ? `/${e}` : e);
+}
+function normalizeString(e, s) {
   let n = "",
     t = 0,
-    s = -1,
+    i = -1,
     r = 0,
     o = null;
   for (let l = 0; l <= e.length; ++l) {
@@ -38,20 +37,20 @@ function normalizeString(e, i) {
       o = "/";
     }
     if (o === "/") {
-      if (!(s === l - 1 || r === 1)) if (r === 2) {
+      if (!(i === l - 1 || r === 1)) if (r === 2) {
         if (n.length < 2 || t !== 2 || n[n.length - 1] !== "." || n[n.length - 2] !== ".") {
           if (n.length > 2) {
             const f = n.lastIndexOf("/");
-            f === -1 ? (n = "", t = 0) : (n = n.slice(0, f), t = n.length - 1 - n.lastIndexOf("/")), s = l, r = 0;
+            f === -1 ? (n = "", t = 0) : (n = n.slice(0, f), t = n.length - 1 - n.lastIndexOf("/")), i = l, r = 0;
             continue;
           } else if (n.length > 0) {
-            n = "", t = 0, s = l, r = 0;
+            n = "", t = 0, i = l, r = 0;
             continue;
           }
         }
-        i && (n += n.length > 0 ? "/.." : "..", t = 2);
-      } else n.length > 0 ? n += `/${e.slice(s + 1, l)}` : n = e.slice(s + 1, l), t = l - s - 1;
-      s = l, r = 0;
+        s && (n += n.length > 0 ? "/.." : "..", t = 2);
+      } else n.length > 0 ? n += `/${e.slice(i + 1, l)}` : n = e.slice(i + 1, l), t = l - i - 1;
+      i = l, r = 0;
     } else o === "." && r !== -1 ? ++r : r = -1;
   }
   return n;

package/dist/{normalize-path.d.ts → correct-path.d.ts}

@@ -6,7 +6,13 @@
  */
 export declare function slash(str: string): string;
 export declare function normalizeWindowsPath(input?: string): string;
-export declare const correctPaths: (path?: string) => string;
+/**
+ * Corrects/normalized a file path.
+ *
+ * @param path - The path to correct.
+ * @returns The corrected path.
+ */
+export declare function correctPath(path?: string): string;
 /**
  * Resolves a string path, resolving '.' and '.' segments and allowing paths above the root.
  *

package/dist/correct-path.mjs

@@ -0,0 +1 @@
+import{isAbsolutePath as g}from"./is-file";export function slash(e){return e.replace(/\\/g,"/")}const c=/^[A-Z]:\//i;export function normalizeWindowsPath(e=""){return e&&e.replace(/\\/g,"/").replace(c,s=>s.toUpperCase())}const u=/^[/\\]{2}/,E=/^[A-Z]:$/i;export function correctPath(e){if(!e||e.length===0)return".";e=normalizeWindowsPath(e);const s=e.match(u),n=g(e),t=e[e.length-1]==="/";return e=normalizeString(e,!n),e.length===0?n?"/":t?"./":".":(t&&(e+="/"),E.test(e)&&(e+="/"),s?n?`//${e}`:`//./${e}`:n&&!g(e)?`/${e}`:e)}export function normalizeString(e,s){let n="",t=0,i=-1,r=0,o=null;for(let l=0;l<=e.length;++l){if(l<e.length)o=e[l];else{if(o==="/")break;o="/"}if(o==="/"){if(!(i===l-1||r===1))if(r===2){if(n.length<2||t!==2||n[n.length-1]!=="."||n[n.length-2]!=="."){if(n.length>2){const f=n.lastIndexOf("/");f===-1?(n="",t=0):(n=n.slice(0,f),t=n.length-1-n.lastIndexOf("/")),i=l,r=0;continue}else if(n.length>0){n="",t=0,i=l,r=0;continue}}s&&(n+=n.length>0?"/..":"..",t=2)}else n.length>0?n+=`/${e.slice(i+1,l)}`:n=e.slice(i+1,l),t=l-i-1;i=l,r=0}else o==="."&&r!==-1?++r:r=-1}return n}

package/dist/file-path-fns.cjs

@@ -16,19 +16,19 @@ exports.renameFile = renameFile;
 exports.resolvePath = resolvePath;
 exports.resolvePaths = resolvePaths;
 var _base = require("@stryke/types/base");
-var _getWorkspaceRoot = require("../workspace/get-workspace-root");
+var _correctPath = require("./correct-path.cjs");
+var _getWorkspaceRoot = require("./get-workspace-root.cjs");
 var _isFile = require("./is-file.cjs");
 var _joinPaths = require("./join-paths.cjs");
-var _normalizePath = require("./normalize-path.cjs");
 function findFileName(n, {
   requireExtension: e,
   withExtension: r
 } = {}) {
-  const t = (0, _normalizePath.normalizeWindowsPath)(n)?.split(n?.includes("\\") ? "\\" : "/")?.pop() ?? "";
+  const t = (0, _correctPath.normalizeWindowsPath)(n)?.split(n?.includes("\\") ? "\\" : "/")?.pop() ?? "";
   return e === !0 && !t.includes(".") ? _base.EMPTY_STRING : r === !1 && t.includes(".") ? t.split(".").slice(-1).join(".") || _base.EMPTY_STRING : t;
 }
 function findFilePath(n) {
-  const e = (0, _normalizePath.normalizeWindowsPath)(n);
+  const e = (0, _correctPath.normalizeWindowsPath)(n);
   return e.replace(findFileName(e, {
     requireExtension: !0
   }), "");
@@ -47,7 +47,7 @@ function findFolderName(n) {
 }
 function findFileExtension(n) {
   if (n === "..") return "";
-  const e = /.(\.[^./]+|\.)$/.exec((0, _normalizePath.normalizeWindowsPath)(n));
+  const e = /.(\.[^./]+|\.)$/.exec((0, _correctPath.normalizeWindowsPath)(n));
   return e && e[1] || _base.EMPTY_STRING;
 }
 function hasFileName(n) {
@@ -57,17 +57,17 @@ function hasFilePath(n) {
   return !!findFilePath(n);
 }
 function resolvePath(n, e = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
-  const r = (0, _normalizePath.normalizeWindowsPath)(n).split("/");
+  const r = (0, _correctPath.normalizeWindowsPath)(n).split("/");
   let t = "",
     i = !1;
   for (let o = r.length - 1; o >= -1 && !i; o--) {
     const s = o >= 0 ? r[o] : e;
     !s || s.length === 0 || (t = (0, _joinPaths.joinPaths)(s, t), i = (0, _isFile.isAbsolutePath)(s));
   }
-  return t = (0, _normalizePath.normalizeString)(t, !i), i && !(0, _isFile.isAbsolutePath)(t) ? `/${t}` : t.length > 0 ? t : ".";
+  return t = (0, _correctPath.normalizeString)(t, !i), i && !(0, _isFile.isAbsolutePath)(t) ? `/${t}` : t.length > 0 ? t : ".";
 }
 function resolvePaths(...n) {
-  return resolvePath((0, _joinPaths.joinPaths)(...n.map(e => (0, _normalizePath.normalizeWindowsPath)(e))));
+  return resolvePath((0, _joinPaths.joinPaths)(...n.map(e => (0, _correctPath.normalizeWindowsPath)(e))));
 }
 function relativePath(n, e) {
   const r = resolvePath(n).replace(/^\/([A-Z]:)?$/i, "$1").split("/"),
@@ -85,7 +85,7 @@ function relativeToWorkspaceRoot(n) {
 }
 function parsePath(n) {
   const e = /^[/\\]|^[a-z]:[/\\]/i.exec(n)?.[0]?.replace(/\\/g, "/") || "",
-    r = (0, _normalizePath.normalizeWindowsPath)(n),
+    r = (0, _correctPath.normalizeWindowsPath)(n),
     t = r.replace(/\/$/, "").split("/").slice(0, -1);
   t.length === 1 && /^[A-Z]:$/i.test(t[0]) && (t[0] += "/");
   const i = findFolderName(r),

package/dist/file-path-fns.d.ts

@@ -83,7 +83,7 @@ export declare function hasFilePath(filePath: string): boolean;
  * @param cwd - The current working directory
  * @returns The resolved path
  */
-export declare function resolvePath(path: string, cwd?: any): string;
+export declare function resolvePath(path: string, cwd?: string): string;
 /**
  * Resolve the file path to an absolute path.
  *

package/dist/file-path-fns.mjs

@@ -1 +1 @@
-import{EMPTY_STRING as a}from"@stryke/types/base";import{getWorkspaceRoot as f}from"../workspace/get-workspace-root";import{isAbsolutePath as c}from"./is-file";import{joinPaths as u}from"./join-paths";import{normalizeString as p,normalizeWindowsPath as l}from"./normalize-path";export function findFileName(n,{requireExtension:e,withExtension:r}={}){const t=l(n)?.split(n?.includes("\\")?"\\":"/")?.pop()??"";return e===!0&&!t.includes(".")?a:r===!1&&t.includes(".")?t.split(".").slice(-1).join(".")||a:t}export function findFilePath(n){const e=l(n);return e.replace(findFileName(e,{requireExtension:!0}),"")}export function findFolderName(n){const e=findFilePath(n).split("/");let r="";for(let t=e.length-1;t>=0;t--){const i=e[t];if(i){r=i;break}}return r??a}export function findFileExtension(n){if(n==="..")return"";const e=/.(\.[^./]+|\.)$/.exec(l(n));return e&&e[1]||a}export function hasFileName(n){return!!findFileName(n)}export function hasFilePath(n){return!!findFilePath(n)}export function resolvePath(n,e=f()){const r=l(n).split("/");let t="",i=!1;for(let o=r.length-1;o>=-1&&!i;o--){const s=o>=0?r[o]:e;!s||s.length===0||(t=u(s,t),i=c(s))}return t=p(t,!i),i&&!c(t)?`/${t}`:t.length>0?t:"."}export function resolvePaths(...n){return resolvePath(u(...n.map(e=>l(e))))}export function relativePath(n,e){const r=resolvePath(n).replace(/^\/([A-Z]:)?$/i,"$1").split("/"),t=resolvePath(e).replace(/^\/([A-Z]:)?$/i,"$1").split("/");if(t[0][1]===":"&&r[0][1]===":"&&r[0]!==t[0])return t.join("/");const i=[...r];for(const o of i){if(t[0]!==o)break;r.shift(),t.shift()}return[...r.map(()=>".."),...t].join("/")}export function relativeToWorkspaceRoot(n){return relativePath(n,f())}export function parsePath(n){const e=/^[/\\]|^[a-z]:[/\\]/i.exec(n)?.[0]?.replace(/\\/g,"/")||"",r=l(n),t=r.replace(/\/$/,"").split("/").slice(0,-1);t.length===1&&/^[A-Z]:$/i.test(t[0])&&(t[0]+="/");const i=findFolderName(r),o=t.join("/")||(c(n)?"/":"."),s=findFileExtension(n);return{root:e,dir:o,base:i,ext:s,name:i.slice(0,i.length-s.length)}}export function renameFile(n,e){const r=parsePath(n);return u(r.dir,e.includes(".")?e:e+r.ext)}
+import{EMPTY_STRING as a}from"@stryke/types/base";import{normalizeString as p,normalizeWindowsPath as l}from"./correct-path";import{getWorkspaceRoot as f}from"./get-workspace-root";import{isAbsolutePath as c}from"./is-file";import{joinPaths as u}from"./join-paths";export function findFileName(n,{requireExtension:e,withExtension:r}={}){const t=l(n)?.split(n?.includes("\\")?"\\":"/")?.pop()??"";return e===!0&&!t.includes(".")?a:r===!1&&t.includes(".")?t.split(".").slice(-1).join(".")||a:t}export function findFilePath(n){const e=l(n);return e.replace(findFileName(e,{requireExtension:!0}),"")}export function findFolderName(n){const e=findFilePath(n).split("/");let r="";for(let t=e.length-1;t>=0;t--){const i=e[t];if(i){r=i;break}}return r??a}export function findFileExtension(n){if(n==="..")return"";const e=/.(\.[^./]+|\.)$/.exec(l(n));return e&&e[1]||a}export function hasFileName(n){return!!findFileName(n)}export function hasFilePath(n){return!!findFilePath(n)}export function resolvePath(n,e=f()){const r=l(n).split("/");let t="",i=!1;for(let o=r.length-1;o>=-1&&!i;o--){const s=o>=0?r[o]:e;!s||s.length===0||(t=u(s,t),i=c(s))}return t=p(t,!i),i&&!c(t)?`/${t}`:t.length>0?t:"."}export function resolvePaths(...n){return resolvePath(u(...n.map(e=>l(e))))}export function relativePath(n,e){const r=resolvePath(n).replace(/^\/([A-Z]:)?$/i,"$1").split("/"),t=resolvePath(e).replace(/^\/([A-Z]:)?$/i,"$1").split("/");if(t[0][1]===":"&&r[0][1]===":"&&r[0]!==t[0])return t.join("/");const i=[...r];for(const o of i){if(t[0]!==o)break;r.shift(),t.shift()}return[...r.map(()=>".."),...t].join("/")}export function relativeToWorkspaceRoot(n){return relativePath(n,f())}export function parsePath(n){const e=/^[/\\]|^[a-z]:[/\\]/i.exec(n)?.[0]?.replace(/\\/g,"/")||"",r=l(n),t=r.replace(/\/$/,"").split("/").slice(0,-1);t.length===1&&/^[A-Z]:$/i.test(t[0])&&(t[0]+="/");const i=findFolderName(r),o=t.join("/")||(c(n)?"/":"."),s=findFileExtension(n);return{root:e,dir:o,base:i,ext:s,name:i.slice(0,i.length-s.length)}}export function renameFile(n,e){const r=parsePath(n);return u(r.dir,e.includes(".")?e:e+r.ext)}

package/dist/index.cjs

@@ -14,6 +14,17 @@ Object.keys(_assetExtensions).forEach(function (key) {
     }
   });
 });
+var _correctPath = require("./correct-path.cjs");
+Object.keys(_correctPath).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _correctPath[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _correctPath[key];
+    }
+  });
+});
 var _delimiter = require("./delimiter.cjs");
 Object.keys(_delimiter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -102,17 +113,6 @@ Object.keys(_joinPaths).forEach(function (key) {
     }
   });
 });
-var _normalizePath = require("./normalize-path.cjs");
-Object.keys(_normalizePath).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _normalizePath[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _normalizePath[key];
-    }
-  });
-});
 var _resolve = require("./resolve.cjs");
 Object.keys(_resolve).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/dist/index.d.ts

@@ -7,6 +7,7 @@
  * @packageDocumentation
  */
 export * from "./asset-extensions";
+export * from "./correct-path";
 export * from "./delimiter";
 export * from "./exists";
 export * from "./file-path-fns";
@@ -15,5 +16,4 @@ export * from "./get-workspace-root";
 export * from "./is-file";
 export * from "./is-root-dir";
 export * from "./join-paths";
-export * from "./normalize-path";
 export * from "./resolve";

package/dist/index.mjs

@@ -1 +1 @@
-export*from"./asset-extensions";export*from"./delimiter";export*from"./exists";export*from"./file-path-fns";export*from"./get-parent-path";export*from"./get-workspace-root";export*from"./is-file";export*from"./is-root-dir";export*from"./join-paths";export*from"./normalize-path";export*from"./resolve";
+export*from"./asset-extensions";export*from"./correct-path";export*from"./delimiter";export*from"./exists";export*from"./file-path-fns";export*from"./get-parent-path";export*from"./get-workspace-root";export*from"./is-file";export*from"./is-root-dir";export*from"./join-paths";export*from"./resolve";

package/dist/join-paths.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.joinPaths = void 0;
-var _normalizePath = require("./normalize-path.cjs");
+var _correctPath = require("./correct-path.cjs");
 const joinPaths = (...i) => {
   let t = "";
   for (const o of i) if (o) if (t.length > 0) {
@@ -12,6 +12,6 @@ const joinPaths = (...i) => {
       n = o[0] === "/";
     e && n ? t += o.slice(1) : t += e || n ? o : `/${o}`;
   } else t += o;
-  return (0, _normalizePath.correctPaths)(t);
+  return (0, _correctPath.correctPath)(t);
 };
 exports.joinPaths = joinPaths;

package/dist/join-paths.mjs

@@ -1 +1 @@
-import{correctPaths as s}from"./normalize-path";export const joinPaths=(...i)=>{let t="";for(const o of i)if(o)if(t.length>0){const e=t[t.length-1]==="/",n=o[0]==="/";e&&n?t+=o.slice(1):t+=e||n?o:`/${o}`}else t+=o;return s(t)};
+import{correctPath as h}from"./correct-path";export const joinPaths=(...i)=>{let t="";for(const o of i)if(o)if(t.length>0){const e=t[t.length-1]==="/",n=o[0]==="/";e&&n?t+=o.slice(1):t+=e||n?o:`/${o}`}else t+=o;return h(t)};

package/dist/resolve.cjs

@@ -11,29 +11,28 @@ exports.resolveSafe = resolveSafe;
 exports.resolveSafeSync = resolveSafeSync;
 exports.resolveSync = resolveSync;
 var _mlly = require("mlly");
-var _nodeProcess = _interopRequireDefault(require("node:process"));
-var _utilities = require("../utilities");
-var _getWorkspaceRoot = require("../workspace/get-workspace-root");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _correctPath = require("./correct-path.cjs");
+var _getWorkspaceRoot = require("./get-workspace-root.cjs");
+var _joinPaths = require("./join-paths.cjs");
 async function resolve(r, e = {}) {
   const t = e.paths ?? [];
-  t.length === 0 && t.push(_nodeProcess.default.cwd());
+  t.length === 0 && t.push(process.cwd());
   const n = (0, _getWorkspaceRoot.getWorkspaceRoot)();
-  return t.includes(n) || t.push(n), (0, _utilities.normalizePath)(await (0, _mlly.resolvePath)(r, {
+  return t.includes(n) || t.push(n), (0, _correctPath.correctPath)(await (0, _mlly.resolvePath)(r, {
     url: t
   }));
 }
 function resolveSync(r, e = {}) {
   const t = e.paths ?? [];
-  t.length === 0 && t.push(_nodeProcess.default.cwd());
+  t.length === 0 && t.push(process.cwd());
   const n = (0, _getWorkspaceRoot.getWorkspaceRoot)();
-  return t.includes(n) || t.push(n), (0, _utilities.normalizePath)((0, _mlly.resolvePathSync)(r, {
+  return t.includes(n) || t.push(n), (0, _correctPath.correctPath)((0, _mlly.resolvePathSync)(r, {
     url: e.paths
   }));
 }
-function resolveSafe(r, e = {}) {
+async function resolveSafe(r, e = {}) {
   try {
-    return resolve(r, e);
+    return await resolve(r, e);
   } catch {
     return;
   }
@@ -50,10 +49,10 @@ async function importModule(r) {
   return e && (0, _mlly.interopDefault)(e);
 }
 async function resolvePackage(r, e = {}) {
-  let t = await resolveSafe((0, _utilities.joinPaths)(r, "package.json"), e);
-  return t || (t = await resolveSafe((0, _utilities.joinPaths)(r, "index.js"), e), t || (t = await resolveSafe(r, e))), t;
+  let t = await resolveSafe((0, _joinPaths.joinPaths)(r, "package.json"), e);
+  return t || (t = await resolveSafe((0, _joinPaths.joinPaths)(r, "index.js"), e), t || (t = await resolveSafe(r, e))), t;
 }
 async function resolvePackageSync(r, e = {}) {
-  let t = await resolveSafeSync((0, _utilities.joinPaths)(r, "package.json"), e);
-  return t || (t = await resolveSafeSync((0, _utilities.joinPaths)(r, "index.js"), e), t || (t = await resolveSafeSync(r, e))), t;
+  let t = resolveSafeSync((0, _joinPaths.joinPaths)(r, "package.json"), e);
+  return t || (t = resolveSafeSync((0, _joinPaths.joinPaths)(r, "index.js"), e), t || (t = resolveSafeSync(r, e))), t;
 }

package/dist/resolve.d.ts

@@ -16,7 +16,7 @@ export interface PackageResolvingOptions {
  * @param options - The options to use when resolving the module
  * @returns A promise for the path to the module
  */
-export declare function resolve(path: string, options?: PackageResolvingOptions): Promise<any>;
+export declare function resolve(path: string, options?: PackageResolvingOptions): Promise<string>;
 /**
  * Resolve the path to a specified module
  *
@@ -24,7 +24,7 @@ export declare function resolve(path: string, options?: PackageResolvingOptions)
  * @param options - The options to use when resolving the module
  * @returns The path to the module or undefined
  */
-export declare function resolveSync(path: string, options?: PackageResolvingOptions): any;
+export declare function resolveSync(path: string, options?: PackageResolvingOptions): string;
 /**
  * Resolve the path to a specified module with error handling
  *
@@ -32,7 +32,7 @@ export declare function resolveSync(path: string, options?: PackageResolvingOpti
  * @param options - The options to use when resolving the module
  * @returns A promise for the path to the module
  */
-export declare function resolveSafe(name: string, options?: PackageResolvingOptions): Promise<any> | undefined;
+export declare function resolveSafe(name: string, options?: PackageResolvingOptions): Promise<string | undefined>;
 /**
  * Resolve the path to a specified module with error handling
  *
@@ -40,7 +40,7 @@ export declare function resolveSafe(name: string, options?: PackageResolvingOpti
  * @param options - The options to use when resolving the module
  * @returns The path to the module or undefined
  */
-export declare function resolveSafeSync(name: string, options?: PackageResolvingOptions): any;
+export declare function resolveSafeSync(name: string, options?: PackageResolvingOptions): string | undefined;
 /**
  * Import a module from a specified path
  *
@@ -54,11 +54,11 @@ export declare function importModule<T = any>(path: string): Promise<T>;
  * @param path - The path to the module
  * @returns The module or undefined
  */
-export declare function resolvePackage(name: string, options?: PackageResolvingOptions): Promise<any>;
+export declare function resolvePackage(name: string, options?: PackageResolvingOptions): Promise<string | undefined>;
 /**
  * Import a module from a specified path with error handling
  *
  * @param path - The path to the module
  * @returns The module or undefined
  */
-export declare function resolvePackageSync(name: string, options?: PackageResolvingOptions): Promise<any>;
+export declare function resolvePackageSync(name: string, options?: PackageResolvingOptions): Promise<string | undefined>;

package/dist/resolve.mjs

@@ -1 +1 @@
-import{interopDefault as c,resolvePath as p,resolvePathSync as l}from"mlly";import s from"node:process";import{joinPaths as o,normalizePath as a}from"../utilities";import{getWorkspaceRoot as i}from"../workspace/get-workspace-root";export async function resolve(r,e={}){const t=e.paths??[];t.length===0&&t.push(s.cwd());const n=i();return t.includes(n)||t.push(n),a(await p(r,{url:t}))}export function resolveSync(r,e={}){const t=e.paths??[];t.length===0&&t.push(s.cwd());const n=i();return t.includes(n)||t.push(n),a(l(r,{url:e.paths}))}export function resolveSafe(r,e={}){try{return resolve(r,e)}catch{return}}export function resolveSafeSync(r,e={}){try{return resolveSync(r,e)}catch{return}}export async function importModule(r){const e=await import(r);return e&&c(e)}export async function resolvePackage(r,e={}){let t=await resolveSafe(o(r,"package.json"),e);return t||(t=await resolveSafe(o(r,"index.js"),e),t||(t=await resolveSafe(r,e))),t}export async function resolvePackageSync(r,e={}){let t=await resolveSafeSync(o(r,"package.json"),e);return t||(t=await resolveSafeSync(o(r,"index.js"),e),t||(t=await resolveSafeSync(r,e))),t}
+import{interopDefault as i,resolvePath as c,resolvePathSync as p}from"mlly";import{correctPath as o}from"./correct-path";import{getWorkspaceRoot as a}from"./get-workspace-root";import{joinPaths as s}from"./join-paths";export async function resolve(r,e={}){const t=e.paths??[];t.length===0&&t.push(process.cwd());const n=a();return t.includes(n)||t.push(n),o(await c(r,{url:t}))}export function resolveSync(r,e={}){const t=e.paths??[];t.length===0&&t.push(process.cwd());const n=a();return t.includes(n)||t.push(n),o(p(r,{url:e.paths}))}export async function resolveSafe(r,e={}){try{return await resolve(r,e)}catch{return}}export function resolveSafeSync(r,e={}){try{return resolveSync(r,e)}catch{return}}export async function importModule(r){const e=await import(r);return e&&i(e)}export async function resolvePackage(r,e={}){let t=await resolveSafe(s(r,"package.json"),e);return t||(t=await resolveSafe(s(r,"index.js"),e),t||(t=await resolveSafe(r,e))),t}export async function resolvePackageSync(r,e={}){let t=resolveSafeSync(s(r,"package.json"),e);return t||(t=resolveSafeSync(s(r,"index.js"),e),t||(t=resolveSafeSync(r,e))),t}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stryke/path",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
-  "description": "A package containing various utilities that expand the functionality of NodeJs's `path` module",
+  "description": "A package containing various utilities that expand the functionality of NodeJs's built-in `path` module",
   "repository": {
     "type": "github",
     "url": "https://github.com/storm-software/stryke.git",
@@ -12,9 +12,12 @@
   "dependencies": {
     "@storm-software/config-tools": "latest",
     "mlly": "1.7.4",
-    "@stryke/types": ">=0.6.0"
+    "@stryke/types": ">=0.6.1"
+  },
+  "devDependencies": {
+    "@stryke/types": "workspace:*",
+    "@types/node": "^22.13.1"
   },
-  "devDependencies": { "@types/node": "^22.13.1" },
   "publishConfig": { "access": "public" },
   "sideEffects": false,
   "files": ["dist/**/*"],
@@ -73,20 +76,6 @@
         "default": "./dist/resolve.mjs"
       }
     },
-    "./normalize-path": {
-      "import": {
-        "types": "./dist/normalize-path.d.ts",
-        "default": "./dist/normalize-path.mjs"
-      },
-      "require": {
-        "types": "./dist/normalize-path.d.ts",
-        "default": "./dist/normalize-path.cjs"
-      },
-      "default": {
-        "types": "./dist/normalize-path.d.ts",
-        "default": "./dist/normalize-path.mjs"
-      }
-    },
     "./join-paths": {
       "import": {
         "types": "./dist/join-paths.d.ts",
@@ -207,6 +196,20 @@
         "default": "./dist/delimiter.mjs"
       }
     },
+    "./correct-path": {
+      "import": {
+        "types": "./dist/correct-path.d.ts",
+        "default": "./dist/correct-path.mjs"
+      },
+      "require": {
+        "types": "./dist/correct-path.d.ts",
+        "default": "./dist/correct-path.cjs"
+      },
+      "default": {
+        "types": "./dist/correct-path.d.ts",
+        "default": "./dist/correct-path.mjs"
+      }
+    },
     "./asset-extensions": {
       "import": {
         "types": "./dist/asset-extensions.d.ts",

package/dist/normalize-path.mjs

@@ -1 +0,0 @@
-import{isAbsolutePath as g}from"./is-file";export function slash(e){return e.replace(/\\/g,"/")}const c=/^[A-Z]:\//i;export function normalizeWindowsPath(e=""){return e&&e.replace(/\\/g,"/").replace(c,i=>i.toUpperCase())}const u=/^[/\\]{2}/,E=/^[A-Z]:$/i;export const correctPaths=e=>{if(!e||e.length===0)return".";e=normalizeWindowsPath(e);const i=e.match(u),n=g(e),t=e[e.length-1]==="/";return e=normalizeString(e,!n),e.length===0?n?"/":t?"./":".":(t&&(e+="/"),E.test(e)&&(e+="/"),i?n?`//${e}`:`//./${e}`:n&&!g(e)?`/${e}`:e)};export function normalizeString(e,i){let n="",t=0,s=-1,r=0,o=null;for(let l=0;l<=e.length;++l){if(l<e.length)o=e[l];else{if(o==="/")break;o="/"}if(o==="/"){if(!(s===l-1||r===1))if(r===2){if(n.length<2||t!==2||n[n.length-1]!=="."||n[n.length-2]!=="."){if(n.length>2){const f=n.lastIndexOf("/");f===-1?(n="",t=0):(n=n.slice(0,f),t=n.length-1-n.lastIndexOf("/")),s=l,r=0;continue}else if(n.length>0){n="",t=0,s=l,r=0;continue}}i&&(n+=n.length>0?"/..":"..",t=2)}else n.length>0?n+=`/${e.slice(s+1,l)}`:n=e.slice(s+1,l),t=l-s-1;s=l,r=0}else o==="."&&r!==-1?++r:r=-1}return n}