@stryke/fs 0.19.0 → 0.20.1

package/dist/package-fns.cjs

@@ -4,19 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPackageInfo = getPackageInfo;
-exports.getPackageInfoSync = getPackageInfoSync;
 exports.getPackageManager = getPackageManager;
 exports.isPackageExists = isPackageExists;
 exports.isPackageListed = isPackageListed;
-exports.loadPackageJSON = loadPackageJSON;
-var _stormJson = require("@stryke/json/storm-json");
+exports.loadPackageJson = loadPackageJson;
 var _path = require("@stryke/path");
 var _getParentPath = require("@stryke/path/get-parent-path");
 var _getWorkspaceRoot = require("@stryke/path/get-workspace-root");
 var _resolve = require("@stryke/path/resolve");
+var _nodeFs = require("node:fs");
 var _readFile = require("./read-file.cjs");
-function getPackageManager(e = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
-  const n = (0, _getParentPath.getParentPath)(["package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lock"], e);
+function getPackageManager(a = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
+  const n = (0, _getParentPath.getParentPath)(["package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lock"], a);
   if (!n) return "pnpm";
   switch ((0, _path.findFileName)(n)) {
     case "yarn.lock":
@@ -29,56 +28,44 @@ function getPackageManager(e = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
       return "npm";
   }
 }
-async function u(e) {
+async function f(a) {
   let n;
   for (;;) {
-    if (!e) return;
-    const a = (0, _path.findFilePath)(e);
-    if (a === e) return;
-    if (e = a, n = (0, _path.joinPaths)(e, "package.json"), await (0, _path.exists)(n)) break;
+    if (!a) return;
+    const e = (0, _path.findFilePath)(a);
+    if (e === a) return;
+    if (a = e, n = (0, _path.joinPaths)(a, "package.json"), await (0, _path.exists)(n)) break;
   }
   return n;
 }
-async function k(e, n = {}) {
-  const a = await (0, _resolve.resolvePackage)(e, n);
-  if (a) return u(a);
+async function u(a, n = {}) {
+  const e = await (0, _resolve.resolvePackage)(a, n);
+  if (e) return f(e);
 }
-async function getPackageInfo(e, n = {}) {
-  const a = await k(e, n);
-  if (!a) return;
-  const t = _stormJson.StormJSON.parse(await (0, _readFile.readFile)(a));
+async function getPackageInfo(a, n = {}) {
+  const e = await u(a, n);
+  if (!e) return;
+  const t = await (0, _readFile.readJsonFile)(e);
   return {
-    name: e,
+    name: a,
     version: t.version,
-    rootPath: (0, _path.findFilePath)(a),
-    packageJsonPath: a,
+    rootPath: (0, _path.findFilePath)(e),
+    packageJsonPath: e,
     packageJson: t
   };
 }
-async function getPackageInfoSync(e, n = {}) {
-  const a = await k(e, n);
-  if (!a) return;
-  const t = _stormJson.StormJSON.parse(await (0, _readFile.readFile)(a));
-  return {
-    name: e,
-    version: t.version,
-    rootPath: (0, _path.findFilePath)(a),
-    packageJsonPath: a,
-    packageJson: t
-  };
-}
-async function loadPackageJSON(e = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
-  const n = (0, _getParentPath.getParentPath)("package.json", e, {
+async function loadPackageJson(a = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
+  const n = (0, _getParentPath.getParentPath)("package.json", a, {
     skipCwd: !1
   });
-  return !n || !(await (0, _path.exists)(n)) ? null : _stormJson.StormJSON.parse(await (0, _readFile.readFile)(n));
+  return !n || !(0, _nodeFs.existsSync)(n) ? null : (0, _readFile.readJsonFile)(n);
 }
-async function isPackageListed(e, n) {
-  let a = e;
-  a.includes("@") && (a = !a.startsWith("@") || a.lastIndexOf("@") > 0 ? a.slice(0, a.lastIndexOf("@")) : a);
-  const t = (await loadPackageJSON(n)) ?? {};
-  return a in (t.dependencies ?? {}) || a in (t.devDependencies ?? {});
+async function isPackageListed(a, n) {
+  let e = a;
+  e.includes("@") && (e = !e.startsWith("@") || e.lastIndexOf("@") > 0 ? e.slice(0, e.lastIndexOf("@")) : e);
+  const t = (await loadPackageJson(n)) ?? {};
+  return e in (t.dependencies ?? {}) || e in (t.devDependencies ?? {});
 }
-function isPackageExists(e, n = {}) {
-  return !!(0, _resolve.resolvePackage)(e, n);
+function isPackageExists(a, n = {}) {
+  return !!(0, _resolve.resolvePackage)(a, n);
 }

package/dist/package-fns.d.ts

@@ -19,21 +19,7 @@ export declare function getPackageInfo(name: string, options?: PackageResolvingO
     version: any;
     rootPath: any;
     packageJsonPath: any;
-    packageJson: any;
-} | undefined>;
-/**
- * Get package info synchronously
- *
- * @param name - The name of the package
- * @param options - The options to use when resolving the package
- * @returns The package info
- */
-export declare function getPackageInfoSync(name: string, options?: PackageResolvingOptions): Promise<{
-    name: string;
-    version: any;
-    rootPath: any;
-    packageJsonPath: any;
-    packageJson: any;
+    packageJson: PackageJson;
 } | undefined>;
 /**
  * Get the package info from the package.json file
@@ -41,7 +27,7 @@ export declare function getPackageInfoSync(name: string, options?: PackageResolv
  * @param cwd - The current working directory
  * @returns The package info
  */
-export declare function loadPackageJSON(cwd?: any): Promise<PackageJson | null>;
+export declare function loadPackageJson(cwd?: any): Promise<PackageJson | null>;
 /**
  * Check if a package is listed in the package.json file
  *

package/dist/package-fns.mjs

@@ -1 +1 @@
-import{StormJSON as o}from"@stryke/json/storm-json";import{exists as i,findFileName as l,findFilePath as r,joinPaths as f}from"@stryke/path";import{getParentPath as c}from"@stryke/path/get-parent-path";import{getWorkspaceRoot as g}from"@stryke/path/get-workspace-root";import{resolvePackage as p}from"@stryke/path/resolve";import{readFile as s}from"./read-file";export function getPackageManager(e=g()){const n=c(["package-lock.json","yarn.lock","pnpm-lock.yaml","bun.lock"],e);if(!n)return"pnpm";switch(l(n)){case"yarn.lock":return"yarn";case"pnpm-lock.yaml":return"pnpm";case"bun.lock":return"bun";default:return"npm"}}async function u(e){let n;for(;;){if(!e)return;const a=r(e);if(a===e)return;if(e=a,n=f(e,"package.json"),await i(n))break}return n}async function k(e,n={}){const a=await p(e,n);if(a)return u(a)}export async function getPackageInfo(e,n={}){const a=await k(e,n);if(!a)return;const t=o.parse(await s(a));return{name:e,version:t.version,rootPath:r(a),packageJsonPath:a,packageJson:t}}export async function getPackageInfoSync(e,n={}){const a=await k(e,n);if(!a)return;const t=o.parse(await s(a));return{name:e,version:t.version,rootPath:r(a),packageJsonPath:a,packageJson:t}}export async function loadPackageJSON(e=g()){const n=c("package.json",e,{skipCwd:!1});return!n||!await i(n)?null:o.parse(await s(n))}export async function isPackageListed(e,n){let a=e;a.includes("@")&&(a=!a.startsWith("@")||a.lastIndexOf("@")>0?a.slice(0,a.lastIndexOf("@")):a);const t=await loadPackageJSON(n)??{};return a in(t.dependencies??{})||a in(t.devDependencies??{})}export function isPackageExists(e,n={}){return!!p(e,n)}
+import{exists as p,findFileName as g,findFilePath as o,joinPaths as k}from"@stryke/path";import{getParentPath as r}from"@stryke/path/get-parent-path";import{getWorkspaceRoot as s}from"@stryke/path/get-workspace-root";import{resolvePackage as i}from"@stryke/path/resolve";import{existsSync as l}from"node:fs";import{readJsonFile as c}from"./read-file";export function getPackageManager(a=s()){const n=r(["package-lock.json","yarn.lock","pnpm-lock.yaml","bun.lock"],a);if(!n)return"pnpm";switch(g(n)){case"yarn.lock":return"yarn";case"pnpm-lock.yaml":return"pnpm";case"bun.lock":return"bun";default:return"npm"}}async function f(a){let n;for(;;){if(!a)return;const e=o(a);if(e===a)return;if(a=e,n=k(a,"package.json"),await p(n))break}return n}async function u(a,n={}){const e=await i(a,n);if(e)return f(e)}export async function getPackageInfo(a,n={}){const e=await u(a,n);if(!e)return;const t=await c(e);return{name:a,version:t.version,rootPath:o(e),packageJsonPath:e,packageJson:t}}export async function loadPackageJson(a=s()){const n=r("package.json",a,{skipCwd:!1});return!n||!l(n)?null:c(n)}export async function isPackageListed(a,n){let e=a;e.includes("@")&&(e=!e.startsWith("@")||e.lastIndexOf("@")>0?e.slice(0,e.lastIndexOf("@")):e);const t=await loadPackageJson(n)??{};return e in(t.dependencies??{})||e in(t.devDependencies??{})}export function isPackageExists(a,n={}){return!!i(a,n)}

package/dist/tsconfig.cjs

@@ -4,119 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loadTsConfig = loadTsConfig;
-exports.loadTsConfigSync = loadTsConfigSync;
-var _path = require("@stryke/path");
 var _exists = require("@stryke/path/exists");
 var _filePathFns = require("@stryke/path/file-path-fns");
 var _joinPaths = require("@stryke/path/join-paths");
-var _base = require("@stryke/types/base");
 var _defu = _interopRequireDefault(require("defu"));
-var _nodeModule = require("node:module");
+var _jiti = require("jiti");
 var _readFile = require("./read-file.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const x = Symbol("singleComment"),
-  L = Symbol("multiComment"),
-  E = () => "",
-  k = (e, t, o) => e.slice(t, o).replace(/\S/g, " "),
-  $ = (e, t) => {
-    let o = t - 1,
-      i = 0;
-    for (; e[o] === "\\";) o -= 1, i += 1;
-    return !!(i % 2);
-  },
-  v = (e, {
-    whitespace: t = !0,
-    trailingCommas: o = !1
-  } = {}) => {
-    if (typeof e != "string") throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof e}\``);
-    const i = t ? k : E;
-    let s = !1,
-      l = !1,
-      r = 0,
-      f = "",
-      u = "",
-      c = -1;
-    for (let n = 0; n < e.length; n++) {
-      const a = e[n],
-        m = e[n + 1];
-      !l && a === '"' && ($(e, n) || (s = !s)), !s && (!l && a + (m ?? _base.EMPTY_STRING) === "//" ? (f += e.slice(r, n), r = n, l = x, n++) : l === x && a + (m ?? _base.EMPTY_STRING) === `\r
-` ? (n++, l = !1, f += i(e, r, n), r = n) : l === x && a === `
-` ? (l = !1, f += i(e, r, n), r = n) : !l && a + (m ?? _base.EMPTY_STRING) === "/*" ? (f += e.slice(r, n), r = n, l = L, n++) : l === L && a + (m ?? _base.EMPTY_STRING) === "*/" ? (n++, l = !1, f += i(e, r, n + 1), r = n + 1) : o && !l && (c !== -1 ? a === "}" || a === "]" ? (f += e.slice(r, n), u += i(f, 0, 1) + f.slice(1), f = "", r = n, c = -1) : a !== " " && a !== "	" && a !== "\r" && a !== `
-` && (f += e.slice(r, n), r = n, c = -1) : a === "," && (u += f + e.slice(r, n), f = "", r = n, c = n)));
-    }
-    return u + f + (l ? i(e.slice(r)) : e.slice(r));
-  },
-  P = e => {
-    try {
-      return new Function(`return ${v(e).trim()}`)();
-    } catch {
-      return {};
-    }
-  },
-  J = (0, _nodeModule.createRequire)(require('url').pathToFileURL(__filename).toString());
-function R(e, t) {
-  if ((0, _path.isAbsolutePath)(t)) return (0, _exists.existsSync)(t) ? t : null;
-  const o = t.endsWith(".json") ? t : `${t}.json`;
-  return (0, _exists.existsSync)((0, _joinPaths.joinPaths)(e, o)) ? (0, _joinPaths.joinPaths)(e, o) : (0, _path.getParentPath)(o, e, {
-    ignoreCase: !0,
-    skipCwd: !0,
-    targetType: "file"
-  });
-}
-function W(e, t) {
-  if ((0, _path.isAbsolutePath)(t)) return (0, _exists.existsSync)(t) ? t : null;
-  const o = t.endsWith(".json") ? t : `${t}.json`;
-  return (0, _exists.existsSync)((0, _joinPaths.joinPaths)(e, o)) ? (0, _joinPaths.joinPaths)(e, o) : o.startsWith(".") ? (0, _path.getParentPath)((0, _filePathFns.findFileName)(o), e, {
-    ignoreCase: !0,
-    skipCwd: !1,
-    targetType: "file"
-  }) : J.resolve(t, {
-    paths: [e]
-  });
-}
-async function I(e, t, o = !1) {
-  const i = o ? W((0, _path.slash)(e), t) : R((0, _path.slash)(e), t);
-  if (!i) return null;
-  let s = P(await (0, _readFile.readFile)(i));
-  const l = (0, _filePathFns.findFilePath)(i);
-  s?.compilerOptions?.baseUrl && (s.compilerOptions.baseUrl = (0, _joinPaths.joinPaths)(l, s.compilerOptions.baseUrl));
-  const r = [];
-  if (s.extends) {
-    const f = Array.isArray(s.extends) ? s.extends : [s.extends];
-    for (const u of f) {
-      const c = await I(l, u, !0);
-      c && (s = (0, _defu.default)(s, c.data ?? {}), r.push(...c.files));
-    }
-  }
-  return s.extends = void 0, {
-    path: i,
-    data: s,
-    files: [...r, i]
-  };
-}
-function O(e, t, o = !1) {
-  const i = o ? W((0, _path.slash)(e), t) : R((0, _path.slash)(e), t);
-  if (!i) return null;
-  let s = P((0, _readFile.readFileSync)(i));
-  const l = (0, _filePathFns.findFilePath)(i);
-  s?.compilerOptions?.baseUrl && (s.compilerOptions.baseUrl = (0, _joinPaths.joinPaths)(l, s.compilerOptions.baseUrl));
-  const r = [];
-  if (s.extends) {
-    const f = Array.isArray(s.extends) ? s.extends : [s.extends];
-    for (const u of f) {
-      const c = O(l, u, !0);
-      c && (s = (0, _defu.default)(s, c.data ?? {}), r.push(...c.files));
+const d = (0, _jiti.createJiti)(require('url').pathToFileURL(__filename).toString());
+async function loadTsConfig(s = process.cwd()) {
+  let e = s.endsWith(".json") ? s : (0, _joinPaths.joinPaths)(s, "tsconfig.json");
+  if (!(0, _exists.existsSync)(e) && (e = d.esmResolve(s), !(0, _exists.existsSync)(e))) throw new Error(`tsconfig.json not found at ${e}. Please ensure the file exists.`);
+  let o = await (0, _readFile.readJsonFile)(e);
+  if (o?.compilerOptions?.baseUrl && (o.compilerOptions.baseUrl = (0, _joinPaths.joinPaths)((0, _filePathFns.findFilePath)(e), o.compilerOptions.baseUrl)), o?.extends) {
+    const f = Array.isArray(o.extends) ? o.extends : [o.extends];
+    for (const m of f) {
+      const i = await loadTsConfig((0, _joinPaths.joinPaths)((0, _filePathFns.findFilePath)(e), m));
+      i && (o = (0, _defu.default)(o, i ?? {}));
     }
   }
-  return s.extends = void 0, {
-    path: i,
-    data: s,
-    files: [...r, i]
-  };
-}
-async function loadTsConfig(e, t) {
-  return I((0, _filePathFns.findFilePath)(e) ? (0, _filePathFns.findFilePath)(e) : process.cwd(), t ? (0, _filePathFns.findFileName)(t) : "tsconfig.json");
-}
-function loadTsConfigSync(e, t) {
-  return O((0, _filePathFns.findFilePath)(e) ? (0, _filePathFns.findFilePath)(e) : process.cwd(), t ? (0, _filePathFns.findFileName)(t) : "tsconfig.json");
+  return o.extends = void 0, o;
 }

package/dist/tsconfig.d.ts

@@ -1,22 +1,8 @@
 import type { TsConfigJson } from "@stryke/types/tsconfig";
-export interface LoadTsConfigResult {
-    path: string;
-    data: TsConfigJson;
-    files: string[];
-}
 /**
  * Loads a tsconfig.json file and returns the parsed JSON object.
  *
  * @param filePath - The directory to start searching for the tsconfig.json file.
- * @param fileName - The name of the tsconfig.json file.
  * @returns The parsed tsconfig.json object or null if not found.
  */
-export declare function loadTsConfig(filePath: string, fileName?: string): Promise<LoadTsConfigResult | null>;
-/**
- * Synchronously loads a tsconfig.json file and returns the parsed JSON object.
- *
- * @param filePath - The directory to start searching for the tsconfig.json file.
- * @param fileName - The name of the tsconfig.json file.
- * @returns The parsed tsconfig.json object or null if not found.
- */
-export declare function loadTsConfigSync(filePath: string, fileName?: string): LoadTsConfigResult | null;
+export declare function loadTsConfig(filePath?: string): Promise<TsConfigJson>;

package/dist/tsconfig.mjs

@@ -1,4 +1 @@
-import{getParentPath as b,isAbsolutePath as T,slash as g}from"@stryke/path";import{existsSync as C}from"@stryke/path/exists";import{findFileName as y,findFilePath as p}from"@stryke/path/file-path-fns";import{joinPaths as d}from"@stryke/path/join-paths";import{EMPTY_STRING as h}from"@stryke/types/base";import F from"defu";import{createRequire as U}from"node:module";import{readFile as w,readFileSync as A}from"./read-file";const x=Symbol("singleComment"),L=Symbol("multiComment"),E=()=>"",k=(e,t,o)=>e.slice(t,o).replace(/\S/g," "),$=(e,t)=>{let o=t-1,i=0;for(;e[o]==="\\";)o-=1,i+=1;return!!(i%2)},v=(e,{whitespace:t=!0,trailingCommas:o=!1}={})=>{if(typeof e!="string")throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof e}\``);const i=t?k:E;let s=!1,l=!1,r=0,f="",u="",c=-1;for(let n=0;n<e.length;n++){const a=e[n],m=e[n+1];!l&&a==='"'&&($(e,n)||(s=!s)),!s&&(!l&&a+(m??h)==="//"?(f+=e.slice(r,n),r=n,l=x,n++):l===x&&a+(m??h)===`\r
-`?(n++,l=!1,f+=i(e,r,n),r=n):l===x&&a===`
-`?(l=!1,f+=i(e,r,n),r=n):!l&&a+(m??h)==="/*"?(f+=e.slice(r,n),r=n,l=L,n++):l===L&&a+(m??h)==="*/"?(n++,l=!1,f+=i(e,r,n+1),r=n+1):o&&!l&&(c!==-1?a==="}"||a==="]"?(f+=e.slice(r,n),u+=i(f,0,1)+f.slice(1),f="",r=n,c=-1):a!==" "&&a!=="	"&&a!=="\r"&&a!==`
-`&&(f+=e.slice(r,n),r=n,c=-1):a===","&&(u+=f+e.slice(r,n),f="",r=n,c=n)))}return u+f+(l?i(e.slice(r)):e.slice(r))},P=e=>{try{return new Function(`return ${v(e).trim()}`)()}catch{return{}}},J=U(import.meta.url);function R(e,t){if(T(t))return C(t)?t:null;const o=t.endsWith(".json")?t:`${t}.json`;return C(d(e,o))?d(e,o):b(o,e,{ignoreCase:!0,skipCwd:!0,targetType:"file"})}function W(e,t){if(T(t))return C(t)?t:null;const o=t.endsWith(".json")?t:`${t}.json`;return C(d(e,o))?d(e,o):o.startsWith(".")?b(y(o),e,{ignoreCase:!0,skipCwd:!1,targetType:"file"}):J.resolve(t,{paths:[e]})}async function I(e,t,o=!1){const i=o?W(g(e),t):R(g(e),t);if(!i)return null;let s=P(await w(i));const l=p(i);s?.compilerOptions?.baseUrl&&(s.compilerOptions.baseUrl=d(l,s.compilerOptions.baseUrl));const r=[];if(s.extends){const f=Array.isArray(s.extends)?s.extends:[s.extends];for(const u of f){const c=await I(l,u,!0);c&&(s=F(s,c.data??{}),r.push(...c.files))}}return s.extends=void 0,{path:i,data:s,files:[...r,i]}}function O(e,t,o=!1){const i=o?W(g(e),t):R(g(e),t);if(!i)return null;let s=P(A(i));const l=p(i);s?.compilerOptions?.baseUrl&&(s.compilerOptions.baseUrl=d(l,s.compilerOptions.baseUrl));const r=[];if(s.extends){const f=Array.isArray(s.extends)?s.extends:[s.extends];for(const u of f){const c=O(l,u,!0);c&&(s=F(s,c.data??{}),r.push(...c.files))}}return s.extends=void 0,{path:i,data:s,files:[...r,i]}}export async function loadTsConfig(e,t){return I(p(e)?p(e):process.cwd(),t?y(t):"tsconfig.json")}export function loadTsConfigSync(e,t){return O(p(e)?p(e):process.cwd(),t?y(t):"tsconfig.json")}
+import{existsSync as n}from"@stryke/path/exists";import{findFilePath as r}from"@stryke/path/file-path-fns";import{joinPaths as t}from"@stryke/path/join-paths";import p from"defu";import{createJiti as a}from"jiti";import{readJsonFile as c}from"./read-file";const d=a(import.meta.url);export async function loadTsConfig(s=process.cwd()){let e=s.endsWith(".json")?s:t(s,"tsconfig.json");if(!n(e)&&(e=d.esmResolve(s),!n(e)))throw new Error(`tsconfig.json not found at ${e}. Please ensure the file exists.`);let o=await c(e);if(o?.compilerOptions?.baseUrl&&(o.compilerOptions.baseUrl=t(r(e),o.compilerOptions.baseUrl)),o?.extends){const f=Array.isArray(o.extends)?o.extends:[o.extends];for(const m of f){const i=await loadTsConfig(t(r(e),m));i&&(o=p(o,i??{}))}}return o.extends=void 0,o}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/fs",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "type": "module",
   "description": "A package containing various file system utilities that expand the functionality of NodeJs's built-in `fs` module.",
   "repository": {
@@ -20,9 +20,10 @@
     "chalk": "^5.4.1",
     "defu": "^6.1.4",
     "glob": "^11.0.1",
+    "jiti": "^2.4.2",
     "nanotar": "^0.2.0",
     "semver": "7.7.1",
-    "@stryke/json": "^0.8.3",
+    "@stryke/json": "^0.9.0",
     "@stryke/type-checks": "^0.3.3",
     "@stryke/types": "^0.8.3"
   },