music-metadata 7.11.6 → 7.11.9

package/README.md

@@ -26,6 +26,7 @@ Supports any common audio and tagging format.
 | AAC           | ADTS / Advanced Audio Coding    | [:link:](https://en.wikipedia.org/wiki/Advanced_Audio_Coding)      | <img src="https://svgshare.com/i/UT8.svg" width="40" alt="AAC logo">                                                                          |
 | APE           | Monkey's Audio                  | [:link:](https://wikipedia.org/wiki/Monkey's_Audio)                | <img src="https://foreverhits.files.wordpress.com/2015/05/ape_audio.jpg" width="40" alt="Monkey's Audio logo">                                |
 | ASF           | Advanced Systems Format         | [:link:](https://wikipedia.org/wiki/Advanced_Systems_Format)       |                                                                                                                                               |
+| BWF           | Broadcast Wave Format           | [:link:](https://en.wikipedia.org/wiki/Broadcast_Wave_Format)      |                                                                                                                                               |  
 | DSDIFF        | Philips DSDIFF                  | [:link:](https://wikipedia.org/wiki/Direct_Stream_Digital)         | <img src="https://upload.wikimedia.org/wikipedia/commons/b/bc/DSDlogo.svg" width="80" alt="DSD logo">                                         |
 | DSF           | Sony's DSD Stream File          | [:link:](https://wikipedia.org/wiki/Direct_Stream_Digital)         | <img src="https://upload.wikimedia.org/wikipedia/commons/b/bc/DSDlogo.svg" width="80" alt="DSD logo">                                         |
 | FLAC          | Free Lossless Audio Codec       | [:link:](https://wikipedia.org/wiki/FLAC)                          | <img src="https://upload.wikimedia.org/wikipedia/commons/a/a2/FLAC_logo_vector.svg" width="80" alt="FLAC logo">                               |
@@ -70,9 +71,10 @@ Support for encoding / format details:
   
 
 ## Online demo's
-*   [<img src="https://gitcdn.xyz/repo/Borewit/audio-tag-analyzer/master/src/assets/icon/audio-tag-analyzer.svg" width="40">Audio Tag Analyzer](https://audio-tag-analyzer.netlify.com/)
+*   [<img src="https://raw.githubusercontent.com/Borewit/audio-tag-analyzer/master/src/assets/icon/audio-tag-analyzer.svg" width="40">Audio Tag Analyzer](https://audio-tag-analyzer.netlify.com/)
 *   [<img src="https://cdn.sanity.io/images/3do82whm/next/ba8c847f13a5fa39d88f8bc9b7846b7886531b18-2500x2500.svg" width="40"> Webamp](https://webamp.org/)
 
+
 ## Compatibility
 
 The JavaScript in runtime is compliant with [ECMAScript 2017 (ES8)](https://en.wikipedia.org/wiki/ECMAScript#8th_Edition_-_ECMAScript_2017).

package/lib/ParserFactory.d.ts

@@ -39,7 +39,6 @@ export declare class ParserFactory {
      */
     static getParserIdForExtension(filePath: string): ParserType;
     static loadParser(moduleName: ParserType): Promise<ITokenParser>;
-    private static _parse;
     private static getExtension;
     /**
      * @param httpContentType - HTTP Content-Type, extension, path or filename

package/lib/ParserFactory.js

@@ -31,6 +31,13 @@ function parseHttpContentType(contentType) {
     };
 }
 exports.parseHttpContentType = parseHttpContentType;
+async function parse(tokenizer, parserId, opts = {}) {
+    // Parser found, execute parser
+    const parser = await ParserFactory.loadParser(parserId);
+    const metadata = new MetadataCollector_1.MetadataCollector(opts);
+    await parser.init(metadata, tokenizer, opts).parse();
+    return metadata.toCommonMetadata();
+}
 class ParserFactory {
     /**
      * Parse metadata from tokenizer
@@ -69,7 +76,7 @@ class ParserFactory {
             }
         }
         // Parser found, execute parser
-        return this._parse(tokenizer, parserId, opts);
+        return parse(tokenizer, parserId, opts);
     }
     /**
      * @param filePath - Path, filename or extension to audio file
@@ -114,6 +121,7 @@ class ParserFactory {
             case '.aifc':
                 return 'aiff';
             case '.wav':
+            case '.bwf': // Broadcast Wave Format
                 return 'riff';
             case '.wv':
             case '.wvp':
@@ -153,13 +161,6 @@ class ParserFactory {
                 throw new Error(`Unknown parser type: ${moduleName}`);
         }
     }
-    static async _parse(tokenizer, parserId, opts = {}) {
-        // Parser found, execute parser
-        const parser = await ParserFactory.loadParser(parserId);
-        const metadata = new MetadataCollector_1.MetadataCollector(opts);
-        await parser.init(metadata, tokenizer, opts).parse();
-        return metadata.toCommonMetadata();
-    }
     static getExtension(fname) {
         const i = fname.lastIndexOf('.');
         return i === -1 ? '' : fname.slice(i);

package/lib/aiff/AiffParser.d.ts

@@ -4,9 +4,8 @@ import * as iff from '../iff';
  * AIFF - Audio Interchange File Format
  *
  * Ref:
- *  http://www.onicos.com/staff/iz/formats/aiff.html
- *  http://muratnkonar.com/aiff/index.html
- *  http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/AIFF.html
+ * - http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/AIFF.html
+ * - http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/Docs/AIFF-1.3.pdf
  */
 export declare class AIFFParser extends BasicParser {
     private isCompressed;

package/lib/aiff/AiffParser.js

@@ -14,9 +14,8 @@ const debug = initDebug('music-metadata:parser:aiff');
  * AIFF - Audio Interchange File Format
  *
  * Ref:
- *  http://www.onicos.com/staff/iz/formats/aiff.html
- *  http://muratnkonar.com/aiff/index.html
- *  http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/AIFF.html
+ * - http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/AIFF.html
+ * - http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/Docs/AIFF-1.3.pdf
  */
 class AIFFParser extends BasicParser_1.BasicParser {
     async parse() {

package/lib/apev2/APEv2Parser.js

@@ -106,10 +106,9 @@ class APEv2Parser extends BasicParser_1.BasicParser {
             await this.tokenizer.ignore(1);
             bytesRemaining -= key.length + 1;
             switch (tagItemHeader.flags.dataType) {
-                case APEv2Token_1.DataType.text_utf8: { // utf-8 textstring
+                case APEv2Token_1.DataType.text_utf8: { // utf-8 text-string
                     const value = await this.tokenizer.readToken(new token_types_1.StringType(tagItemHeader.size, 'utf8'));
                     const values = value.split(/\x00/g);
-                    /*jshint loopfunc:true */
                     for (const val of values) {
                         this.metadata.addTag(tagFormat, key, val);
                     }

package/lib/apev2/APEv2Token.d.ts

@@ -3,12 +3,12 @@ import { IGetToken } from 'strtok3/lib/core';
 /**
  * APETag versionIndex history / supported formats
  *
- *  1.0 (1000) - Original APE tag spec.  Fully supported by this code.
- *  2.0 (2000) - Refined APE tag spec (better streaming support, UTF StringEncoding). Fully supported by this code.
+ * 1.0 (1000) - Original APE tag spec.  Fully supported by this code.
+ * 2.0 (2000) - Refined APE tag spec (better streaming support, UTF StringEncoding). Fully supported by this code.
  *
- *  Notes:
- *  - also supports reading of ID3v1.1 tags
- *  - all saving done in the APE Tag format using CURRENT_APE_TAG_VERSION
+ * Notes:
+ * - also supports reading of ID3v1.1 tags
+ * - all saving done in the APE Tag format using CURRENT_APE_TAG_VERSION
  *
  * APE File Format Overview: (pieces in order -- only valid for the latest versionIndex APE files)
  *

package/lib/asf/AsfParser.d.ts

@@ -1,13 +1,13 @@
 import { BasicParser } from '../common/BasicParser';
 /**
  * Windows Media Metadata Usage Guidelines
- *   Ref: https://msdn.microsoft.com/en-us/library/ms867702.aspx
+ * - Ref: https://msdn.microsoft.com/en-us/library/ms867702.aspx
  *
  * Ref:
- *   https://tools.ietf.org/html/draft-fleischman-asf-01
- *   https://hwiegman.home.xs4all.nl/fileformats/asf/ASF_Specification.pdf
- *   http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
- *   https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
+ * - https://tools.ietf.org/html/draft-fleischman-asf-01
+ * - https://hwiegman.home.xs4all.nl/fileformats/asf/ASF_Specification.pdf
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
  */
 export declare class AsfParser extends BasicParser {
     parse(): Promise<void>;

package/lib/asf/AsfParser.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsfParser = void 0;
-const _debug = require("debug");
+const initDebug = require("debug");
 const type_1 = require("../type");
 const GUID_1 = require("./GUID");
 const AsfObject = require("./AsfObject");
 const BasicParser_1 = require("../common/BasicParser");
-const debug = _debug('music-metadata:parser:ASF');
+const debug = initDebug('music-metadata:parser:ASF');
 const headerType = 'asf';
 /**
  * Windows Media Metadata Usage Guidelines
- *   Ref: https://msdn.microsoft.com/en-us/library/ms867702.aspx
+ * - Ref: https://msdn.microsoft.com/en-us/library/ms867702.aspx
  *
  * Ref:
- *   https://tools.ietf.org/html/draft-fleischman-asf-01
- *   https://hwiegman.home.xs4all.nl/fileformats/asf/ASF_Specification.pdf
- *   http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
- *   https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
+ * - https://tools.ietf.org/html/draft-fleischman-asf-01
+ * - https://hwiegman.home.xs4all.nl/fileformats/asf/ASF_Specification.pdf
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
  */
 class AsfParser extends BasicParser_1.BasicParser {
     async parse() {

package/lib/asf/GUID.d.ts

@@ -1,19 +1,17 @@
 /// <reference types="node" />
 /**
  * Ref:
- *    https://tools.ietf.org/html/draft-fleischman-asf-01, Appendix A: ASF GUIDs
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - https://tools.ietf.org/html/draft-fleischman-asf-01, Appendix A: ASF GUIDs
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
  *
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * ASF File Structure:
+ * - https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
  *
- *  ASF File Structure:
- *    https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
- *
- *  ASF GUIDs:
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
- *
- *    https://github.com/dji-sdk/FFmpeg/blob/master/libavformat/asf.c
+ * ASF GUIDs:
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - https://github.com/dji-sdk/FFmpeg/blob/master/libavformat/asf.c
  */
 export default class GUID {
     str: string;
@@ -65,19 +63,19 @@ export default class GUID {
      * Decode GUID in format like "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
      * @param objectId Binary GUID
      * @param offset Read offset in bytes, default 0
-     * @returns {string} GUID as dashed hexadecimal representation
+     * @returns GUID as dashed hexadecimal representation
      */
     static decode(objectId: Buffer, offset?: number): string;
     /**
      * Decode stream type
-     * @param {string} mediaType
-     * @returns {string}
+     * @param mediaType Media type GUID
+     * @returns Media type
      */
-    static decodeMediaType(mediaType: GUID): string;
+    static decodeMediaType(mediaType: GUID): 'audio' | 'video' | 'command' | 'degradable-jpeg' | 'file-transfer' | 'binary' | undefined;
     /**
      * Encode GUID
      * @param guid GUID like: "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
-     * @returns {Buffer} Encoded Bnary GUID
+     * @returns Encoded Binary GUID
      */
     static encode(str: string): Buffer;
     constructor(str: string);

package/lib/asf/GUID.js

@@ -2,19 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Ref:
- *    https://tools.ietf.org/html/draft-fleischman-asf-01, Appendix A: ASF GUIDs
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - https://tools.ietf.org/html/draft-fleischman-asf-01, Appendix A: ASF GUIDs
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
  *
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * ASF File Structure:
+ * - https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
  *
- *  ASF File Structure:
- *    https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
- *
- *  ASF GUIDs:
- *    http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
- *
- *    https://github.com/dji-sdk/FFmpeg/blob/master/libavformat/asf.c
+ * ASF GUIDs:
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - https://github.com/dji-sdk/FFmpeg/blob/master/libavformat/asf.c
  */
 class GUID {
     constructor(str) {
@@ -27,7 +25,7 @@ class GUID {
      * Decode GUID in format like "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
      * @param objectId Binary GUID
      * @param offset Read offset in bytes, default 0
-     * @returns {string} GUID as dashed hexadecimal representation
+     * @returns GUID as dashed hexadecimal representation
      */
     static decode(objectId, offset = 0) {
         const guid = objectId.readUInt32LE(offset).toString(16) + "-" +
@@ -39,8 +37,8 @@ class GUID {
     }
     /**
      * Decode stream type
-     * @param {string} mediaType
-     * @returns {string}
+     * @param mediaType Media type GUID
+     * @returns Media type
      */
     static decodeMediaType(mediaType) {
         switch (mediaType.str) {
@@ -55,7 +53,7 @@ class GUID {
     /**
      * Encode GUID
      * @param guid GUID like: "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
-     * @returns {Buffer} Encoded Bnary GUID
+     * @returns Encoded Binary GUID
      */
     static encode(str) {
         const bin = Buffer.alloc(16);

package/lib/common/CombinedTagMapper.d.ts

@@ -1,6 +1,6 @@
-import { IGenericTag, TagType } from "./GenericTagTypes";
-import { IGenericTagMapper } from "./GenericTagMapper";
-import { ITag } from "../type";
+import { IGenericTag, TagType } from './GenericTagTypes';
+import { IGenericTagMapper } from './GenericTagMapper';
+import { ITag } from '../type';
 import { INativeMetadataCollector } from './MetadataCollector';
 export declare class CombinedTagMapper {
     tagMappers: {

package/lib/common/CombinedTagMapper.js

@@ -40,7 +40,7 @@ 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/GenericTagMapper.d.ts

@@ -44,8 +44,8 @@ export declare class CommonTagMapper implements IGenericTagMapper {
     protected getCommonName(tag: string): generic.GenericTagId;
     /**
      * Handle post mapping exceptions / correction
-     * @param {string} tag Tag e.g. {"©alb", "Buena Vista Social Club")
-     * @param {warnings} Used to register warnings
+     * @param tag Tag e.g. {"©alb", "Buena Vista Social Club")
+     * @param warnings Used to register warnings
      */
     protected postMap(tag: ITag, warnings: IWarningCollector): void;
 }

package/lib/common/GenericTagMapper.js

@@ -44,8 +44,8 @@ class CommonTagMapper {
     }
     /**
      * Handle post mapping exceptions / correction
-     * @param {string} tag Tag e.g. {"©alb", "Buena Vista Social Club")
-     * @param {warnings} Used to register warnings
+     * @param tag Tag e.g. {"©alb", "Buena Vista Social Club")
+     * @param warnings Used to register warnings
      */
     postMap(tag, warnings) {
         return;

package/lib/common/MetadataCollector.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.joinArtists = exports.MetadataCollector = void 0;
 const type_1 = require("../type");
-const _debug = require("debug");
+const initDebug = require("debug");
 const GenericTagTypes_1 = require("./GenericTagTypes");
 const CombinedTagMapper_1 = require("./CombinedTagMapper");
 const GenericTagMapper_1 = require("./GenericTagMapper");
 const Util_1 = require("./Util");
 const FileType = require("file-type/core");
-const debug = _debug('music-metadata:collector');
+const debug = initDebug('music-metadata:collector');
 const TagPriority = ['matroska', 'APEv2', 'vorbis', 'ID3v2.4', 'ID3v2.3', 'ID3v2.2', 'exif', 'asf', 'iTunes', 'ID3v1'];
 /**
  * Provided to the parser to uodate the metadata result.

package/lib/common/Util.d.ts

@@ -1,6 +1,10 @@
 /// <reference types="node" />
 import { IRatio } from '../type';
 export declare type StringEncoding = 'ascii' | 'utf8' | 'utf16le' | '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
@@ -13,10 +17,7 @@ export declare function getBit(buf: Uint8Array, off: number, bit: number): boole
 export declare function findZero(uint8Array: Uint8Array, start: number, end: number, encoding?: StringEncoding): number;
 export declare function trimRightNull(x: string): string;
 /**
- *
- * @param buffer Decoder input data
- * @param encoding 'utf16le' | 'utf16' | 'utf8' | 'iso-8859-1'
- * @return {string}
+ * Decode string
  */
 export declare function decodeString(buffer: Buffer, encoding: StringEncoding): string;
 export declare function stripNulls(str: string): string;

package/lib/common/Util.js

@@ -50,28 +50,21 @@ function swapBytes(uint8Array) {
     return uint8Array;
 }
 /**
- *
- * @param buffer Decoder input data
- * @param encoding 'utf16le' | 'utf16' | 'utf8' | 'iso-8859-1'
- * @return {string}
+ * Decode string
  */
 function decodeString(buffer, encoding) {
     // annoying workaround for a double BOM issue
     // https://github.com/leetreveil/musicmetadata/issues/84
-    let offset = 0;
     if (buffer[0] === 0xFF && buffer[1] === 0xFE) { // little endian
-        if (encoding === 'utf16le') {
-            offset = 2;
-        }
-        else if (buffer[2] === 0xFE && buffer[3] === 0xFF) {
-            offset = 2; // Clear double BOM
-        }
+        return decodeString(buffer.subarray(2), encoding);
     }
     else if (encoding === 'utf16le' && buffer[0] === 0xFE && buffer[1] === 0xFF) {
         // BOM, indicating big endian decoding
+        if ((buffer.length & 1) !== 0)
+            throw new Error('Expected even number of octets for 16-bit unicode string');
         return decodeString(swapBytes(buffer), encoding);
     }
-    return buffer.toString(encoding, offset);
+    return buffer.toString(encoding);
 }
 exports.decodeString = decodeString;
 function stripNulls(str) {
@@ -152,18 +145,13 @@ function toRatio(value) {
     // @ts-ignore
     if (ps.length >= 1) {
         const v = parseFloat(ps[0]);
-        if (ps.length === 2 && ps[1] === 'db') {
-            return {
-                dB: v,
-                ratio: dbToRatio(v)
-            };
-        }
-        else {
-            return {
-                dB: ratioToDb(v),
-                ratio: v
-            };
-        }
+        return ps.length === 2 && ps[1] === 'db' ? {
+            dB: v,
+            ratio: dbToRatio(v)
+        } : {
+            dB: ratioToDb(v),
+            ratio: v
+        };
     }
 }
 exports.toRatio = toRatio;

package/lib/dsdiff/DsdiffParser.d.ts

@@ -3,7 +3,7 @@ import { BasicParser } from '../common/BasicParser';
  * DSDIFF - Direct Stream Digital Interchange File Format (Phillips)
  *
  * Ref:
- *  http://www.sonicstudio.com/pdf/dsd/DSDIFF_1.5_Spec.pdf
+ * - http://www.sonicstudio.com/pdf/dsd/DSDIFF_1.5_Spec.pdf
  */
 export declare class DsdiffParser extends BasicParser {
     parse(): Promise<void>;

package/lib/dsdiff/DsdiffParser.js

@@ -13,7 +13,7 @@ const debug = initDebug('music-metadata:parser:aiff');
  * DSDIFF - Direct Stream Digital Interchange File Format (Phillips)
  *
  * Ref:
- *  http://www.sonicstudio.com/pdf/dsd/DSDIFF_1.5_Spec.pdf
+ * - http://www.sonicstudio.com/pdf/dsd/DSDIFF_1.5_Spec.pdf
  */
 class DsdiffParser extends BasicParser_1.BasicParser {
     async parse() {

package/lib/dsf/DsfParser.d.ts

@@ -4,6 +4,6 @@ import { AbstractID3Parser } from '../id3v2/AbstractID3Parser';
  * Ref: https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
  */
 export declare class DsfParser extends AbstractID3Parser {
-    _parse(): Promise<void>;
+    postId3v2Parse(): Promise<void>;
     private parseChunks;
 }

package/lib/dsf/DsfParser.js

@@ -11,7 +11,7 @@ const debug = _debug('music-metadata:parser:DSF');
  * Ref: https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
  */
 class DsfParser extends AbstractID3Parser_1.AbstractID3Parser {
-    async _parse() {
+    async postId3v2Parse() {
         const p0 = this.tokenizer.position; // mark start position, normally 0
         const chunkHeader = await this.tokenizer.readToken(DsfChunk_1.ChunkHeader);
         if (chunkHeader.id !== 'DSD ')

package/lib/flac/FlacParser.d.ts

@@ -13,7 +13,7 @@ export declare class FlacParser extends AbstractID3Parser {
      * @param {IOptions} options Parsing options
      */
     init(metadata: INativeMetadataCollector, tokenizer: ITokenizer, options: IOptions): ITokenParser;
-    _parse(): Promise<void>;
+    postId3v2Parse(): Promise<void>;
     private parseDataBlock;
     /**
      * Parse STREAMINFO

package/lib/flac/FlacParser.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlacParser = void 0;
-const Token = require("token-types");
-const _debug = require("debug");
+const token_types_1 = require("token-types");
+const initDebug = require("debug");
 const util = require("../common/Util");
 const Vorbis_1 = require("../ogg/vorbis/Vorbis");
 const AbstractID3Parser_1 = require("../id3v2/AbstractID3Parser");
 const FourCC_1 = require("../common/FourCC");
 const VorbisParser_1 = require("../ogg/vorbis/VorbisParser");
 const VorbisDecoder_1 = require("../ogg/vorbis/VorbisDecoder");
-const debug = _debug('music-metadata:parser:FLAC');
+const debug = initDebug('music-metadata:parser:FLAC');
 /**
  * FLAC supports up to 128 kinds of metadata blocks; currently the following are defined:
  * ref: https://xiph.org/flac/format.html#metadata_block
@@ -40,7 +40,7 @@ class FlacParser extends AbstractID3Parser_1.AbstractID3Parser {
         this.vorbisParser = new VorbisParser_1.VorbisParser(metadata, options);
         return this;
     }
-    async _parse() {
+    async postId3v2Parse() {
         const fourCC = await this.tokenizer.readToken(FourCC_1.FourCcToken);
         if (fourCC.toString() !== 'fLaC') {
             throw new Error('Invalid FLAC preamble');
@@ -103,7 +103,7 @@ class FlacParser extends AbstractID3Parser_1.AbstractID3Parser {
      * Ref: https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-640004.2.3
      */
     async parseComment(dataLen) {
-        const data = await this.tokenizer.readToken(new Token.Uint8ArrayType(dataLen));
+        const data = await this.tokenizer.readToken(new token_types_1.Uint8ArrayType(dataLen));
         const decoder = new VorbisDecoder_1.VorbisDecoder(data, 0);
         decoder.readStringUtf8(); // vendor (skip)
         const commentListLength = decoder.readInt32();
@@ -131,7 +131,7 @@ Metadata.BlockHeader = {
         return {
             lastBlock: util.getBit(buf, off, 7),
             type: util.getBitAllignedNumber(buf, off, 1, 7),
-            length: Token.UINT24_BE.get(buf, off + 1)
+            length: token_types_1.UINT24_BE.get(buf, off + 1)
         };
     }
 };
@@ -144,20 +144,20 @@ Metadata.BlockStreamInfo = {
     get: (buf, off) => {
         return {
             // The minimum block size (in samples) used in the stream.
-            minimumBlockSize: Token.UINT16_BE.get(buf, off),
+            minimumBlockSize: token_types_1.UINT16_BE.get(buf, off),
             // The maximum block size (in samples) used in the stream.
             // (Minimum blocksize == maximum blocksize) implies a fixed-blocksize stream.
-            maximumBlockSize: Token.UINT16_BE.get(buf, off + 2) / 1000,
+            maximumBlockSize: token_types_1.UINT16_BE.get(buf, off + 2) / 1000,
             // The minimum frame size (in bytes) used in the stream.
             // May be 0 to imply the value is not known.
-            minimumFrameSize: Token.UINT24_BE.get(buf, off + 4),
+            minimumFrameSize: token_types_1.UINT24_BE.get(buf, off + 4),
             // The maximum frame size (in bytes) used in the stream.
             // May be 0 to imply the value is not known.
-            maximumFrameSize: Token.UINT24_BE.get(buf, off + 7),
+            maximumFrameSize: token_types_1.UINT24_BE.get(buf, off + 7),
             // Sample rate in Hz. Though 20 bits are available,
             // the maximum sample rate is limited by the structure of frame headers to 655350Hz.
             // Also, a value of 0 is invalid.
-            sampleRate: Token.UINT24_BE.get(buf, off + 10) >> 4,
+            sampleRate: token_types_1.UINT24_BE.get(buf, off + 10) >> 4,
             // probably slower: sampleRate: common.getBitAllignedNumber(buf, off + 10, 0, 20),
             // (number of channels)-1. FLAC supports from 1 to 8 channels
             channels: util.getBitAllignedNumber(buf, off + 12, 4, 3) + 1,
@@ -169,7 +169,7 @@ Metadata.BlockStreamInfo = {
             // A value of zero here means the number of total samples is unknown.
             totalSamples: util.getBitAllignedNumber(buf, off + 13, 4, 36),
             // the MD5 hash of the file (see notes for usage... it's a littly tricky)
-            fileMD5: new Token.Uint8ArrayType(16).get(buf, off + 18)
+            fileMD5: new token_types_1.Uint8ArrayType(16).get(buf, off + 18)
         };
     }
 };