@stryke/fs 0.32.14 → 0.32.15

package/dist/resolve.cjs

@@ -11,111 +11,117 @@ exports.resolvePackageSync = resolvePackageSync;
 exports.resolveSafe = resolveSafe;
 exports.resolveSafeSync = resolveSafeSync;
 exports.resolveSync = resolveSync;
+var _getUnique = require("@stryke/helpers/get-unique");
 var _path = require("@stryke/path");
 var _correctPath = require("@stryke/path/correct-path");
 var _cwd = require("@stryke/path/cwd");
 var _filePathFns = require("@stryke/path/file-path-fns");
 var _joinPaths = require("@stryke/path/join-paths");
 var _mlly = require("mlly");
+var _nodeFs = require("node:fs");
 var _getWorkspaceRoot = require("./get-workspace-root.cjs");
 const DEFAULT_EXTENSIONS = exports.DEFAULT_EXTENSIONS = ["js", "jsx", "mjs", "cjs", "ts", "tsx", "mts", "cts", "json", "jsonc", "json5", "node"];
-async function resolve(t, r = {}) {
-  let e = r.paths ?? [];
-  e.length === 0 && e.push((0, _cwd.cwd)());
-  const c = (0, _getWorkspaceRoot.getWorkspaceRoot)();
-  e.includes(c) || e.push(c), e = e.filter(Boolean).map(o => (0, _correctPath.correctPath)(o));
-  let n, i;
+async function resolve(n, e = {}) {
+  let r = e.paths ?? [];
+  r.length === 0 && r.push((0, _cwd.cwd)());
+  const o = (0, _getWorkspaceRoot.getWorkspaceRoot)();
+  r.includes(o) || r.push(o), r = (0, _getUnique.getUnique)(r.filter(Boolean).map(t => (0, _correctPath.correctPath)(t)).reduce((t, i, E, x) => (t.push(i), (0, _nodeFs.existsSync)((0, _path.appendPath)(i, o)) && t.push((0, _path.appendPath)(i, o)), x.forEach(l => {
+    (0, _nodeFs.existsSync)((0, _path.appendPath)(i, l)) && t.push((0, _path.appendPath)(i, l));
+  }), t), []));
+  let s, c;
   try {
-    n = await (0, _mlly.resolvePath)(t, {
-      url: e,
-      extensions: r.extensions ?? DEFAULT_EXTENSIONS,
-      conditions: r.conditions
+    s = await (0, _mlly.resolvePath)(n, {
+      url: r,
+      extensions: e.extensions ?? DEFAULT_EXTENSIONS,
+      conditions: e.conditions
     });
-  } catch (o) {
-    i = o;
+  } catch (t) {
+    c = t;
   }
-  if (!n) for (let o = 0; o < e.length && !n; o++) try {
-    n = await (0, _mlly.resolvePath)((0, _path.replacePath)(t, e[o]), {
-      url: e,
-      extensions: r.extensions ?? DEFAULT_EXTENSIONS,
-      conditions: r.conditions
+  if (!s) for (let t = 0; t < r.length && !s; t++) try {
+    s = await (0, _mlly.resolvePath)((0, _path.replacePath)(n, r[t]), {
+      url: r,
+      extensions: e.extensions ?? DEFAULT_EXTENSIONS,
+      conditions: e.conditions
     });
-  } catch (f) {
-    i = f;
+  } catch (i) {
+    c = i;
   }
-  if (!n && (0, _filePathFns.findFileName)(t, {
+  if (!s && (0, _filePathFns.findFileName)(n, {
     withExtension: !1
   }) !== "index") try {
-    n = await resolve((0, _joinPaths.joinPaths)(t, "index"), {
-      ...r,
-      paths: e
-    }), n && (n = (0, _filePathFns.findFilePath)(n));
-  } catch (o) {
-    i = o;
+    s = await resolve((0, _joinPaths.joinPaths)(n, "index"), {
+      ...e,
+      paths: r
+    }), s && (s = (0, _filePathFns.findFilePath)(s));
+  } catch (t) {
+    c = t;
   }
-  if (!n) throw i ?? new Error(`Cannot resolve module '${t}'`);
-  return (0, _correctPath.correctPath)(n);
+  if (!s) throw c ?? new Error(`Cannot resolve module '${n}'`);
+  return (0, _correctPath.correctPath)(s);
 }
-function resolveSync(t, r = {}) {
-  let e = r.paths ?? [];
-  e.length === 0 && e.push(process.cwd());
-  const c = (0, _getWorkspaceRoot.getWorkspaceRoot)();
-  e.includes(c) || e.push(c), e = e.filter(Boolean).map(o => (0, _correctPath.correctPath)(o));
-  let n, i;
+function resolveSync(n, e = {}) {
+  let r = e.paths ?? [];
+  r.length === 0 && r.push(process.cwd());
+  const o = (0, _getWorkspaceRoot.getWorkspaceRoot)();
+  r.includes(o) || r.push(o), r = (0, _getUnique.getUnique)(r.filter(Boolean).map(t => (0, _correctPath.correctPath)(t)).reduce((t, i, E, x) => (t.push(i), (0, _nodeFs.existsSync)((0, _path.appendPath)(i, o)) && t.push((0, _path.appendPath)(i, o)), x.forEach(l => {
+    (0, _nodeFs.existsSync)((0, _path.appendPath)(i, l)) && t.push((0, _path.appendPath)(i, l));
+  }), t), []));
+  let s, c;
   try {
-    n = (0, _mlly.resolvePathSync)(t, {
-      url: e,
-      extensions: r.extensions ?? DEFAULT_EXTENSIONS,
-      conditions: r.conditions
+    s = (0, _mlly.resolvePathSync)(n, {
+      url: r,
+      extensions: e.extensions ?? DEFAULT_EXTENSIONS,
+      conditions: e.conditions
     });
-  } catch (o) {
-    i = o;
+  } catch (t) {
+    c = t;
   }
-  if (!n) for (let o = 0; o < e.length && !n; o++) try {
-    n = (0, _mlly.resolvePathSync)((0, _path.replacePath)(t, e[o]), {
-      url: e,
-      extensions: r.extensions ?? DEFAULT_EXTENSIONS,
-      conditions: r.conditions
+  if (!s) for (let t = 0; t < r.length && !s; t++) try {
+    s = (0, _mlly.resolvePathSync)((0, _path.replacePath)(n, r[t]), {
+      url: r,
+      extensions: e.extensions ?? DEFAULT_EXTENSIONS,
+      conditions: e.conditions
     });
-  } catch (f) {
-    i = f;
+  } catch (i) {
+    c = i;
   }
-  if (!n && (0, _filePathFns.findFileName)(t, {
+  if (!s && (0, _filePathFns.findFileName)(n, {
     withExtension: !1
   }) !== "index") try {
-    n = resolveSync((0, _joinPaths.joinPaths)(t, "index"), {
-      ...r,
-      paths: e
-    }), n && (n = (0, _filePathFns.findFilePath)(n));
-  } catch (o) {
-    i = o;
+    s = resolveSync((0, _joinPaths.joinPaths)(n, "index"), {
+      ...e,
+      paths: r
+    }), s && (s = (0, _filePathFns.findFilePath)(s));
+  } catch (t) {
+    c = t;
   }
-  if (!n) throw i ?? new Error(`Cannot resolve module '${t}'`);
-  return (0, _correctPath.correctPath)(n);
+  if (!s) throw c ?? new Error(`Cannot resolve module '${n}'`);
+  return (0, _correctPath.correctPath)(s);
 }
-async function resolveSafe(t, r = {}) {
+async function resolveSafe(n, e = {}) {
   try {
-    return await resolve(t, r);
+    return await resolve(n, e);
   } catch {
     return;
   }
 }
-function resolveSafeSync(t, r = {}) {
+function resolveSafeSync(n, e = {}) {
   try {
-    return resolveSync(t, r);
+    return resolveSync(n, e);
   } catch {
     return;
   }
 }
-async function importModule(t) {
-  const r = await Promise.resolve(`${t}`).then(s => require(s));
-  return r && (0, _mlly.interopDefault)(r);
+async function importModule(n) {
+  const e = await Promise.resolve(`${n}`).then(s => require(s));
+  return e && (0, _mlly.interopDefault)(e);
 }
-async function resolvePackage(t, r = {}) {
-  let e = await resolveSafe((0, _joinPaths.joinPaths)(t, "package.json"), r);
-  return e || (e = await resolveSafe((0, _joinPaths.joinPaths)(t, "index.js"), r), e || (e = await resolveSafe(t, r))), e ? (0, _filePathFns.findFilePath)(e) : void 0;
+async function resolvePackage(n, e = {}) {
+  let r = await resolveSafe((0, _joinPaths.joinPaths)(n, "package.json"), e);
+  return r || (r = await resolveSafe((0, _joinPaths.joinPaths)(n, "index.js"), e), r || (r = await resolveSafe(n, e))), r ? (0, _filePathFns.findFilePath)(r) : void 0;
 }
-function resolvePackageSync(t, r = {}) {
-  let e = resolveSafeSync((0, _joinPaths.joinPaths)(t, "package.json"), r);
-  return e || (e = resolveSafeSync((0, _joinPaths.joinPaths)(t, "index.js"), r), e || (e = resolveSafeSync(t, r))), e ? (0, _filePathFns.findFilePath)(e) : void 0;
+function resolvePackageSync(n, e = {}) {
+  let r = resolveSafeSync((0, _joinPaths.joinPaths)(n, "package.json"), e);
+  return r || (r = resolveSafeSync((0, _joinPaths.joinPaths)(n, "index.js"), e), r || (r = resolveSafeSync(n, e))), r ? (0, _filePathFns.findFilePath)(r) : void 0;
 }

package/dist/resolve.d.ts

@@ -25,7 +25,7 @@ export interface ResolveOptions {
  * @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?: ResolveOptions): Promise<any>;
+export declare function resolve(path: string, options?: ResolveOptions): Promise<string>;
 /**
  * Resolve the path to a specified module
  *
@@ -41,7 +41,7 @@ export declare function resolveSync(path: string, options?: ResolveOptions): any
  * @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?: ResolveOptions): Promise<any>;
+export declare function resolveSafe(name: string, options?: ResolveOptions): Promise<string | undefined>;
 /**
  * Resolve the path to a specified module with error handling
  *

package/dist/resolve.mjs

@@ -1 +1 @@
-import{replacePath as u}from"@stryke/path";import{correctPath as a}from"@stryke/path/correct-path";import{cwd as g}from"@stryke/path/cwd";import{findFileName as d,findFilePath as l}from"@stryke/path/file-path-fns";import{joinPaths as s}from"@stryke/path/join-paths";import{interopDefault as m,resolvePath as x,resolvePathSync as h}from"mlly";import{getWorkspaceRoot as p}from"./get-workspace-root";export const DEFAULT_EXTENSIONS=["js","jsx","mjs","cjs","ts","tsx","mts","cts","json","jsonc","json5","node"];export async function resolve(t,r={}){let e=r.paths??[];e.length===0&&e.push(g());const c=p();e.includes(c)||e.push(c),e=e.filter(Boolean).map(o=>a(o));let n,i;try{n=await x(t,{url:e,extensions:r.extensions??DEFAULT_EXTENSIONS,conditions:r.conditions})}catch(o){i=o}if(!n)for(let o=0;o<e.length&&!n;o++)try{n=await x(u(t,e[o]),{url:e,extensions:r.extensions??DEFAULT_EXTENSIONS,conditions:r.conditions})}catch(f){i=f}if(!n&&d(t,{withExtension:!1})!=="index")try{n=await resolve(s(t,"index"),{...r,paths:e}),n&&(n=l(n))}catch(o){i=o}if(!n)throw i??new Error(`Cannot resolve module '${t}'`);return a(n)}export function resolveSync(t,r={}){let e=r.paths??[];e.length===0&&e.push(process.cwd());const c=p();e.includes(c)||e.push(c),e=e.filter(Boolean).map(o=>a(o));let n,i;try{n=h(t,{url:e,extensions:r.extensions??DEFAULT_EXTENSIONS,conditions:r.conditions})}catch(o){i=o}if(!n)for(let o=0;o<e.length&&!n;o++)try{n=h(u(t,e[o]),{url:e,extensions:r.extensions??DEFAULT_EXTENSIONS,conditions:r.conditions})}catch(f){i=f}if(!n&&d(t,{withExtension:!1})!=="index")try{n=resolveSync(s(t,"index"),{...r,paths:e}),n&&(n=l(n))}catch(o){i=o}if(!n)throw i??new Error(`Cannot resolve module '${t}'`);return a(n)}export async function resolveSafe(t,r={}){try{return await resolve(t,r)}catch{return}}export function resolveSafeSync(t,r={}){try{return resolveSync(t,r)}catch{return}}export async function importModule(t){const r=await import(t);return r&&m(r)}export async function resolvePackage(t,r={}){let e=await resolveSafe(s(t,"package.json"),r);return e||(e=await resolveSafe(s(t,"index.js"),r),e||(e=await resolveSafe(t,r))),e?l(e):void 0}export function resolvePackageSync(t,r={}){let e=resolveSafeSync(s(t,"package.json"),r);return e||(e=resolveSafeSync(s(t,"index.js"),r),e||(e=resolveSafeSync(t,r))),e?l(e):void 0}
+import{getUnique as m}from"@stryke/helpers/get-unique";import{appendPath as a,replacePath as p}from"@stryke/path";import{correctPath as u}from"@stryke/path/correct-path";import{cwd as j}from"@stryke/path/cwd";import{findFileName as g,findFilePath as d}from"@stryke/path/file-path-fns";import{joinPaths as f}from"@stryke/path/join-paths";import{interopDefault as P,resolvePath as w,resolvePathSync as y}from"mlly";import{existsSync as h}from"node:fs";import{getWorkspaceRoot as v}from"./get-workspace-root";export const DEFAULT_EXTENSIONS=["js","jsx","mjs","cjs","ts","tsx","mts","cts","json","jsonc","json5","node"];export async function resolve(n,e={}){let r=e.paths??[];r.length===0&&r.push(j());const o=v();r.includes(o)||r.push(o),r=m(r.filter(Boolean).map(t=>u(t)).reduce((t,i,E,x)=>(t.push(i),h(a(i,o))&&t.push(a(i,o)),x.forEach(l=>{h(a(i,l))&&t.push(a(i,l))}),t),[]));let s,c;try{s=await w(n,{url:r,extensions:e.extensions??DEFAULT_EXTENSIONS,conditions:e.conditions})}catch(t){c=t}if(!s)for(let t=0;t<r.length&&!s;t++)try{s=await w(p(n,r[t]),{url:r,extensions:e.extensions??DEFAULT_EXTENSIONS,conditions:e.conditions})}catch(i){c=i}if(!s&&g(n,{withExtension:!1})!=="index")try{s=await resolve(f(n,"index"),{...e,paths:r}),s&&(s=d(s))}catch(t){c=t}if(!s)throw c??new Error(`Cannot resolve module '${n}'`);return u(s)}export function resolveSync(n,e={}){let r=e.paths??[];r.length===0&&r.push(process.cwd());const o=v();r.includes(o)||r.push(o),r=m(r.filter(Boolean).map(t=>u(t)).reduce((t,i,E,x)=>(t.push(i),h(a(i,o))&&t.push(a(i,o)),x.forEach(l=>{h(a(i,l))&&t.push(a(i,l))}),t),[]));let s,c;try{s=y(n,{url:r,extensions:e.extensions??DEFAULT_EXTENSIONS,conditions:e.conditions})}catch(t){c=t}if(!s)for(let t=0;t<r.length&&!s;t++)try{s=y(p(n,r[t]),{url:r,extensions:e.extensions??DEFAULT_EXTENSIONS,conditions:e.conditions})}catch(i){c=i}if(!s&&g(n,{withExtension:!1})!=="index")try{s=resolveSync(f(n,"index"),{...e,paths:r}),s&&(s=d(s))}catch(t){c=t}if(!s)throw c??new Error(`Cannot resolve module '${n}'`);return u(s)}export async function resolveSafe(n,e={}){try{return await resolve(n,e)}catch{return}}export function resolveSafeSync(n,e={}){try{return resolveSync(n,e)}catch{return}}export async function importModule(n){const e=await import(n);return e&&P(e)}export async function resolvePackage(n,e={}){let r=await resolveSafe(f(n,"package.json"),e);return r||(r=await resolveSafe(f(n,"index.js"),e),r||(r=await resolveSafe(n,e))),r?d(r):void 0}export function resolvePackageSync(n,e={}){let r=resolveSafeSync(f(n,"package.json"),e);return r||(r=resolveSafeSync(f(n,"index.js"),e),r||(r=resolveSafeSync(n,e))),r?d(r):void 0}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/fs",
-  "version": "0.32.14",
+  "version": "0.32.15",
   "type": "module",
   "description": "A package containing various file system utilities that expand the functionality of NodeJs's built-in `fs` module.",
   "repository": {
@@ -15,9 +15,10 @@
     "@antfu/install-pkg": "^1.1.0",
     "@ltd/j-toml": "^1.38.0",
     "@storm-software/config-tools": "^1.188.48",
-    "@stryke/convert": "^0.6.3",
-    "@stryke/path": "^0.19.3",
-    "@stryke/string-format": "^0.12.3",
+    "@stryke/convert": "^0.6.4",
+    "@stryke/helpers": "^0.9.6",
+    "@stryke/path": "^0.19.4",
+    "@stryke/string-format": "^0.12.4",
     "chalk": "^5.6.2",
     "defu": "^6.1.4",
     "glob": "^11.1.0",
@@ -25,9 +26,9 @@
     "nanotar": "^0.2.0",
     "semver": "7.7.1",
     "yaml": "^2.8.1",
-    "@stryke/json": "^0.9.6",
-    "@stryke/type-checks": "^0.3.13",
-    "@stryke/types": "^0.10.3"
+    "@stryke/json": "^0.9.7",
+    "@stryke/type-checks": "^0.3.14",
+    "@stryke/types": "^0.10.4"
   },
   "devDependencies": {
     "@types/node": "^24.10.1",
@@ -409,5 +410,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "f96193e785d85704cdc3d2a8c9894766631d7388"
+  "gitHead": "201972005e4b1291d431d46e3fb49764f44690c5"
 }