Moved book format identifier assignment to makeBook.

Author: Protected

comic-book.js

@@ -24,7 +24,6 @@ export const makeComicBook = ({ entries, loadBlob, getSize }, file) => {
     if (!files.length) throw new Error('No supported image files in archive')
 
     const book = {}
-    Object.defineProperty(book, "type", {get: () => 'comic-book'})
     book.getCover = () => loadBlob(files[0])
     book.metadata = { title: file.name }
     book.sections = files.map(name => ({

epub.js

@@ -930,7 +930,6 @@ export class EPUB {
         this.getSize = getSize
         this.#encryption = new Encryption(deobfuscators(sha1))
     }
-    get type() { return 'epub'; }
     async #loadXML(uri) {
         const str = await this.loadText(uri)
         if (!str) return null

fb2.js

@@ -231,7 +231,6 @@ const dataID = 'data-foliate-id'
 
 export const makeFB2 = async blob => {
     const book = {}
-    Object.defineProperty(book, "type", {get: () => 'fb2'})
 
     const doc = await parseXML(blob)
     const converter = new FB2Converter(doc)

mobi.js

@@ -670,7 +670,6 @@ class MOBI6 {
     constructor(mobi) {
         this.mobi = mobi
     }
-    get type() { return 'mobi'; }
     async init() {
         // load all text records in an array
         let array = new Uint8Array()

pdf.js

@@ -119,7 +119,6 @@ export const makePDF = async file => {
     }).promise
 
     const book = { rendition: { layout: 'pre-paginated' } }
-    Object.defineProperty(book, "type", {get: () => 'pdf'})
 
     const { metadata, info } = await pdf.getMetadata() ?? {}
     // TODO: for better results, parse `metadata.getRaw()`

view.js

@@ -83,39 +83,46 @@ export const makeBook = async file => {
         const loader = await makeDirectoryLoader(file)
         const { EPUB } = await import('./epub.js')
         book = await new EPUB(loader).init()
+        book.type = 'epub';
     }
     else if (!file.size) throw new NotFoundError('File not found')
     else if (await isZip(file)) {
         const loader = await makeZipLoader(file)
         if (isCBZ(file)) {
             const { makeComicBook } = await import('./comic-book.js')
             book = makeComicBook(loader, file)
+            book.type = 'comic-book';
         }
         else if (isFBZ(file)) {
             const { makeFB2 } = await import('./fb2.js')
             const { entries } = loader
             const entry = entries.find(entry => entry.filename.endsWith('.fb2'))
             const blob = await loader.loadBlob((entry ?? entries[0]).filename)
             book = await makeFB2(blob)
+            book.type = 'fb2';
         }
         else {
             const { EPUB } = await import('./epub.js')
             book = await new EPUB(loader).init()
+            book.type = 'epub';
         }
     }
     else if (await isPDF(file)) {
         const { makePDF } = await import('./pdf.js')
         book = await makePDF(file)
+        book.type = 'pdf'
     }
     else {
         const { isMOBI, MOBI } = await import('./mobi.js')
         if (await isMOBI(file)) {
             const fflate = await import('./vendor/fflate.js')
             book = await new MOBI({ unzlib: fflate.unzlibSync }).open(file)
+            book.type = 'mobi';
         }
         else if (isFB2(file)) {
             const { makeFB2 } = await import('./fb2.js')
             book = await makeFB2(file)
+            book.type = 'fb2';
         }
     }
     if (!book) throw new UnsupportedTypeError('File type not supported')