@readium/shared 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readium/shared",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "type": "module",
   "description": "Shared models to be used across other Readium projects and implementations in Typescript",
   "author": "readium",
@@ -31,9 +31,9 @@
   "types": "./types/src/index.d.ts",
   "exports": {
     ".": {
+      "types": "./types/src/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.umd.cjs",
-      "types": "./types/src/index.d.ts"
+      "require": "./dist/index.umd.cjs"
     }
   },
   "files": [
@@ -48,7 +48,6 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "update-accessibility-locales": "node update-accessibility-locales.mjs",
-    "postinstall": "npm run update-accessibility-locales",
     "test": "jest",
     "size": "size-limit"
   },
@@ -59,18 +58,18 @@
     }
   ],
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-typescript": "^7.22.5",
-    "@size-limit/file": "^11.1.4",
-    "@types/jest": "^29.5.10",
-    "babel-jest": "^29.0.0",
-    "css-selector-generator": "^3.6.4",
-    "jest": "^29.7.0",
-    "size-limit": "^11.1.4",
-    "ts-jest": "^29.1.1",
-    "tslib": "^2.6.2",
-    "typescript": "^5.4.5",
-    "vite": "^4.5.5"
+    "@babel/core": "^7.28.3",
+    "@babel/preset-env": "^7.28.3",
+    "@babel/preset-typescript": "^7.27.1",
+    "@size-limit/file": "^11.2.0",
+    "@types/jest": "^30.0.0",
+    "babel-jest": "^30.1.1",
+    "css-selector-generator": "^3.6.9",
+    "jest": "^30.1.1",
+    "size-limit": "^11.2.0",
+    "ts-jest": "^29.4.1",
+    "tslib": "^2.8.1",
+    "typescript": "^5.9.3",
+    "vite": "^7.2.4"
   }
 }

package/src/opds/Acquisition.ts

@@ -35,7 +35,7 @@ export class Acquisition {
   }
 
   public static deserializeArray(json: any): Array<Acquisition> | undefined {
-    if (!(json instanceof Array)) return;
+    if (!(Array.isArray(json))) return;
     return json
       .map<Acquisition>(item => Acquisition.deserialize(item) as Acquisition)
       .filter(x => x !== undefined);

package/src/publication/BelongsTo.ts

@@ -25,7 +25,7 @@ export class BelongsTo {
    * Parses a [BelongsTo] from its RWPM JSON representation.
    */
   public static deserialize(json: any): BelongsTo | undefined {
-    if (!(json && json instanceof Object)) return;
+    if (!(json && typeof json === 'object')) return;
 
     const items = new Map<string, Collection>();
     Object.entries(json).forEach(([key, value]) => {

package/src/publication/Contributor.ts

@@ -21,7 +21,7 @@ export class Contributor {
   public readonly name: LocalizedString;
 
   /** The string used to sort the name of the contributor. */
-  public readonly sortAs?: string;
+  public readonly sortAs?: LocalizedString;
 
   /** An unambiguous reference to this contributor. */
   public readonly identifier?: string;
@@ -43,7 +43,7 @@ export class Contributor {
    */
   constructor(values: {
     name: LocalizedString;
-    sortAs?: string;
+    sortAs?: LocalizedString;
     identifier?: string;
     altIdentifiers?: Set<AltIdentifier>;
     roles?: Set<string>;
@@ -74,10 +74,10 @@ export class Contributor {
       if (!json.name) return;
       return new Contributor({
         name: LocalizedString.deserialize(json.name) as LocalizedString,
-        sortAs: json.sortAs,
+        sortAs: LocalizedString.deserialize(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))
@@ -98,7 +98,7 @@ export class Contributor {
    */
   public serialize(): any {
     const json: any = { name: this.name.serialize() };
-    if (this.sortAs !== undefined) json.sortAs = this.sortAs;
+    if (this.sortAs !== undefined) json.sortAs = this.sortAs.serialize();
     if (this.identifier !== undefined) json.identifier = this.identifier;
     if (this.altIdentifiers) json.altIdentifier = setToArray(this.altIdentifiers).map(altId => altId.serialize());
     if (this.roles) json.role = setToArray(this.roles);
@@ -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/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

@@ -14,7 +14,7 @@ export class Subject {
   public readonly name: LocalizedString;
 
   /** Provides a string that a machine can sort. */
-  public readonly sortAs?: string;
+  public readonly sortAs?: LocalizedString;
 
   /** EPUB 3.1 opf:term. */
   public readonly code?: string;
@@ -28,7 +28,7 @@ export class Subject {
   /** Creates a [Subject]. */
   constructor(values: {
     name: LocalizedString;
-    sortAs?: string;
+    sortAs?: LocalizedString;
     code?: string;
     scheme?: string;
     links?: Links;
@@ -56,7 +56,7 @@ export class Subject {
       if (!json.name) return;
       return new Subject({
         name: LocalizedString.deserialize(json.name) as LocalizedString,
-        sortAs: json.sortAs,
+        sortAs: json.sortAs ? LocalizedString.deserialize(json.sortAs) : undefined,
         code: json.code,
         scheme: json.scheme,
         links: Links.deserialize(json.links),
@@ -69,7 +69,7 @@ export class Subject {
    */
   public serialize(): any {
     const json: any = { name: this.name.serialize() };
-    if (this.sortAs !== undefined) json.sortAs = this.sortAs;
+    if (this.sortAs !== undefined) json.sortAs = this.sortAs.serialize();
     if (this.code !== undefined) json.code = this.code;
     if (this.scheme !== undefined) json.scheme = this.scheme;
     if (this.links) json.links = this.links.serialize();
@@ -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)

package/src/publication/opds/Properties.ts

@@ -61,7 +61,7 @@ Properties.prototype.getIndirectAcquisitions = function():
   | Array<Acquisition>
   | undefined {
   const json = this.otherProperties['indirectAcquisition'];
-  if (!(json && json instanceof Array)) return;
+  if (!(json && Array.isArray(json))) return;
   return json
     .map<Acquisition>(item => Acquisition.deserialize(item) as Acquisition)
     .filter(x => x !== undefined);

package/src/util/JSONParse.ts

@@ -1,6 +1,6 @@
 /** Parses the given array (or undefined it it's not an array) */
 export function arrayfromJSON(json: any): Array<any> | undefined {
-  return json && json instanceof Array ? json : undefined;
+  return json && Array.isArray(json) ? json : undefined;
 }
 
 export function arrayfromJSONorString(json: any): Array<any> | undefined {

package/types/src/publication/Contributor.d.ts

@@ -9,7 +9,7 @@ export declare class Contributor {
     /** The name of the contributor. */
     readonly name: LocalizedString;
     /** The string used to sort the name of the contributor. */
-    readonly sortAs?: string;
+    readonly sortAs?: LocalizedString;
     /** An unambiguous reference to this contributor. */
     readonly identifier?: string;
     /** Alternate identifiers for this contributor. */
@@ -25,7 +25,7 @@ export declare class Contributor {
      */
     constructor(values: {
         name: LocalizedString;
-        sortAs?: string;
+        sortAs?: LocalizedString;
         identifier?: string;
         altIdentifiers?: Set<AltIdentifier>;
         roles?: Set<string>;

package/types/src/publication/Subject.d.ts

@@ -7,7 +7,7 @@ export declare class Subject {
     /** Subject name. */
     readonly name: LocalizedString;
     /** Provides a string that a machine can sort. */
-    readonly sortAs?: string;
+    readonly sortAs?: LocalizedString;
     /** EPUB 3.1 opf:term. */
     readonly code?: string;
     /** EPUB 3.1 opf:authority. */
@@ -17,7 +17,7 @@ export declare class Subject {
     /** Creates a [Subject]. */
     constructor(values: {
         name: LocalizedString;
-        sortAs?: string;
+        sortAs?: LocalizedString;
         code?: string;
         scheme?: string;
         links?: Links;