@realsee/hdr-toolbox 1.1.3 → 1.1.4

package/dist/avif.js

@@ -0,0 +1,206 @@
+/**
+ * AVIF reading and writing for HDR content.
+ *
+ * Two AVIF forms are supported:
+ * - gain map AVIF: an 8-bit SDR base, an 8-bit gain map and an ISO 21496-1
+ *   `tmap` item that references both (`dimg`, base first, gain map second).
+ * - 10-bit HDR AVIF: one `av01` image in PQ or HLG (BT.2020), read as linear light.
+ *
+ * Plain 8-bit AVIF is not HDR, so it is rejected here. Tiled (`grid`) items are
+ * rejected too.
+ */
+import { decodeAvif, encodeAvif10, encodeAvif8, subsample420, subsample444, } from "./avif-codec.js";
+import { colrBox, itemBitDepth, itemColourInfo, itemPayload, itemPropertyBytes, parseAvif, writeAvifContainer, } from "./avif-container.js";
+import { parseTmapMetadata, serializeTmapMetadata } from "./avif-gainmap.js";
+import { CICP_MATRIX_BT601, CICP_PRIMARIES_BT2020, CICP_PRIMARIES_BT709, CICP_TRANSFER_HLG, CICP_TRANSFER_PQ, CICP_TRANSFER_SRGB, codeValuesToLinear, linearToPqCodes, } from "./hdr-transfer.js";
+import { normalizeGainMapConfig } from "./xmp.js";
+/** Default lossy quality for AVIF output (0-100). */
+export const defaultAvifQuality = 90;
+function findGainMapItems(parsed) {
+    const tmap = [...parsed.items.values()].find((item) => item.type === "tmap");
+    if (!tmap)
+        return undefined;
+    const reference = parsed.references.find((entry) => entry.type === "dimg" && entry.from === tmap.id);
+    if (!reference || reference.to.length < 2)
+        return undefined;
+    const base = parsed.items.get(reference.to[0]);
+    const gain = parsed.items.get(reference.to[1]);
+    if (!base || !gain)
+        throw new Error("tmap item references a missing image item.");
+    return { tmap, base, gain };
+}
+function requireAv1Item(item) {
+    if (item.type !== "av01")
+        throw new Error(`Unsupported AVIF item type "${item.type}" (only av01 image items are supported; tiled AVIF is not).`);
+}
+/**
+ * Decode one `av01` item at `bitDepth`. The item is repackaged as a standalone
+ * AVIF around its AV1 payload and its codec properties, so the decoder sees the
+ * same codec configuration and colour information as the original file.
+ */
+function standaloneItem(parsed, item) {
+    requireAv1Item(item);
+    const properties = ["av1C", "ispe", "pixi", "colr"]
+        .map((type) => itemPropertyBytes(parsed, item, type))
+        .filter((box) => box !== undefined);
+    return writeAvifContainer({
+        primaryItemId: 1,
+        items: [{ id: 1, type: "av01", payload: itemPayload(parsed, item), properties }],
+    });
+}
+async function decodeItem8(parsed, item) {
+    return decodeAvif(standaloneItem(parsed, item), 8);
+}
+async function decodeItemCodes(parsed, item, bitDepth) {
+    return decodeAvif(standaloneItem(parsed, item), bitDepth);
+}
+function rgbaToRgb(pixels) {
+    const pixelCount = pixels.width * pixels.height;
+    const data = Buffer.alloc(pixelCount * 3);
+    for (let pixel = 0; pixel < pixelCount; pixel++) {
+        data[pixel * 3] = pixels.data[pixel * 4];
+        data[pixel * 3 + 1] = pixels.data[pixel * 4 + 1];
+        data[pixel * 3 + 2] = pixels.data[pixel * 4 + 2];
+    }
+    return { width: pixels.width, height: pixels.height, data };
+}
+function rgbToRgba(image) {
+    const pixelCount = image.width * image.height;
+    const data = new Uint8ClampedArray(pixelCount * 4);
+    for (let pixel = 0; pixel < pixelCount; pixel++) {
+        data[pixel * 4] = image.data[pixel * 3];
+        data[pixel * 4 + 1] = image.data[pixel * 3 + 1];
+        data[pixel * 4 + 2] = image.data[pixel * 3 + 2];
+        data[pixel * 4 + 3] = 255;
+    }
+    return { width: image.width, height: image.height, data };
+}
+/** Read an AVIF file as either a gain map pair or linear HDR, whichever it is. */
+export async function readAvif(buffer) {
+    const parsed = parseAvif(buffer);
+    const gainMap = findGainMapItems(parsed);
+    if (gainMap) {
+        const [sdr, gain] = await Promise.all([
+            decodeItem8(parsed, gainMap.base),
+            decodeItem8(parsed, gainMap.gain),
+        ]);
+        const config = normalizeGainMapConfig(parseTmapMetadata(itemPayload(parsed, gainMap.tmap)));
+        return {
+            kind: "gainmap",
+            pair: { sdr: rgbaToRgb(sdr), gain: rgbaToRgb(gain), config },
+        };
+    }
+    const primaryId = parsed.primaryItemId;
+    const primary = primaryId === undefined ? undefined : parsed.items.get(primaryId);
+    if (!primary)
+        throw new Error("AVIF file has no primary image item.");
+    requireAv1Item(primary);
+    const depth = itemBitDepth(parsed, primary) ?? 8;
+    if (depth <= 8)
+        throw new Error("AVIF is 8-bit SDR and has no gain map, so it holds no HDR data. Use a 10-bit PQ/HLG AVIF or a gain map AVIF.");
+    if (depth !== 10 && depth !== 12)
+        throw new Error(`Unsupported AVIF bit depth ${depth} (only 10 and 12 bits are supported).`);
+    const colour = itemColourInfo(parsed, primary);
+    if (!colour)
+        throw new Error("AVIF has no CICP colour information, so its HDR transfer is unknown.");
+    if (colour.transfer !== CICP_TRANSFER_PQ && colour.transfer !== CICP_TRANSFER_HLG)
+        throw new Error(`Unsupported AVIF transfer characteristic ${colour.transfer} (only PQ and HLG are supported).`);
+    if (colour.primaries !== CICP_PRIMARIES_BT709 && colour.primaries !== CICP_PRIMARIES_BT2020)
+        throw new Error(`Unsupported AVIF colour primaries ${colour.primaries} (only BT.709 and BT.2020 are supported).`);
+    const decoded = await decodeItemCodes(parsed, primary, depth);
+    if (decoded.depth !== depth)
+        throw new Error("AVIF decoder returned an unexpected bit depth.");
+    const linear = codeValuesToLinear(decoded.data, decoded.width, decoded.height, depth, colour.transfer, colour.primaries);
+    return { kind: "hdr10", image: linear };
+}
+/** Pull the AV1 payload and codec properties out of an encoded AVIF file. */
+function encodedImageParts(encoded) {
+    const parsed = parseAvif(encoded);
+    const item = parsed.primaryItemId === undefined ? undefined : parsed.items.get(parsed.primaryItemId);
+    if (!item)
+        throw new Error("Encoder produced no primary image item.");
+    const properties = ["av1C", "ispe", "pixi"]
+        .map((type) => itemPropertyBytes(parsed, item, type))
+        .filter((box) => box !== undefined);
+    if (!properties.some((box) => box.toString("latin1", 4, 8) === "av1C"))
+        throw new Error("Encoder produced an AVIF without an av1C property.");
+    return {
+        payload: itemPayload(parsed, item),
+        properties: properties.map((box) => Buffer.from(box)),
+    };
+}
+/**
+ * Colour tag for the 8-bit sRGB base and gain map. jsquash does not expose
+ * CICP, and its YUV conversion uses BT.601 (matrix 6), so the tag says 6 to
+ * match the bitstream.
+ */
+const srgbColour = {
+    primaries: CICP_PRIMARIES_BT709,
+    transfer: CICP_TRANSFER_SRGB,
+    matrix: CICP_MATRIX_BT601,
+    fullRange: true,
+};
+/** Encode a gain map pair as a gain map AVIF (ISO 21496-1 `tmap`). */
+export async function encodeAvifGainMap(pair, options = {}) {
+    const quality = options.quality ?? defaultAvifQuality;
+    const config = normalizeGainMapConfig(pair.config);
+    const [base, gain] = await Promise.all([
+        encodeAvif8(rgbToRgba(pair.sdr), { quality, subsample: subsample420 }),
+        encodeAvif8(rgbToRgba(pair.gain), { quality, subsample: subsample444 }),
+    ]);
+    const baseParts = encodedImageParts(base);
+    const gainParts = encodedImageParts(gain);
+    const colr = colrBox(srgbColour);
+    const baseSize = baseParts.properties.find((box) => box.toString("latin1", 4, 8) === "ispe");
+    const basePixelInfo = baseParts.properties.find((box) => box.toString("latin1", 4, 8) === "pixi");
+    return writeAvifContainer({
+        primaryItemId: 1,
+        items: [
+            {
+                id: 1,
+                type: "av01",
+                payload: baseParts.payload,
+                properties: [...baseParts.properties, colr],
+            },
+            {
+                id: 2,
+                type: "tmap",
+                payload: serializeTmapMetadata(config),
+                properties: [baseSize, basePixelInfo, colr].filter((box) => box !== undefined),
+            },
+            {
+                id: 3,
+                type: "av01",
+                payload: gainParts.payload,
+                properties: [...gainParts.properties, colr],
+            },
+        ],
+        references: [{ type: "dimg", from: 2, to: [1, 3] }],
+        alternatives: [{ entities: [2, 1] }],
+    });
+}
+/**
+ * Encode linear HDR as a 10-bit PQ AVIF (BT.2020 primaries, full range, 4:2:0).
+ * Values above 10000 nits are clipped; SDR white (linear 1) is 203 nits. The
+ * 10-bit 4:4:4 encoder fails above about 30 megapixels (7680x3840 encodes,
+ * 8000x4000 does not), so 4:2:0 is used at every size.
+ */
+export async function encodeAvifHdr10(image, options = {}) {
+    const quality = options.quality ?? defaultAvifQuality;
+    const codes = linearToPqCodes({ width: image.width, height: image.height, data: image.data }, 10);
+    const encoded = await encodeAvif10({ width: image.width, height: image.height, data: codes, depth: 10 }, { quality, subsample: subsample420 });
+    const parts = encodedImageParts(encoded);
+    const colr = colrBox({
+        primaries: CICP_PRIMARIES_BT2020,
+        transfer: CICP_TRANSFER_PQ,
+        matrix: CICP_MATRIX_BT601,
+        fullRange: true,
+    });
+    return writeAvifContainer({
+        primaryItemId: 1,
+        items: [
+            { id: 1, type: "av01", payload: parts.payload, properties: [...parts.properties, colr] },
+        ],
+    });
+}
+//# sourceMappingURL=avif.js.map

package/dist/avif.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"avif.js","sourceRoot":"","sources":["../src/avif.ts"],"names":[],"mappings":"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"}

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,wBAAgB,aAAa,IAAI,OAAO,CAkJvC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,aAAa,IAAI,OAAO,CAiJvC"}

package/dist/cli.js

@@ -2,19 +2,15 @@
 import { Command } from "commander";
 import { realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { linearHdrToUltraHdr, ultraHdrToLinearHdr } from "./convert.js";
+import { convertHdrImage } from "./convert.js";
 import { cubeToEquirectUltraHdr, equirectUltraHdrToCube } from "./panorama.js";
 import { composeUltraHdr, extractUltraHdr } from "./ultrahdr.js";
-/** Linear HDR float containers accepted on one side of `convert`. */
-function isLinearHdrPath(path) {
-    return /\.(exr|hdr|pic)$/i.test(path);
-}
 export function createProgram() {
     const program = new Command();
     program
         .name("hdr-toolbox")
         .description("Compose, extract, and convert Android Ultra HDR JPEG images")
-        .version("1.1.3");
+        .version("1.1.4");
     program
         .command("compose")
         .description("Compose an SDR image, gain map image (avif/png/jpg/jpeg), and JSON/XMP config into Ultra HDR")
@@ -75,38 +71,37 @@ export function createProgram() {
     });
     program
         .command("convert")
-        .description("Convert between a linear HDR file (.exr or .hdr) and an Ultra HDR JPEG (direction inferred from extensions)")
-        .requiredOption("-i, --input <path>", "input image (.exr, .hdr, or Ultra HDR .jpg/.jpeg)")
-        .requiredOption("-o, --output <path>", "output image (.exr, .hdr, or Ultra HDR .jpg/.jpeg)")
-        .option("--max-content-boost <ratio>", "HDR→Ultra HDR: linear HDR headroom to encode")
-        .option("--sdr-quality <quality>", "HDR→Ultra HDR: SDR base JPEG quality (1-100)")
-        .option("--gainmap-quality <quality>", "HDR→Ultra HDR: gain map JPEG quality (1-100)")
-        .option("--tone-map <operator>", "HDR→Ultra HDR: SDR tone map (fusion | aces | agx | reinhard; default fusion)")
-        .option("--ev-step <stops>", "HDR→Ultra HDR: exposure-fusion EV spacing (default 2)")
-        .option("--exposure-count <n>", "HDR→Ultra HDR: exposure-fusion exposure count, odd (default 5)")
+        .description("Convert between linear HDR (.exr, .hdr), Ultra HDR (.jpg, .jpeg) and AVIF (.avif); formats come from the extensions")
+        .requiredOption("-i, --input <path>", "input image (.exr, .hdr, .jpg, .jpeg or .avif)")
+        .requiredOption("-o, --output <path>", "output image (.exr, .hdr, .jpg, .jpeg or .avif)")
+        .option("--max-content-boost <ratio>", "HDR to gain map: linear HDR headroom to encode")
+        .option("--sdr-quality <quality>", "HDR to Ultra HDR: SDR base JPEG quality (1-100)")
+        .option("--gainmap-quality <quality>", "HDR to Ultra HDR: gain map JPEG quality (1-100)")
+        .option("--tone-map <operator>", "HDR to gain map: SDR tone map (fusion | aces | agx | reinhard; default fusion)")
+        .option("--ev-step <stops>", "HDR to gain map: exposure-fusion EV spacing (default 2)")
+        .option("--exposure-count <n>", "HDR to gain map: exposure-fusion exposure count, odd (default 5)")
+        .option("--avif-mode <mode>", "AVIF output: gainmap (SDR base + gain map, default) | hdr10 (10-bit PQ)")
+        .option("--avif-quality <quality>", "AVIF output: lossy quality (0-100, default 90)")
         .action(async (options) => {
-        const inputIsLinearHdr = isLinearHdrPath(options.input);
-        const outputIsLinearHdr = isLinearHdrPath(options.output);
-        if (inputIsLinearHdr === outputIsLinearHdr)
-            throw new Error("convert needs exactly one linear HDR side: use a .exr/.hdr input with an Ultra HDR JPEG output, or vice versa.");
-        if (inputIsLinearHdr) {
-            if (options.toneMap !== undefined &&
-                !["fusion", "aces", "agx", "reinhard"].includes(options.toneMap))
-                throw new Error(`Unsupported tone map "${options.toneMap}". Use "fusion", "aces", "agx" or "reinhard".`);
-            await linearHdrToUltraHdr({
-                input: options.input,
-                output: options.output,
-                maxContentBoost: options.maxContentBoost === undefined ? undefined : Number(options.maxContentBoost),
-                sdrQuality: options.sdrQuality === undefined ? undefined : Number(options.sdrQuality),
-                gainMapQuality: options.gainmapQuality === undefined ? undefined : Number(options.gainmapQuality),
-                toneMap: options.toneMap,
-                evStep: options.evStep === undefined ? undefined : Number(options.evStep),
-                exposureCount: options.exposureCount === undefined ? undefined : Number(options.exposureCount),
-            });
-        }
-        else {
-            await ultraHdrToLinearHdr({ input: options.input, output: options.output });
-        }
+        const toneMaps = ["fusion", "aces", "agx", "reinhard"];
+        if (options.toneMap !== undefined && !toneMaps.includes(options.toneMap))
+            throw new Error(`Unsupported tone map "${options.toneMap}". Use "fusion", "aces", "agx" or "reinhard".`);
+        const avifModes = ["gainmap", "hdr10"];
+        if (options.avifMode !== undefined && !avifModes.includes(options.avifMode))
+            throw new Error(`Unsupported AVIF mode "${options.avifMode}". Use "gainmap" or "hdr10".`);
+        const optionalNumber = (value) => value === undefined ? undefined : Number(value);
+        await convertHdrImage({
+            input: options.input,
+            output: options.output,
+            maxContentBoost: optionalNumber(options.maxContentBoost),
+            sdrQuality: optionalNumber(options.sdrQuality),
+            gainMapQuality: optionalNumber(options.gainmapQuality),
+            toneMap: options.toneMap,
+            evStep: optionalNumber(options.evStep),
+            exposureCount: optionalNumber(options.exposureCount),
+            avifMode: options.avifMode,
+            avifQuality: optionalNumber(options.avifQuality),
+        });
     });
     return program;
 }

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/convert.d.ts

@@ -1,5 +1,14 @@
-/** Linear HDR float container formats that `convert` reads and writes. */
+/** Linear HDR float container formats: OpenEXR and Radiance HDR. */
 export type LinearHdrFormat = "exr" | "hdr";
+/** Container families that `convert` reads and writes. */
+export type ContainerKind = "linear" | "ultrahdr" | "avif";
+/**
+ * AVIF output form.
+ * - `"gainmap"` (default): 8-bit SDR base and gain map with an ISO 21496-1 `tmap`.
+ *   Viewers without gain-map support show the SDR base.
+ * - `"hdr10"`: one 10-bit PQ (BT.2020) image. Has no SDR fallback.
+ */
+export type AvifMode = "gainmap" | "hdr10";
 /**
  * SDR tone-mapping operator for the Ultra HDR base image.
  * - `"fusion"` (default): exposure-fusion local tone map; keeps shadow and
@@ -9,29 +18,34 @@ export type LinearHdrFormat = "exr" | "hdr";
  * - `"reinhard"`: cheap global Reinhard curve.
  */
 export type ToneMapOperator = "fusion" | "aces" | "agx" | "reinhard";
-export interface UltraHdrToLinearHdrOptions {
+export interface ConvertOptions {
     input: string;
     output: string;
     /** Linear HDR output format; defaults to the output path extension. */
     format?: LinearHdrFormat;
-}
-export interface LinearHdrToUltraHdrOptions {
-    input: string;
-    output: string;
-    /** Linear HDR input format; defaults to the input path extension. */
-    format?: LinearHdrFormat;
+    /** Linear HDR input format when the input is EXR or HDR; defaults to the input extension. */
+    inputFormat?: LinearHdrFormat;
+    /** Linear ratio of HDR headroom to encode (max_content_boost, default auto). */
+    maxContentBoost?: number;
     /** JPEG quality for the generated SDR base image (1-100, default 95). */
     sdrQuality?: number;
     /** JPEG quality for the generated gain map image (1-100, default 95). */
     gainMapQuality?: number;
-    /** Linear ratio of HDR headroom to encode (max_content_boost, default auto). */
-    maxContentBoost?: number;
     /** SDR tone-mapping operator (default "fusion"). */
     toneMap?: ToneMapOperator;
     /** Exposure fusion: spacing between synthetic exposures in stops (default 2). */
     evStep?: number;
     /** Exposure fusion: number of synthetic exposures, odd (default 5). */
     exposureCount?: number;
+    /** AVIF output form (default "gainmap"). */
+    avifMode?: AvifMode;
+    /** AVIF lossy quality, 0-100 (default 90). */
+    avifQuality?: number;
+}
+export type UltraHdrToLinearHdrOptions = Pick<ConvertOptions, "input" | "output" | "format">;
+/** Linear HDR input (EXR or HDR) to Ultra HDR. `format` is the input format. */
+export interface LinearHdrToUltraHdrOptions extends Pick<ConvertOptions, "input" | "output" | "sdrQuality" | "gainMapQuality" | "maxContentBoost" | "toneMap" | "evStep" | "exposureCount"> {
+    format?: LinearHdrFormat;
 }
 /** Back-compat alias for {@link UltraHdrToLinearHdrOptions}. */
 export type UltraHdrToExrOptions = UltraHdrToLinearHdrOptions;
@@ -39,16 +53,21 @@ export type UltraHdrToExrOptions = UltraHdrToLinearHdrOptions;
 export type ExrToUltraHdrOptions = LinearHdrToUltraHdrOptions;
 /** Resolves a linear HDR format from an explicit option, then the path extension. */
 export declare function resolveLinearHdrFormat(explicit: LinearHdrFormat | undefined, path: string): LinearHdrFormat;
+/** Resolves the container family from the file extension. */
+export declare function resolveContainerKind(path: string): ContainerKind;
 /**
- * Reconstructs a linear-light HDR image from an Ultra HDR JPEG and writes it as
- * a linear float EXR or Radiance HDR file (chosen by the output extension).
+ * Converts between linear HDR (EXR, Radiance HDR), Ultra HDR JPEG and AVIF. The
+ * input and output formats come from their extensions.
  *
- * Applies the Adobe/Android gain map recovery per channel:
- *   logBoost = lerp(log2(min), log2(max), gain^(1/gamma))
- *   hdr      = (sdr_linear + offsetSdr) * 2^logBoost - offsetHdr
- * at full display headroom (weight = 1), so the output captures the complete HDR
- * intent rather than a headroom-limited rendition.
+ * - Linear HDR input is tone-mapped into an SDR base and gain map when the
+ *   output needs one. The tone-map options apply to that step.
+ * - Gain map input (Ultra HDR JPEG or gain map AVIF) is reconstructed to linear
+ *   light for linear output. For 10-bit PQ AVIF output it is limited to the PQ
+ *   peak. For Ultra HDR and gain map AVIF output it is passed through.
+ * - 10-bit PQ AVIF input is decoded to linear light.
  */
+export declare function convertHdrImage(options: ConvertOptions): Promise<void>;
+/** Reconstructs a linear-light HDR image from an Ultra HDR JPEG at full headroom. */
 export declare function ultraHdrToLinearHdr(options: UltraHdrToLinearHdrOptions): Promise<void>;
 /**
  * Builds an Ultra HDR JPEG from a linear float EXR or Radiance HDR file (chosen

package/dist/convert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"AAWA,0EAA0E;AAC1E,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;AAE5C;;;;;;;GAOG;AACH,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,UAAU,CAAC;AAErE,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,qEAAqE;IACrE,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gFAAgF;IAChF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,iFAAiF;IACjF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,gEAAgE;AAChE,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAC9D,gEAAgE;AAChE,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,qFAAqF;AACrF,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,IAAI,EAAE,MAAM,GACX,eAAe,CAQjB;AAwBD;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqC5F;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAuE5F;AAED,+EAA+E;AAC/E,eAAO,MAAM,aAAa,4BAAsB,CAAC;AACjD,+EAA+E;AAC/E,eAAO,MAAM,aAAa,4BAAsB,CAAC"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"AAmBA,oEAAoE;AACpE,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;AAE5C,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;AAE3C;;;;;;;GAOG;AACH,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,UAAU,CAAC;AAErE,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,6FAA6F;IAC7F,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,gFAAgF;IAChF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oDAAoD;IACpD,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,iFAAiF;IACjF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,CAAC;AAE7F,gFAAgF;AAChF,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CACtD,cAAc,EACZ,OAAO,GACP,QAAQ,GACR,YAAY,GACZ,gBAAgB,GAChB,iBAAiB,GACjB,SAAS,GACT,QAAQ,GACR,eAAe,CAClB;IACC,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,gEAAgE;AAChE,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAC9D,gEAAgE;AAChE,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,qFAAqF;AACrF,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,IAAI,EAAE,MAAM,GACX,eAAe,CAQjB;AAED,6DAA6D;AAC7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAQhE;AA+ND;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAc5E;AAED,qFAAqF;AACrF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5F;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5F;AAED,+EAA+E;AAC/E,eAAO,MAAM,aAAa,4BAAsB,CAAC;AACjD,+EAA+E;AAC/E,eAAO,MAAM,aAAa,4BAAsB,CAAC"}