@pixerate/editor 0.185.0 → 0.186.0

package/dist/{chunk-GYYSPMVU.js → chunk-FW7N64XK.js}

@@ -6346,6 +6346,192 @@ function encodeLegacyName(s) {
   return Uint8Array.from(out);
 }
 
+// src/image-editor/psd/compression.ts
+var MAX_DECODED_BYTES = 2 ** 31;
+function rowBytes(width, depth) {
+  return depth === 1 ? Math.ceil(width / 8) : width * Math.max(1, depth >> 3);
+}
+function decodedLength(l) {
+  const total = l.planes * l.height * rowBytes(l.width, l.depth);
+  if (total > MAX_DECODED_BYTES) throw new PsdError(`Decoded channel data of ${total} bytes is larger than the ${MAX_DECODED_BYTES}-byte limit.`);
+  return total;
+}
+function packbitsBound(n) {
+  return n + Math.ceil(n / 128);
+}
+function packbitsEncode(src, out, at) {
+  const n = src.length;
+  let i = 0;
+  while (i < n) {
+    let run = 1;
+    while (i + run < n && run < 128 && src[i + run] === src[i]) run++;
+    if (run >= 2) {
+      out[at++] = 257 - run & 255;
+      out[at++] = src[i];
+      i += run;
+      continue;
+    }
+    const start = i;
+    let len = 0;
+    while (i < n && len < 128) {
+      if (i + 2 < n && src[i] === src[i + 1] && src[i] === src[i + 2]) break;
+      i++;
+      len++;
+    }
+    out[at++] = len - 1;
+    out.set(src.subarray(start, start + len), at);
+    at += len;
+  }
+  return at;
+}
+function packbitsDecodeInto(src, expected, out, at) {
+  const target = at + expected;
+  let i = 0;
+  while (at < target) {
+    if (i >= src.length) throw new PsdError("PackBits row ended early.");
+    const h = src[i++];
+    if (h < 128) {
+      const len = h + 1;
+      if (i + len > src.length) throw new PsdError("PackBits literal is truncated.");
+      if (at + len > target) throw new PsdError("PackBits literal overflows its row.");
+      out.set(src.subarray(i, i + len), at);
+      at += len;
+      i += len;
+    } else if (h !== 128) {
+      const len = 257 - h;
+      if (i >= src.length) throw new PsdError("PackBits run is truncated.");
+      const b = src[i++];
+      if (at + len > target) throw new PsdError("PackBits run overflows its row.");
+      out.fill(b, at, at + len);
+      at += len;
+    }
+  }
+  return at;
+}
+function inflateChecked(data, expected) {
+  let out;
+  try {
+    out = inflate(data, { maxOutput: expected + (1 << 20), sizeHint: expected, verify: false });
+  } catch (e) {
+    throw new PsdError(`ZIP channel data: ${e instanceof ZlibError || e instanceof Error ? e.message : String(e)}`);
+  }
+  if (out.length < expected) throw new PsdError(`ZIP stream produced ${out.length} of ${expected} bytes.`);
+  return out.length === expected ? out : out.subarray(0, expected);
+}
+function unpredict(buf, l) {
+  const rb = rowBytes(l.width, l.depth);
+  if (rb === 0) return;
+  const w = l.width;
+  const scratch = l.depth === 32 ? new Uint8Array(rb) : null;
+  for (let o = 0; o + rb <= buf.length; o += rb) {
+    if (l.depth === 1 || l.depth === 8) {
+      for (let i = 1; i < rb; i++) buf[o + i] = buf[o + i] + buf[o + i - 1] & 255;
+    } else if (l.depth === 16) {
+      for (let i = 1; i < w; i++) {
+        const a = buf[o + 2 * i] << 8 | buf[o + 2 * i + 1];
+        const b = buf[o + 2 * i - 2] << 8 | buf[o + 2 * i - 1];
+        const v = a + b & 65535;
+        buf[o + 2 * i] = v >> 8;
+        buf[o + 2 * i + 1] = v & 255;
+      }
+    } else if (l.depth === 32) {
+      for (let i = 1; i < rb; i++) buf[o + i] = buf[o + i] + buf[o + i - 1] & 255;
+      scratch.set(buf.subarray(o, o + rb));
+      for (let i = 0; i < w; i++) for (let k = 0; k < 4; k++) buf[o + 4 * i + k] = scratch[k * w + i];
+    } else {
+      throw new PsdError(`ZIP prediction is not defined for depth ${l.depth}.`);
+    }
+  }
+}
+function decodeRle(r, l, total) {
+  const rows = l.planes * l.height;
+  const rb = rowBytes(l.width, l.depth);
+  r.checkCount(rows, l.psb ? 4 : 2, "RLE row counts");
+  const counts = new Array(rows);
+  for (let i = 0; i < rows; i++) counts[i] = l.psb ? r.u32() : r.u16();
+  if (total > r.remaining * 130) throw new PsdError("RLE data is too short for its declared size.");
+  const out = new Uint8Array(total);
+  let at = 0;
+  for (const c of counts) at = packbitsDecodeInto(r.bytes(c), rb, out, at);
+  return out;
+}
+function decodePlanes(compression, data, l) {
+  const total = decodedLength(l);
+  switch (compression) {
+    case 0:
+      if (data.length < total) throw new PsdError(`Raw channel data has ${data.length} of ${total} bytes.`);
+      return data.slice(0, total);
+    case 1:
+      return decodeRle(new PsdReader(data), l, total);
+    case 2:
+      return inflateChecked(data, total).slice();
+    case 3: {
+      const v = inflateChecked(data, total).slice();
+      unpredict(v, l);
+      return v;
+    }
+    default:
+      throw new PsdError(`Unsupported compression method ${compression}.`);
+  }
+}
+function encodeRle(decoded2, l) {
+  const rows = l.planes * l.height;
+  const rb = rowBytes(l.width, l.depth);
+  const cs = l.psb ? 4 : 2;
+  const packed = new Uint8Array(rows * packbitsBound(rb));
+  let at = 0;
+  const counts = new Uint8Array(rows * cs);
+  for (let row = 0; row < rows; row++) {
+    const start = at;
+    at = packbitsEncode(decoded2.subarray(row * rb, (row + 1) * rb), packed, at);
+    const n = at - start;
+    if (cs === 2) {
+      if (n > 65535) throw new PsdError("An RLE row is longer than 65535 bytes; write a PSB instead.");
+      counts[row * 2] = n >> 8;
+      counts[row * 2 + 1] = n & 255;
+    } else {
+      counts[row * 4] = n >>> 24;
+      counts[row * 4 + 1] = n >>> 16 & 255;
+      counts[row * 4 + 2] = n >>> 8 & 255;
+      counts[row * 4 + 3] = n & 255;
+    }
+  }
+  const out = new Uint8Array(counts.length + at);
+  out.set(counts);
+  out.set(packed.subarray(0, at), counts.length);
+  return out;
+}
+function predict(buf, l) {
+  const rb = rowBytes(l.width, l.depth);
+  if (rb === 0) return;
+  const w = l.width;
+  const scratch = l.depth === 32 ? new Uint8Array(rb) : null;
+  for (let o = 0; o + rb <= buf.length; o += rb) {
+    if (l.depth === 1 || l.depth === 8) {
+      for (let i = rb - 1; i > 0; i--) buf[o + i] = buf[o + i] - buf[o + i - 1] & 255;
+    } else if (l.depth === 16) {
+      for (let i = w - 1; i > 0; i--) {
+        const a = buf[o + 2 * i] << 8 | buf[o + 2 * i + 1];
+        const b = buf[o + 2 * i - 2] << 8 | buf[o + 2 * i - 1];
+        const v = a - b & 65535;
+        buf[o + 2 * i] = v >> 8;
+        buf[o + 2 * i + 1] = v & 255;
+      }
+    } else if (l.depth === 32) {
+      scratch.set(buf.subarray(o, o + rb));
+      for (let i = 0; i < w; i++) for (let k = 0; k < 4; k++) buf[o + k * w + i] = scratch[4 * i + k];
+      for (let i = rb - 1; i > 0; i--) buf[o + i] = buf[o + i] - buf[o + i - 1] & 255;
+    } else {
+      throw new PsdError(`ZIP prediction is not defined for depth ${l.depth}.`);
+    }
+  }
+}
+function encodeZipPredicted(decoded2, l) {
+  const buf = decoded2.slice();
+  predict(buf, l);
+  return deflate(buf);
+}
+
 // src/image-editor/psd/descriptor.ts
 var MAX_DEPTH = 64;
 var STRING_IDS = /* @__PURE__ */ new Set(["warp", "list", "time"]);
@@ -6945,6 +7131,97 @@ function writeAdjustmentBlock(kind, params) {
   throw new Error(`Unknown adjustment kind "${kind}".`);
 }
 
+// src/image-editor/psd/channels.ts
+var hexToRgb2 = (hex) => {
+  const v = parseInt(/^#?([0-9a-f]{6})$/i.exec(hex)?.[1] ?? "ff0000", 16);
+  return [v >> 16 & 255, v >> 8 & 255, v & 255];
+};
+var rgbToHex = (r, g, b) => `#${[r, g, b].map((c) => c.toString(16).padStart(2, "0")).join("")}`;
+function alphaChannelResources(channels) {
+  if (!channels.length) return [];
+  const names = new PsdWriter();
+  for (const c of channels) names.pascal(encodeLegacyName(c.name), 1);
+  const unicode = new PsdWriter();
+  for (const c of channels) unicode.unicode(c.name);
+  const display = new PsdWriter();
+  display.u32(1);
+  for (const c of channels) {
+    const [r, g, b] = hexToRgb2(c.color);
+    display.u16(0);
+    for (const v of [r, g, b, 0]) display.u16(v * 257);
+    display.u16(Math.round(Math.min(1, Math.max(0, c.opacity)) * 100));
+    display.u8(c.indicates === "selected" ? 0 : 1);
+    display.u8(0);
+  }
+  return [
+    { id: 1006, name: "", data: names.result() },
+    { id: 1045, name: "", data: unicode.result() },
+    { id: 1077, name: "", data: display.result() }
+  ];
+}
+function planeTo8(plane, n, depth) {
+  if (depth === 8) return plane.slice(0, n);
+  const out = new Uint8Array(n);
+  const view = new DataView(plane.buffer, plane.byteOffset, plane.byteLength);
+  for (let i = 0; i < n; i++) {
+    if (depth === 16) out[i] = plane[2 * i];
+    else out[i] = Math.round(Math.min(1, Math.max(0, view.getFloat32(4 * i, false))) * 255);
+  }
+  return out;
+}
+function readAlphaChannels(planes, header, first, resource2, warn) {
+  const count = header.channels - first;
+  if (count <= 0 || header.depth === 1) return [];
+  const size = rowBytes(header.width, header.depth) * header.height;
+  const n = header.width * header.height;
+  const names = [];
+  const unicode = resource2(1045);
+  if (unicode) {
+    const r = new PsdReader(unicode);
+    while (r.remaining >= 4 && names.length < count) names.push(r.unicode().replace(/\0+$/, ""));
+  } else {
+    const legacy = resource2(1006);
+    if (legacy) {
+      const r = new PsdReader(legacy);
+      while (r.remaining >= 1 && names.length < count) names.push(new TextDecoder("latin1").decode(r.pascal(1)));
+    }
+  }
+  const display = [];
+  const info = resource2(1077);
+  if (info && info.length >= 4) {
+    const r = new PsdReader(info);
+    r.u32();
+    while (r.remaining >= 14 && display.length < count) {
+      r.u16();
+      const [cr, cg, cb] = [r.u16(), r.u16(), r.u16()];
+      r.u16();
+      const opacity = r.u16();
+      const kind = r.u8();
+      r.u8();
+      display.push({ color: rgbToHex(cr >> 8, cg >> 8, cb >> 8), opacity: Math.min(100, opacity) / 100, kind });
+    }
+  }
+  const out = [];
+  for (let i = 0; i < count; i++) {
+    const start = (first + i) * size;
+    if (start + size > planes.length) break;
+    const d = display[i];
+    const name = names[i] || `Alpha ${i + 1}`;
+    if (d?.kind === 2) {
+      warn(`Spot colour channel "${name}" is not supported and was left out.`);
+      continue;
+    }
+    out.push({
+      name,
+      data: planeTo8(planes.subarray(start, start + size), n, header.depth),
+      color: d?.color ?? "#ff0000",
+      opacity: d?.opacity ?? 0.5,
+      indicates: d?.kind === 0 ? "selected" : "masked"
+    });
+  }
+  return out;
+}
+
 // src/image-editor/psd/paths.ts
 var RECORD = 26;
 var fixed = (v) => v / 16777216;
@@ -8129,192 +8406,6 @@ function tyShForLayer(layer) {
   return writeTySh({ transform: textMatrix(layer), text: text3, warp, tail: new Uint8Array(16) });
 }
 
-// src/image-editor/psd/compression.ts
-var MAX_DECODED_BYTES = 2 ** 31;
-function rowBytes(width, depth) {
-  return depth === 1 ? Math.ceil(width / 8) : width * Math.max(1, depth >> 3);
-}
-function decodedLength(l) {
-  const total = l.planes * l.height * rowBytes(l.width, l.depth);
-  if (total > MAX_DECODED_BYTES) throw new PsdError(`Decoded channel data of ${total} bytes is larger than the ${MAX_DECODED_BYTES}-byte limit.`);
-  return total;
-}
-function packbitsBound(n) {
-  return n + Math.ceil(n / 128);
-}
-function packbitsEncode(src, out, at) {
-  const n = src.length;
-  let i = 0;
-  while (i < n) {
-    let run = 1;
-    while (i + run < n && run < 128 && src[i + run] === src[i]) run++;
-    if (run >= 2) {
-      out[at++] = 257 - run & 255;
-      out[at++] = src[i];
-      i += run;
-      continue;
-    }
-    const start = i;
-    let len = 0;
-    while (i < n && len < 128) {
-      if (i + 2 < n && src[i] === src[i + 1] && src[i] === src[i + 2]) break;
-      i++;
-      len++;
-    }
-    out[at++] = len - 1;
-    out.set(src.subarray(start, start + len), at);
-    at += len;
-  }
-  return at;
-}
-function packbitsDecodeInto(src, expected, out, at) {
-  const target = at + expected;
-  let i = 0;
-  while (at < target) {
-    if (i >= src.length) throw new PsdError("PackBits row ended early.");
-    const h = src[i++];
-    if (h < 128) {
-      const len = h + 1;
-      if (i + len > src.length) throw new PsdError("PackBits literal is truncated.");
-      if (at + len > target) throw new PsdError("PackBits literal overflows its row.");
-      out.set(src.subarray(i, i + len), at);
-      at += len;
-      i += len;
-    } else if (h !== 128) {
-      const len = 257 - h;
-      if (i >= src.length) throw new PsdError("PackBits run is truncated.");
-      const b = src[i++];
-      if (at + len > target) throw new PsdError("PackBits run overflows its row.");
-      out.fill(b, at, at + len);
-      at += len;
-    }
-  }
-  return at;
-}
-function inflateChecked(data, expected) {
-  let out;
-  try {
-    out = inflate(data, { maxOutput: expected + (1 << 20), sizeHint: expected, verify: false });
-  } catch (e) {
-    throw new PsdError(`ZIP channel data: ${e instanceof ZlibError || e instanceof Error ? e.message : String(e)}`);
-  }
-  if (out.length < expected) throw new PsdError(`ZIP stream produced ${out.length} of ${expected} bytes.`);
-  return out.length === expected ? out : out.subarray(0, expected);
-}
-function unpredict(buf, l) {
-  const rb = rowBytes(l.width, l.depth);
-  if (rb === 0) return;
-  const w = l.width;
-  const scratch = l.depth === 32 ? new Uint8Array(rb) : null;
-  for (let o = 0; o + rb <= buf.length; o += rb) {
-    if (l.depth === 1 || l.depth === 8) {
-      for (let i = 1; i < rb; i++) buf[o + i] = buf[o + i] + buf[o + i - 1] & 255;
-    } else if (l.depth === 16) {
-      for (let i = 1; i < w; i++) {
-        const a = buf[o + 2 * i] << 8 | buf[o + 2 * i + 1];
-        const b = buf[o + 2 * i - 2] << 8 | buf[o + 2 * i - 1];
-        const v = a + b & 65535;
-        buf[o + 2 * i] = v >> 8;
-        buf[o + 2 * i + 1] = v & 255;
-      }
-    } else if (l.depth === 32) {
-      for (let i = 1; i < rb; i++) buf[o + i] = buf[o + i] + buf[o + i - 1] & 255;
-      scratch.set(buf.subarray(o, o + rb));
-      for (let i = 0; i < w; i++) for (let k = 0; k < 4; k++) buf[o + 4 * i + k] = scratch[k * w + i];
-    } else {
-      throw new PsdError(`ZIP prediction is not defined for depth ${l.depth}.`);
-    }
-  }
-}
-function decodeRle(r, l, total) {
-  const rows = l.planes * l.height;
-  const rb = rowBytes(l.width, l.depth);
-  r.checkCount(rows, l.psb ? 4 : 2, "RLE row counts");
-  const counts = new Array(rows);
-  for (let i = 0; i < rows; i++) counts[i] = l.psb ? r.u32() : r.u16();
-  if (total > r.remaining * 130) throw new PsdError("RLE data is too short for its declared size.");
-  const out = new Uint8Array(total);
-  let at = 0;
-  for (const c of counts) at = packbitsDecodeInto(r.bytes(c), rb, out, at);
-  return out;
-}
-function decodePlanes(compression, data, l) {
-  const total = decodedLength(l);
-  switch (compression) {
-    case 0:
-      if (data.length < total) throw new PsdError(`Raw channel data has ${data.length} of ${total} bytes.`);
-      return data.slice(0, total);
-    case 1:
-      return decodeRle(new PsdReader(data), l, total);
-    case 2:
-      return inflateChecked(data, total).slice();
-    case 3: {
-      const v = inflateChecked(data, total).slice();
-      unpredict(v, l);
-      return v;
-    }
-    default:
-      throw new PsdError(`Unsupported compression method ${compression}.`);
-  }
-}
-function encodeRle(decoded2, l) {
-  const rows = l.planes * l.height;
-  const rb = rowBytes(l.width, l.depth);
-  const cs = l.psb ? 4 : 2;
-  const packed = new Uint8Array(rows * packbitsBound(rb));
-  let at = 0;
-  const counts = new Uint8Array(rows * cs);
-  for (let row = 0; row < rows; row++) {
-    const start = at;
-    at = packbitsEncode(decoded2.subarray(row * rb, (row + 1) * rb), packed, at);
-    const n = at - start;
-    if (cs === 2) {
-      if (n > 65535) throw new PsdError("An RLE row is longer than 65535 bytes; write a PSB instead.");
-      counts[row * 2] = n >> 8;
-      counts[row * 2 + 1] = n & 255;
-    } else {
-      counts[row * 4] = n >>> 24;
-      counts[row * 4 + 1] = n >>> 16 & 255;
-      counts[row * 4 + 2] = n >>> 8 & 255;
-      counts[row * 4 + 3] = n & 255;
-    }
-  }
-  const out = new Uint8Array(counts.length + at);
-  out.set(counts);
-  out.set(packed.subarray(0, at), counts.length);
-  return out;
-}
-function predict(buf, l) {
-  const rb = rowBytes(l.width, l.depth);
-  if (rb === 0) return;
-  const w = l.width;
-  const scratch = l.depth === 32 ? new Uint8Array(rb) : null;
-  for (let o = 0; o + rb <= buf.length; o += rb) {
-    if (l.depth === 1 || l.depth === 8) {
-      for (let i = rb - 1; i > 0; i--) buf[o + i] = buf[o + i] - buf[o + i - 1] & 255;
-    } else if (l.depth === 16) {
-      for (let i = w - 1; i > 0; i--) {
-        const a = buf[o + 2 * i] << 8 | buf[o + 2 * i + 1];
-        const b = buf[o + 2 * i - 2] << 8 | buf[o + 2 * i - 1];
-        const v = a - b & 65535;
-        buf[o + 2 * i] = v >> 8;
-        buf[o + 2 * i + 1] = v & 255;
-      }
-    } else if (l.depth === 32) {
-      scratch.set(buf.subarray(o, o + rb));
-      for (let i = 0; i < w; i++) for (let k = 0; k < 4; k++) buf[o + k * w + i] = scratch[4 * i + k];
-      for (let i = rb - 1; i > 0; i--) buf[o + i] = buf[o + i] - buf[o + i - 1] & 255;
-    } else {
-      throw new PsdError(`ZIP prediction is not defined for depth ${l.depth}.`);
-    }
-  }
-}
-function encodeZipPredicted(decoded2, l) {
-  const buf = decoded2.slice();
-  predict(buf, l);
-  return deflate(buf);
-}
-
 // src/image-editor/psd/smart.ts
 var dbl2 = (value) => ({ type: "doub", value });
 var unit2 = (u, value) => ({ type: "UntF", unit: u, value });
@@ -10361,6 +10452,16 @@ function psdToLayers(file, options = {}) {
     const bg = mergedLayer(ctx);
     if (bg) layers = [bg];
   }
+  let alphaChannels = [];
+  const hasTransparency = header.channels > ctx.colorCount && (file.layers.length === 0 || file.mergedAlpha);
+  const firstAlpha = ctx.colorCount + (hasTransparency ? 1 : 0);
+  if (!ctx.skipPixels && header.channels > firstAlpha) {
+    try {
+      alphaChannels = readAlphaChannels(decodeMergedImage(file), header, firstAlpha, (id) => resource(file, id), (m) => warn.extra.push(m));
+    } catch (e) {
+      warn.extra.push(`The alpha channels could not be read (${e instanceof Error ? e.message : String(e)}).`);
+    }
+  }
   const i32 = (b) => b && b.length >= 4 ? new DataView(b.buffer, b.byteOffset, 4).getInt32(0) : void 0;
   const angle = i32(resource(file, 1037));
   const altitude = i32(resource(file, 1049));
@@ -10374,6 +10475,7 @@ function psdToLayers(file, options = {}) {
     patterns: [...ctx.patterns.values()],
     ...angle !== void 0 || altitude !== void 0 ? { globalLight: { angle: Math.max(-360, Math.min(360, angle ?? 120)), altitude: Math.max(0, Math.min(90, altitude ?? 30)) } } : {},
     info: { psb: header.psb, depth: header.depth, colorMode: mode, channels: header.channels },
+    ...alphaChannels.length ? { alphaChannels } : {},
     ...cmykProfile ? { sourceMode: { mode: "cmyk", profile: cmykProfile } } : header.colorMode === MODE_LAB ? { sourceMode: { mode: "lab" } } : {},
     ...resource(file, 1039) ? { iccProfile: resource(file, 1039).slice() } : {},
     bitDepth: (header.depth === 16 || header.depth === 32) && header.colorMode !== MODE_INDEXED && header.colorMode !== MODE_BITMAP ? header.depth : 8
@@ -11411,6 +11513,10 @@ function exportPsd(input) {
       planes = transparent ? dp : dp.slice(0, 3);
     }
   }
+  for (const ch of input.alphaChannels ?? []) {
+    if (ch.data.length !== n) throw new PsdError(`Alpha channel "${ch.name}" has ${ch.data.length} values, expected ${n}.`);
+    planes.push(planeAtDepth(ch.data, depth));
+  }
   const planeBytes = n * (depth >> 3);
   const merged2 = new Uint8Array(planeBytes * planes.length);
   planes.forEach((p, i) => merged2.set(p, i * planeBytes));
@@ -11432,6 +11538,7 @@ function exportPsd(input) {
     { id: 1057, name: "", data: version.result() }
   ];
   if (input.iccProfile?.length) resources.push({ id: 1039, name: "", data: input.iccProfile });
+  resources.push(...alphaChannelResources(input.alphaChannels ?? []));
   if (input.globalLight) {
     const i32 = (v) => {
       const w = new PsdWriter();
@@ -11820,6 +11927,8 @@ export {
   deserializeLayer,
   deserializeLayers,
   PsdError,
+  decodePlanes,
+  encodeRle,
   parseVersionedDescriptor,
   versionedDescriptorBytes,
   ADJUSTMENT_KEYS,
@@ -11829,8 +11938,6 @@ export {
   parseLfx2,
   writeLfx2,
   parseLrfx,
-  decodePlanes,
-  encodeRle,
   BROWSER_IMAGE_TYPES,
   readPsd,
   layerName,