@stryke/path 0.5.1 → 0.6.1

package/dist/correct-path.cjs

@@ -6,25 +6,28 @@ Object.defineProperty(exports, "__esModule", {
 exports.correctPath = correctPath;
 exports.normalizeString = normalizeString;
 exports.normalizeWindowsPath = normalizeWindowsPath;
+exports.toAbsolutePath = toAbsolutePath;
+exports.toRelativePath = toRelativePath;
 var _isFile = require("./is-file.cjs");
+var _joinPaths = require("./join-paths.cjs");
 var _regex = require("./regex.cjs");
 var _slash = require("./slash.cjs");
 function normalizeWindowsPath(e = "") {
-  return e && (0, _slash.slash)(e).replace(_regex.DRIVE_LETTER_START_REGEX, s => s.toUpperCase());
+  return e && (0, _slash.slash)(e).replace(_regex.DRIVE_LETTER_START_REGEX, n => n.toUpperCase());
 }
 function correctPath(e) {
   if (!e || e.length === 0) return ".";
   e = normalizeWindowsPath(e);
-  const s = e.match(_regex.UNC_REGEX),
-    n = (0, _isFile.isAbsolutePath)(e),
-    l = e.endsWith("/");
-  return e = normalizeString(e, !n), e.length === 0 ? n ? "/" : l ? "./" : "." : (l && (e += "/"), _regex.DRIVE_LETTER_REGEX.test(e) && (e += "/"), s ? n ? `//${e}` : `//./${e}` : !e.startsWith("/") && n && !_regex.DRIVE_LETTER_REGEX.test(e) ? `/${e}` : e);
+  const n = e.match(_regex.UNC_REGEX),
+    r = (0, _isFile.isAbsolutePath)(e),
+    i = e.endsWith("/");
+  return e = normalizeString(e, !r), e.length === 0 ? r ? "/" : i ? "./" : "." : (i && (e += "/"), _regex.DRIVE_LETTER_REGEX.test(e) && (e += "/"), n ? r ? `//${e}` : `//./${e}` : !e.startsWith("/") && r && !_regex.DRIVE_LETTER_REGEX.test(e) ? `/${e}` : e);
 }
-function normalizeString(e, s) {
-  let n = "",
-    l = 0,
-    i = -1,
-    r = 0,
+function normalizeString(e, n) {
+  let r = "",
+    i = 0,
+    l = -1,
+    s = 0,
     o = null;
   for (let t = 0; t <= e.length; ++t) {
     if (t < e.length) o = e[t];else {
@@ -32,21 +35,27 @@ function normalizeString(e, s) {
       o = "/";
     }
     if (o === "/") {
-      if (!(i === t - 1 || r === 1)) if (r === 2) {
-        if (n.length < 2 || l !== 2 || n[n.length - 1] !== "." || n[n.length - 2] !== ".") {
-          if (n.length > 2) {
-            const f = n.lastIndexOf("/");
-            f === -1 ? (n = "", l = 0) : (n = n.slice(0, f), l = n.length - 1 - n.lastIndexOf("/")), i = t, r = 0;
+      if (!(l === t - 1 || s === 1)) if (s === 2) {
+        if (r.length < 2 || i !== 2 || r[r.length - 1] !== "." || r[r.length - 2] !== ".") {
+          if (r.length > 2) {
+            const u = r.lastIndexOf("/");
+            u === -1 ? (r = "", i = 0) : (r = r.slice(0, u), i = r.length - 1 - r.lastIndexOf("/")), l = t, s = 0;
             continue;
-          } else if (n.length > 0) {
-            n = "", l = 0, i = t, r = 0;
+          } else if (r.length > 0) {
+            r = "", i = 0, l = t, s = 0;
             continue;
           }
         }
-        s && (n += n.length > 0 ? "/.." : "..", l = 2);
-      } else n.length > 0 ? n += `/${e.slice(i + 1, t)}` : n = e.slice(i + 1, t), l = t - i - 1;
-      i = t, r = 0;
-    } else o === "." && r !== -1 ? ++r : r = -1;
+        n && (r += r.length > 0 ? "/.." : "..", i = 2);
+      } else r.length > 0 ? r += `/${e.slice(l + 1, t)}` : r = e.slice(l + 1, t), i = t - l - 1;
+      l = t, s = 0;
+    } else o === "." && s !== -1 ? ++s : s = -1;
   }
-  return n;
+  return r;
+}
+function toAbsolutePath(e, n) {
+  return (0, _isFile.isAbsolutePath)(e) ? e : (0, _slash.slash)(normalizeString((0, _joinPaths.joinPaths)(n || process.cwd(), e), !0));
+}
+function toRelativePath(e, n) {
+  return !e || e.length === 0 ? "." : ((0, _isFile.isAbsolutePath)(e) ? e = (0, _slash.slash)(normalizeString(e, !0)) : e = (0, _slash.slash)(normalizeString((0, _joinPaths.joinPaths)(n || process.cwd(), e), !0)), e.startsWith("./") ? e.slice(2) : e);
 }

package/dist/correct-path.d.ts

@@ -14,3 +14,19 @@ export declare function correctPath(path?: string): string;
  * @returns the normalize path string.
  */
 export declare function normalizeString(path: string, allowAboveRoot: boolean): string;
+/**
+ * Converts a given path to an absolute path based on the current working directory.
+ *
+ * @param path - The path to convert to an absolute path.
+ * @param cwd - The current working directory to use as the base path if the path is not absolute.
+ * @returns The absolute path.
+ */
+export declare function toAbsolutePath(path: string, cwd?: string): string;
+/**
+ * Converts a given path to a relative path based on the current working directory.
+ *
+ * @param path - The path to convert to a relative path.
+ * @param cwd - The current working directory to use as the base path if the path is not absolute.
+ * @returns The relative path.
+ */
+export declare function toRelativePath(path: string, cwd?: string): string;

package/dist/correct-path.mjs

@@ -1 +1 @@
-import{isAbsolutePath as c}from"./is-file";import{DRIVE_LETTER_REGEX as g,DRIVE_LETTER_START_REGEX as u,UNC_REGEX as E}from"./regex";import{slash as m}from"./slash";export function normalizeWindowsPath(e=""){return e&&m(e).replace(u,s=>s.toUpperCase())}export function correctPath(e){if(!e||e.length===0)return".";e=normalizeWindowsPath(e);const s=e.match(E),n=c(e),l=e.endsWith("/");return e=normalizeString(e,!n),e.length===0?n?"/":l?"./":".":(l&&(e+="/"),g.test(e)&&(e+="/"),s?n?`//${e}`:`//./${e}`:!e.startsWith("/")&&n&&!g.test(e)?`/${e}`:e)}export function normalizeString(e,s){let n="",l=0,i=-1,r=0,o=null;for(let t=0;t<=e.length;++t){if(t<e.length)o=e[t];else{if(o==="/")break;o="/"}if(o==="/"){if(!(i===t-1||r===1))if(r===2){if(n.length<2||l!==2||n[n.length-1]!=="."||n[n.length-2]!=="."){if(n.length>2){const f=n.lastIndexOf("/");f===-1?(n="",l=0):(n=n.slice(0,f),l=n.length-1-n.lastIndexOf("/")),i=t,r=0;continue}else if(n.length>0){n="",l=0,i=t,r=0;continue}}s&&(n+=n.length>0?"/..":"..",l=2)}else n.length>0?n+=`/${e.slice(i+1,t)}`:n=e.slice(i+1,t),l=t-i-1;i=t,r=0}else o==="."&&r!==-1?++r:r=-1}return n}
+import{isAbsolutePath as g}from"./is-file";import{joinPaths as c}from"./join-paths";import{DRIVE_LETTER_REGEX as m,DRIVE_LETTER_START_REGEX as E,UNC_REGEX as d}from"./regex";import{slash as f}from"./slash";export function normalizeWindowsPath(e=""){return e&&f(e).replace(E,n=>n.toUpperCase())}export function correctPath(e){if(!e||e.length===0)return".";e=normalizeWindowsPath(e);const n=e.match(d),r=g(e),i=e.endsWith("/");return e=normalizeString(e,!r),e.length===0?r?"/":i?"./":".":(i&&(e+="/"),m.test(e)&&(e+="/"),n?r?`//${e}`:`//./${e}`:!e.startsWith("/")&&r&&!m.test(e)?`/${e}`:e)}export function normalizeString(e,n){let r="",i=0,l=-1,s=0,o=null;for(let t=0;t<=e.length;++t){if(t<e.length)o=e[t];else{if(o==="/")break;o="/"}if(o==="/"){if(!(l===t-1||s===1))if(s===2){if(r.length<2||i!==2||r[r.length-1]!=="."||r[r.length-2]!=="."){if(r.length>2){const u=r.lastIndexOf("/");u===-1?(r="",i=0):(r=r.slice(0,u),i=r.length-1-r.lastIndexOf("/")),l=t,s=0;continue}else if(r.length>0){r="",i=0,l=t,s=0;continue}}n&&(r+=r.length>0?"/..":"..",i=2)}else r.length>0?r+=`/${e.slice(l+1,t)}`:r=e.slice(l+1,t),i=t-l-1;l=t,s=0}else o==="."&&s!==-1?++s:s=-1}return r}export function toAbsolutePath(e,n){return g(e)?e:f(normalizeString(c(n||process.cwd(),e),!0))}export function toRelativePath(e,n){return!e||e.length===0?".":(g(e)?e=f(normalizeString(e,!0)):e=f(normalizeString(c(n||process.cwd(),e),!0)),e.startsWith("./")?e.slice(2):e)}

package/dist/slash.cjs

@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.slash = slash;
 function slash(r) {
-  return r.replace(/\\/g, "/");
+  return r.startsWith("\\\\?\\") ? r : r.replace(/\\/g, "/");
 }

package/dist/slash.d.ts

@@ -1,7 +1,7 @@
 /**
  * Replace backslash to slash
  *
- * @param str - The string to replace
+ * @param path - The string to replace
  * @returns The string with replaced backslashes
  */
-export declare function slash(str: string): string;
+export declare function slash(path: string): string;

package/dist/slash.mjs

@@ -1 +1 @@
-export function slash(r){return r.replace(/\\/g,"/")}
+export function slash(r){return r.startsWith("\\\\?\\")?r:r.replace(/\\/g,"/")}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/path",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "type": "module",
   "description": "A package containing various utilities that expand the functionality of NodeJs's built-in `path` module",
   "repository": {