@stryke/path 0.4.9 → 0.4.10

package/dist/file-path-fns.cjs

@@ -16,28 +16,29 @@ exports.renameFile = renameFile;
 exports.resolvePath = resolvePath;
 exports.resolvePaths = resolvePaths;
 var _base = require("@stryke/types/base");
+var _nodePath = require("node:path");
 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");
-function findFileName(e, {
-  requireExtension: n,
+function findFileName(t, {
+  requireExtension: e,
   withExtension: r
 } = {}) {
-  const t = (0, _correctPath.normalizeWindowsPath)(e)?.split(e?.includes("\\") ? "\\" : "/")?.pop() ?? "";
-  return n === !0 && !t.includes(".") ? _base.EMPTY_STRING : r === !1 && t.includes(".") ? t.split(".").slice(-1).join(".") || _base.EMPTY_STRING : t;
+  const n = (0, _correctPath.normalizeWindowsPath)(t)?.split(t?.includes("\\") ? "\\" : "/")?.pop() ?? "";
+  return e === !0 && !n.includes(".") ? _base.EMPTY_STRING : r === !1 && n.includes(".") ? n.split(".").slice(-1).join(".") || _base.EMPTY_STRING : n;
 }
-function findFilePath(e) {
-  const n = (0, _correctPath.normalizeWindowsPath)(e);
-  return n.replace(findFileName(n, {
+function findFilePath(t) {
+  const e = (0, _correctPath.normalizeWindowsPath)(t);
+  return e.replace(findFileName(e, {
     requireExtension: !0
   }), "");
 }
-function findFolderName(e) {
-  const n = findFilePath(e).split("/");
+function findFolderName(t) {
+  const e = findFilePath(t).split("/");
   let r = "";
-  for (let t = n.length - 1; t >= 0; t--) {
-    const i = n[t];
+  for (let n = e.length - 1; n >= 0; n--) {
+    const i = e[n];
     if (i) {
       r = i;
       break;
@@ -45,61 +46,53 @@ function findFolderName(e) {
   }
   return r ?? _base.EMPTY_STRING;
 }
-function findFileExtension(e) {
-  if (e === "..") return "";
-  const n = /.(\.[^./]+|\.)$/.exec((0, _correctPath.normalizeWindowsPath)(e));
-  return n && n[1] || _base.EMPTY_STRING;
+function findFileExtension(t) {
+  if (t === "..") return "";
+  const e = /.(\.[^./]+|\.)$/.exec((0, _correctPath.normalizeWindowsPath)(t));
+  return e && e[1] || _base.EMPTY_STRING;
 }
-function hasFileName(e) {
-  return !!findFileName(e);
+function hasFileName(t) {
+  return !!findFileName(t);
 }
-function hasFilePath(e) {
-  return !!findFilePath(e);
+function hasFilePath(t) {
+  return !!findFilePath(t);
 }
-function resolvePath(e, n = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
-  const r = (0, _correctPath.normalizeWindowsPath)(e).split("/");
-  let t = "",
+function resolvePath(t, e = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
+  const r = (0, _correctPath.normalizeWindowsPath)(t).split("/");
+  let n = "",
     i = !1;
-  for (let o = r.length - 1; o >= -1 && !i; o--) {
-    const s = o >= 0 ? r[o] : n;
-    !s || s.length === 0 || (t = (0, _joinPaths.joinPaths)(s, t), i = (0, _isFile.isAbsolutePath)(s));
+  for (let s = r.length - 1; s >= -1 && !i; s--) {
+    const o = s >= 0 ? r[s] : e;
+    !o || o.length === 0 || (n = (0, _joinPaths.joinPaths)(o, n), i = (0, _isFile.isAbsolutePath)(o));
   }
-  return t = (0, _correctPath.normalizeString)(t, !i), i && !(0, _isFile.isAbsolutePath)(t) ? `/${t}` : t.length > 0 ? t : ".";
+  return n = (0, _correctPath.normalizeString)(n, !i), i && !(0, _isFile.isAbsolutePath)(n) ? `/${n}` : n.length > 0 ? n : ".";
 }
-function resolvePaths(...e) {
-  return resolvePath((0, _joinPaths.joinPaths)(...e.map(n => (0, _correctPath.normalizeWindowsPath)(n))));
+function resolvePaths(...t) {
+  return resolvePath((0, _joinPaths.joinPaths)(...t.map(e => (0, _correctPath.normalizeWindowsPath)(e))));
 }
-function relativePath(e, n) {
-  const r = resolvePath(e.replace(/\/$/, "")).replace(/^\/([A-Z]:)?$/i, "$1").split("/"),
-    t = resolvePath(n.replace(/\/$/, "")).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("/");
+function relativePath(t, e) {
+  return (0, _nodePath.relative)(t.replace(/\/$/, ""), e.replace(/\/$/, ""));
 }
-function relativeToWorkspaceRoot(e) {
-  return relativePath(e, (0, _getWorkspaceRoot.getWorkspaceRoot)());
+function relativeToWorkspaceRoot(t) {
+  return relativePath(t, (0, _getWorkspaceRoot.getWorkspaceRoot)());
 }
-function parsePath(e) {
-  const n = /^[/\\]|^[a-z]:[/\\]/i.exec(e)?.[0]?.replace(/\\/g, "/") || "",
-    r = (0, _correctPath.normalizeWindowsPath)(e),
-    t = r.replace(/\/$/, "").split("/").slice(0, -1);
-  t.length === 1 && /^[A-Z]:$/i.test(t[0]) && (t[0] += "/");
+function parsePath(t) {
+  const e = /^[/\\]|^[a-z]:[/\\]/i.exec(t)?.[0]?.replace(/\\/g, "/") || "",
+    r = (0, _correctPath.normalizeWindowsPath)(t),
+    n = r.replace(/\/$/, "").split("/").slice(0, -1);
+  n.length === 1 && /^[A-Z]:$/i.test(n[0]) && (n[0] += "/");
   const i = findFolderName(r),
-    o = t.join("/") || ((0, _isFile.isAbsolutePath)(e) ? "/" : "."),
-    s = findFileExtension(e);
+    s = n.join("/") || ((0, _isFile.isAbsolutePath)(t) ? "/" : "."),
+    o = findFileExtension(t);
   return {
-    root: n,
-    dir: o,
+    root: e,
+    dir: s,
     base: i,
-    ext: s,
-    name: i.slice(0, i.length - s.length)
+    ext: o,
+    name: i.slice(0, i.length - o.length)
   };
 }
-function renameFile(e, n) {
-  const r = parsePath(e);
-  return (0, _joinPaths.joinPaths)(r.dir, n.includes(".") ? n : n + r.ext);
+function renameFile(t, e) {
+  const r = parsePath(t);
+  return (0, _joinPaths.joinPaths)(r.dir, e.includes(".") ? e : e + r.ext);
 }

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

@@ -91,6 +91,12 @@ export declare function resolvePath(path: string, cwd?: string): string;
  * @returns The resolved path
  */
 export declare function resolvePaths(...paths: string[]): string;
+/**
+ * Get the relative path from one file to another.
+ *
+ * @remarks
+ * This function wraps the `path.relative` function in Node's path module.
+ */
 export declare function relativePath(from: string, to: string): string;
 /**
  * Find the file path relative to the workspace root path.

package/dist/file-path-fns.mjs

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

package/package.json

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