@stryke/fs 0.24.1 → 0.25.0

package/dist/package-fns.cjs

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.doesPackageMatch = doesPackageMatch;
 exports.getPackageInfo = getPackageInfo;
+exports.getPackageListing = getPackageListing;
 exports.getPackageManager = getPackageManager;
 exports.isPackageExists = isPackageExists;
 exports.isPackageListed = isPackageListed;
@@ -15,10 +17,10 @@ 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)()) {
-  const e = (0, _getParentPath.getParentPath)(["package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lock"], n);
+function getPackageManager(t = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
+  const e = (0, _getParentPath.getParentPath)(["package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lock"], t);
   if (!e) return "pnpm";
   switch ((0, _path.findFileName)(e)) {
     case "yarn.lock":
@@ -31,46 +33,62 @@ function getPackageManager(n = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
       return "npm";
   }
 }
-async function h(n) {
+async function v(t) {
   let e;
   for (;;) {
-    if (!n) return;
-    const a = (0, _path.findFilePath)(n);
-    if (a === n) return;
-    if (n = a, e = (0, _path.joinPaths)(n, "package.json"), await (0, _path.exists)(e)) break;
+    if (!t) return;
+    const n = (0, _path.findFilePath)(t);
+    if (n === t) return;
+    if (t = n, e = (0, _path.joinPaths)(t, "package.json"), await (0, _path.exists)(e)) break;
   }
   return e;
 }
-async function J(n, e = {}) {
-  const a = await (0, _resolve.resolvePackage)(n, e);
-  if (a) return h(a);
+async function x(t, e = {}) {
+  const n = await (0, _resolve.resolvePackage)(t, e);
+  if (n) return v(n);
 }
-async function getPackageInfo(n, e = {}) {
-  const a = await J(n, e);
-  if (!a) return;
-  const s = await (0, _json.readJsonFile)(a);
+async function getPackageInfo(t, e = {}) {
+  const n = await x(t, e);
+  if (!n) return;
+  const s = await (0, _json.readJsonFile)(n);
   return {
-    name: n,
+    name: t,
     version: s.version,
-    rootPath: (0, _path.findFilePath)(a),
-    packageJsonPath: a,
+    rootPath: (0, _path.findFilePath)(n),
+    packageJsonPath: n,
     packageJson: s
   };
 }
-async function loadPackageJson(n = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
-  const e = (0, _getParentPath.getParentPath)("package.json", n, {
+async function loadPackageJson(t = (0, _getWorkspaceRoot.getWorkspaceRoot)()) {
+  const e = (0, _getParentPath.getParentPath)("package.json", t, {
     skipCwd: !1
   });
   return !e || !(0, _nodeFs.existsSync)(e) ? null : (0, _json.readJsonFile)(e);
 }
-async function isPackageListed(n, e) {
-  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 = (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;
+async function isPackageListed(t, e) {
+  const n = (0, _package.getPackageName)(t),
+    s = (0, _isString.isString)(e) ? e : e?.cwd,
+    a = await loadPackageJson(s);
+  return a ? !!(a.dependencies && n in a.dependencies && a.dependencies[n] || a.devDependencies && n in a.devDependencies && a.devDependencies[n]) : !1;
+}
+async function getPackageListing(t, e) {
+  const n = (0, _package.getPackageName)(t),
+    s = (0, _isString.isString)(e) ? e : e?.cwd,
+    a = await loadPackageJson(s);
+  if (!a) return;
+  const i = a.dependencies && n in a.dependencies ? a.dependencies[n] : a.devDependencies && n in a.devDependencies ? a.devDependencies[n] : void 0,
+    o = (a.dependencies && n in a.dependencies ? "dependencies" : a.devDependencies && n in a.devDependencies ? "devDependencies" : void 0) || void 0;
+  return i && o ? {
+    version: i,
+    type: o
+  } : void 0;
+}
+async function doesPackageMatch(t, e, n) {
+  const s = await getPackageListing(t, {
+    cwd: n
+  });
+  return s ? s.version.startsWith("catalog:") || s.version.startsWith("workspace:") || (0, _semver.subset)(s.version, e) : !1;
 }
-function isPackageExists(n, e = {}) {
-  return !!(0, _resolve.resolvePackage)(n, e);
+function isPackageExists(t, e = {}) {
+  return !!(0, _resolve.resolvePackage)(t, e);
 }

package/dist/package-fns.d.ts

@@ -34,6 +34,8 @@ export interface PackageExistsOptions {
      * The current working directory
      */
     cwd?: string;
+}
+export interface PackageMatchesOptions extends PackageExistsOptions {
     /**
      * The version range of the package to check
      */
@@ -55,6 +57,27 @@ export declare function isPackageListed(name: string, cwd?: string): Promise<boo
  * @returns An indicator specifying if the package is listed
  */
 export declare function isPackageListed(name: string, options?: PackageExistsOptions): Promise<boolean>;
+export interface GetPackageListingReturn {
+    version: string;
+    type: "dependencies" | "devDependencies";
+}
+/**
+ * Return the package version and dependency type listed in the package.json file
+ *
+ * @param name - The name of the package
+ * @param cwdOrOptions - The current working directory or options to use when checking if the package is listed
+ * @returns The version and type of the package if listed, otherwise undefined
+ */
+export declare function getPackageListing(name: string, cwdOrOptions?: string | PackageExistsOptions): Promise<GetPackageListingReturn | undefined>;
+/**
+ * Check if a package version matches a specific version range
+ *
+ * @param name - The name of the package
+ * @param version - The version to check against
+ * @param cwd - The current working directory
+ * @returns An indicator specifying if the package version matches the range
+ */
+export declare function doesPackageMatch(name: string, version: string, cwd?: string): Promise<boolean>;
 /**
  * Check if a package exists
  *

package/dist/package-fns.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/fs",
-  "version": "0.24.1",
+  "version": "0.25.0",
   "type": "module",
   "description": "A package containing various file system utilities that expand the functionality of NodeJs's built-in `fs` module.",
   "repository": {
@@ -9,14 +9,14 @@
     "directory": "packages/fs"
   },
   "private": false,
-  "peerDependencies": { "nx": "21.3.10" },
+  "peerDependencies": { "nx": "^21.4.1" },
   "peerDependenciesMeta": { "nx": { "optional": true } },
   "dependencies": {
     "@antfu/install-pkg": "^1.0.0",
     "@ltd/j-toml": "^1.38.0",
     "@stryke/convert": "^0.3.1",
     "@stryke/path": "^0.12.5",
-    "@stryke/string-format": "0.10.0",
+    "@stryke/string-format": "^0.10.0",
     "@zkochan/js-yaml": "^0.0.7",
     "chalk": "^5.4.1",
     "defu": "^6.1.4",
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@types/node": "^22.14.0",
     "@types/semver": "^7.5.8",
-    "nx": "21.3.10",
+    "nx": "^21.4.1",
     "tinyexec": "^0.3.2"
   },
   "publishConfig": { "access": "public" },
@@ -338,5 +338,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "b6c7dec04a3f5c6aa82f13ccba8a096c2da2519c"
+  "gitHead": "a4337f9cb38835e8f5b60e857c08235552b7db77"
 }