Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fix-error-stacking.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"jsrepo": patch
---

Fix error message stacking in manifest fetch errors. Removes redundant "Error fetching" prefixes to improve readability of error messages.
10 changes: 10 additions & 0 deletions packages/jsrepo/src/providers/azure.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ class Azure implements Provider {
const response = await f(url.toString(), { headers });

if (!response.ok) {
const isJson = response.headers.get('content-type')?.includes('application/json');
if (isJson) {
throw new ProviderFetchError(
`${response.status} ${(await response.json()).message ?? response.statusText}`,
url.toString()
);
}
throw new ProviderFetchError(
`${response.status} ${response.statusText}`,
url.toString()
Expand All @@ -86,6 +93,9 @@ class Azure implements Provider {

return await response.text();
} catch (error) {
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, url.toString());
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
url.toString()
Expand Down
10 changes: 10 additions & 0 deletions packages/jsrepo/src/providers/bitbucket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ class BitBucket implements Provider {
const response = await f(url.toString(), { headers });

if (!response.ok) {
const isJson = response.headers.get('content-type')?.includes('application/json');
if (isJson) {
throw new ProviderFetchError(
`${response.status} ${(await response.json()).message ?? response.statusText}`,
url.toString()
);
}
throw new ProviderFetchError(
`${response.status} ${response.statusText}`,
url.toString()
Expand All @@ -87,6 +94,9 @@ class BitBucket implements Provider {

return await response.text();
} catch (error) {
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, url.toString());
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
url.toString()
Expand Down
3 changes: 3 additions & 0 deletions packages/jsrepo/src/providers/fs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ class Fs implements Provider {
const resourcePathStr = path.isAbsolute(filePath)
? filePath
: path.join(process.cwd(), filePath);
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, resourcePathStr);
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
resourcePathStr
Expand Down
10 changes: 10 additions & 0 deletions packages/jsrepo/src/providers/github.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ class GitHub implements Provider {
const response = await f(url.toString(), { headers });

if (!response.ok) {
const isJson = response.headers.get('content-type')?.includes('application/json');
if (isJson) {
throw new ProviderFetchError(
`${response.status} ${(await response.json()).message ?? response.statusText}`,
url.toString()
);
}
throw new ProviderFetchError(
`${response.status} ${response.statusText}`,
url.toString()
Expand All @@ -88,6 +95,9 @@ class GitHub implements Provider {

return await response.text();
} catch (error) {
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, url.toString());
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
url.toString()
Expand Down
10 changes: 10 additions & 0 deletions packages/jsrepo/src/providers/gitlab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ class GitLab implements Provider {
const response = await f(url.toString(), { headers });

if (!response.ok) {
const isJson = response.headers.get('content-type')?.includes('application/json');
if (isJson) {
throw new ProviderFetchError(
`${response.status} ${(await response.json()).message ?? response.statusText}`,
url.toString()
);
}
throw new ProviderFetchError(
`${response.status} ${response.statusText}`,
url.toString()
Expand All @@ -88,6 +95,9 @@ class GitLab implements Provider {

return await response.text();
} catch (error) {
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, url.toString());
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
url.toString()
Expand Down
10 changes: 10 additions & 0 deletions packages/jsrepo/src/providers/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ class Http implements Provider {
const response = await f(url.toString(), { headers });

if (!response.ok) {
const isJson = response.headers.get('content-type')?.includes('application/json');
if (isJson) {
throw new ProviderFetchError(
`${response.status} ${(await response.json()).message ?? response.statusText}`,
url.toString()
);
}
throw new ProviderFetchError(
`${response.status} ${response.statusText}`,
url.toString()
Expand All @@ -107,6 +114,9 @@ class Http implements Provider {

return await response.text();
} catch (error) {
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, url.toString());
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
url.toString()
Expand Down
10 changes: 10 additions & 0 deletions packages/jsrepo/src/providers/jsrepo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ class Jsrepo implements Provider {
const response = await f(url.toString(), { headers });

if (!response.ok) {
const isJson = response.headers.get('content-type')?.includes('application/json');
if (isJson) {
throw new ProviderFetchError(
`${response.status} ${(await response.json()).message ?? response.statusText}`,
url.toString()
);
}
throw new ProviderFetchError(
`${response.status} ${response.statusText}`,
url.toString()
Expand All @@ -116,6 +123,9 @@ class Jsrepo implements Provider {

return await response.text();
} catch (error) {
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, url.toString());
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
url.toString()
Expand Down
2 changes: 1 addition & 1 deletion packages/jsrepo/src/utils/add.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ export async function fetchFile(fileName: string, block: ResolvedItem) {
} catch (error) {
if (error instanceof ProviderFetchError)
return err(
new RegistryFileFetchError(error.message, {
new RegistryFileFetchError(error.originalMessage, {
registry: block.registry.url,
item: block.name,
resourcePath: error.resourcePath,
Expand Down
10 changes: 7 additions & 3 deletions packages/jsrepo/src/utils/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,24 @@ export class RegistryItemNotFoundError extends JsrepoError {

export class ProviderFetchError extends JsrepoError {
readonly resourcePath: string;
readonly originalMessage: string;
constructor(message: string, resourcePath: string) {
super(`Error fetching ${resourcePath}: ${message}`, {
suggestion: 'Please try again.',
});
this.resourcePath = resourcePath;
this.originalMessage = message;
}
}

export class ManifestFetchError extends JsrepoError {
constructor(error: unknown) {
super(
error instanceof ProviderFetchError
? `Error fetching manifest file from ${pc.bold(error.resourcePath)}: ${error.message}`
: `Error fetching manifest file: ${error instanceof Error ? error.message : String(error)}`,
? `Error fetching manifest file from ${pc.bold(error.resourcePath)}: ${error.originalMessage}`
: error instanceof ManifestFetchError
? error.message
: `Error fetching manifest file: ${error instanceof Error ? error.message : String(error)}`,
{
suggestion: 'Please try again.',
}
Expand All @@ -125,7 +129,7 @@ export class RegistryItemFetchError extends JsrepoError {
error instanceof ProviderFetchError
? `Error fetching ${pc.bold(`${options.registry}/${options.item}`)} from ${pc.bold(
error.resourcePath
)}: ${error.message}`
)}: ${error.originalMessage}`
: `Error fetching ${options.registry}/${options.item}: ${
error instanceof Error ? error.message : String(error)
}`,
Expand Down
10 changes: 10 additions & 0 deletions packages/shadcn/src/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ class Shadcn implements Provider {
const response = await f(url.toString());

if (!response.ok) {
const isJson = response.headers.get('content-type')?.includes('application/json');
if (isJson) {
throw new ProviderFetchError(
`${response.status} ${(await response.json()).message ?? response.statusText}`,
url.toString()
);
}
throw new ProviderFetchError(
`${response.status} ${response.statusText}`,
url.toString()
Expand All @@ -62,6 +69,9 @@ class Shadcn implements Provider {

return await response.text();
} catch (error) {
if (error instanceof ProviderFetchError) {
throw new ProviderFetchError(error.originalMessage, url.toString());
}
throw new ProviderFetchError(
`${error instanceof Error ? error.message : String(error)}`,
url.toString()
Expand Down
Loading