music-metadata 7.12.6 → 7.13.0

package/README.md

@@ -55,6 +55,7 @@ Following tag header formats are supported:
 *   [iTunes](https://github.com/sergiomb2/libmp4v2/wiki/iTunesMetadata)
 *   [RIFF](https://wikipedia.org/wiki/Resource_Interchange_File_Format)/INFO
 *   [Vorbis comment](https://wikipedia.org/wiki/Vorbis_comment)
+*   [AIFF](https://wikipedia.org/wiki/Audio_Interchange_File_Format)
 
 It allows many tags to be accessed in audio format, and tag format independent way.
 
@@ -90,8 +91,8 @@ import * as mm from 'music-metadata/lib/core';
 ```
 
 | function                                             | `music-metadata`           | `music-metadata/lib/core`  |
-| -----------------------------------------------------| ---------------------------|----------------------------|
-| [`parseBuffer`](#parsefile-function)                 | ✓                          | ✓                          |
+|------------------------------------------------------| ---------------------------|----------------------------|
+| [`parseBuffer`](#parsebuffer-function)               | ✓                          | ✓                          |
 | [`parseStream`](#parsestream-function) *             | ✓                          | ✓                          |
 | [`parseFromTokenizer`](#parsefromtokenizer-function) | ✓                          | ✓                          |
 | [`parseFile`](#parsefile-function)                   | ✓                          |                            |

package/lib/aiff/AiffParser.d.ts

@@ -11,4 +11,5 @@ export declare class AIFFParser extends BasicParser {
     private isCompressed;
     parse(): Promise<void>;
     readData(header: iff.IChunkHeader): Promise<number>;
+    readTextChunk(header: iff.IChunkHeader): Promise<number>;
 }

package/lib/aiff/AiffParser.js

@@ -51,7 +51,6 @@ class AIFFParser extends BasicParser_1.BasicParser {
             while (!this.tokenizer.fileInfo.size || this.tokenizer.fileInfo.size - this.tokenizer.position >= iff.Header.len) {
                 debug('Reading AIFF chunk at offset=' + this.tokenizer.position);
                 const chunkHeader = await this.tokenizer.readToken(iff.Header);
-                debug(`Chunk id=${chunkHeader.chunkID}`);
                 const nextChunk = 2 * Math.round(chunkHeader.chunkSize / 2);
                 const bytesRead = await this.readData(chunkHeader);
                 await this.tokenizer.ignore(nextChunk - bytesRead);
@@ -88,9 +87,22 @@ class AIFFParser extends BasicParser_1.BasicParser {
                     this.metadata.setFormat('bitrate', 8 * header.chunkSize / this.metadata.format.duration);
                 }
                 return 0;
+            case 'NAME': // Sample name chunk
+            case 'AUTH': // Author chunk
+            case '(c) ': // Copyright chunk
+            case 'ANNO': // Annotation chunk
+                return this.readTextChunk(header);
             default:
+                debug(`Ignore chunk id=${header.chunkID}, size=${header.chunkSize}`);
                 return 0;
         }
     }
+    async readTextChunk(header) {
+        const value = await this.tokenizer.readToken(new Token.StringType(header.chunkSize, 'ascii'));
+        value.split('\0').map(v => v.trim()).filter(v => v && v.length > 0).forEach(v => {
+            this.metadata.addTag('AIFF', header.chunkID, v.trim());
+        });
+        return header.chunkSize;
+    }
 }
 exports.AIFFParser = AIFFParser;

package/lib/aiff/AiffTagMap.d.ts

@@ -0,0 +1,4 @@
+import { CommonTagMapper } from '../common/GenericTagMapper.js';
+export declare class AiffTagMapper extends CommonTagMapper {
+    constructor();
+}

package/lib/aiff/AiffTagMap.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AiffTagMapper = void 0;
+const GenericTagMapper_js_1 = require("../common/GenericTagMapper.js");
+/**
+ * ID3v1 tag mappings
+ */
+const tagMap = {
+    NAME: 'title',
+    AUTH: 'artist',
+    '(c) ': 'copyright',
+    ANNO: 'comment'
+};
+class AiffTagMapper extends GenericTagMapper_js_1.CommonTagMapper {
+    constructor() {
+        super(['AIFF'], tagMap);
+    }
+}
+exports.AiffTagMapper = AiffTagMapper;
+//# sourceMappingURL=AiffTagMap.js.map

package/lib/common/CombinedTagMapper.js

@@ -10,6 +10,7 @@ const MP4TagMapper_1 = require("../mp4/MP4TagMapper");
 const VorbisTagMapper_1 = require("../ogg/vorbis/VorbisTagMapper");
 const RiffInfoTagMap_1 = require("../riff/RiffInfoTagMap");
 const MatroskaTagMapper_1 = require("../matroska/MatroskaTagMapper");
+const AiffTagMap_1 = require("../aiff/AiffTagMap");
 class CombinedTagMapper {
     constructor() {
         this.tagMappers = {};
@@ -23,7 +24,8 @@ class CombinedTagMapper {
             new APEv2TagMapper_1.APEv2TagMapper(),
             new AsfTagMapper_1.AsfTagMapper(),
             new RiffInfoTagMap_1.RiffInfoTagMapper(),
-            new MatroskaTagMapper_1.MatroskaTagMapper()
+            new MatroskaTagMapper_1.MatroskaTagMapper(),
+            new AiffTagMap_1.AiffTagMapper()
         ].forEach(mapper => {
             this.registerTagMapper(mapper);
         });

package/lib/common/FourCC.js

@@ -11,11 +11,8 @@ exports.FourCcToken = {
     len: 4,
     get: (buf, off) => {
         const id = buf.toString('binary', off, off + exports.FourCcToken.len);
-        switch (id) {
-            default:
-                if (!id.match(validFourCC)) {
-                    throw new Error(`FourCC contains invalid characters: ${util.a2hex(id)} "${id}"`);
-                }
+        if (!id.match(validFourCC)) {
+            throw new Error(`FourCC contains invalid characters: ${util.a2hex(id)} "${id}"`);
         }
         return id;
     },

package/lib/common/GenericTagTypes.d.ts

@@ -1,4 +1,4 @@
-export declare type TagType = 'vorbis' | 'ID3v1' | 'ID3v2.2' | 'ID3v2.3' | 'ID3v2.4' | 'APEv2' | 'asf' | 'iTunes' | 'exif' | 'matroska';
+export declare type TagType = 'vorbis' | 'ID3v1' | 'ID3v2.2' | 'ID3v2.3' | 'ID3v2.4' | 'APEv2' | 'asf' | 'iTunes' | 'exif' | 'matroska' | 'AIFF';
 export interface IGenericTag {
     id: GenericTagId;
     value: any;

package/lib/common/MetadataCollector.js

@@ -9,7 +9,7 @@ const GenericTagMapper_1 = require("./GenericTagMapper");
 const Util_1 = require("./Util");
 const FileType = require("file-type/core");
 const debug = (0, debug_1.default)('music-metadata:collector');
-const TagPriority = ['matroska', 'APEv2', 'vorbis', 'ID3v2.4', 'ID3v2.3', 'ID3v2.2', 'exif', 'asf', 'iTunes', 'ID3v1'];
+const TagPriority = ['matroska', 'APEv2', 'vorbis', 'ID3v2.4', 'ID3v2.3', 'ID3v2.2', 'exif', 'asf', 'iTunes', 'AIFF', 'ID3v1'];
 /**
  * Provided to the parser to uodate the metadata result.
  * Responsible for triggering async updates
@@ -44,7 +44,7 @@ class MetadataCollector {
             this.originPriority[tagType] = priority++;
         }
         this.originPriority.artificial = 500; // Filled using alternative tags
-        this.originPriority.id3v1 = 600; // Consider worst due to field length limit
+        this.originPriority.id3v1 = 600; // Consider as the worst because of the field length limit
     }
     /**
      * @returns {boolean} true if one or more tags have been found

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "music-metadata",
   "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
-  "version": "7.12.6",
+  "version": "7.13.0",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -89,25 +89,25 @@
     "file-type": "^16.5.4",
     "media-typer": "^1.1.0",
     "strtok3": "^6.3.0",
-    "token-types": "^4.2.0"
+    "token-types": "^4.2.1"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.1",
+    "@types/chai": "^4.3.3",
     "@types/chai-as-promised": "^7.1.5",
     "@types/debug": "^4.1.7",
     "@types/file-type": "^10.9.1",
     "@types/mocha": "^9.1.0",
-    "@types/node": "^18.6.3",
-    "@typescript-eslint/eslint-plugin": "^5.32.0",
-    "@typescript-eslint/parser": "^5.32.0",
+    "@types/node": "^18.7.14",
+    "@typescript-eslint/eslint-plugin": "^5.37.0",
+    "@typescript-eslint/parser": "^5.37.0",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "del-cli": "5.0.0",
-    "eslint": "^8.21.0",
+    "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-typescript": "^3.4.0",
+    "eslint-import-resolver-typescript": "^3.5.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.3.4",
+    "eslint-plugin-jsdoc": "^39.3.6",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-unicorn": "^43.0.2",
     "mime": "^3.0.0",
@@ -118,7 +118,7 @@
     "remark-preset-lint-recommended": "^6.1.2",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.3"
   },
   "engines": {
     "node": ">=10"