@stryke/fs 0.24.0 → 0.24.2

package/dist/package-fns.cjs

@@ -12,8 +12,10 @@ 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 _package = require("@stryke/string-format/package");
 var _isString = require("@stryke/type-checks/is-string");
 var _nodeFs = require("node:fs");
+var _semver = require("semver");
 var _json = require("./json.cjs");
 var _semverFns = require("./semver-fns.cjs");
 function getPackageManager(n = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
@@ -30,7 +32,7 @@ function getPackageManager(n = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
       return "npm";
   }
 }
-async function y(n) {
+async function h(n) {
   let e;
   for (;;) {
     if (!n) return;
@@ -40,12 +42,12 @@ async function y(n) {
   }
   return e;
 }
-async function v(n, e = {}) {
+async function J(n, e = {}) {
   const a = await (0, _resolve.resolvePackage)(n, e);
-  if (a) return y(a);
+  if (a) return h(a);
 }
 async function getPackageInfo(n, e = {}) {
-  const a = await v(n, e);
+  const a = await J(n, e);
   if (!a) return;
   const s = await (0, _json.readJsonFile)(a);
   return {
@@ -63,12 +65,12 @@ async function loadPackageJson(n = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
   return !e || !(0, _nodeFs.existsSync)(e) ? null : (0, _json.readJsonFile)(e);
 }
 async function isPackageListed(n, e) {
-  const a = n.replace(/@.*$/, ""),
+  const a = (0, _package.getPackageName)(n),
     s = (0, _isString.isString)(e) ? e : e?.cwd;
   let o = (0, _isString.isString)(e) ? void 0 : e?.version;
-  (!o || !(0, _semverFns.isValidRange)(o)) && (o = n.includes("@") && (0, _semverFns.isValidRange)(n.replace(/^.*@/, "")) ? n.replace(/^.*@/, "") : void 0);
+  (!o || !(0, _semverFns.isValidRange)(o)) && (o = (0, _package.hasPackageVersion)(n) && (0, _semverFns.isValidRange)((0, _package.getPackageVersion)(n)) ? (0, _package.getPackageVersion)(n) : void 0);
   const t = await loadPackageJson(s);
-  return t ? !!((t.dependencies && a in t.dependencies && (!o || (0, _semverFns.satisfiesVersion)(t.dependencies[a], o))) ?? (t.devDependencies && a in t.devDependencies && t.devDependencies[a])) : !1;
+  return t ? !!((t.dependencies && a in t.dependencies && t.dependencies[a] && (!o || (0, _semver.subset)(t.dependencies[a], o))) ?? (t.devDependencies && a in t.devDependencies && t.devDependencies[a] && (!o || (0, _semver.subset)(t.devDependencies[a], o)))) : !1;
 }
 function isPackageExists(n, e = {}) {
   return !!(0, _resolve.resolvePackage)(n, e);

package/dist/package-fns.mjs

@@ -1 +1 @@
-import{exists as f,findFileName as m,findFilePath as r,joinPaths as u}from"@stryke/path";import{getParentPath as i}from"@stryke/path/get-parent-path";import{getWorkspaceRoot as c}from"@stryke/path/get-workspace-root";import{resolvePackage as p}from"@stryke/path/resolve";import{isString as g}from"@stryke/type-checks/is-string";import{existsSync as P}from"node:fs";import{readJsonFile as k}from"./json";import{isValidRange as l,satisfiesVersion as d}from"./semver-fns";export function getPackageManager(n=c()){const e=i(["package-lock.json","yarn.lock","pnpm-lock.yaml","bun.lock"],n);if(!e)return"pnpm";switch(m(e)){case"yarn.lock":return"yarn";case"pnpm-lock.yaml":return"pnpm";case"bun.lock":return"bun";default:return"npm"}}async function y(n){let e;for(;;){if(!n)return;const a=r(n);if(a===n)return;if(n=a,e=u(n,"package.json"),await f(e))break}return e}async function v(n,e={}){const a=await p(n,e);if(a)return y(a)}export async function getPackageInfo(n,e={}){const a=await v(n,e);if(!a)return;const s=await k(a);return{name:n,version:s.version,rootPath:r(a),packageJsonPath:a,packageJson:s}}export async function loadPackageJson(n=c()){const e=i("package.json",n,{skipCwd:!1});return!e||!P(e)?null:k(e)}export async function isPackageListed(n,e){const a=n.replace(/@.*$/,""),s=g(e)?e:e?.cwd;let o=g(e)?void 0:e?.version;(!o||!l(o))&&(o=n.includes("@")&&l(n.replace(/^.*@/,""))?n.replace(/^.*@/,""):void 0);const t=await loadPackageJson(s);return t?!!((t.dependencies&&a in t.dependencies&&(!o||d(t.dependencies[a],o)))??(t.devDependencies&&a in t.devDependencies&&t.devDependencies[a])):!1}export function isPackageExists(n,e={}){return!!p(n,e)}
+import{exists as l,findFileName as u,findFilePath as r,joinPaths as d}from"@stryke/path";import{getParentPath as i}from"@stryke/path/get-parent-path";import{getWorkspaceRoot as c}from"@stryke/path/get-workspace-root";import{resolvePackage as g}from"@stryke/path/resolve";import{getPackageName as y,getPackageVersion as p,hasPackageVersion as v}from"@stryke/string-format/package";import{isString as k}from"@stryke/type-checks/is-string";import{existsSync as x}from"node:fs";import{subset as m}from"semver";import{readJsonFile as f}from"./json";import{isValidRange as P}from"./semver-fns";export function getPackageManager(n=c()){const e=i(["package-lock.json","yarn.lock","pnpm-lock.yaml","bun.lock"],n);if(!e)return"pnpm";switch(u(e)){case"yarn.lock":return"yarn";case"pnpm-lock.yaml":return"pnpm";case"bun.lock":return"bun";default:return"npm"}}async function h(n){let e;for(;;){if(!n)return;const a=r(n);if(a===n)return;if(n=a,e=d(n,"package.json"),await l(e))break}return e}async function J(n,e={}){const a=await g(n,e);if(a)return h(a)}export async function getPackageInfo(n,e={}){const a=await J(n,e);if(!a)return;const s=await f(a);return{name:n,version:s.version,rootPath:r(a),packageJsonPath:a,packageJson:s}}export async function loadPackageJson(n=c()){const e=i("package.json",n,{skipCwd:!1});return!e||!x(e)?null:f(e)}export async function isPackageListed(n,e){const a=y(n),s=k(e)?e:e?.cwd;let o=k(e)?void 0:e?.version;(!o||!P(o))&&(o=v(n)&&P(p(n))?p(n):void 0);const t=await loadPackageJson(s);return t?!!((t.dependencies&&a in t.dependencies&&t.dependencies[a]&&(!o||m(t.dependencies[a],o)))??(t.devDependencies&&a in t.devDependencies&&t.devDependencies[a]&&(!o||m(t.devDependencies[a],o)))):!1}export function isPackageExists(n,e={}){return!!g(n,e)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/fs",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "type": "module",
   "description": "A package containing various file system utilities that expand the functionality of NodeJs's built-in `fs` module.",
   "repository": {
@@ -15,7 +15,8 @@
     "@antfu/install-pkg": "^1.0.0",
     "@ltd/j-toml": "^1.38.0",
     "@stryke/convert": "^0.3.1",
-    "@stryke/path": "0.12.5",
+    "@stryke/path": "^0.12.5",
+    "@stryke/string-format": "^0.10.0",
     "@zkochan/js-yaml": "^0.0.7",
     "chalk": "^5.4.1",
     "defu": "^6.1.4",
@@ -337,5 +338,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "f8abb224a6b6540e442cc664bbb2cf1273b2be2b"
+  "gitHead": "6d49c50f150faf90973f0dce1af515553599f3e1"
 }