Merge pull request #20 from constructive-io/fix/pkg2

Fix/pkg2

Author: pyramation

packages/find-and-require-package-json/README.md

@@ -13,7 +13,7 @@
   </a>
 </p>
 
-This TypeScript module provides a function to locate, read, and parse the `package.json` file from the current directory or any of its parent directories.
+This TypeScript module provides a function to locate, read, and parse the `package.json` file starting from a specified directory and searching up through parent directories.
 
 ## install
 
@@ -26,7 +26,21 @@ npm install find-and-require-package-json
 ```js
 import { findAndRequirePackageJson } from 'find-and-require-package-json';
 
-const packageJson = findAndRequirePackageJson();
+// Pass __dirname to find the package.json for your module
+const packageJson = findAndRequirePackageJson(__dirname);
 console.log('Package name:', packageJson.name);
 console.log('Version:', packageJson.version);
-```
+```
+
+### ESM Usage
+
+For ESM modules, you'll need to convert `import.meta.url` to a directory path:
+
+```js
+import { findAndRequirePackageJson } from 'find-and-require-package-json';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const packageJson = findAndRequirePackageJson(__dirname);
+```

packages/find-and-require-package-json/__tests__/find-pkg.test.ts

@@ -38,7 +38,7 @@ describe('findAndRequirePackageJson', () => {
 
     jest.spyOn(process, 'cwd').mockReturnValue(mockCurrentDir);
 
-    const result = findAndRequirePackageJson();
+    const result = findAndRequirePackageJson(mockCurrentDir);
 
     expect(result).toEqual(mockPackageJson);
     expect(existsSync).toHaveBeenCalledWith(mockFilePath);
@@ -57,7 +57,7 @@ describe('findAndRequirePackageJson', () => {
 
     jest.spyOn(process, 'cwd').mockReturnValue(mockCurrentDir);
 
-    expect(() => findAndRequirePackageJson()).toThrow(
+    expect(() => findAndRequirePackageJson(mockCurrentDir)).toThrow(
       'package.json not found in any parent directory'
     );
     expect(existsSync).toHaveBeenCalledWith(mockFilePath);

packages/find-and-require-package-json/package.json

@@ -1,6 +1,6 @@
 {
   "name": "find-and-require-package-json",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "author": "Dan Lynch <[email protected]>",
   "description": "Find the package.json file from within a build/package",
   "main": "index.js",

packages/find-and-require-package-json/src/package.ts

@@ -36,9 +36,10 @@ function _findPackageJson(currentDir: string): string {
   return _findPackageJson(parentDir);
 }
 
-export function findAndRequirePackageJson(): PackageJson {
-  // Start searching from the current directory
-  const pkgPath = _findPackageJson(__dirname);
+export function findAndRequirePackageJson(callerDir: string): PackageJson {
+  // Start searching from the caller's directory
+  // The caller should pass __dirname (CJS) or dirname(fileURLToPath(import.meta.url)) (ESM)
+  const pkgPath = _findPackageJson(callerDir);
 
   // Read and parse the package.json
   const str = readFileSync(pkgPath, 'utf8');

packages/inquirerer/src/utils.ts

@@ -3,13 +3,13 @@ import { findAndRequirePackageJson } from "find-and-require-package-json";
 
 // Function to display the version information
 export function displayVersion(): any {
-  const pkg = findAndRequirePackageJson();
+  const pkg = findAndRequirePackageJson(__dirname);
   console.log(green(`Name: ${pkg.name}`));
   console.log(blue(`Version: ${pkg.version}`));
 }
 
 
 export function getVersion(): string {
-  const pkg = findAndRequirePackageJson();
+  const pkg = findAndRequirePackageJson(__dirname);
   return pkg.version;
 }