cozy-iiif 0.6.2 → 0.6.3

package/dist/core/image-service.d.ts

@@ -12,8 +12,9 @@ export declare const getStaticImagePixelSize: (url: string) => () => Promise<{
     height: number;
 }>;
 export declare const getImageURLFromService: (service: Service, width: number, height: number) => string;
-export declare const getRegionURLFromService: (service: Service, bounds: Bounds, opts?: GetRegionURLOpts) => string | undefined;
-export declare const getRegionURL: (image: CozyImageResource) => (bounds: Bounds, opts?: GetRegionURLOpts) => string | undefined;
+export declare const getRegionURLFromService: (service: Service, bounds: Bounds, rotation?: number, // 0, 90, 180, 270
+opts?: GetRegionURLOpts) => string | undefined;
+export declare const getRegionURL: (image: CozyImageResource) => (bounds: Bounds, rotation?: number, opts?: GetRegionURLOpts) => string | undefined;
 export declare const getImageURL: (width: number | undefined, height: number | undefined, service: Service) => (minSize?: number) => string | undefined;
 export declare const getPixelSizeFromServiceUrl: (serviceUrl: string) => () => Promise<{
     width: number;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { g as m, a as k, b as x } from "./resource-DS2brz47.js";
+import { g as y, a as k, b as x } from "./resource-DS2brz47.js";
 import { c as je } from "./resource-DS2brz47.js";
 import { imageSize as ft } from "image-size";
 function T(e) {
@@ -23,7 +23,7 @@ function mt(e) {
   var t = gt(e, "string");
   return T(t) == "symbol" ? t : t + "";
 }
-function L(e, t, r) {
+function S(e, t, r) {
   return (t = mt(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
 }
 function C(e) {
@@ -56,7 +56,7 @@ function dt(e, t) {
 }
 var N = class F {
   constructor(t, r = {}) {
-    L(this, "traversals", void 0), L(this, "options", void 0), L(this, "_traverseManifest", $(this.traverseManifestItems.bind(this), this.traverseNavPlace.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this), this.traverseLinkedCanvases.bind(this), this.traverseManifestStructures.bind(this), this.traverseInlineAnnotationPages.bind(this))), L(this, "_traverseCanvas", $(this.traverseCanvasItems.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this), this.traverseLinkedCanvases.bind(this), this.traverseInlineAnnotationPages.bind(this))), L(this, "_traverseAnnotationPage", $(this.traverseAnnotationPageItems.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this))), L(this, "_traverseRange", $(this.traverseRangeRanges.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this), this.traverseLinkedCanvases.bind(this))), this.traversals = { collection: [], manifest: [], canvas: [], annotationCollection: [], annotationPage: [], annotation: [], contentResource: [], choice: [], range: [], service: [], agent: [], specificResource: [], geoJson: [], ...t }, this.options = { allowUndefinedReturn: !1, ...r };
+    S(this, "traversals", void 0), S(this, "options", void 0), S(this, "_traverseManifest", $(this.traverseManifestItems.bind(this), this.traverseNavPlace.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this), this.traverseLinkedCanvases.bind(this), this.traverseManifestStructures.bind(this), this.traverseInlineAnnotationPages.bind(this))), S(this, "_traverseCanvas", $(this.traverseCanvasItems.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this), this.traverseLinkedCanvases.bind(this), this.traverseInlineAnnotationPages.bind(this))), S(this, "_traverseAnnotationPage", $(this.traverseAnnotationPageItems.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this))), S(this, "_traverseRange", $(this.traverseRangeRanges.bind(this), this.traverseLinking.bind(this), this.traverseDescriptive.bind(this), this.traverseLinkedCanvases.bind(this))), this.traversals = { collection: [], manifest: [], canvas: [], annotationCollection: [], annotationPage: [], annotation: [], contentResource: [], choice: [], range: [], service: [], agent: [], specificResource: [], geoJson: [], ...t }, this.options = { allowUndefinedReturn: !1, ...r };
   }
   static all(t) {
     return new F({ collection: [t], manifest: [t], canvas: [t], annotationCollection: [t], annotationPage: [t], annotation: [t], contentResource: [t], choice: [t], range: [t], service: [t], geoJson: [t], specificResource: [t], agent: [t] });
@@ -182,7 +182,7 @@ function Vt(e) {
 }
 var Bt = class et {
   constructor(t, r = {}) {
-    L(this, "traversals", void 0), L(this, "options", void 0), this.traversals = { collection: [], manifest: [], canvas: [], annotationList: [], sequence: [], annotation: [], contentResource: [], choice: [], range: [], service: [], layer: [], ...t }, this.options = { convertPropsToArray: !0, mergeMemberProperties: !0, allowUndefinedReturn: !1, ...r };
+    S(this, "traversals", void 0), S(this, "options", void 0), this.traversals = { collection: [], manifest: [], canvas: [], annotationList: [], sequence: [], annotation: [], contentResource: [], choice: [], range: [], service: [], layer: [], ...t }, this.options = { convertPropsToArray: !0, mergeMemberProperties: !0, allowUndefinedReturn: !1, ...r };
   }
   static all(t) {
     return new et({ collection: [t], manifest: [t], canvas: [t], annotationList: [t], sequence: [t], annotation: [t], contentResource: [t], choice: [t], range: [t], service: [t], layer: [t] });
@@ -326,7 +326,7 @@ function Ft(e) {
   }
   return r;
 }
-function I(e, t = "none") {
+function w(e, t = "none") {
   if (!e) return { none: [""] };
   let r = Ft(e), i = {};
   for (let n of r) {
@@ -442,12 +442,12 @@ function Kt(e) {
 function Xt(e, t = "Rights/License", r = "none") {
   let i = null, n = [], s = Array.isArray(e) ? e : [e];
   for (let a of s) {
-    let l = a ? Kt(a) : void 0;
-    if (l && (l.indexOf("creativecommons.org") !== -1 || l.indexOf("rightsstatements.org") !== -1)) {
-      i = l.startsWith("https://") ? `http://${l.slice(8)}` : l;
+    let c = a ? Kt(a) : void 0;
+    if (c && (c.indexOf("creativecommons.org") !== -1 || c.indexOf("rightsstatements.org") !== -1)) {
+      i = c.startsWith("https://") ? `http://${c.slice(8)}` : c;
       continue;
     }
-    l && n.push({ label: { [r]: [t] }, value: { [r]: [l] } });
+    c && n.push({ label: { [r]: [t] }, value: { [r]: [c] } });
   }
   return [i, n];
 }
@@ -461,7 +461,7 @@ function Qt(e) {
   }
 }
 function Zt(e) {
-  return e ? e.map((t) => ({ label: I(t.label), value: I(t.value) })) : [];
+  return e ? e.map((t) => ({ label: w(t.label), value: w(t.value) })) : [];
 }
 let B = 0;
 function it(e, t) {
@@ -476,7 +476,7 @@ function b(e) {
 }
 function R(e) {
   let [t, r] = Xt(e.license), i = [...e.metadata ? Zt(e.metadata) : [], ...r];
-  return { rights: t, metadata: i.length ? i : void 0, label: e.label ? I(e.label) : void 0, requiredStatement: e.attribution ? { label: I(U.attributionLabel), value: I(e.attribution) } : void 0, navDate: e.navDate, summary: e.description ? I(e.description) : void 0, thumbnail: te(e.thumbnail) };
+  return { rights: t, metadata: i.length ? i : void 0, label: e.label ? w(e.label) : void 0, requiredStatement: e.attribution ? { label: w(U.attributionLabel), value: w(e.attribution) } : void 0, navDate: e.navDate, summary: e.description ? w(e.description) : void 0, thumbnail: te(e.thumbnail) };
 }
 function te(e) {
   return e && (Array.isArray(e) ? e : [e]).map((r) => typeof r == "string" ? { id: r, type: "Image" } : (r.type === "unknown" && (r.type = "Image"), r));
@@ -493,9 +493,9 @@ function ee(e) {
   } else i["@id"] && r.push({ id: i["@id"], type: E(i) });
   return r.length ? r : void 0;
 }
-function S(e) {
+function I(e) {
   let t = e.related ? Array.isArray(e.related) ? e.related : [e.related] : [], r = e.contentLayer;
-  return { provider: e.logo || t.length ? [{ id: U.providerId, type: "Agent", homepage: t.length ? [t[0]] : void 0, logo: e.logo ? Array.isArray(e.logo) ? e.logo : [e.logo] : void 0, label: I(U.providerName) }] : void 0, partOf: ee(e), rendering: e.rendering, seeAlso: e.seeAlso, start: e.startCanvas, service: e.service ? C(e.service) : void 0, supplementary: r ? [r] : void 0 };
+  return { provider: e.logo || t.length ? [{ id: U.providerId, type: "Agent", homepage: t.length ? [t[0]] : void 0, logo: e.logo ? Array.isArray(e.logo) ? e.logo : [e.logo] : void 0, label: w(U.providerName) }] : void 0, partOf: ee(e), rendering: e.rendering, seeAlso: e.seeAlso, start: e.startCanvas, service: e.service ? C(e.service) : void 0, supplementary: r ? [r] : void 0 };
 }
 function re(e) {
   return { chars: e.chars, format: e.format ? e.format : void 0, language: e.language };
@@ -528,13 +528,13 @@ function ne(e) {
   return t;
 }
 function se(e) {
-  return A({ ...b(e), ...R(e), ...S(e), ...ie(e), items: ne(e.members) });
+  return A({ ...b(e), ...R(e), ...I(e), ...ie(e), items: ne(e.members) });
 }
 function ae(e) {
   let t = [], r = [], i, n;
   for (let a of e.sequences || []) a.canvases.length && t.push(...a.canvases), a.behavior && r.push(...a.behavior), a.viewingDirection && (n = a.viewingDirection), a.startCanvas && (i = a.startCanvas);
   let s = b(e);
-  return r.length && (s.behavior ? s.behavior.push(...r) : s.behavior = r), A({ ...s, ...R(e), ...S(e), viewingDirection: n, start: i, items: t, structures: oe(e.structures) });
+  return r.length && (s.behavior ? s.behavior.push(...r) : s.behavior = r), A({ ...s, ...R(e), ...I(e), viewingDirection: n, start: i, items: t, structures: oe(e.structures) });
 }
 function oe(e) {
   if (!e) return e;
@@ -548,10 +548,10 @@ function oe(e) {
   return e.filter((i) => r.indexOf(i.id) === -1);
 }
 function ce(e) {
-  return A({ ...b(e), ...R(e), ...S(e), annotations: e.otherContent && e.otherContent.length ? e.otherContent : void 0, items: e.images && e.images.length ? [{ id: it(e, "annotation-page"), type: "AnnotationPage", items: e.images }] : void 0 });
+  return A({ ...b(e), ...R(e), ...I(e), annotations: e.otherContent && e.otherContent.length ? e.otherContent : void 0, items: e.images && e.images.length ? [{ id: it(e, "annotation-page"), type: "AnnotationPage", items: e.images }] : void 0 });
 }
 function le(e) {
-  return A({ ...b(e), ...R(e), ...S(e), items: e.resources && e.resources.length ? e.resources : void 0 });
+  return A({ ...b(e), ...R(e), ...I(e), items: e.resources && e.resources.length ? e.resources : void 0 });
 }
 function pe(e) {
   return !e.canvases || e.canvases.length === 0 ? { canvases: [], behavior: [] } : { canvases: e.canvases, behavior: e.viewingHint ? [e.viewingHint] : [], viewingDirection: e.viewingDirection, startCanvas: e.startCanvas };
@@ -572,28 +572,28 @@ function ve(e) {
       return { type: "SpecificResource", source: i, selector: O(r.selector) };
     } else return encodeURI(r["@id"]).trim();
   }
-  return A({ ...b(e), ...R(e), ...S(e), target: t(e.on), body: Array.isArray(e.resource) ? e.resource.map(z) : z(e.resource) });
+  return A({ ...b(e), ...R(e), ...I(e), target: t(e.on), body: Array.isArray(e.resource) ? e.resource.map(z) : z(e.resource) });
 }
 function z(e) {
   return e.type === "Choice" ? e : nt(e);
 }
 function nt(e) {
   let t = e;
-  return A({ ...b(t), ...R(t), ...S(t), ...re(t) });
+  return A({ ...b(t), ...R(t), ...I(t), ...re(t) });
 }
 function he(e) {
   let t = [];
   return e.default && e.default !== "rdf:nil" && t.push(e.default), e.item && e.item !== "rdf:nil" && t.push(...e.item), A({ ...b(e), ...R(e), items: t });
 }
 function ue(e) {
-  return A({ ...b(e), ...R(e), ...S(e), items: e.members });
+  return A({ ...b(e), ...R(e), ...I(e), items: e.members });
 }
 function fe(e) {
   let { "@id": t, "@type": r, "@context": i, profile: n, ...s } = e, a = {};
   return t && (a["@id"] = t), a["@type"] = E(e), a["@type"] === "unknown" && (i && i.length && (a["@context"] = i), a["@type"] = "Service"), n && (a.profile = rt(n)), A({ ...a, ...s });
 }
 function ge(e) {
-  return A({ ...b(e), ...R(e), ...S(e) });
+  return A({ ...b(e), ...R(e), ...I(e) });
 }
 const me = new Bt({ collection: [se], manifest: [ae], canvas: [ce], annotationList: [le], sequence: [pe], annotation: [ve], contentResource: [nt], choice: [he], range: [ue], service: [fe], layer: [ge] });
 function st(e) {
@@ -608,11 +608,11 @@ function O(e) {
 }
 const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/`}info.json`, ot = (e) => {
   var r;
-  return m(e, "type").startsWith("ImageService") || ((r = e.profile) == null ? void 0 : r.toString().includes("iiif.io/api/image/"));
+  return y(e, "type").startsWith("ImageService") || ((r = e.profile) == null ? void 0 : r.toString().includes("iiif.io/api/image/"));
 }, ct = (e) => {
-  const t = m(e, "type"), r = m(e, "context");
+  const t = y(e, "type"), r = y(e, "context");
   if (t === "ImageService2" || r != null && r.includes("image/2")) {
-    const n = m(e, "profile"), s = ["level0", "level1", "level2"];
+    const n = y(e, "profile"), s = ["level0", "level1", "level2"];
     return { majorVersion: 2, profileLevel: (Array.isArray(n) ? n : n ? [n] : []).map((p) => s.findIndex((o) => p.toString().includes(o))).filter((p) => p > -1).sort((p, o) => o - p)[0] };
   } else if (t || r)
     return { majorVersion: 3, profileLevel: parseInt(e.profile) };
@@ -623,70 +623,70 @@ const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/
     return i.close(), { width: n, height: s };
   }) : r.arrayBuffer().then((i) => ft(new Uint8Array(i))));
 }, D = (e, t, r) => {
-  const i = m(e, "id"), n = e.profile || "";
+  const i = y(e, "id"), n = e.profile || "";
   if (typeof n == "string" && (n.includes("level0") || n.includes("level:0"))) {
     if ("sizes" in e && Array.isArray(e.sizes)) {
-      const a = e.sizes.sort((l, p) => p.width * p.height - l.width * l.height).filter((l) => l.width * l.height >= t * r)[0];
+      const a = e.sizes.sort((c, p) => p.width * p.height - c.width * c.height).filter((c) => c.width * c.height >= t * r)[0];
       if (a)
         return `${i}/full/${a.width},${a.height}/0/default.jpg`;
     }
     return `${i}/full/full/0/default.jpg`;
   }
   return `${i}/full/!${t},${r}/0/default.jpg`;
-}, de = (e, t, r = { minSize: 400 }) => {
-  const i = m(e, "id"), n = e.profile || "";
-  if (typeof n == "string" && (n.includes("level0") || n.includes("level:0"))) {
-    console.warn(`Level 0 image service does not support custom region URLs: ${i}`);
+}, de = (e, t, r = 0, i = { minSize: 400 }) => {
+  const n = y(e, "id"), s = e.profile || "";
+  if (typeof s == "string" && (s.includes("level0") || s.includes("level:0"))) {
+    console.warn(`Level 0 image service does not support custom region URLs: ${n}`);
     return;
   }
-  const { x: a, y: l, w: p, h: o } = t, { minSize: v = 400, maxSize: u } = r, h = p / o, c = h < 1;
-  let g = Math.ceil(c ? v / h : v), d = Math.ceil(c ? v : v / h);
-  u && (d > u || g > u) && (c ? (g = Math.min(g, u), d = Math.ceil(g * h)) : (d = Math.min(d, u), g = Math.ceil(d / h)));
-  const f = `${Math.round(a)},${Math.round(l)},${Math.round(p)},${Math.round(o)}`;
-  return `${i}/${f}/!${d},${g}/0/default.jpg`;
-}, pt = (e) => (t, r = { minSize: 400 }) => {
+  const { x: c, y: p, w: o, h: u } = t, { minSize: f = 400, maxSize: v } = i, g = r % 180 !== 0 ? u / o : o / u, L = g < 1;
+  let h = Math.ceil(L ? f / g : f), m = Math.ceil(L ? f : f / g);
+  v && (m > v || h > v) && (L ? (h = Math.min(h, v), m = Math.ceil(h * g)) : (m = Math.min(m, v), h = Math.ceil(m / g)));
+  const d = `${Math.round(c)},${Math.round(p)},${Math.round(o)},${Math.round(u)}`;
+  return `${n}/${d}/!${m},${h}/${r}/default.jpg`;
+}, pt = (e) => (t, r = 0, i = { minSize: 400 }) => {
   if (e.type === "dynamic")
-    return de(e.service, t, r);
+    return de(e.service, t, r, i);
   console.error("Level 0 or static image canvas: unsupported");
 }, vt = (e, t, r) => (i = 800) => {
   if (!e || !t) return;
-  const n = e / t, s = n < 1, a = Math.ceil(s ? i / n : i), l = Math.ceil(s ? i : i / n);
-  return D(r, l, a);
+  const n = e / t, s = n < 1, a = Math.ceil(s ? i / n : i), c = Math.ceil(s ? i : i / n);
+  return D(r, c, a);
 }, ht = (e) => () => fetch(e).then((t) => t.json()).then((t) => {
   const r = t.width, i = t.height;
   return r !== void 0 && i !== void 0 ? { width: r, height: i } : void 0;
 }), ye = (e, t = []) => (r = 400) => {
   const { width: i, height: n } = e;
   if (!i || !n) return;
-  const s = i / n, a = s < 1, l = Math.ceil(a ? r / s : r), p = Math.ceil(a ? r : r / s);
+  const s = i / n, a = s < 1, c = Math.ceil(a ? r / s : r), p = Math.ceil(a ? r : r / s);
   if (e.thumbnail && e.thumbnail.length > 0) {
     const o = e.thumbnail[0];
     if ("service" in o && Array.isArray(o.service)) {
-      const v = o.service.find((u) => ot(u));
-      if (v)
-        return D(v, p, l);
+      const u = o.service.find((f) => ot(f));
+      if (u)
+        return D(u, p, c);
     }
     if ("id" in o) return o.id;
   }
   for (const o of t) {
     if (o.type === "dynamic" || o.type === "level0")
-      return D(o.service, p, l);
+      return D(o.service, p, c);
     if (o.type === "static")
       return o.url;
   }
 }, Ae = (e) => {
-  const { format: t, height: r, width: i } = e, n = m(e, "id"), s = (e.service || []).find(ot), a = s ? ct(s) : void 0;
+  const { format: t, height: r, width: i } = e, n = y(e, "id"), s = (e.service || []).find(ot), a = s ? ct(s) : void 0;
   if (s && a) {
-    const l = at(m(s, "id")), p = {
+    const c = at(y(s, "id")), p = {
       source: e,
       type: a.profileLevel === 0 ? "level0" : "dynamic",
       service: s,
       width: i,
       height: r,
       majorVersion: a.majorVersion,
-      serviceUrl: l,
+      serviceUrl: c,
       getImageURL: vt(i, r, s),
-      getPixelSize: ht(l)
+      getPixelSize: ht(c)
     };
     return a.profileLevel === 0 ? p : {
       ...p,
@@ -714,57 +714,57 @@ const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/
     }]
   }).traverseCanvas(e), t;
 }, be = (e) => () => {
-  const t = /* @__PURE__ */ new Map(), r = (o, v, u = 0) => {
-    const h = {
+  const t = /* @__PURE__ */ new Map(), r = (o, u, f = 0) => {
+    const v = {
       id: o.id,
       type: "range",
       source: o,
       children: [],
       navItems: [],
       navSections: [],
-      parent: v,
-      level: u,
+      parent: u,
+      level: f,
       getLabel: o.getLabel
     };
-    o.items && o.items.length > 0 && o.items.forEach((f) => {
-      if (f.source.type === "Range") {
-        const y = r(f, h, u + 1);
-        h.children.push(y);
+    o.items && o.items.length > 0 && o.items.forEach((h) => {
+      if (h.source.type === "Range") {
+        const d = r(h, v, f + 1);
+        v.children.push(d);
       } else {
-        const w = {
-          id: f.id,
+        const m = {
+          id: h.id,
           type: "canvas",
-          source: f,
+          source: h,
           children: [],
           navItems: [],
           navSections: [],
-          parent: h,
-          level: u + 1,
-          getLabel: f.getLabel
+          parent: v,
+          level: f + 1,
+          getLabel: h.getLabel
         };
-        h.children.push(w), t.set(w.id, w);
+        v.children.push(m), t.set(m.id, m);
       }
     });
-    const c = h.children.map((f) => f.type === "canvas" ? f.source : f.children.length === 1 && f.children[0].type === "canvas" ? f.children[0].source : f.source), g = c.filter((f) => f.source.type === "Canvas"), d = c.filter((f) => f.source.type === "Range");
-    return h.navItems.push(...g), h.navSections.push(...d), t.set(h.id, h), h;
+    const l = v.children.map((h) => h.type === "canvas" ? h.source : h.children.length === 1 && h.children[0].type === "canvas" ? h.children[0].source : h.source), g = l.filter((h) => h.source.type === "Canvas"), L = l.filter((h) => h.source.type === "Range");
+    return v.navItems.push(...g), v.navSections.push(...L), t.set(v.id, v), v;
   };
   return { root: e.filter((o) => {
-    var v;
-    return (v = o.source.behavior) == null ? void 0 : v.includes("top");
+    var u;
+    return (u = o.source.behavior) == null ? void 0 : u.includes("top");
   }).map((o) => r(o, void 0)), enumerateNodes: (o) => {
-    const v = Array.from(t.values());
-    return o ? v.filter((u) => u.type === o) : v;
+    const u = Array.from(t.values());
+    return o ? u.filter((f) => f.type === o) : u;
   }, getBreadcrumbs: (o) => {
-    const v = t.get(o);
-    if (!v) return [];
-    const u = (h, c = []) => h.parent ? u(h.parent, [h, ...c]) : [h, ...c];
-    return u(v);
+    const u = t.get(o);
+    if (!u) return [];
+    const f = (v, l = []) => v.parent ? f(v.parent, [v, ...l]) : [v, ...l];
+    return f(u);
   }, getNavParent: (o) => {
-    var h, c;
-    const v = t.get(o);
-    if (!v || v.type !== "canvas" || ((h = v.parent) == null ? void 0 : h.type) !== "range") return;
-    const { parent: u } = v;
-    return u.children.length === 1 && u.children[0].type === "canvas" ? ((c = u.parent) == null ? void 0 : c.type) === "range" ? u.parent.source : void 0 : u.source;
+    var v, l;
+    const u = t.get(o);
+    if (!u || u.type !== "canvas" || ((v = u.parent) == null ? void 0 : v.type) !== "range") return;
+    const { parent: f } = u;
+    return f.children.length === 1 && f.children[0].type === "canvas" ? ((l = f.parent) == null ? void 0 : l.type) === "range" ? f.parent.source : void 0 : f.source;
   }, getNode: (o) => t.get(o) };
 }, Re = async (e) => {
   try {
@@ -820,7 +820,7 @@ const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/
       code: "INVALID_MANIFEST",
       message: "Missing @context"
     };
-  const i = m(e, "id");
+  const i = y(e, "id");
   if (!i)
     return {
       type: "error",
@@ -829,7 +829,7 @@ const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/
     };
   if (r.includes("presentation/2") || r.includes("presentation/3") || r.includes("shared-canvas")) {
     const n = r.includes("presentation/3") ? 3 : 2;
-    return m(e, "type").includes("Collection") ? {
+    return y(e, "type").includes("Collection") ? {
       type: "collection",
       url: t || i,
       resource: Le(e, n)
@@ -878,43 +878,43 @@ const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/
   };
 }, Se = (e, t) => {
   const r = (a) => {
-    const l = [], p = [];
+    const c = [], p = [];
     new N({
-      canvas: [(c) => {
-        c.items && l.push(c);
+      canvas: [(l) => {
+        l.items && c.push(l);
       }],
-      range: [(c) => {
-        c.type === "Range" && p.push(c);
+      range: [(l) => {
+        l.type === "Range" && p.push(l);
       }]
     }).traverseManifest(a);
-    const v = l.map((c) => {
-      const g = Ce(c);
+    const u = c.map((l) => {
+      const g = Ce(l);
       return {
-        source: c,
-        id: c.id,
-        width: c.width,
-        height: c.height,
+        source: l,
+        id: l.id,
+        width: l.width,
+        height: l.height,
         images: g,
-        annotations: c.annotations || [],
+        annotations: l.annotations || [],
         getImageURL: g.length > 0 ? g[0].getImageURL : () => {
         },
-        getLabel: x(c),
-        getMetadata: k(c),
-        getThumbnailURL: ye(c, g)
+        getLabel: x(l),
+        getMetadata: k(l),
+        getThumbnailURL: ye(l, g)
       };
-    }), u = (c) => {
-      const g = c.items || [], d = g.filter((y) => y.type === "Canvas").map((y) => v.find((M) => M.id === y.id)).filter(Boolean), f = g.filter((y) => y.type === "Range").map((y) => u(y)), w = [...d, ...f];
+    }), f = (l) => {
+      const g = l.items || [], L = g.filter((d) => d.type === "Canvas").map((d) => u.find((M) => M.id === d.id)).filter(Boolean), h = g.filter((d) => d.type === "Range").map((d) => f(d)), m = [...L, ...h];
       return {
-        source: c,
-        id: c.id,
+        source: l,
+        id: l.id,
         // Maintain original order
-        items: g.map((y) => w.find((M) => M.id === y.id)),
-        canvases: d,
-        ranges: f,
-        getLabel: x(c)
+        items: g.map((d) => m.find((M) => M.id === d.id)),
+        canvases: L,
+        ranges: h,
+        getLabel: x(l)
       };
-    }, h = p.map((c) => u(c));
-    return { canvases: v, ranges: h };
+    }, v = p.map((l) => f(l));
+    return { canvases: u, ranges: v };
   }, i = t === 2 ? st(e) : e, { canvases: n, ranges: s } = r(i);
   return {
     source: i,
@@ -927,9 +927,9 @@ const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/
     getTableOfContents: be(s)
   };
 }, Ie = (e) => {
-  const { width: t, height: r, format: i } = e, n = m(e, "id"), s = ct(e);
+  const { width: t, height: r, format: i } = e, n = y(e, "id"), s = ct(e);
   if (s) {
-    const a = at(m(e, "id")), l = {
+    const a = at(y(e, "id")), c = {
       source: e,
       type: s.profileLevel === 0 ? "level0" : "dynamic",
       service: e,
@@ -940,9 +940,9 @@ const at = (e) => e.endsWith("/info.json") ? e : `${e.endsWith("/") ? e : `${e}/
       getImageURL: vt(t, r, e),
       getPixelSize: ht(a)
     };
-    return s.profileLevel === 0 ? l : {
-      ...l,
-      getRegionURL: pt(l)
+    return s.profileLevel === 0 ? c : {
+      ...c,
+      getRegionURL: pt(c)
     };
   } else
     return {
@@ -964,7 +964,7 @@ export {
   x as getLabel,
   k as getMetadata,
   ht as getPixelSizeFromServiceUrl,
-  m as getPropertyValue,
+  y as getPropertyValue,
   pt as getRegionURL,
   de as getRegionURLFromService,
   lt as getStaticImagePixelSize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-iiif",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "A developer-friendly collection of abstractions and utilities built on top of @iiif/presentation-3 and @iiif/parser",
   "license": "MIT",
   "author": "Rainer Simon",

package/src/core/image-service.ts

@@ -90,6 +90,7 @@ export const getImageURLFromService = (
 export const getRegionURLFromService = (
   service: Service,
   bounds: Bounds,
+  rotation = 0, // 0, 90, 180, 270
   opts: GetRegionURLOpts = { minSize: 400 }
 ): string | undefined => {
   const id = getPropertyValue(service, 'id');
@@ -106,7 +107,8 @@ export const getRegionURLFromService = (
   const { x, y, w , h } = bounds;
   const { minSize = 400, maxSize } = opts;
 
-  const aspect = w / h;
+  const isTransposed = rotation % 180 !== 0;
+  const aspect = isTransposed ? h / w : w / h;
   const isPortrait = aspect < 1;
   
   let height = Math.ceil(isPortrait ? minSize / aspect : minSize);
@@ -126,17 +128,18 @@ export const getRegionURLFromService = (
   }
 
   const regionParam = `${Math.round(x)},${Math.round(y)},${Math.round(w)},${Math.round(h)}`;
-  return `${id}/${regionParam}/!${width},${height}/0/default.jpg`;
+  return `${id}/${regionParam}/!${width},${height}/${rotation}/default.jpg`;
 }
 
 export const getRegionURL = (
   image: CozyImageResource
 ) => (
   bounds: Bounds,
+  rotation = 0,
   opts: GetRegionURLOpts = { minSize: 400 }
 ): string | undefined => {
   if (image.type === 'dynamic') {
-    return getRegionURLFromService(image.service, bounds, opts);
+    return getRegionURLFromService(image.service, bounds, rotation, opts);
   } else {
     console.error('Level 0 or static image canvas: unsupported');
   }

package/test/core/canvas.test.ts

@@ -1,28 +1,10 @@
 import { describe, it, expect } from 'vitest';
 import { Cozy, CozyManifest } from '../../src';
 
-import { STATIC_IMAGE, WITH_DIFFERENT_CANVAS_DIMENSIONS } from './fixtures';
+import { STATIC_IMAGE } from './fixtures';
 
 describe('canvas', () => {
 
-  it('should determine correct pixel size for image service', async () => {
-    const result = await Cozy.parseURL(WITH_DIFFERENT_CANVAS_DIMENSIONS);
-    expect(result.type).toBe('manifest');
-    expect('resource' in result).toBeTruthy();
-
-    const manifest = (result as any).resource as CozyManifest;
-    expect(manifest.canvases.length).toBe(66);
-
-    const page2 = manifest.canvases[1];
-    expect(page2.getLabel()).toBe('Page 2');
-    expect(page2.images.length).toBe(1);
-
-    const image = page2.images[0];
-    const { width, height } = await image.getPixelSize();
-    expect(width).toBe(3796);
-    expect(height).toBe(5910);
-  });
-
   it('should determine correct pixel size for static image', async () => {
     const result = await Cozy.parseURL(STATIC_IMAGE);
     expect(result.type).toBe('manifest');

package/test/core/fixtures.ts

@@ -1,10 +1,6 @@
 // IIIF cookbook static image
 export const STATIC_IMAGE = 
   'https://iiif.io/api/cookbook/recipe/0001-mvm-image/manifest.json';
-  
-// Manifest that uses `structures` to define a Table of Contents
-export const WITH_STRUCTURES =
-  'https://lib.is/IE19255085/manifest';
 
 // Manifest that specifies a different size for the canvas
 // then the physical image pixel size

package/test/helpers/fixtures.ts

@@ -135,4 +135,10 @@ export const TWO_CANVASES_NO_ANNOTATIONS = {
       ]
     }
   ]
-}
+}
+
+// With Media Fragment in target URL
+// {
+//   "target": "https://cogapplabs.github.io/StoriiiesViewer/demo/grande-jatte/canvases/1#xywh=346,597,8800,4812"
+// }
+export const HAS_FRAGEMENT_TARGET = 'https://raw.githubusercontent.com/cogappLabs/storiiiesViewer/main/docs/demo/grande-jatte.json';

package/test/core/manifest.test.ts

@@ -1,28 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { Cozy, CozyManifest } from '../../src';
-
-import { WITH_STRUCTURES } from './fixtures';
-
-describe('manifest', () => {
-
-  it('should generate proper ToC breadcrumbs', async () => {
-    const result = await Cozy.parseURL(WITH_STRUCTURES);
-    expect(result.type).toBe('manifest');
-    expect('resource' in result).toBeTruthy();
-
-    const manifest = (result as any).resource as CozyManifest;
-    expect(manifest.structure.length > 0).toBeTruthy();
-
-    /*
-    const toc = manifest.getTableOfContents();
-
-    const breadcrumbs = toc.getBreadcrumbs('https://lib.is/IE19255085/range/range-0-12.json');
-
-    expect(breadcrumbs.length).toBe(3);
-    expect(breadcrumbs[0].getLabel()).toBe('Table of Contents');
-    expect(breadcrumbs[1].getLabel()).toBe('Woodcuts full');
-    expect(breadcrumbs[2].getLabel()).toBe('f. X2v-f. X3r: woodcut full ')
-    */
-  });
-
-});