music-metadata 7.12.5 → 8.0.1

package/lib/ogg/vorbis/VorbisParser.js

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VorbisParser = void 0;
-const Token = require("token-types");
-const debug_1 = require("debug");
-const VorbisDecoder_1 = require("./VorbisDecoder");
-const Vorbis_1 = require("./Vorbis");
-const debug = (0, debug_1.default)('music-metadata:parser:ogg:vorbis1');
+import * as Token from 'token-types';
+import debugInit from 'debug';
+import { VorbisDecoder } from './VorbisDecoder.js';
+import { CommonHeader, IdentificationHeader, VorbisPictureToken } from './Vorbis.js';
+const debug = debugInit('music-metadata:parser:ogg:vorbis1');
 /**
  * Vorbis 1 Parser.
  * Used by OggParser
  */
-class VorbisParser {
+export class VorbisParser {
     constructor(metadata, options) {
         this.metadata = metadata;
         this.options = options;
@@ -28,7 +25,7 @@ class VorbisParser {
         else {
             if (header.headerType.continued) {
                 if (this.pageSegments.length === 0) {
-                    throw new Error("Cannot continue on previous page");
+                    throw new Error('Cannot continue on previous page');
                 }
                 this.pageSegments.push(pageData);
             }
@@ -50,7 +47,7 @@ class VorbisParser {
         this.parseFullPage(Buffer.concat(this.pageSegments));
     }
     parseUserComment(pageData, offset) {
-        const decoder = new VorbisDecoder_1.VorbisDecoder(pageData, offset);
+        const decoder = new VorbisDecoder(pageData, offset);
         const tag = decoder.parseUserComment();
         this.addTag(tag.key, tag.value);
         return tag.len;
@@ -61,7 +58,7 @@ class VorbisParser {
                 debug(`Ignore picture`);
                 return;
             }
-            value = Vorbis_1.VorbisPictureToken.fromBase64(value);
+            value = VorbisPictureToken.fromBase64(value);
             debug(`Push picture: id=${id}, format=${value.format}`);
         }
         else {
@@ -78,33 +75,33 @@ class VorbisParser {
     }
     /**
      * Parse first Ogg/Vorbis page
-     * @param {IPageHeader} header
-     * @param {Buffer} pageData
+     * @param header
+     * @param pageData
      */
     parseFirstPage(header, pageData) {
         this.metadata.setFormat('codec', 'Vorbis I');
-        debug("Parse first page");
+        debug('Parse first page');
         // Parse  Vorbis common header
-        const commonHeader = Vorbis_1.CommonHeader.get(pageData, 0);
+        const commonHeader = CommonHeader.get(pageData, 0);
         if (commonHeader.vorbis !== 'vorbis')
             throw new Error('Metadata does not look like Vorbis');
         if (commonHeader.packetType === 1) {
-            const idHeader = Vorbis_1.IdentificationHeader.get(pageData, Vorbis_1.CommonHeader.len);
+            const idHeader = IdentificationHeader.get(pageData, CommonHeader.len);
             this.metadata.setFormat('sampleRate', idHeader.sampleRate);
             this.metadata.setFormat('bitrate', idHeader.bitrateNominal);
             this.metadata.setFormat('numberOfChannels', idHeader.channelMode);
-            debug("sample-rate=%s[hz], bitrate=%s[b/s], channel-mode=%s", idHeader.sampleRate, idHeader.bitrateNominal, idHeader.channelMode);
+            debug('sample-rate=%s[hz], bitrate=%s[b/s], channel-mode=%s', idHeader.sampleRate, idHeader.bitrateNominal, idHeader.channelMode);
         }
         else
             throw new Error('First Ogg page should be type 1: the identification header');
     }
     parseFullPage(pageData) {
         // New page
-        const commonHeader = Vorbis_1.CommonHeader.get(pageData, 0);
-        debug("Parse full page: type=%s, byteLength=%s", commonHeader.packetType, pageData.byteLength);
+        const commonHeader = CommonHeader.get(pageData, 0);
+        debug('Parse full page: type=%s, byteLength=%s', commonHeader.packetType, pageData.byteLength);
         switch (commonHeader.packetType) {
             case 3: //  type 3: comment header
-                return this.parseUserCommentList(pageData, Vorbis_1.CommonHeader.len);
+                return this.parseUserCommentList(pageData, CommonHeader.len);
             case 1: // type 1: the identification header
             case 5: // type 5: setup header type
                 break; // ignore
@@ -125,4 +122,3 @@ class VorbisParser {
         }
     }
 }
-exports.VorbisParser = VorbisParser;

package/lib/ogg/vorbis/VorbisTagMapper.d.ts

@@ -1,5 +1,5 @@
-import { CommonTagMapper } from '../../common/GenericTagMapper';
-import { IRating, ITag } from '../../type';
+import { CommonTagMapper } from '../../common/GenericTagMapper.js';
+import { IRating, ITag } from '../../type.js';
 export declare class VorbisTagMapper extends CommonTagMapper {
     static toRating(email: string, rating: string): IRating;
     constructor();

package/lib/ogg/vorbis/VorbisTagMapper.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VorbisTagMapper = void 0;
-const GenericTagMapper_1 = require("../../common/GenericTagMapper");
+import { CommonTagMapper } from '../../common/GenericTagMapper.js';
 /**
  * Vorbis tag mappings
  *
@@ -111,11 +108,11 @@ const vorbisTagMap = {
     REPLAYGAIN_ALBUM_MINMAX: 'replaygain_album_minmax',
     REPLAYGAIN_UNDO: 'replaygain_undo'
 };
-class VorbisTagMapper extends GenericTagMapper_1.CommonTagMapper {
+export class VorbisTagMapper extends CommonTagMapper {
     static toRating(email, rating) {
         return {
             source: email ? email.toLowerCase() : email,
-            rating: parseFloat(rating) * GenericTagMapper_1.CommonTagMapper.maxRatingScore
+            rating: parseFloat(rating) * CommonTagMapper.maxRatingScore
         };
     }
     constructor() {
@@ -129,5 +126,4 @@ class VorbisTagMapper extends GenericTagMapper_1.CommonTagMapper {
         }
     }
 }
-exports.VorbisTagMapper = VorbisTagMapper;
 //# sourceMappingURL=VorbisTagMapper.js.map

package/lib/riff/RiffChunk.d.ts

@@ -1,6 +1,6 @@
-import { IGetToken } from 'strtok3/lib/core';
-import { IChunkHeader } from '../iff';
-export { IChunkHeader } from '../iff';
+import { IGetToken } from 'strtok3/core';
+import { IChunkHeader } from '../iff/index.js';
+export { IChunkHeader } from '../iff/index.js';
 /**
  * Common RIFF chunk header
  */

package/lib/riff/RiffChunk.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListInfoTagValue = exports.Header = void 0;
-const Token = require("token-types");
+import * as Token from 'token-types';
 /**
  * Common RIFF chunk header
  */
-exports.Header = {
+export const Header = {
     len: 8,
     get: (buf, off) => {
         return {
@@ -19,7 +16,7 @@ exports.Header = {
 /**
  * Token to parse RIFF-INFO tag value
  */
-class ListInfoTagValue {
+export class ListInfoTagValue {
     constructor(tagHeader) {
         this.tagHeader = tagHeader;
         this.len = tagHeader.chunkSize;
@@ -29,4 +26,3 @@ class ListInfoTagValue {
         return new Token.StringType(this.tagHeader.chunkSize, 'ascii').get(buf, off);
     }
 }
-exports.ListInfoTagValue = ListInfoTagValue;

package/lib/riff/RiffInfoTagMap.d.ts

@@ -1,5 +1,5 @@
-import { INativeTagMap } from '../common/GenericTagTypes';
-import { CommonTagMapper } from '../common/GenericTagMapper';
+import { INativeTagMap } from '../common/GenericTagTypes.js';
+import { CommonTagMapper } from '../common/GenericTagMapper.js';
 /**
  * RIFF Info Tags; part of the EXIF 2.3
  * Ref: http://owl.phy.queensu.ca/~phil/exiftool/TagNames/RIFF.html#Info

package/lib/riff/RiffInfoTagMap.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RiffInfoTagMapper = exports.riffInfoTagMap = void 0;
-const GenericTagMapper_1 = require("../common/GenericTagMapper");
+import { CommonTagMapper } from '../common/GenericTagMapper.js';
 /**
  * RIFF Info Tags; part of the EXIF 2.3
  * Ref: http://owl.phy.queensu.ca/~phil/exiftool/TagNames/RIFF.html#Info
  */
-exports.riffInfoTagMap = {
+export const riffInfoTagMap = {
     IART: 'artist',
     ICRD: 'date',
     INAM: 'title',
@@ -29,10 +26,9 @@ exports.riffInfoTagMap = {
     IMED: 'media',
     IRPD: 'album' // Product, where the file was intended for
 };
-class RiffInfoTagMapper extends GenericTagMapper_1.CommonTagMapper {
+export class RiffInfoTagMapper extends CommonTagMapper {
     constructor() {
-        super(['exif'], exports.riffInfoTagMap);
+        super(['exif'], riffInfoTagMap);
     }
 }
-exports.RiffInfoTagMapper = RiffInfoTagMapper;
 //# sourceMappingURL=RiffInfoTagMap.js.map

package/lib/type.d.ts

@@ -1,8 +1,9 @@
-/// <reference types="node" />
-import { GenericTagId, TagType } from './common/GenericTagTypes';
-import { IFooter } from './apev2/APEv2Token';
-import { TrackType } from './matroska/types';
-export { TrackType } from './matroska/types';
+/// <reference types="node" resolution-mode="require"/>
+import { Buffer } from 'node:buffer';
+import { GenericTagId, TagType } from './common/GenericTagTypes.js';
+import { IFooter } from './apev2/APEv2Token.js';
+import { TrackType } from './matroska/types.js';
+export { TrackType } from './matroska/types.js';
 /**
  * Attached picture, typically used for cover art
  */

package/lib/type.js

@@ -1,6 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrackType = void 0;
-var types_1 = require("./matroska/types");
-Object.defineProperty(exports, "TrackType", { enumerable: true, get: function () { return types_1.TrackType; } });
+export { TrackType } from './matroska/types.js';
 //# sourceMappingURL=type.js.map

package/lib/wav/BwfChunk.d.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 export interface IBroadcastAudioExtensionChunk {
     description: string;
     originator: string;

package/lib/wav/BwfChunk.js

@@ -1,21 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BroadcastAudioExtensionChunk = void 0;
-const Token = require("token-types");
-const Util_1 = require("../common/Util");
+import * as Token from 'token-types';
+import { stripNulls } from '../common/Util.js';
 /**
  * Broadcast Audio Extension Chunk
  * Ref: https://tech.ebu.ch/docs/tech/tech3285.pdf
  */
-exports.BroadcastAudioExtensionChunk = {
+export const BroadcastAudioExtensionChunk = {
     len: 420,
     get: (uint8array, off) => {
         return {
-            description: (0, Util_1.stripNulls)(new Token.StringType(256, 'ascii').get(uint8array, off)).trim(),
-            originator: (0, Util_1.stripNulls)(new Token.StringType(32, 'ascii').get(uint8array, off + 256)).trim(),
-            originatorReference: (0, Util_1.stripNulls)(new Token.StringType(32, 'ascii').get(uint8array, off + 288)).trim(),
-            originationDate: (0, Util_1.stripNulls)(new Token.StringType(10, 'ascii').get(uint8array, off + 320)).trim(),
-            originationTime: (0, Util_1.stripNulls)(new Token.StringType(8, 'ascii').get(uint8array, off + 330)).trim(),
+            description: stripNulls(new Token.StringType(256, 'ascii').get(uint8array, off)).trim(),
+            originator: stripNulls(new Token.StringType(32, 'ascii').get(uint8array, off + 256)).trim(),
+            originatorReference: stripNulls(new Token.StringType(32, 'ascii').get(uint8array, off + 288)).trim(),
+            originationDate: stripNulls(new Token.StringType(10, 'ascii').get(uint8array, off + 320)).trim(),
+            originationTime: stripNulls(new Token.StringType(8, 'ascii').get(uint8array, off + 330)).trim(),
             timeReferenceLow: Token.UINT32_LE.get(uint8array, off + 338),
             timeReferenceHigh: Token.UINT32_LE.get(uint8array, off + 342),
             version: Token.UINT16_LE.get(uint8array, off + 346),

package/lib/wav/WaveChunk.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="node" />
-import { IGetToken } from 'strtok3/lib/core';
-import { IChunkHeader } from '../iff';
+/// <reference types="node" resolution-mode="require"/>
+import { IGetToken } from 'strtok3/core';
+import { IChunkHeader } from '../iff/index.js';
 /**
  * Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd317599(v=vs.85).aspx
  */

package/lib/wav/WaveChunk.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FactChunk = exports.Format = exports.WaveFormat = void 0;
 /**
  * Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd317599(v=vs.85).aspx
  */
-var WaveFormat;
+export var WaveFormat;
 (function (WaveFormat) {
     WaveFormat[WaveFormat["PCM"] = 1] = "PCM";
     // MPEG-4 and AAC Audio Types
@@ -21,12 +18,12 @@ var WaveFormat;
     WaveFormat[WaveFormat["DRM"] = 9] = "DRM";
     WaveFormat[WaveFormat["DTS2"] = 8193] = "DTS2";
     WaveFormat[WaveFormat["MPEG"] = 80] = "MPEG";
-})(WaveFormat = exports.WaveFormat || (exports.WaveFormat = {}));
+})(WaveFormat = WaveFormat || (WaveFormat = {}));
 /**
  * format chunk; chunk-id is "fmt "
  * http://soundfile.sapp.org/doc/WaveFormat/
  */
-class Format {
+export class Format {
     constructor(header) {
         if (header.chunkSize < 16)
             throw new Error('Invalid chunk size');
@@ -43,13 +40,12 @@ class Format {
         };
     }
 }
-exports.Format = Format;
 /**
  * Fact chunk; chunk-id is "fact"
  * http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
  * http://www.recordingblogs.com/wiki/fact-chunk-of-a-wave-file
  */
-class FactChunk {
+export class FactChunk {
     constructor(header) {
         if (header.chunkSize < 4) {
             throw new Error('Invalid fact chunk size.');
@@ -62,4 +58,3 @@ class FactChunk {
         };
     }
 }
-exports.FactChunk = FactChunk;

package/lib/wav/WaveParser.d.ts

@@ -1,5 +1,5 @@
-import * as riff from '../riff/RiffChunk';
-import { BasicParser } from '../common/BasicParser';
+import * as riff from '../riff/RiffChunk.js';
+import { BasicParser } from '../common/BasicParser.js';
 /**
  * Resource Interchange File Format (RIFF) Parser
  *

package/lib/wav/WaveParser.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WaveParser = void 0;
-const strtok3 = require("strtok3/lib/core");
-const Token = require("token-types");
-const debug_1 = require("debug");
-const riff = require("../riff/RiffChunk");
-const WaveChunk = require("./../wav/WaveChunk");
-const ID3v2Parser_1 = require("../id3v2/ID3v2Parser");
-const util = require("../common/Util");
-const FourCC_1 = require("../common/FourCC");
-const BasicParser_1 = require("../common/BasicParser");
-const BwfChunk_1 = require("../wav/BwfChunk");
-const debug = (0, debug_1.default)('music-metadata:parser:RIFF');
+import * as strtok3 from 'strtok3/core';
+import * as Token from 'token-types';
+import initDebug from 'debug';
+import * as riff from '../riff/RiffChunk.js';
+import * as WaveChunk from './../wav/WaveChunk.js';
+import { ID3v2Parser } from '../id3v2/ID3v2Parser.js';
+import * as util from '../common/Util.js';
+import { FourCcToken } from '../common/FourCC.js';
+import { BasicParser } from '../common/BasicParser.js';
+import { BroadcastAudioExtensionChunk } from '../wav/BwfChunk.js';
+const debug = initDebug('music-metadata:parser:RIFF');
 /**
  * Resource Interchange File Format (RIFF) Parser
  *
@@ -23,7 +20,7 @@ const debug = (0, debug_1.default)('music-metadata:parser:RIFF');
  *
  * ToDo: Split WAVE part from RIFF parser
  */
-class WaveParser extends BasicParser_1.BasicParser {
+export class WaveParser extends BasicParser {
     async parse() {
         const riffHeader = await this.tokenizer.readToken(riff.Header);
         debug(`pos=${this.tokenizer.position}, parse: chunkID=${riffHeader.chunkID}`);
@@ -36,11 +33,11 @@ class WaveParser extends BasicParser_1.BasicParser {
         });
     }
     async parseRiffChunk(chunkSize) {
-        const type = await this.tokenizer.readToken(FourCC_1.FourCcToken);
+        const type = await this.tokenizer.readToken(FourCcToken);
         this.metadata.setFormat('container', type);
         switch (type) {
             case 'WAVE':
-                return this.readWaveChunk(chunkSize - FourCC_1.FourCcToken.len);
+                return this.readWaveChunk(chunkSize - FourCcToken.len);
             default:
                 throw new Error(`Unsupported RIFF format: RIFF/${type}`);
         }
@@ -80,7 +77,7 @@ class WaveParser extends BasicParser_1.BasicParser {
                 case 'ID3 ': // The way Mp3Tags stores ID3 meta-data
                     const id3_data = await this.tokenizer.readToken(new Token.Uint8ArrayType(header.chunkSize));
                     const rst = strtok3.fromBuffer(id3_data);
-                    await new ID3v2Parser_1.ID3v2Parser().parse(this.metadata, rst, this.options);
+                    await new ID3v2Parser().parse(this.metadata, rst, this.options);
                     break;
                 case 'data': // PCM-data
                     if (this.metadata.format.lossless !== false) {
@@ -103,11 +100,11 @@ class WaveParser extends BasicParser_1.BasicParser {
                     await this.tokenizer.ignore(header.chunkSize);
                     break;
                 case 'bext': // Broadcast Audio Extension chunk	https://tech.ebu.ch/docs/tech/tech3285.pdf
-                    const bext = await this.tokenizer.readToken(BwfChunk_1.BroadcastAudioExtensionChunk);
+                    const bext = await this.tokenizer.readToken(BroadcastAudioExtensionChunk);
                     Object.keys(bext).forEach(key => {
                         this.metadata.addTag('exif', 'bext.' + key, bext[key]);
                     });
-                    const bextRemaining = header.chunkSize - BwfChunk_1.BroadcastAudioExtensionChunk.len;
+                    const bextRemaining = header.chunkSize - BroadcastAudioExtensionChunk.len;
                     await this.tokenizer.ignore(bextRemaining);
                     break;
                 case '\x00\x00\x00\x00': // padding ??
@@ -155,4 +152,3 @@ class WaveParser extends BasicParser_1.BasicParser {
         this.metadata.addTag('exif', id, value);
     }
 }
-exports.WaveParser = WaveParser;

package/lib/wavpack/WavPackParser.d.ts

@@ -1,4 +1,4 @@
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
 /**
  * WavPack Parser
  */

package/lib/wavpack/WavPackParser.js

@@ -1,33 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WavPackParser = void 0;
-const Token = require("token-types");
-const APEv2Parser_1 = require("../apev2/APEv2Parser");
-const FourCC_1 = require("../common/FourCC");
-const BasicParser_1 = require("../common/BasicParser");
-const WavPackToken_1 = require("./WavPackToken");
-const debug_1 = require("debug");
-const debug = (0, debug_1.default)('music-metadata:parser:WavPack');
+import * as Token from 'token-types';
+import { APEv2Parser } from '../apev2/APEv2Parser.js';
+import { FourCcToken } from '../common/FourCC.js';
+import { BasicParser } from '../common/BasicParser.js';
+import { WavPack } from './WavPackToken.js';
+import initDebug from 'debug';
+const debug = initDebug('music-metadata:parser:WavPack');
 /**
  * WavPack Parser
  */
-class WavPackParser extends BasicParser_1.BasicParser {
+export class WavPackParser extends BasicParser {
     async parse() {
         this.audioDataSize = 0;
         // First parse all WavPack blocks
         await this.parseWavPackBlocks();
         // try to parse APEv2 header
-        return APEv2Parser_1.APEv2Parser.tryParseApeHeader(this.metadata, this.tokenizer, this.options);
+        return APEv2Parser.tryParseApeHeader(this.metadata, this.tokenizer, this.options);
     }
     async parseWavPackBlocks() {
         do {
-            const blockId = await this.tokenizer.peekToken(FourCC_1.FourCcToken);
+            const blockId = await this.tokenizer.peekToken(FourCcToken);
             if (blockId !== 'wvpk')
                 break;
-            const header = await this.tokenizer.readToken(WavPackToken_1.WavPack.BlockHeaderToken);
+            const header = await this.tokenizer.readToken(WavPack.BlockHeaderToken);
             if (header.BlockID !== 'wvpk')
                 throw new Error('Invalid WavPack Block-ID');
-            debug(`WavPack header blockIndex=${header.blockIndex}, len=${WavPackToken_1.WavPack.BlockHeaderToken.len}`);
+            debug(`WavPack header blockIndex=${header.blockIndex}, len=${WavPack.BlockHeaderToken.len}`);
             if (header.blockIndex === 0 && !this.metadata.format.container) {
                 this.metadata.setFormat('container', 'WavPack');
                 this.metadata.setFormat('lossless', !header.flags.isHybrid);
@@ -42,12 +39,12 @@ class WavPackParser extends BasicParser_1.BasicParser {
                 this.metadata.setFormat('numberOfSamples', header.totalSamples);
                 this.metadata.setFormat('codec', header.flags.isDSD ? 'DSD' : 'PCM');
             }
-            const ignoreBytes = header.blockSize - (WavPackToken_1.WavPack.BlockHeaderToken.len - 8);
+            const ignoreBytes = header.blockSize - (WavPack.BlockHeaderToken.len - 8);
             await (header.blockIndex === 0 ? this.parseMetadataSubBlock(header, ignoreBytes) : this.tokenizer.ignore(ignoreBytes));
             if (header.blockSamples > 0) {
                 this.audioDataSize += header.blockSize; // Count audio data for bit-rate calculation
             }
-        } while (!this.tokenizer.fileInfo.size || this.tokenizer.fileInfo.size - this.tokenizer.position >= WavPackToken_1.WavPack.BlockHeaderToken.len);
+        } while (!this.tokenizer.fileInfo.size || this.tokenizer.fileInfo.size - this.tokenizer.position >= WavPack.BlockHeaderToken.len);
         this.metadata.setFormat('bitrate', this.audioDataSize * 8 / this.metadata.format.duration);
     }
     /**
@@ -55,8 +52,8 @@ class WavPackParser extends BasicParser_1.BasicParser {
      * @param remainingLength
      */
     async parseMetadataSubBlock(header, remainingLength) {
-        while (remainingLength > WavPackToken_1.WavPack.MetadataIdToken.len) {
-            const id = await this.tokenizer.readToken(WavPackToken_1.WavPack.MetadataIdToken);
+        while (remainingLength > WavPack.MetadataIdToken.len) {
+            const id = await this.tokenizer.readToken(WavPack.MetadataIdToken);
             const dataSizeInWords = await this.tokenizer.readNumber(id.largeBlock ? Token.UINT24_LE : Token.UINT8);
             const data = Buffer.alloc(dataSizeInWords * 2 - (id.isOddSize ? 1 : 0));
             await this.tokenizer.readBuffer(data);
@@ -87,7 +84,7 @@ class WavPackParser extends BasicParser_1.BasicParser {
                     debug(`Ignore unsupported meta-sub-block-id functionId=0x${id.functionId.toString(16)}`);
                     break;
             }
-            remainingLength -= WavPackToken_1.WavPack.MetadataIdToken.len + (id.largeBlock ? Token.UINT24_LE.len : Token.UINT8.len) + dataSizeInWords * 2;
+            remainingLength -= WavPack.MetadataIdToken.len + (id.largeBlock ? Token.UINT24_LE.len : Token.UINT8.len) + dataSizeInWords * 2;
             debug(`remainingLength=${remainingLength}`);
             if (id.isOddSize)
                 this.tokenizer.ignore(1);
@@ -96,4 +93,3 @@ class WavPackParser extends BasicParser_1.BasicParser {
             throw new Error('metadata-sub-block should fit it remaining length');
     }
 }
-exports.WavPackParser = WavPackParser;

package/lib/wavpack/WavPackToken.d.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 /**
  * WavPack Block Header
  *

package/lib/wavpack/WavPackToken.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WavPack = void 0;
-const Token = require("token-types");
-const FourCC_1 = require("../common/FourCC");
+import * as Token from 'token-types';
+import { FourCcToken } from '../common/FourCC.js';
 const SampleRates = [6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000, 32000, 44100,
     48000, 64000, 88200, 96000, 192000, -1];
-class WavPack {
+export class WavPack {
     static isBitSet(flags, bitOffset) {
         return WavPack.getBitAllignedNumber(flags, bitOffset, 1) === 1;
     }
@@ -13,7 +10,6 @@ class WavPack {
         return (flags >>> bitOffset) & (0xffffffff >>> (32 - len));
     }
 }
-exports.WavPack = WavPack;
 /**
  * WavPack Block Header
  *
@@ -27,7 +23,7 @@ WavPack.BlockHeaderToken = {
         const flags = Token.UINT32_LE.get(buf, off + 24);
         const res = {
             // should equal 'wvpk'
-            BlockID: FourCC_1.FourCcToken.get(buf, off),
+            BlockID: FourCcToken.get(buf, off),
             //  0x402 to 0x410 are valid for decode
             blockSize: Token.UINT32_LE.get(buf, off + 4),
             //  0x402 (1026) to 0x410 are valid for decode