address feedback

This commit is contained in:
A.K.M. Adib
2026-01-26 15:25:30 -05:00
parent 2a3c879782
commit 43846f4e3b
2 changed files with 73 additions and 4 deletions

View File

@@ -0,0 +1,65 @@
/**
* @license
* Copyright 2025 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import { getPackageJson } from './package.js';
import { readPackageUp } from 'read-package-up';
vi.mock('read-package-up', () => ({
readPackageUp: vi.fn(),
}));
describe('getPackageJson', () => {
beforeEach(() => {
vi.resetAllMocks();
});
afterEach(() => {
vi.restoreAllMocks();
});
it('should return packageJson when found', async () => {
const mockPackageJson = { name: 'test-pkg', version: '1.2.3' };
vi.mocked(readPackageUp).mockResolvedValue({
packageJson: mockPackageJson,
path: '/path/to/package.json',
});
const result = await getPackageJson('/some/path');
expect(result).toEqual(mockPackageJson);
expect(readPackageUp).toHaveBeenCalledWith({
cwd: '/some/path',
normalize: false,
});
});
it.each([
{
description: 'no package.json is found',
setup: () => vi.mocked(readPackageUp).mockResolvedValue(undefined),
expected: undefined,
},
{
description: 'non-semver versions (when normalize is false)',
setup: () =>
vi.mocked(readPackageUp).mockResolvedValue({
packageJson: { name: 'test-pkg', version: '2024.60' },
path: '/path/to/package.json',
}),
expected: { name: 'test-pkg', version: '2024.60' },
},
{
description: 'readPackageUp throws',
setup: () =>
vi.mocked(readPackageUp).mockRejectedValue(new Error('Read error')),
expected: undefined,
},
])('should handle $description', async ({ setup, expected }) => {
setup();
const result = await getPackageJson('/some/path');
expect(result).toEqual(expected);
});
});

View File

@@ -32,10 +32,14 @@ export type PackageJson = BasePackageJson & {
export async function getPackageJson(
cwd: string,
): Promise<PackageJson | undefined> {
const result = await readPackageUp({ cwd });
if (!result) {
try {
const result = await readPackageUp({ cwd, normalize: false });
if (!result) {
return undefined;
}
return result.packageJson;
} catch (_error) {
return undefined;
}
return result.packageJson;
}