@pgpmjs/env 2.9.1 → 2.9.3

package/config.d.ts

@@ -19,3 +19,20 @@ export declare const loadConfigSync: (cwd?: string) => PgpmOptions;
  * Moved from PgpmPackage class for better reusability
  */
 export declare const resolvePgpmPath: (cwd?: string) => string | undefined;
+/**
+ * Resolve the path to a pnpm workspace by finding pnpm-workspace.yaml
+ */
+export declare const resolvePnpmWorkspace: (cwd?: string) => string | undefined;
+/**
+ * Resolve the path to a lerna workspace by finding lerna.json
+ */
+export declare const resolveLernaWorkspace: (cwd?: string) => string | undefined;
+/**
+ * Resolve the path to an npm workspace by finding package.json with workspaces field
+ */
+export declare const resolveNpmWorkspace: (cwd?: string) => string | undefined;
+export type WorkspaceType = 'pgpm' | 'pnpm' | 'lerna' | 'npm';
+/**
+ * Resolve workspace path based on workspace type
+ */
+export declare const resolveWorkspaceByType: (cwd: string, workspaceType: WorkspaceType) => string | undefined;

package/config.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePgpmPath = exports.loadConfigSync = exports.loadConfigSyncFromDir = exports.loadConfigFileSync = void 0;
+exports.resolveWorkspaceByType = exports.resolveNpmWorkspace = exports.resolveLernaWorkspace = exports.resolvePnpmWorkspace = exports.resolvePgpmPath = exports.loadConfigSync = exports.loadConfigSyncFromDir = exports.loadConfigFileSync = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const utils_1 = require("./utils");
@@ -106,3 +106,69 @@ const resolvePgpmPath = (cwd = process.cwd()) => {
     return undefined;
 };
 exports.resolvePgpmPath = resolvePgpmPath;
+/**
+ * Resolve the path to a pnpm workspace by finding pnpm-workspace.yaml
+ */
+const resolvePnpmWorkspace = (cwd = process.cwd()) => {
+    try {
+        return (0, utils_1.walkUp)(cwd, 'pnpm-workspace.yaml');
+    }
+    catch {
+        return undefined;
+    }
+};
+exports.resolvePnpmWorkspace = resolvePnpmWorkspace;
+/**
+ * Resolve the path to a lerna workspace by finding lerna.json
+ */
+const resolveLernaWorkspace = (cwd = process.cwd()) => {
+    try {
+        return (0, utils_1.walkUp)(cwd, 'lerna.json');
+    }
+    catch {
+        return undefined;
+    }
+};
+exports.resolveLernaWorkspace = resolveLernaWorkspace;
+/**
+ * Resolve the path to an npm workspace by finding package.json with workspaces field
+ */
+const resolveNpmWorkspace = (cwd = process.cwd()) => {
+    let currentDir = path.resolve(cwd);
+    const root = path.parse(currentDir).root;
+    while (currentDir !== root) {
+        const packageJsonPath = path.join(currentDir, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            try {
+                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                if (packageJson.workspaces) {
+                    return currentDir;
+                }
+            }
+            catch {
+                // Ignore JSON parse errors
+            }
+        }
+        currentDir = path.dirname(currentDir);
+    }
+    return undefined;
+};
+exports.resolveNpmWorkspace = resolveNpmWorkspace;
+/**
+ * Resolve workspace path based on workspace type
+ */
+const resolveWorkspaceByType = (cwd, workspaceType) => {
+    switch (workspaceType) {
+        case 'pgpm':
+            return (0, exports.resolvePgpmPath)(cwd);
+        case 'pnpm':
+            return (0, exports.resolvePnpmWorkspace)(cwd);
+        case 'lerna':
+            return (0, exports.resolveLernaWorkspace)(cwd);
+        case 'npm':
+            return (0, exports.resolveNpmWorkspace)(cwd);
+        default:
+            return undefined;
+    }
+};
+exports.resolveWorkspaceByType = resolveWorkspaceByType;

package/esm/config.js

@@ -66,3 +66,65 @@ export const resolvePgpmPath = (cwd = process.cwd()) => {
     }
     return undefined;
 };
+/**
+ * Resolve the path to a pnpm workspace by finding pnpm-workspace.yaml
+ */
+export const resolvePnpmWorkspace = (cwd = process.cwd()) => {
+    try {
+        return walkUp(cwd, 'pnpm-workspace.yaml');
+    }
+    catch {
+        return undefined;
+    }
+};
+/**
+ * Resolve the path to a lerna workspace by finding lerna.json
+ */
+export const resolveLernaWorkspace = (cwd = process.cwd()) => {
+    try {
+        return walkUp(cwd, 'lerna.json');
+    }
+    catch {
+        return undefined;
+    }
+};
+/**
+ * Resolve the path to an npm workspace by finding package.json with workspaces field
+ */
+export const resolveNpmWorkspace = (cwd = process.cwd()) => {
+    let currentDir = path.resolve(cwd);
+    const root = path.parse(currentDir).root;
+    while (currentDir !== root) {
+        const packageJsonPath = path.join(currentDir, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            try {
+                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                if (packageJson.workspaces) {
+                    return currentDir;
+                }
+            }
+            catch {
+                // Ignore JSON parse errors
+            }
+        }
+        currentDir = path.dirname(currentDir);
+    }
+    return undefined;
+};
+/**
+ * Resolve workspace path based on workspace type
+ */
+export const resolveWorkspaceByType = (cwd, workspaceType) => {
+    switch (workspaceType) {
+        case 'pgpm':
+            return resolvePgpmPath(cwd);
+        case 'pnpm':
+            return resolvePnpmWorkspace(cwd);
+        case 'lerna':
+            return resolveLernaWorkspace(cwd);
+        case 'npm':
+            return resolveNpmWorkspace(cwd);
+        default:
+            return undefined;
+    }
+};

package/esm/index.js

@@ -1,4 +1,4 @@
 export { getEnvOptions, getConnEnvOptions, getDeploymentEnvOptions } from './merge';
-export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath } from './config';
+export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath, resolvePnpmWorkspace, resolveLernaWorkspace, resolveNpmWorkspace, resolveWorkspaceByType } from './config';
 export { getEnvVars, getNodeEnv, parseEnvBoolean } from './env';
 export { walkUp, mergeArraysUnique } from './utils';

package/index.d.ts

@@ -1,5 +1,6 @@
 export { getEnvOptions, getConnEnvOptions, getDeploymentEnvOptions } from './merge';
-export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath } from './config';
+export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath, resolvePnpmWorkspace, resolveLernaWorkspace, resolveNpmWorkspace, resolveWorkspaceByType } from './config';
+export type { WorkspaceType } from './config';
 export { getEnvVars, getNodeEnv, parseEnvBoolean } from './env';
 export { walkUp, mergeArraysUnique } from './utils';
 export type { PgpmOptions, PgTestConnectionOptions, DeploymentOptions } from '@pgpmjs/types';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeArraysUnique = exports.walkUp = exports.parseEnvBoolean = exports.getNodeEnv = exports.getEnvVars = exports.resolvePgpmPath = exports.loadConfigFileSync = exports.loadConfigSyncFromDir = exports.loadConfigSync = exports.getDeploymentEnvOptions = exports.getConnEnvOptions = exports.getEnvOptions = void 0;
+exports.mergeArraysUnique = exports.walkUp = exports.parseEnvBoolean = exports.getNodeEnv = exports.getEnvVars = exports.resolveWorkspaceByType = exports.resolveNpmWorkspace = exports.resolveLernaWorkspace = exports.resolvePnpmWorkspace = exports.resolvePgpmPath = exports.loadConfigFileSync = exports.loadConfigSyncFromDir = exports.loadConfigSync = exports.getDeploymentEnvOptions = exports.getConnEnvOptions = exports.getEnvOptions = void 0;
 var merge_1 = require("./merge");
 Object.defineProperty(exports, "getEnvOptions", { enumerable: true, get: function () { return merge_1.getEnvOptions; } });
 Object.defineProperty(exports, "getConnEnvOptions", { enumerable: true, get: function () { return merge_1.getConnEnvOptions; } });
@@ -10,6 +10,10 @@ Object.defineProperty(exports, "loadConfigSync", { enumerable: true, get: functi
 Object.defineProperty(exports, "loadConfigSyncFromDir", { enumerable: true, get: function () { return config_1.loadConfigSyncFromDir; } });
 Object.defineProperty(exports, "loadConfigFileSync", { enumerable: true, get: function () { return config_1.loadConfigFileSync; } });
 Object.defineProperty(exports, "resolvePgpmPath", { enumerable: true, get: function () { return config_1.resolvePgpmPath; } });
+Object.defineProperty(exports, "resolvePnpmWorkspace", { enumerable: true, get: function () { return config_1.resolvePnpmWorkspace; } });
+Object.defineProperty(exports, "resolveLernaWorkspace", { enumerable: true, get: function () { return config_1.resolveLernaWorkspace; } });
+Object.defineProperty(exports, "resolveNpmWorkspace", { enumerable: true, get: function () { return config_1.resolveNpmWorkspace; } });
+Object.defineProperty(exports, "resolveWorkspaceByType", { enumerable: true, get: function () { return config_1.resolveWorkspaceByType; } });
 var env_1 = require("./env");
 Object.defineProperty(exports, "getEnvVars", { enumerable: true, get: function () { return env_1.getEnvVars; } });
 Object.defineProperty(exports, "getNodeEnv", { enumerable: true, get: function () { return env_1.getNodeEnv; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/env",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "author": "Dan Lynch <Dan Lynch>",
   "description": "PGPM environment management",
   "main": "index.js",
@@ -29,7 +29,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpmjs/types": "^2.13.0",
+    "@pgpmjs/types": "^2.14.0",
     "deepmerge": "^4.3.1"
   },
   "keywords": [
@@ -41,7 +41,7 @@
     "env"
   ],
   "devDependencies": {
-    "makage": "^0.1.9"
+    "makage": "^0.1.10"
   },
-  "gitHead": "14ed679aeb6172e013c817b8a458e5bee68ab492"
+  "gitHead": "ba5bbacf7ccc1980cba10bf3f45ebb0ca639fb79"
 }