cozy-iiif 0.8.0 → 0.8.2

package/dist/helpers/index.js

@@ -35,20 +35,18 @@ function d(e, t = 0) {
 }
 //#endregion
 //#region node_modules/uuid/dist/rng.js
-var f, p = new Uint8Array(16);
-function m() {
-	if (!f) {
-		if (typeof crypto > "u" || !crypto.getRandomValues) throw Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-		f = crypto.getRandomValues.bind(crypto);
-	}
-	return f(p);
+var f = new Uint8Array(16);
+function p() {
+	return crypto.getRandomValues(f);
 }
-var h = { randomUUID: typeof crypto < "u" && crypto.randomUUID && crypto.randomUUID.bind(crypto) };
 //#endregion
 //#region node_modules/uuid/dist/v4.js
-function g(e, t, n) {
+function m(e, t, n) {
+	return !t && !e && crypto.randomUUID ? crypto.randomUUID() : h(e, t, n);
+}
+function h(e, t, n) {
 	e ||= {};
-	let r = e.random ?? e.rng?.() ?? m();
+	let r = e.random ?? e.rng?.() ?? p();
 	if (r.length < 16) throw Error("Random bytes length must be >= 16");
 	if (r[6] = r[6] & 15 | 64, r[8] = r[8] & 63 | 128, t) {
 		if (n ||= 0, n < 0 || n + 16 > t.length) throw RangeError(`UUID byte range ${n}:${n + 15} is out of buffer bounds`);
@@ -57,16 +55,13 @@ function g(e, t, n) {
 	}
 	return d(r);
 }
-function _(e, t, n) {
-	return h.randomUUID && !t && !e ? h.randomUUID() : g(e, t, n);
-}
 //#endregion
 //#region src/helpers/import-annotations.ts
-var v = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), y = (e, t) => {
+var g = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), _ = (e, t) => {
 	if (t) {
 		let n = e.annotations;
 		if (n.length > 0) {
-			let r = RegExp(`${v(e.id)}/${v(t)}/page/p(\\d+)$`), i = n.reduce((e, t) => {
+			let r = RegExp(`${g(e.id)}/${g(t)}/page/p(\\d+)$`), i = n.reduce((e, t) => {
 				let n = t.id.match(r);
 				if (n && n[1]) {
 					let t = parseInt(n[1]);
@@ -75,10 +70,10 @@ var v = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), y = (e, t) => {
 			}, 1);
 			return `${e.id}/${t}/annotations/page/p${i}`;
 		} else return `${e.id}/${t}/annotations/page/p1`;
-	} else return `${e.id}/annotations/page/${_()}`;
-}, b = (e, t, n) => {
+	} else return `${e.id}/annotations/page/${m()}`;
+}, v = (e, t, n) => {
 	let r = {
-		id: y(e, n),
+		id: _(e, n),
 		type: "AnnotationPage",
 		items: t
 	};
@@ -96,7 +91,7 @@ var v = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), y = (e, t) => {
 		getMetadata: e.getMetadata,
 		getThumbnailURL: e.getThumbnailURL
 	};
-}, x = (e, t, n) => {
+}, y = (e, t, n) => {
 	let r = (e) => {
 		let t = e.target;
 		if (t) return typeof t == "string" ? t.substring(0, t.indexOf("#")) : t.source;
@@ -105,7 +100,7 @@ var v = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), y = (e, t) => {
 		return n ? (e[n] || (e[n] = []), e[n].push(t), e) : e;
 	}, {}), a = e.canvases.map((e) => {
 		let t = i[e.id] || [];
-		return t.length > 0 ? b(e, t, n) : e;
+		return t.length > 0 ? v(e, t, n) : e;
 	});
 	return {
 		source: {
@@ -120,7 +115,7 @@ var v = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), y = (e, t) => {
 		getMetadata: e.getMetadata,
 		getTableOfContents: e.getTableOfContents
 	};
-}, S = (e, t, n) => e.source.type === "Canvas" ? b(e, t, n) : x(e, t, n), C = (e) => {
+}, b = (e, t, n) => e.source.type === "Canvas" ? v(e, t, n) : y(e, t, n), x = (e) => {
 	let t = e.images[0];
 	if (!t) return Promise.resolve(!1);
 	let n;
@@ -134,4 +129,4 @@ var v = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), y = (e, t) => {
 	});
 };
 //#endregion
-export { c as fetchAnnotations, l as hydrateCanvas, S as importAnnotations, C as testCORS };
+export { c as fetchAnnotations, l as hydrateCanvas, b as importAnnotations, x as testCORS };

package/dist/index.js

@@ -848,9 +848,12 @@ var Ge = async (e) => {
 		message: "JSON resource is not a recognized IIIF format"
 	};
 }, Ke = (t, n) => {
-	let r = (t) => {
-		let n = [];
-		return new e({ manifest: [(e) => n.push(e)] }).traverseCollection(t), n.map((e) => ({
+	let r = (n) => {
+		let r = [];
+		return new e({
+			collection: [(e) => e.id !== s(t, "id") && r.push(e)],
+			manifest: [(e) => r.push(e)]
+		}).traverseCollection(n), r.map((e) => ({
 			id: e.id,
 			type: e.type,
 			getLabel: p(e),
@@ -858,6 +861,7 @@ var Ge = async (e) => {
 		}));
 	}, i = n === 2 ? Z(t) : t, a = r(i);
 	return {
+		type: "Collection",
 		source: i,
 		id: i.id,
 		majorVersion: n,

package/dist/types.d.ts

@@ -26,16 +26,18 @@ export interface CozyCollection {
     readonly majorVersion: number;
     readonly source: Collection;
     readonly id: string;
+    readonly type: 'Collection';
     readonly items: CozyCollectionItem[];
     getLabel(locale?: string): string | undefined;
     getMetadata(locale?: string): CozyMetadata[];
 }
-export interface CozyCollectionItem {
+export interface CozyCollectionManifestItem {
     readonly id: string;
-    readonly type: string;
+    readonly type: 'Manifest';
     readonly source: any;
     getLabel(locale?: string): string | undefined;
 }
+export type CozyCollectionItem = CozyCollectionManifestItem | CozyCollection;
 export interface CozyManifest {
     readonly majorVersion: number;
     readonly source: Manifest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-iiif",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "A developer-friendly collection of abstractions and utilities built on top of @iiif/presentation-3 and @iiif/parser",
   "license": "MIT",
   "author": "Rainer Simon",
@@ -28,15 +28,15 @@
     "./level-0": "./dist/level-0/index.js"
   },
   "devDependencies": {
-    "typescript": "^6.0.2",
-    "vite": "^8.0.8",
-    "vitest": "^4.1.4"
+    "typescript": "^6.0.3",
+    "vite": "^8.0.11",
+    "vitest": "^4.1.5"
   },
   "dependencies": {
     "@iiif/parser": "^2.2.10",
     "@iiif/presentation-3": "^2.2.3",
     "image-size": "^2.0.2",
     "p-throttle": "^8.1.0",
-    "uuid": "^13.0.0"
+    "uuid": "^14.0.0"
   }
 }

package/src/Cozy.ts

@@ -158,6 +158,9 @@ const parseCollectionResource = (resource: any, majorVersion: number): CozyColle
     const items: any[] = [];
 
     const modelBuilder = new Traverse({
+      // The model builder fires on the collection ITSELF - we don't want that, but want
+      // to collect sub-collections
+      collection: [item => item.id !== getPropertyValue(resource, 'id') && items.push(item)],
       manifest: [item => items.push(item)]
     });
 
@@ -176,6 +179,7 @@ const parseCollectionResource = (resource: any, majorVersion: number): CozyColle
   const items = parseV3(v3);
 
   return {
+    type: 'Collection',
     source: v3,
     id: v3.id,
     majorVersion,

package/src/types.ts

@@ -28,6 +28,8 @@ export interface CozyCollection {
 
   readonly id: string;
 
+  readonly type: 'Collection';
+
   readonly items: CozyCollectionItem[];
 
   getLabel(locale?: string): string | undefined;
@@ -36,11 +38,11 @@ export interface CozyCollection {
 
 }
 
-export interface CozyCollectionItem {
+export interface CozyCollectionManifestItem {
 
   readonly id: string;
 
-  readonly type: string;
+  readonly type: 'Manifest';
 
   readonly source: any;
 
@@ -48,6 +50,8 @@ export interface CozyCollectionItem {
 
 }
 
+export type CozyCollectionItem = CozyCollectionManifestItem | CozyCollection;
+
 export interface CozyManifest {
 
   readonly majorVersion: number;

package/test/Cozy.test.ts

@@ -1,8 +1,9 @@
 import { describe, it, expect } from 'vitest';
-import { Cozy, CozyManifest, DynamicImageServiceResource } from '../src';
+import { Cozy, CozyCollection, CozyManifest, DynamicImageServiceResource } from '../src';
 
 import { 
   COLLECTION, 
+  NESTED_COLLECTION,
   INFO_JSON_V3,
   WITH_MULTI_IMAGE,
   WITH_STRUCTURES,
@@ -14,6 +15,18 @@ describe('Cozy', () => {
   it('should parse collection manifests correctly', async () => {
     const result = await Cozy.parseURL(COLLECTION);
     expect(result.type).toBe('collection');
+
+    const collection = (result as any).resource as CozyCollection;
+    expect(collection.items.length).toBe(16);
+  });
+
+  it('should parse nested collection manifests correctly', async () => {
+    const result = await Cozy.parseURL(NESTED_COLLECTION);
+    expect(result.type).toBe('collection');
+
+    const collection = (result as any).resource as CozyCollection;
+    expect(collection.items.length).toBe(7);
+    expect(collection.items.every(item => item.type === 'Collection'))
   });
   
   it('should parse structures in presentation manifests', async () => {

package/test/fixtures.ts

@@ -1,6 +1,9 @@
 export const COLLECTION =
   'https://www.davidrumsey.com/luna/servlet/iiif/collection/s/1k986a';
 
+export const NESTED_COLLECTION =
+  'https://image-ub.bgo1.test.rail.uib.no/iiif/presentation/na/fragmenter/collection.json';
+
 export const WITH_STRUCTURES =
   'https://lib.is/IE19255085/manifest';