@d-i-t-a/reader 3.0.0-alpha.6 → 3.0.0-alpha.7

package/dist/esm/index.js

@@ -14676,7 +14676,7 @@ var require_lodash = __commonJS({
             } else if (isPlainObject(srcValue) || isArguments(srcValue)) {
               newValue = objValue;
               if (isArguments(objValue)) {
-                newValue = toPlainObject(objValue);
+                newValue = toPlainObject2(objValue);
               } else if (!isObject(objValue) || isFunction(objValue)) {
                 newValue = initCloneObject(srcValue);
               }
@@ -17317,7 +17317,7 @@ var require_lodash = __commonJS({
           var isBinary = reIsBinary.test(value);
           return isBinary || reIsOctal.test(value) ? freeParseInt(value.slice(2), isBinary ? 2 : 8) : reIsBadHex.test(value) ? NAN : +value;
         }
-        function toPlainObject(value) {
+        function toPlainObject2(value) {
           return copyObject(value, keysIn(value));
         }
         function toSafeInteger(value) {
@@ -18197,7 +18197,7 @@ var require_lodash = __commonJS({
         lodash4.toPairs = toPairs;
         lodash4.toPairsIn = toPairsIn;
         lodash4.toPath = toPath;
-        lodash4.toPlainObject = toPlainObject;
+        lodash4.toPlainObject = toPlainObject2;
         lodash4.transform = transform;
         lodash4.unary = unary;
         lodash4.union = union;
@@ -68637,7 +68637,7 @@ var Link = class extends U {
 // src/model/v3/Publication.ts
 function toLink(link) {
   if (link instanceof Link) return link;
-  return Object.assign(new Link({ href: link.href }), {
+  return new Link({
     href: link.href,
     templated: link.templated,
     type: link.type,
@@ -68663,6 +68663,27 @@ var Publication = class _Publication {
     this.manifest = manifest;
     this.manifestUrl = manifestUrl;
   }
+  /**
+   * Create a Publication from a raw JSON object.
+   * Handles both RWPM (camelCase) and legacy (PascalCase) key formats.
+   * Returns null if the JSON cannot be parsed.
+   */
+  static fromJSON(json, url) {
+    const normalized = {
+      metadata: json.metadata ?? json.Metadata ?? { title: "" },
+      links: json.links ?? json.Links ?? [],
+      readingOrder: json.readingOrder ?? json.spine ?? json.Spine ?? [],
+      resources: json.resources ?? json.Resources,
+      toc: json.toc ?? json.TOC
+    };
+    if (!normalized.metadata.title) {
+      normalized.metadata.title = normalized.metadata.Title ?? "";
+    }
+    const manifest = Ue.deserialize(normalized);
+    if (!manifest) return null;
+    manifest.setSelfLink(url.href);
+    return new _Publication(manifest, url);
+  }
   static async fromUrl(url, requestConfig) {
     const response = await fetch(url.href, requestConfig);
     const manifestJSON = await response.json();
@@ -76921,16 +76942,6 @@ var MediaOverlayNode = class _MediaOverlayNode {
   }
 };
 
-// src/utils/JsonUtil.ts
-init_polyfills();
-function TaJsonDeserialize(json, type) {
-  if (type && typeof type.deserialize === "function") {
-    const result = type.deserialize(json);
-    if (result) return result;
-  }
-  return Object.assign(new type(), json);
-}
-
 // src/modules/mediaoverlays/MediaOverlaySettings.ts
 init_polyfills();
 init_HTMLUtilities();
@@ -77393,10 +77404,7 @@ var MediaOverlayModule = class {
         import_loglevel11.default.log("## moJson" + moJson);
         return;
       }
-      link.mediaOverlayNode = TaJsonDeserialize(
-        moJson,
-        MediaOverlayNode
-      );
+      link.mediaOverlayNode = MediaOverlayNode.deserialize(moJson);
       link.mediaOverlayNode.initialized = true;
       const href = link.hrefDecoded || link.href;
       const hrefUrlObj = new URL("https://dita.digital/" + href);
@@ -77475,10 +77483,7 @@ var MediaOverlayModule = class {
             if (response.ok) {
               const moJson = await response.json();
               if (moJson) {
-                link.mediaOverlayNode = TaJsonDeserialize(
-                  moJson,
-                  MediaOverlayNode
-                );
+                link.mediaOverlayNode = MediaOverlayNode.deserialize(moJson);
                 link.mediaOverlayNode.initialized = true;
               }
             }
@@ -87512,41 +87517,18 @@ init_HTMLUtilities();
 
 // src/model/Link.ts
 init_polyfills();
-function convertAndCamel(o) {
+function toPlainObject(o) {
   if (o == null) return o;
-  if (o.items && Array.isArray(o.items)) {
-    return convertAndCamel(o.items);
-  }
-  let newO, origKey, newKey, value;
-  if (o instanceof Array) {
-    return o.map(function(value2) {
-      if (typeof value2 === "object") {
-        value2 = convertAndCamel(value2);
-      }
-      return value2;
-    });
-  } else {
-    newO = {};
-    for (origKey in o) {
-      if (o.hasOwnProperty(origKey)) {
-        newKey = (origKey.charAt(0).toLowerCase() + origKey.slice(1) || origKey).toString();
-        value = o[origKey];
-        if (value && value.items && Array.isArray(value.items)) {
-          value = convertAndCamel(value.items);
-        } else if (value instanceof Array || value !== null && value !== void 0 && value.constructor === Object) {
-          value = convertAndCamel(value);
-        }
-        if (newKey === "href1") {
-          newO["href"] = value;
-        } else if (newKey === "typeLink") {
-          newO["type"] = value;
-        } else {
-          newO[newKey] = value;
-        }
-      }
-    }
+  if (o instanceof Set) return Array.from(o);
+  if (o.items && Array.isArray(o.items)) return o.items.map(toPlainObject);
+  if (Array.isArray(o)) return o.map(toPlainObject);
+  if (typeof o !== "object") return o;
+  const result = {};
+  for (const key in o) {
+    if (!o.hasOwnProperty(key)) continue;
+    result[key] = toPlainObject(o[key]);
   }
-  return newO;
+  return result;
 }
 
 // src/modules/highlight/LayerSettings.ts
@@ -88022,27 +88004,10 @@ var D2Reader = class _D2Reader {
       if (pubInput instanceof Publication) {
         publication = pubInput;
       } else {
-        const json = {
-          metadata: pubInput.metadata ?? pubInput.Metadata ?? { title: "" },
-          links: pubInput.links ?? pubInput.Links ?? [],
-          readingOrder: pubInput.readingOrder ?? pubInput.spine ?? pubInput.Spine ?? [],
-          resources: pubInput.resources ?? pubInput.Resources,
-          toc: pubInput.toc ?? pubInput.TOC
-        };
-        if (!json.metadata.title && !json.metadata.Title) {
-          json.metadata.title = "";
-        }
-        if (json.metadata.Title && !json.metadata.title) {
-          json.metadata.title = json.metadata.Title;
-        }
-        const manifest = Ue.deserialize(json);
-        if (!manifest) {
-          throw new Error("Failed to parse publication manifest from config");
-        }
-        manifest.setSelfLink(webPubManifestUrl.href);
-        publication = new Publication(manifest, new URL(webPubManifestUrl));
+        publication = Publication.fromJSON(pubInput, webPubManifestUrl);
       }
-    } else {
+    }
+    if (!publication) {
       publication = await Publication.fromUrl(
         webPubManifestUrl,
         initialConfig.requestConfig
@@ -88266,19 +88231,19 @@ var D2Reader = class _D2Reader {
   }
   /** Table of Contents */
   get tableOfContents() {
-    return convertAndCamel(this.navigator.tableOfContents()) ?? [];
+    return toPlainObject(this.navigator.tableOfContents()) ?? [];
   }
   /** Landmarks */
   get landmarks() {
-    return convertAndCamel(this.navigator.landmarks()) ?? [];
+    return toPlainObject(this.navigator.landmarks()) ?? [];
   }
   /** Page List */
   get pageList() {
-    return convertAndCamel(this.navigator.pageList()) ?? [];
+    return toPlainObject(this.navigator.pageList()) ?? [];
   }
   /** Reading Order or Spine */
   get readingOrder() {
-    return convertAndCamel(this.navigator.readingOrder()) ?? [];
+    return toPlainObject(this.navigator.readingOrder()) ?? [];
   }
   /** Current Bookmarks */
   get bookmarks() {