Add support for JPEG XL and XR

closes #170

lib/types/index.ts

@@ -9,6 +9,8 @@ import { ICO } from './ico'
 import { J2C } from './j2c'
 import { JP2 } from './jp2'
 import { JPG } from './jpg'
+import { JXL } from './jxl'
+import { JXR } from './jxr'
 import { KTX } from './ktx'
 import { PNG } from './png'
 import { PNM } from './pnm'
@@ -29,6 +31,8 @@ export const typeHandlers = new Map([
   ['j2c', J2C],
   ['jp2', JP2],
   ['jpg', JPG],
+  ['jxl', JXL],
+  ['jxr', JXR],
   ['ktx', KTX],
   ['png', PNG],
   ['pnm', PNM],

lib/types/j2c.ts

@@ -1,9 +1,9 @@
 import type { IImage } from './interface'
-import { toHexString, readUInt32BE } from './utils'
+import { readUInt32BE } from './utils'
 
 export const J2C: IImage = {
   // TODO: this doesn't seem right. SIZ marker doesn't have to be right after the SOC
-  validate: (input) => toHexString(input, 0, 4) === 'ff4fff51',
+  validate: (input) => readUInt32BE(input, 0) === 0xff4fff51,
 
   calculate: (input) => ({
     height: readUInt32BE(input, 12),

lib/types/jxl.ts

@@ -0,0 +1,11 @@
+import type { IImage } from './interface'
+import { readUInt32BE, readUInt16BE } from './utils'
+
+export const JXL: IImage = {
+  validate: (input) => readUInt16BE(input, 0) === 0xff0a,
+
+  calculate: (input) => ({
+    height: readUInt32BE(input, 12),
+    width: readUInt32BE(input, 8),
+  }),
+}

lib/types/jxr.ts

@@ -0,0 +1,11 @@
+import type { IImage } from './interface'
+import { readUInt32BE } from './utils'
+
+export const JXR: IImage = {
+  validate: (input) => readUInt32BE(input, 0) === 0x4949BC01,
+
+  calculate: (input) => ({
+    height: readUInt32BE(input, 12),
+    width: readUInt32BE(input, 8),
+  }),
+}