music-metadata 10.0.1 → 10.2.0

package/lib/common/CombinedTagMapper.js

@@ -39,7 +39,7 @@ export class CombinedTagMapper {
         if (tagMapper) {
             return this.tagMappers[tagType].mapGenericTag(tag, warnings);
         }
-        throw new Error('No generic tag mapper defined for tag-format: ' + tagType);
+        throw new Error(`No generic tag mapper defined for tag-format: ${tagType}`);
     }
     registerTagMapper(genericTagMapper) {
         for (const tagType of genericTagMapper.tagTypes) {

package/lib/common/FourCC.d.ts

@@ -1,4 +1,4 @@
-import { IToken } from 'strtok3';
+import type { IToken } from 'strtok3';
 /**
  * Token for read FourCC
  * Ref: https://en.wikipedia.org/wiki/FourCC

package/lib/common/GenericTagMapper.d.ts

@@ -1,6 +1,6 @@
-import * as generic from './GenericTagTypes.js';
-import { ITag } from '../type.js';
-import { INativeMetadataCollector, IWarningCollector } from './MetadataCollector.js';
+import type * as generic from './GenericTagTypes.js';
+import type { ITag } from '../type.js';
+import type { INativeMetadataCollector, IWarningCollector } from './MetadataCollector.js';
 export interface IGenericTagMapper {
     /**
      * Which tagType is able to map to the generic mapping format
@@ -16,16 +16,16 @@ export interface IGenericTagMapper {
      * @param warnings  Register warnings
      * @return Generic tag, if native tag could be mapped
      */
-    mapGenericTag(tag: ITag, warnings: INativeMetadataCollector): generic.IGenericTag;
+    mapGenericTag(tag: ITag, warnings: INativeMetadataCollector): generic.IGenericTag | null;
 }
 export declare class CommonTagMapper implements IGenericTagMapper {
     tagTypes: generic.TagType[];
     tagMap: generic.INativeTagMap;
     static maxRatingScore: number;
-    static toIntOrNull(str: string): number;
+    static toIntOrNull(str: string): number | null;
     static normalizeTrack(origVal: number | string): {
-        no: number;
-        of: number;
+        no: number | null;
+        of: number | null;
     };
     constructor(tagTypes: generic.TagType[], tagMap: generic.INativeTagMap);
     /**
@@ -35,7 +35,7 @@ export declare class CommonTagMapper implements IGenericTagMapper {
      * @param warnings Register warnings
      * @return common name
      */
-    mapGenericTag(tag: ITag, warnings: IWarningCollector): generic.IGenericTag;
+    mapGenericTag(tag: ITag, warnings: IWarningCollector): generic.IGenericTag | null;
     /**
      * Convert native tag key to common tag key
      * @param tag Native header tag

package/lib/common/GenericTagMapper.js

@@ -1,7 +1,7 @@
 export class CommonTagMapper {
     static toIntOrNull(str) {
-        const cleaned = parseInt(str, 10);
-        return isNaN(cleaned) ? null : cleaned;
+        const cleaned = Number.parseInt(str, 10);
+        return Number.isNaN(cleaned) ? null : cleaned;
     }
     // TODO: a string of 1of1 would fail to be converted
     // converts 1/10 to no : 1, of : 10
@@ -9,8 +9,8 @@ export class CommonTagMapper {
     static normalizeTrack(origVal) {
         const split = origVal.toString().split('/');
         return {
-            no: parseInt(split[0], 10) || null,
-            of: parseInt(split[1], 10) || null
+            no: Number.parseInt(split[0], 10) || null,
+            of: Number.parseInt(split[1], 10) || null
         };
     }
     constructor(tagTypes, tagMap) {

package/lib/common/GenericTagTypes.d.ts

@@ -1,7 +1,8 @@
+import type { AnyTagValue, ICommonTagsResult } from '../type.js';
 export type TagType = 'vorbis' | 'ID3v1' | 'ID3v2.2' | 'ID3v2.3' | 'ID3v2.4' | 'APEv2' | 'asf' | 'iTunes' | 'exif' | 'matroska' | 'AIFF';
 export interface IGenericTag {
-    id: GenericTagId;
-    value: any;
+    id: keyof ICommonTagsResult;
+    value: AnyTagValue;
 }
 export type GenericTagId = 'track' | 'disk' | 'year' | 'title' | 'artist' | 'artists' | 'albumartist' | 'album' | 'date' | 'originaldate' | 'originalyear' | 'releasedate' | 'comment' | 'genre' | 'picture' | 'composer' | 'lyrics' | 'albumsort' | 'titlesort' | 'work' | 'artistsort' | 'albumartistsort' | 'composersort' | 'lyricist' | 'writer' | 'conductor' | 'remixer' | 'arranger' | 'engineer' | 'technician' | 'producer' | 'djmixer' | 'mixer' | 'publisher' | 'label' | 'grouping' | 'subtitle' | 'discsubtitle' | 'totaltracks' | 'totaldiscs' | 'compilation' | 'rating' | 'bpm' | 'mood' | 'media' | 'catalognumber' | 'tvShow' | 'tvShowSort' | 'tvEpisode' | 'tvEpisodeId' | 'tvNetwork' | 'tvSeason' | 'podcast' | 'podcasturl' | 'releasestatus' | 'releasetype' | 'releasecountry' | 'script' | 'language' | 'copyright' | 'license' | 'encodedby' | 'encodersettings' | 'gapless' | 'barcode' | 'isrc' | 'asin' | 'musicbrainz_recordingid' | 'musicbrainz_trackid' | 'musicbrainz_albumid' | 'musicbrainz_artistid' | 'musicbrainz_albumartistid' | 'musicbrainz_releasegroupid' | 'musicbrainz_workid' | 'musicbrainz_trmid' | 'musicbrainz_discid' | 'acoustid_id' | 'acoustid_fingerprint' | 'musicip_puid' | 'musicip_fingerprint' | 'website' | 'performer:instrument' | 'peakLevel' | 'averageLevel' | 'notes' | 'key' | 'originalalbum' | 'originalartist' | 'discogs_artist_id' | 'discogs_label_id' | 'discogs_master_release_id' | 'discogs_rating' | 'discogs_release_id' | 'discogs_votes' | 'replaygain_track_gain' | 'replaygain_track_peak' | 'replaygain_album_gain' | 'replaygain_album_peak' | 'replaygain_track_minmax' | 'replaygain_album_minmax' | 'replaygain_undo' | 'description' | 'longDescription' | 'category' | 'hdVideo' | 'keywords' | 'movement' | 'movementIndex' | 'movementTotal' | 'podcastId' | 'showMovement' | 'stik';
 export interface INativeTagMap {
@@ -25,9 +26,9 @@ export declare const commonTags: ITagInfoMap;
  * @param alias Name of common tag
  * @returns {boolean|*} true if given alias is mapped as a singleton', otherwise false
  */
-export declare function isSingleton(alias: GenericTagId): boolean;
+export declare function isSingleton(alias: keyof ICommonTagsResult): boolean;
 /**
  * @param alias Common (generic) tag
  * @returns {boolean|*} true if given alias is a singleton or explicitly marked as unique
  */
-export declare function isUnique(alias: GenericTagId): boolean;
+export declare function isUnique(alias: keyof ICommonTagsResult): boolean;

package/lib/common/GenericTagTypes.js

@@ -116,13 +116,13 @@ export const commonTags = {
  * @returns {boolean|*} true if given alias is mapped as a singleton', otherwise false
  */
 export function isSingleton(alias) {
-    return commonTags.hasOwnProperty(alias) && !commonTags[alias].multiple;
+    return commonTags[alias] && !commonTags[alias].multiple;
 }
 /**
  * @param alias Common (generic) tag
  * @returns {boolean|*} true if given alias is a singleton or explicitly marked as unique
  */
 export function isUnique(alias) {
-    return !commonTags[alias].multiple || commonTags[alias].unique;
+    return !commonTags[alias].multiple || commonTags[alias].unique || false;
 }
 //# sourceMappingURL=GenericTagTypes.js.map

package/lib/common/MetadataCollector.d.ts

@@ -1,5 +1,5 @@
-import { FormatId, IAudioMetadata, ICommonTagsResult, IFormat, INativeTags, IOptions, IQualityInformation, ITrackInfo } from '../type.js';
-import { IGenericTag, TagType } from './GenericTagTypes.js';
+import { type FormatId, type IAudioMetadata, type ICommonTagsResult, type IFormat, type INativeTags, type IOptions, type IQualityInformation, type ITrackInfo, type AnyTagValue } from '../type.js';
+import { type IGenericTag, type TagType } from './GenericTagTypes.js';
 /**
  * Combines all generic-tag-mappers for each tag type
  */
@@ -8,7 +8,7 @@ export interface IWarningCollector {
      * Register parser warning
      * @param warning
      */
-    addWarning(warning: string): any;
+    addWarning(warning: string): void;
 }
 export interface INativeMetadataCollector extends IWarningCollector {
     /**
@@ -21,8 +21,8 @@ export interface INativeMetadataCollector extends IWarningCollector {
      * @returns {boolean} true if one or more tags have been found
      */
     hasAny(): boolean;
-    setFormat(key: FormatId, value: any): void;
-    addTag(tagType: TagType, tagId: string, value: any): Promise<void>;
+    setFormat(key: FormatId, value: AnyTagValue): void;
+    addTag(tagType: TagType, tagId: string, value: AnyTagValue): Promise<void>;
     addStreamInfo(streamInfo: ITrackInfo): void;
 }
 /**
@@ -30,7 +30,7 @@ export interface INativeMetadataCollector extends IWarningCollector {
  * Responsible for triggering async updates
  */
 export declare class MetadataCollector implements INativeMetadataCollector {
-    private opts;
+    private opts?;
     readonly format: IFormat;
     readonly native: INativeTags;
     readonly common: ICommonTagsResult;
@@ -44,14 +44,14 @@ export declare class MetadataCollector implements INativeMetadataCollector {
      */
     private readonly originPriority;
     private tagMapper;
-    constructor(opts: IOptions);
+    constructor(opts?: IOptions | undefined);
     /**
      * @returns {boolean} true if one or more tags have been found
      */
     hasAny(): boolean;
     addStreamInfo(streamInfo: ITrackInfo): void;
-    setFormat(key: FormatId, value: any): void;
-    addTag(tagType: TagType, tagId: string, value: any): Promise<void>;
+    setFormat(key: FormatId, value: AnyTagValue): void;
+    addTag(tagType: TagType, tagId: string, value: AnyTagValue): Promise<void>;
     addWarning(warning: string): void;
     postMap(tagType: TagType | 'artificial', tag: IGenericTag): Promise<void>;
     /**

package/lib/common/MetadataCollector.js

@@ -22,7 +22,7 @@ export class MetadataCollector {
         this.common = {
             track: { no: null, of: null },
             disk: { no: null, of: null },
-            movementIndex: {}
+            movementIndex: { no: null, of: null }
         };
         this.quality = {
             warnings: []
@@ -50,13 +50,13 @@ export class MetadataCollector {
         return Object.keys(this.native).length > 0;
     }
     addStreamInfo(streamInfo) {
-        debug(`streamInfo: type=${TrackType[streamInfo.type]}, codec=${streamInfo.codecName}`);
+        debug(`streamInfo: type=${streamInfo.type ? TrackType[streamInfo.type] : '?'}, codec=${streamInfo.codecName}`);
         this.format.trackInfo.push(streamInfo);
     }
     setFormat(key, value) {
         debug(`format: ${key} = ${value}`);
         this.format[key] = value; // as any to override readonly
-        if (this.opts.observer) {
+        if (this.opts?.observer) {
             this.opts.observer({ metadata: this, tag: { type: 'format', id: key, value } });
         }
     }
@@ -117,29 +117,31 @@ export class MetadataCollector {
                 return;
             case 'track':
             case 'disk':
-            case 'movementIndex':
+            case 'movementIndex': {
                 const of = this.common[tag.id].of; // store of value, maybe maybe overwritten
                 this.common[tag.id] = CommonTagMapper.normalizeTrack(tag.value);
                 this.common[tag.id].of = of != null ? of : this.common[tag.id].of;
                 return;
+            }
             case 'bpm':
             case 'year':
             case 'originalyear':
-                tag.value = parseInt(tag.value, 10);
+                tag.value = Number.parseInt(tag.value, 10);
                 break;
-            case 'date':
+            case 'date': {
                 // ToDo: be more strict on 'YYYY...'
-                const year = parseInt(tag.value.substr(0, 4), 10);
-                if (!isNaN(year)) {
+                const year = Number.parseInt(tag.value.substr(0, 4), 10);
+                if (!Number.isNaN(year)) {
                     this.common.year = year;
                 }
                 break;
+            }
             case 'discogs_label_id':
             case 'discogs_release_id':
             case 'discogs_master_release_id':
             case 'discogs_artist_id':
             case 'discogs_votes':
-                tag.value = typeof tag.value === 'string' ? parseInt(tag.value, 10) : tag.value;
+                tag.value = typeof tag.value === 'string' ? Number.parseInt(tag.value, 10) : tag.value;
                 break;
             case 'replaygain_track_gain':
             case 'replaygain_track_peak':
@@ -148,25 +150,28 @@ export class MetadataCollector {
                 tag.value = toRatio(tag.value);
                 break;
             case 'replaygain_track_minmax':
-                tag.value = tag.value.split(',').map(v => parseInt(v, 10));
+                tag.value = tag.value.split(',').map(v => Number.parseInt(v, 10));
                 break;
-            case 'replaygain_undo':
-                const minMix = tag.value.split(',').map(v => parseInt(v, 10));
+            case 'replaygain_undo': {
+                const minMix = tag.value.split(',').map(v => Number.parseInt(v, 10));
                 tag.value = {
                     leftChannel: minMix[0],
                     rightChannel: minMix[1]
                 };
                 break;
+            }
             case 'gapless': // iTunes gap-less flag
             case 'compilation':
             case 'podcast':
             case 'showMovement':
                 tag.value = tag.value === '1' || tag.value === 1; // boolean
                 break;
-            case 'isrc': // Only keep unique values
-                if (this.common[tag.id] && this.common[tag.id].indexOf(tag.value) !== -1)
+            case 'isrc': { // Only keep unique values
+                const commonTag = this.common[tag.id];
+                if (commonTag && commonTag.indexOf(tag.value) !== -1)
                     return;
                 break;
+            }
             case 'comment':
                 if (typeof tag.value === 'string') {
                     tag.value = { text: tag.value };
@@ -216,7 +221,7 @@ export class MetadataCollector {
             }
             return picture;
         }
-        this.addWarning(`Empty picture tag found`);
+        this.addWarning("Empty picture tag found");
         return null;
     }
     /**
@@ -263,7 +268,7 @@ export class MetadataCollector {
                 return debug(`Ignore native tag (list): ${tagType}.${tag.id} = ${tag.value}`);
             }
         }
-        if (this.opts.observer) {
+        if (this.opts?.observer) {
             this.opts.observer({ metadata: this, tag: { type: 'common', id: tag.id, value: tag.value } });
         }
         // ToDo: trigger metadata event
@@ -271,7 +276,7 @@ export class MetadataCollector {
 }
 export function joinArtists(artists) {
     if (artists.length > 2) {
-        return artists.slice(0, artists.length - 1).join(', ') + ' & ' + artists[artists.length - 1];
+        return `${artists.slice(0, artists.length - 1).join(', ')} & ${artists[artists.length - 1]}`;
     }
     return artists.join(' & ');
 }

package/lib/common/RandomFileReader.d.ts

@@ -1,4 +1,4 @@
-import { IRandomReader } from '../type.js';
+import type { IRandomReader } from '../type.js';
 /**
  * Provides abstract file access via the IRandomRead interface
  */

package/lib/common/RandomFileReader.js

@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 /**
  * Provides abstract file access via the IRandomRead interface
  */

package/lib/common/RandomUint8ArrayReader.d.ts

@@ -1,4 +1,4 @@
-import { IRandomReader } from '../type.js';
+import type { IRandomReader } from '../type.js';
 /**
  * Provides abstract Uint8Array access via the IRandomRead interface
  */

package/lib/common/Util.d.ts

@@ -1,9 +1,5 @@
-import { IRatio } from '../type.js';
+import type { IRatio } from '../type.js';
 export type StringEncoding = 'ascii' | 'utf8' | 'utf-16le' | 'ucs2' | 'base64url' | 'latin1' | 'hex';
-export interface ITextEncoding {
-    encoding: StringEncoding;
-    bom?: boolean;
-}
 export declare function getBit(buf: Uint8Array, off: number, bit: number): boolean;
 /**
  * Found delimiting zero in uint8Array
@@ -54,4 +50,4 @@ export declare function dbToRatio(dB: number): number;
  * Convert replay gain to ratio and Decibel
  * @param value string holding a ratio like '0.034' or '-7.54 dB'
  */
-export declare function toRatio(value: string): IRatio;
+export declare function toRatio(value: string): IRatio | undefined;

package/lib/common/Util.js

@@ -20,14 +20,12 @@ export function findZero(uint8Array, start, end, encoding) {
         }
         return i;
     }
-    else {
-        while (uint8Array[i] !== 0) {
-            if (i >= end)
-                return end;
-            i++;
-        }
-        return i;
+    while (uint8Array[i] !== 0) {
+        if (i >= end)
+            return end;
+        i++;
     }
+    return i;
 }
 export function trimRightNull(x) {
     const pos0 = x.indexOf('\0');
@@ -53,7 +51,7 @@ export function decodeString(uint8Array, encoding) {
     if (uint8Array[0] === 0xFF && uint8Array[1] === 0xFE) { // little endian
         return decodeString(uint8Array.subarray(2), encoding);
     }
-    else if (encoding === 'utf-16le' && uint8Array[0] === 0xFE && uint8Array[1] === 0xFF) {
+    if (encoding === 'utf-16le' && uint8Array[0] === 0xFE && uint8Array[1] === 0xFF) {
         // BOM, indicating big endian decoding
         if ((uint8Array.length & 1) !== 0)
             throw new Error('Expected even number of octets for 16-bit unicode string');
@@ -106,7 +104,7 @@ export function a2hex(str) {
     const arr = [];
     for (let i = 0, l = str.length; i < l; i++) {
         const hex = Number(str.charCodeAt(i)).toString(16);
-        arr.push(hex.length === 1 ? '0' + hex : hex);
+        arr.push(hex.length === 1 ? `0${hex}` : hex);
     }
     return arr.join(' ');
 }
@@ -122,7 +120,7 @@ export function ratioToDb(ratio) {
  * db Decibels
  */
 export function dbToRatio(dB) {
-    return Math.pow(10, dB / 10);
+    return 10 ** (dB / 10);
 }
 /**
  * Convert replay gain to ratio and Decibel
@@ -132,7 +130,7 @@ export function toRatio(value) {
     const ps = value.split(' ').map(p => p.trim().toLowerCase());
     // @ts-ignore
     if (ps.length >= 1) {
-        const v = parseFloat(ps[0]);
+        const v = Number.parseFloat(ps[0]);
         return ps.length === 2 && ps[1] === 'db' ? {
             dB: v,
             ratio: dbToRatio(v)

package/lib/core.d.ts

@@ -1,12 +1,10 @@
 /**
  * Primary entry point, Node.js specific entry point is index.ts
  */
-import * as strtok3 from 'strtok3';
+import { type AnyWebByteStream, type IFileInfo, type ITokenizer } from 'strtok3';
 import type { IAudioMetadata, INativeTagDict, IOptions, IPicture, IPrivateOptions, IRandomReader, ITag } from './type.js';
-import type { ReadableStream as NodeReadableStream } from 'node:stream/web';
-export { IFileInfo } from 'strtok3';
-export { IAudioMetadata, IOptions, ITag, INativeTagDict, ICommonTagsResult, IFormat, IPicture, IRatio, IChapter, ILyricsTag, LyricsContentType, TimestampFormat } from './type.js';
-export type AnyWebStream<G> = NodeReadableStream<G> | ReadableStream<G>;
+export type { IFileInfo } from 'strtok3';
+export { type IAudioMetadata, type IOptions, type ITag, type INativeTagDict, type ICommonTagsResult, type IFormat, type IPicture, type IRatio, type IChapter, type ILyricsTag, LyricsContentType, TimestampFormat, IMetadataEventTag, IMetadataEvent } from './type.js';
 /**
  * Parse Web API File
  * Requires Blob to be able to stream using a ReadableStreamBYOBReader, only available since Node.js ≥ 20
@@ -22,7 +20,7 @@ export declare function parseBlob(blob: Blob, options?: IOptions): Promise<IAudi
  * @param fileInfo - File information object or MIME-type string
  * @returns Metadata
  */
-export declare function parseWebStream(webStream: AnyWebStream<Uint8Array>, fileInfo?: strtok3.IFileInfo | string, options?: IOptions): Promise<IAudioMetadata>;
+export declare function parseWebStream(webStream: AnyWebByteStream, fileInfo?: IFileInfo | string, options?: IOptions): Promise<IAudioMetadata>;
 /**
  * Parse audio from Node Buffer
  * @param uint8Array - Uint8Array holding audio data
@@ -31,14 +29,14 @@ export declare function parseWebStream(webStream: AnyWebStream<Uint8Array>, file
  * @returns Metadata
  * Ref: https://github.com/Borewit/strtok3/blob/e6938c81ff685074d5eb3064a11c0b03ca934c1d/src/index.ts#L15
  */
-export declare function parseBuffer(uint8Array: Uint8Array, fileInfo?: strtok3.IFileInfo | string, options?: IOptions): Promise<IAudioMetadata>;
+export declare function parseBuffer(uint8Array: Uint8Array, fileInfo?: IFileInfo | string, options?: IOptions): Promise<IAudioMetadata>;
 /**
  * Parse audio from ITokenizer source
  * @param tokenizer - Audio source implementing the tokenizer interface
  * @param options - Parsing options
  * @returns Metadata
  */
-export declare function parseFromTokenizer(tokenizer: strtok3.ITokenizer, options?: IOptions): Promise<IAudioMetadata>;
+export declare function parseFromTokenizer(tokenizer: ITokenizer, options?: IOptions): Promise<IAudioMetadata>;
 /**
  * Create a dictionary ordered by their tag id (key)
  * @param nativeTags list of tags
@@ -50,7 +48,7 @@ export declare function orderTags(nativeTags: ITag[]): INativeTagDict;
  * @param rating Normalized rating [0..1] (common.rating[n].rating)
  * @returns Number of stars: 1, 2, 3, 4 or 5 stars
  */
-export declare function ratingToStars(rating: number): number;
+export declare function ratingToStars(rating: number | undefined): number;
 /**
  * Select most likely cover image.
  * @param pictures Usually metadata.common.picture

package/lib/core.js

@@ -1,8 +1,8 @@
 /**
  * Primary entry point, Node.js specific entry point is index.ts
  */
-import * as strtok3 from 'strtok3';
-import { ParserFactory } from './ParserFactory.js';
+import { fromWebStream, fromBuffer } from 'strtok3';
+import { parseOnContentType } from './ParserFactory.js';
 import { RandomUint8ArrayReader } from './common/RandomUint8ArrayReader.js';
 import { APEv2Parser } from './apev2/APEv2Parser.js';
 import { hasID3v1Header } from './id3v1/ID3v1Parser.js';
@@ -30,7 +30,7 @@ export async function parseBlob(blob, options = {}) {
  * @returns Metadata
  */
 export function parseWebStream(webStream, fileInfo, options = {}) {
-    return parseFromTokenizer(strtok3.fromWebStream(webStream, { fileInfo: typeof fileInfo === 'string' ? { mimeType: fileInfo } : fileInfo }), options);
+    return parseFromTokenizer(fromWebStream(webStream, { fileInfo: typeof fileInfo === 'string' ? { mimeType: fileInfo } : fileInfo }), options);
 }
 /**
  * Parse audio from Node Buffer
@@ -43,7 +43,7 @@ export function parseWebStream(webStream, fileInfo, options = {}) {
 export async function parseBuffer(uint8Array, fileInfo, options = {}) {
     const bufferReader = new RandomUint8ArrayReader(uint8Array);
     await scanAppendingHeaders(bufferReader, options);
-    const tokenizer = strtok3.fromBuffer(uint8Array, { fileInfo: typeof fileInfo === 'string' ? { mimeType: fileInfo } : fileInfo });
+    const tokenizer = fromBuffer(uint8Array, { fileInfo: typeof fileInfo === 'string' ? { mimeType: fileInfo } : fileInfo });
     return parseFromTokenizer(tokenizer, options);
 }
 /**
@@ -53,7 +53,7 @@ export async function parseBuffer(uint8Array, fileInfo, options = {}) {
  * @returns Metadata
  */
 export function parseFromTokenizer(tokenizer, options) {
-    return ParserFactory.parseOnContentType(tokenizer, options);
+    return parseOnContentType(tokenizer, options);
 }
 /**
  * Create a dictionary ordered by their tag id (key)
@@ -62,8 +62,11 @@ export function parseFromTokenizer(tokenizer, options) {
  */
 export function orderTags(nativeTags) {
     const tags = {};
-    for (const tag of nativeTags) {
-        (tags[tag.id] = (tags[tag.id] || [])).push(tag.value);
+    for (const { id, value } of nativeTags) {
+        if (!tags[id]) {
+            tags[id] = [];
+        }
+        tags[id].push(value);
     }
     return tags;
 }

package/lib/dsdiff/DsdiffParser.js

@@ -24,7 +24,7 @@ export class DsdiffParser extends BasicParser {
                 this.metadata.setFormat('lossless', true);
                 return this.readFmt8Chunks(header.chunkSize - BigInt(FourCcToken.len));
             default:
-                throw Error(`Unsupported DSDIFF type: ${type}`);
+                throw new Error(`Unsupported DSDIFF type: ${type}`);
         }
     }
     async readFmt8Chunks(remainingSize) {
@@ -40,28 +40,35 @@ export class DsdiffParser extends BasicParser {
         debug(`Reading data of chunk[ID=${header.chunkID}, size=${header.chunkSize}]`);
         const p0 = this.tokenizer.position;
         switch (header.chunkID.trim()) {
-            case 'FVER': // 3.1 FORMAT VERSION CHUNK
+            case 'FVER': { // 3.1 FORMAT VERSION CHUNK
                 const version = await this.tokenizer.readToken(Token.UINT32_LE);
                 debug(`DSDIFF version=${version}`);
                 break;
-            case 'PROP': // 3.2 PROPERTY CHUNK
+            }
+            case 'PROP': { // 3.2 PROPERTY CHUNK
                 const propType = await this.tokenizer.readToken(FourCcToken);
                 if (propType !== 'SND ')
                     throw new Error('Unexpected PROP-chunk ID');
                 await this.handleSoundPropertyChunks(header.chunkSize - BigInt(FourCcToken.len));
                 break;
-            case 'ID3': // Unofficial ID3 tag support
+            }
+            case 'ID3': { // Unofficial ID3 tag support
                 const id3_data = await this.tokenizer.readToken(new Token.Uint8ArrayType(Number(header.chunkSize)));
                 const rst = strtok3.fromBuffer(id3_data);
                 await new ID3v2Parser().parse(this.metadata, rst, this.options);
                 break;
+            }
+            case 'DSD':
+                if (this.metadata.format.numberOfChannels) {
+                    this.metadata.setFormat('numberOfSamples', Number(header.chunkSize * BigInt(8) / BigInt(this.metadata.format.numberOfChannels)));
+                }
+                if (this.metadata.format.numberOfSamples && this.metadata.format.sampleRate) {
+                    this.metadata.setFormat('duration', this.metadata.format.numberOfSamples / this.metadata.format.sampleRate);
+                }
+                break;
             default:
                 debug(`Ignore chunk[ID=${header.chunkID}, size=${header.chunkSize}]`);
                 break;
-            case 'DSD':
-                this.metadata.setFormat('numberOfSamples', Number(header.chunkSize * BigInt(8) / BigInt(this.metadata.format.numberOfChannels)));
-                this.metadata.setFormat('duration', this.metadata.format.numberOfSamples / this.metadata.format.sampleRate);
-                break;
         }
         const remaining = header.chunkSize - BigInt(this.tokenizer.position - p0);
         if (remaining > 0) {
@@ -76,16 +83,18 @@ export class DsdiffParser extends BasicParser {
             debug(`Sound-property-chunk[ID=${sndPropHeader.chunkID}, size=${sndPropHeader.chunkSize}]`);
             const p0 = this.tokenizer.position;
             switch (sndPropHeader.chunkID.trim()) {
-                case 'FS': // 3.2.1 Sample Rate Chunk
+                case 'FS': { // 3.2.1 Sample Rate Chunk
                     const sampleRate = await this.tokenizer.readToken(Token.UINT32_BE);
                     this.metadata.setFormat('sampleRate', sampleRate);
                     break;
-                case 'CHNL': // 3.2.2 Channels Chunk
+                }
+                case 'CHNL': { // 3.2.2 Channels Chunk
                     const numChannels = await this.tokenizer.readToken(Token.UINT16_BE);
                     this.metadata.setFormat('numberOfChannels', numChannels);
                     await this.handleChannelChunks(sndPropHeader.chunkSize - BigInt(Token.UINT16_BE.len));
                     break;
-                case 'CMPR': // 3.2.3 Compression Type Chunk
+                }
+                case 'CMPR': { // 3.2.3 Compression Type Chunk
                     const compressionIdCode = (await this.tokenizer.readToken(FourCcToken)).trim();
                     const count = await this.tokenizer.readToken(Token.UINT8);
                     const compressionName = await this.tokenizer.readToken(new Token.StringType(count, 'ascii'));
@@ -95,18 +104,20 @@ export class DsdiffParser extends BasicParser {
                     }
                     this.metadata.setFormat('codec', `${compressionIdCode} (${compressionName})`);
                     break;
-                case 'ABSS': // 3.2.4 Absolute Start Time Chunk
+                }
+                case 'ABSS': { // 3.2.4 Absolute Start Time Chunk
                     const hours = await this.tokenizer.readToken(Token.UINT16_BE);
                     const minutes = await this.tokenizer.readToken(Token.UINT8);
                     const seconds = await this.tokenizer.readToken(Token.UINT8);
                     const samples = await this.tokenizer.readToken(Token.UINT32_BE);
                     debug(`ABSS ${hours}:${minutes}:${seconds}.${samples}`);
                     break;
-                case 'LSCO': // 3.2.5 Loudspeaker Configuration Chunk
+                }
+                case 'LSCO': { // 3.2.5 Loudspeaker Configuration Chunk
                     const lsConfig = await this.tokenizer.readToken(Token.UINT16_BE);
                     debug(`LSCO lsConfig=${lsConfig}`);
                     break;
-                case 'COMT':
+                }
                 default:
                     debug(`Unknown sound-property-chunk[ID=${sndPropHeader.chunkID}, size=${sndPropHeader.chunkSize}]`);
                     await this.tokenizer.ignore(Number(sndPropHeader.chunkSize));
@@ -137,3 +148,4 @@ export class DsdiffParser extends BasicParser {
         return channels;
     }
 }
+//# sourceMappingURL=DsdiffParser.js.map

package/lib/dsdiff/DsdiffToken.d.ts

@@ -1,6 +1,6 @@
 import type { IGetToken } from 'strtok3';
-import { IChunkHeader64 } from '../iff/index.js';
-export { IChunkHeader64 } from '../iff/index.js';
+import type { IChunkHeader64 } from '../iff/index.js';
+export { type IChunkHeader64 } from '../iff/index.js';
 /**
  * DSDIFF chunk header
  * The data-size encoding is deviating from EA-IFF 85

package/lib/dsdiff/DsdiffToken.js

@@ -16,3 +16,4 @@ export const ChunkHeader64 = {
         };
     }
 };
+//# sourceMappingURL=DsdiffToken.js.map

package/lib/dsf/DsfChunk.js

@@ -49,3 +49,4 @@ export const FormatChunk = {
         };
     }
 };
+//# sourceMappingURL=DsfChunk.js.map