@readium/shared 2.0.0 → 2.1.1

package/src/publication/Contributor.ts

@@ -77,7 +77,7 @@ export class Contributor {
         sortAs: json.sortAs,
         identifier: json.identifier,
         altIdentifiers: json.altIdentifier
-          ? (json.altIdentifier instanceof Array
+          ? (Array.isArray(json.altIdentifier)
             ? new Set<AltIdentifier>(json.altIdentifier
                 .map((x: string | { value: string; scheme?: string }) => AltIdentifier.deserialize(x))
                 .filter((x: AltIdentifier | undefined): x is AltIdentifier => x !== undefined))
@@ -127,7 +127,7 @@ export class Contributors {
    */
   public static deserialize(json: any): Contributors | undefined {
     if (!json) return;
-    const items = json instanceof Array ? json : [json];
+    const items = Array.isArray(json) ? json : [json];
     return new Contributors(
       items
         .map<Contributor>(item => Contributor.deserialize(item) as Contributor)

package/src/publication/GuidedNavigation.ts

@@ -211,7 +211,7 @@ export class GuidedNavigationObject {
      * Parses a [GuidedNavigationObject] array from its RWPM JSON representation.
      */
     public static deserializeArray(json: any): GuidedNavigationObject[] | undefined {
-        if (!(json instanceof Array)) return undefined;
+        if (!(Array.isArray(json))) return undefined;
         return json
             .map<GuidedNavigationObject>((item) => GuidedNavigationObject.deserialize(item) as GuidedNavigationObject)
             .filter((x) => x !== undefined);

package/src/publication/Link.ts

@@ -107,7 +107,7 @@ export class Link {
       type: json.type,
       title: json.title,
       rels: json.rel
-        ? json.rel instanceof Array
+        ? Array.isArray(json.rel)
           ? new Set<string>(json.rel as Array<string>)
           : new Set<string>([json.rel as string])
         : undefined,
@@ -226,7 +226,7 @@ export class Links {
    * Creates a list of [Link] from its RWPM JSON representation.
    */
   public static deserialize(json: any): Links | undefined {
-    if (!(json && json instanceof Array)) return;
+    if (!(json && Array.isArray(json))) return;
     return new Links(
       json
         .map<Link>(item => Link.deserialize(item) as Link)

package/src/publication/LocatorCollection.ts

@@ -102,7 +102,7 @@ export class LocatorCollection {
 
     let jsonList = json.locators;
 
-    if (jsonList && jsonList instanceof Array) {
+    if (jsonList && Array.isArray(jsonList)) {
       locators = jsonList
         .map<Locator>(x => Locator.deserialize(x) as Locator)
         .filter(x => x !== undefined);

package/src/publication/Metadata.ts

@@ -1,4 +1,4 @@
-/* Copyright 2021 Readium Foundation. All rights reserved.
+/* Copyright 2025 Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license,
  * available in the LICENSE file present in the Github repository of the project.
  */
@@ -16,6 +16,7 @@ import { LocalizedString } from './LocalizedString';
 import { Profile } from './Profiles';
 import { ReadingProgression } from './ReadingProgression';
 import { Subjects } from './Subject';
+import { Accessibility } from './accessibility/Accessibility';
 import { TDM } from './TDM';
 
 /**
@@ -59,6 +60,7 @@ export class Metadata {
   public readingProgression?: ReadingProgression;
   public duration?: number;
   public numberOfPages?: number;
+  public accessibility?: Accessibility;
   public tdm?: TDM;
   public otherMetadata?: { [key: string]: any };
 
@@ -94,6 +96,7 @@ export class Metadata {
     'readingProgression',
     'duration',
     'numberOfPages',
+    'accessibility',
     'tdm'
   ];
 
@@ -131,6 +134,7 @@ export class Metadata {
     readingProgression?: ReadingProgression;
     duration?: number;
     numberOfPages?: number;
+    accessibility?: Accessibility;
     tdm?: TDM;
     otherMetadata?: { [key: string]: any };
   }) {
@@ -184,6 +188,7 @@ export class Metadata {
     this.readingProgression = values.readingProgression;
     this.duration = values.duration;
     this.numberOfPages = values.numberOfPages;
+    this.accessibility = values.accessibility;
     this.tdm = values.tdm;
     this.otherMetadata = values.otherMetadata;
   }
@@ -222,6 +227,7 @@ export class Metadata {
     const modified = datefromJSON(json.modified);
     const subjects = Subjects.deserialize(json.subject);
     const belongsTo = BelongsTo.deserialize(json.belongsTo);
+    const accessibility = Accessibility.deserialize(json.accessibility);
     const layout = json.layout;
     const readingProgression = json.readingProgression;
     const duration = positiveNumberfromJSON(json.duration);
@@ -265,6 +271,7 @@ export class Metadata {
       readingProgression,
       duration,
       numberOfPages,
+      accessibility,
       tdm,
       otherMetadata
     });
@@ -308,6 +315,7 @@ export class Metadata {
     if (this.duration !== undefined) json.duration = this.duration;
     if (this.numberOfPages !== undefined)
       json.numberOfPages = this.numberOfPages;
+    if (this.accessibility) json.accessibility = this.accessibility.serialize();
     if (this.tdm) json.tdm = this.tdm.serialize();
 
     if (this.otherMetadata) {

package/src/publication/PublicationCollection.ts

@@ -39,10 +39,10 @@ export class PublicationCollection {
     let metadata: Map<string, any> | undefined;
     let subcollections: Map<string, Array<PublicationCollection>> | undefined;
 
-    if (json instanceof Array) {
+    if (Array.isArray(json)) {
       // Parses an array of links.
       links = Links.deserialize(json);
-    } else if (json instanceof Object) {
+    } else if (typeof json === 'object') {
       // Parses a sub-collection object.
       links = Links.deserialize(json.links);
 
@@ -86,7 +86,7 @@ export class PublicationCollection {
           const list = new Array<PublicationCollection>();
           list.push(collection);
           collections.set(role, list);
-        } else if (subJSON instanceof Array) {
+        } else if (Array.isArray(subJSON)) {
           // Parses a list of collection objects.
           const list = subJSON
             .map<PublicationCollection>(

package/src/publication/Subject.ts

@@ -98,7 +98,7 @@ export class Subjects {
    */
   public static deserialize(json: any): Subjects | undefined {
     if (!json) return;
-    const items = json instanceof Array ? json : [json];
+    const items = Array.isArray(json) ? json : [json];
     return new Subjects(
       items
         .map<Subject>(item => Subject.deserialize(item) as Subject)