music-metadata 8.1.2 → 8.1.4

package/lib/asf/AsfObject.js

@@ -93,7 +93,7 @@ export class IgnoreObjectState extends State {
  * Token for: 3.2: File Properties Object (mandatory, one only)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_2
  */
-export class FilePropertiesObject extends State {
+class FilePropertiesObject extends State {
     constructor(header) {
         super(header);
     }
@@ -118,11 +118,12 @@ export class FilePropertiesObject extends State {
     }
 }
 FilePropertiesObject.guid = GUID.FilePropertiesObject;
+export { FilePropertiesObject };
 /**
  * Token for: 3.3 Stream Properties Object (mandatory, one per stream)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_3
  */
-export class StreamPropertiesObject extends State {
+class StreamPropertiesObject extends State {
     constructor(header) {
         super(header);
     }
@@ -135,11 +136,12 @@ export class StreamPropertiesObject extends State {
     }
 }
 StreamPropertiesObject.guid = GUID.StreamPropertiesObject;
+export { StreamPropertiesObject };
 /**
  * 3.4: Header Extension Object (mandatory, one only)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_4
  */
-export class HeaderExtensionObject {
+class HeaderExtensionObject {
     constructor() {
         this.len = 22;
     }
@@ -152,6 +154,7 @@ export class HeaderExtensionObject {
     }
 }
 HeaderExtensionObject.guid = GUID.HeaderExtensionObject;
+export { HeaderExtensionObject };
 /**
  * 3.5: The Codec List Object provides user-friendly information about the codecs and formats used to encode the content found in the ASF file.
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_5
@@ -206,7 +209,7 @@ async function readCodecEntry(tokenizer) {
  * 3.10 Content Description Object (optional, one only)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_10
  */
-export class ContentDescriptionObjectState extends State {
+class ContentDescriptionObjectState extends State {
     constructor(header) {
         super(header);
     }
@@ -227,11 +230,12 @@ export class ContentDescriptionObjectState extends State {
 }
 ContentDescriptionObjectState.guid = GUID.ContentDescriptionObject;
 ContentDescriptionObjectState.contentDescTags = ['Title', 'Author', 'Copyright', 'Description', 'Rating'];
+export { ContentDescriptionObjectState };
 /**
  * 3.11 Extended Content Description Object (optional, one only)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_11
  */
-export class ExtendedContentDescriptionObjectState extends State {
+class ExtendedContentDescriptionObjectState extends State {
     constructor(header) {
         super(header);
     }
@@ -256,11 +260,12 @@ export class ExtendedContentDescriptionObjectState extends State {
     }
 }
 ExtendedContentDescriptionObjectState.guid = GUID.ExtendedContentDescriptionObject;
+export { ExtendedContentDescriptionObjectState };
 /**
  * 4.1 Extended Stream Properties Object (optional, 1 per media stream)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/04_objects_in_the_asf_header_extension_object.html#4_1
  */
-export class ExtendedStreamPropertiesObjectState extends State {
+class ExtendedStreamPropertiesObjectState extends State {
     constructor(header) {
         super(header);
     }
@@ -292,11 +297,12 @@ export class ExtendedStreamPropertiesObjectState extends State {
     }
 }
 ExtendedStreamPropertiesObjectState.guid = GUID.ExtendedStreamPropertiesObject;
+export { ExtendedStreamPropertiesObjectState };
 /**
  * 4.7  Metadata Object (optional, 0 or 1)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/04_objects_in_the_asf_header_extension_object.html#4_7
  */
-export class MetadataObjectState extends State {
+class MetadataObjectState extends State {
     constructor(header) {
         super(header);
     }
@@ -323,13 +329,15 @@ export class MetadataObjectState extends State {
     }
 }
 MetadataObjectState.guid = GUID.MetadataObject;
+export { MetadataObjectState };
 // 4.8	Metadata Library Object (optional, 0 or 1)
-export class MetadataLibraryObjectState extends MetadataObjectState {
+class MetadataLibraryObjectState extends MetadataObjectState {
     constructor(header) {
         super(header);
     }
 }
 MetadataLibraryObjectState.guid = GUID.MetadataLibraryObject;
+export { MetadataLibraryObjectState };
 /**
  * Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd757977(v=vs.85).aspx
  */

package/lib/asf/AsfUtil.js

@@ -1,7 +1,7 @@
 import * as Token from 'token-types';
 import { Buffer } from 'node:buffer';
 import * as util from '../common/Util.js';
-export class AsfUtil {
+class AsfUtil {
     static getParserForAttr(i) {
         return AsfUtil.attributeParsers[i];
     }
@@ -33,3 +33,4 @@ AsfUtil.attributeParsers = [
     AsfUtil.parseWordAttr,
     AsfUtil.parseByteArrayAttr
 ];
+export { AsfUtil };

package/lib/asf/GUID.js

@@ -12,7 +12,7 @@
  * - 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 {
+class GUID {
     static fromBin(bin, offset = 0) {
         return new GUID(this.decode(bin, offset));
     }
@@ -116,3 +116,4 @@ GUID.Degradable_JPEG_Media = new GUID("35907DE0-E415-11CF-A917-00805F5C442B");
 GUID.FileTransferMedia = new GUID("91BD222C-F21C-497A-8B6D-5AA86BFC0185");
 GUID.BinaryMedia = new GUID("3AFB65E2-47EF-40F2-AC2C-70A90D71D343");
 GUID.ASF_Index_Placeholder_Object = new GUID("D9AADE20-7C17-4F9C-BC28-8555DD98E2A2");
+export default GUID;

package/lib/common/GenericTagMapper.js

@@ -1,4 +1,4 @@
-export class CommonTagMapper {
+class CommonTagMapper {
     static toIntOrNull(str) {
         const cleaned = parseInt(str, 10);
         return isNaN(cleaned) ? null : cleaned;
@@ -49,4 +49,5 @@ export class CommonTagMapper {
     }
 }
 CommonTagMapper.maxRatingScore = 1;
+export { CommonTagMapper };
 //# sourceMappingURL=GenericTagMapper.js.map

package/lib/mp4/Atom.js

@@ -1,5 +1,6 @@
 import initDebug from 'debug';
 import * as AtomToken from './AtomToken.js';
+import { Header } from './AtomToken.js';
 const debug = initDebug('music-metadata:parser:MP4:Atom');
 export class Atom {
     static async readAtom(tokenizer, dataHandler, parent, remaining) {
@@ -52,8 +53,10 @@ export class Atom {
                 return this.readAtoms(tokenizer, dataHandler, this.getPayloadLength(remaining));
             case 'meta': // Metadata Atom, ref: https://developer.apple.com/library/content/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW8
                 // meta has 4 bytes of padding, ignore
-                await tokenizer.ignore(4);
-                return this.readAtoms(tokenizer, dataHandler, this.getPayloadLength(remaining) - 4);
+                const peekHeader = await tokenizer.peekToken(Header);
+                const paddingLength = peekHeader.name === 'hdlr' ? 0 : 4;
+                await tokenizer.ignore(paddingLength);
+                return this.readAtoms(tokenizer, dataHandler, this.getPayloadLength(remaining) - paddingLength);
             case 'mdhd': // Media header atom
             case 'mvhd': // 'movie' => 'mvhd': movie header atom; child of Movie Atom
             case 'tkhd':

package/lib/ogg/OggParser.js

@@ -29,7 +29,7 @@ export class SegmentTable {
 /**
  * Parser for Ogg logical bitstream framing
  */
-export class OggParser extends BasicParser {
+class OggParser extends BasicParser {
     /**
      * Parse page
      * @returns {Promise<void>}
@@ -119,3 +119,4 @@ OggParser.Header = {
         };
     }
 };
+export { OggParser };

package/lib/riff/RiffInfoTagMap.js

@@ -10,6 +10,7 @@ export const riffInfoTagMap = {
     TITL: 'title',
     IPRD: 'album',
     ITRK: 'track',
+    IPRT: 'track',
     COMM: 'comment',
     ICMT: 'comment',
     ICNT: 'releasecountry',

package/lib/wavpack/WavPackToken.js

@@ -2,7 +2,7 @@ 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];
-export class WavPack {
+class WavPack {
     static isBitSet(flags, bitOffset) {
         return WavPack.getBitAllignedNumber(flags, bitOffset, 1) === 1;
     }
@@ -70,3 +70,4 @@ WavPack.MetadataIdToken = {
         };
     }
 };
+export { WavPack };

package/package.json

@@ -1,140 +1,140 @@
-{
-  "name": "music-metadata",
-  "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
-  "version": "8.1.2",
-  "author": {
-    "name": "Borewit",
-    "url": "https://github.com/Borewit"
-  },
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/Borewit"
-  },
-  "type": "module",
-  "exports": {
-    ".": {
-      "node": "./lib/index.js",
-      "default": "./lib/core.js"
-    }
-  },
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/**/*.js",
-    "lib/**/*.d.ts"
-  ],
-  "keywords": [
-    "music",
-    "metadata",
-    "meta",
-    "audio",
-    "tag",
-    "tags",
-    "duration",
-    "MusicBrainz",
-    "Discogs",
-    "Picard",
-    "ID3",
-    "ID3v1",
-    "ID3v2",
-    "m4a",
-    "m4b",
-    "mp3",
-    "mp4",
-    "Vorbis",
-    "ogg",
-    "flac",
-    "Matroska",
-    "WebM",
-    "EBML",
-    "asf",
-    "wma",
-    "wmv",
-    "ape",
-    "MonkeyAudio",
-    "aiff",
-    "wav",
-    "WavPack",
-    "Opus",
-    "speex",
-    "musepack",
-    "mpc",
-    "dsd",
-    "dsf",
-    "mpc",
-    "dff",
-    "dsdiff",
-    "aac",
-    "adts",
-    "length",
-    "chapter",
-    "info",
-    "parse",
-    "parser",
-    "bwf"
-  ],
-  "scripts": {
-    "clean": "del-cli lib/**/*.js lib/**/*.js.map lib/**/*.d.ts src/**/*.d.ts test/**/*.js test/**/*.js.map test/**/*.js test/**/*.js.map doc-gen/**/*.js doc-gen/**/*.js.map",
-    "compile-src": "tsc -p lib",
-    "compile-test": "tsc -p test",
-    "compile-doc": "tsc -p doc-gen",
-    "compile": "npm run compile-src && npm run compile-test && npm run compile-doc",
-    "eslint": "eslint lib/**/*.ts --ignore-pattern lib/**/*.d.ts example/typescript/**/*.ts test/**/*.ts doc-gen/**/*.ts",
-    "lint-md": "remark -u preset-lint-recommended .",
-    "lint": "npm run lint-md && npm run eslint",
-    "test": "mocha",
-    "build": "npm run clean && npm run compile && npm run doc-gen",
-    "start": "npm-run-all compile lint cover-test",
-    "test-coverage": "c8 npm run test",
-    "send-codacy": "c8 report --reporter=text-lcov | codacy-coverage",
-    "doc-gen": "node doc-gen/gen.js"
-  },
-  "dependencies": {
-    "@tokenizer/token": "^0.3.0",
-    "content-type": "^1.0.4",
-    "debug": "^4.3.4",
-    "file-type": "^18.0.0",
-    "media-typer": "^1.1.0",
-    "strtok3": "^7.0.0",
-    "token-types": "^5.0.1"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.4",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/debug": "^4.1.7",
-    "@types/file-type": "^10.9.1",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.11.18",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.48.0",
-    "c8": "^7.12.0",
-    "chai": "^4.3.7",
-    "chai-as-promised": "^7.1.1",
-    "del-cli": "5.0.0",
-    "eslint": "^8.31.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-import-resolver-typescript": "^3.5.2",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.6.4",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-unicorn": "^45.0.2",
-    "mime": "^3.0.0",
-    "mocha": "^10.1.0",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.2",
-    "remark-cli": "^11.0.0",
-    "remark-preset-lint-recommended": "^6.1.2",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
-  },
-  "engines": {
-    "node": "^14.13.1 || >=16.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/borewit/music-metadata.git"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Borewit/music-metadata/issues"
-  }
-}
+{
+  "name": "music-metadata",
+  "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
+  "version": "8.1.4",
+  "author": {
+    "name": "Borewit",
+    "url": "https://github.com/Borewit"
+  },
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/Borewit"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "node": "./lib/index.js",
+      "default": "./lib/core.js"
+    }
+  },
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib/**/*.js",
+    "lib/**/*.d.ts"
+  ],
+  "keywords": [
+    "music",
+    "metadata",
+    "meta",
+    "audio",
+    "tag",
+    "tags",
+    "duration",
+    "MusicBrainz",
+    "Discogs",
+    "Picard",
+    "ID3",
+    "ID3v1",
+    "ID3v2",
+    "m4a",
+    "m4b",
+    "mp3",
+    "mp4",
+    "Vorbis",
+    "ogg",
+    "flac",
+    "Matroska",
+    "WebM",
+    "EBML",
+    "asf",
+    "wma",
+    "wmv",
+    "ape",
+    "MonkeyAudio",
+    "aiff",
+    "wav",
+    "WavPack",
+    "Opus",
+    "speex",
+    "musepack",
+    "mpc",
+    "dsd",
+    "dsf",
+    "mpc",
+    "dff",
+    "dsdiff",
+    "aac",
+    "adts",
+    "length",
+    "chapter",
+    "info",
+    "parse",
+    "parser",
+    "bwf"
+  ],
+  "scripts": {
+    "clean": "del-cli lib/**/*.js lib/**/*.js.map lib/**/*.d.ts src/**/*.d.ts test/**/*.js test/**/*.js.map test/**/*.js test/**/*.js.map doc-gen/**/*.js doc-gen/**/*.js.map",
+    "compile-src": "tsc -p lib",
+    "compile-test": "tsc -p test",
+    "compile-doc": "tsc -p doc-gen",
+    "compile": "npm run compile-src && npm run compile-test && npm run compile-doc",
+    "eslint": "eslint lib/**/*.ts --ignore-pattern lib/**/*.d.ts example/typescript/**/*.ts test/**/*.ts doc-gen/**/*.ts",
+    "lint-md": "remark -u preset-lint-recommended .",
+    "lint": "npm run lint-md && npm run eslint",
+    "test": "mocha",
+    "build": "npm run clean && npm run compile && npm run doc-gen",
+    "start": "npm-run-all compile lint cover-test",
+    "test-coverage": "c8 npm run test",
+    "send-codacy": "c8 report --reporter=text-lcov | codacy-coverage",
+    "doc-gen": "node doc-gen/gen.js"
+  },
+  "dependencies": {
+    "@tokenizer/token": "^0.3.0",
+    "content-type": "^1.0.5",
+    "debug": "^4.3.4",
+    "file-type": "^18.2.1",
+    "media-typer": "^1.1.0",
+    "strtok3": "^7.0.0",
+    "token-types": "^5.0.1"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.4",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/debug": "^4.1.7",
+    "@types/file-type": "^10.9.1",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.15.11",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
+    "c8": "^7.13.0",
+    "chai": "^4.3.7",
+    "chai-as-promised": "^7.1.1",
+    "del-cli": "5.0.0",
+    "eslint": "^8.37.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-import-resolver-typescript": "^3.5.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsdoc": "^40.1.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-unicorn": "^46.0.0",
+    "mime": "^3.0.0",
+    "mocha": "^10.2.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.8.7",
+    "remark-cli": "^11.0.0",
+    "remark-preset-lint-recommended": "^6.1.2",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.2"
+  },
+  "engines": {
+    "node": "^14.13.1 || >=16.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/borewit/music-metadata.git"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/Borewit/music-metadata/issues"
+  }
+}