cozy-iiif 0.8.1 → 0.8.2

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.1",
+  "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",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "typescript": "^6.0.3",
-    "vite": "^8.0.10",
+    "vite": "^8.0.11",
     "vitest": "^4.1.5"
   },
   "dependencies": {

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';