Fix: let Squoosh default image quality internally (#4906)

* removes our quality defaults, allowing Squoosh format-specific defaults to be used

* chore: add changeset

.changeset/fuzzy-garlics-obey.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/image': patch
+---
+
+Updates the default image service to use format-specific quality defaults

packages/integrations/image/src/loaders/squoosh.ts

@@ -115,7 +115,7 @@ class SquooshService extends BaseSSRService {
  inputBuffer,
  operations,
  transform.format,
- transform.quality || 100
+ transform.quality
  );
 
  return {

packages/integrations/image/src/vendor/squoosh/image-pool.ts

@@ -78,7 +78,7 @@ export async function processBuffer(
  buffer: Buffer,
  operations: Operation[],
  encoding: OutputFormat,
- quality: number
+ quality?: number
 ): Promise<Uint8Array> {
  // @ts-ignore
  const worker = await getWorker()
@@ -109,14 +109,14 @@ export async function processBuffer(
  return await worker.dispatchJob({
  operation: 'encodeavif',
  imageData,
- quality: quality || 100
+ quality,
  }) as Uint8Array;
  case 'jpeg':
  case 'jpg':
  return await worker.dispatchJob({
  operation: 'encodejpeg',
  imageData,
- quality: quality || 100,
+ quality,
  }) as Uint8Array;
  case 'png':
  return await worker.dispatchJob({
@@ -127,7 +127,7 @@ export async function processBuffer(
  return await worker.dispatchJob({
  operation: 'encodewebp',
  imageData,
- quality: quality || 100,
+ quality,
  }) as Uint8Array;
  default:
  throw Error(`Unsupported encoding format`)

packages/integrations/image/src/vendor/squoosh/image.ts

@@ -16,7 +16,7 @@ export async function processBuffer(
  buffer: Buffer,
  operations: Operation[],
  encoding: OutputFormat,
- quality: number
+ quality?: number
 ): Promise<Uint8Array> {
  let imageData = await impl.decodeBuffer(buffer)
  for (const operation of operations) {
@@ -29,7 +29,7 @@ export async function processBuffer(
 
  switch (encoding) {
  case 'avif':
- return await impl.encodeAvif(imageData, { quality: quality }) as Uint8Array;
+ return await impl.encodeAvif(imageData, { quality }) as Uint8Array;
  case 'jpeg':
  case 'jpg':
  return await impl.encodeJpeg(imageData, { quality }) as Uint8Array;

packages/integrations/image/src/vendor/squoosh/impl.ts

@@ -71,13 +71,14 @@ export async function resize({ image, width, height }: ResizeOpts) {
 
 export async function encodeJpeg(
  image: ImageData,
- { quality }: { quality: number }
+ opts: { quality?: number }
 ): Promise<Uint8Array> {
  image = ImageData.from(image)
-
+ 
  const e = supportedFormats['mozjpeg']
  const m = await e.enc()
  await maybeDelay()
+ const quality = opts.quality || e.defaultEncoderOptions.quality
  const r = await m.encode(image.data, image.width, image.height, {
  ...e.defaultEncoderOptions,
  quality,
@@ -87,13 +88,14 @@ export async function encodeJpeg(
 
 export async function encodeWebp(
  image: ImageData,
- { quality }: { quality: number }
+ opts: { quality?: number }
 ): Promise<Uint8Array> {
  image = ImageData.from(image)
 
  const e = supportedFormats['webp']
  const m = await e.enc()
  await maybeDelay()
+ const quality = opts.quality || e.defaultEncoderOptions.quality
  const r = await m.encode(image.data, image.width, image.height, {
  ...e.defaultEncoderOptions,
  quality,
@@ -103,14 +105,16 @@ export async function encodeWebp(
 
 export async function encodeAvif(
  image: ImageData,
- { quality }: { quality: number }
+ opts: { quality?: number }
 ): Promise<Uint8Array> {
  image = ImageData.from(image)
 
  const e = supportedFormats['avif']
  const m = await e.enc()
  await maybeDelay()
  const val = e.autoOptimize.min
+ // AVIF doesn't use a 0-100 quality, default to 75 and convert to cqLevel below
+ const quality = opts.quality || 75
  const r = await m.encode(image.data, image.width, image.height, {
  ...e.defaultEncoderOptions,
  // Think of cqLevel as the "amount" of quantization (0 to 62),