@dragon708/docmind-markdown 1.2.5 → 1.2.6

package/node_modules/music-metadata/lib/id3v2/ID3v24TagMapper.js

@@ -1,7 +1,9 @@
-import { UINT32_LE } from 'token-types';
-import { CommonTagMapper } from '../common/GenericTagMapper.js';
-import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap.js';
-import { decodeString } from '../common/Util.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ID3v24TagMapper = void 0;
+const GenericTagMapper_1 = require("../common/GenericTagMapper");
+const CaseInsensitiveTagMap_1 = require("../common/CaseInsensitiveTagMap");
+const util = require("../common/Util");
 /**
  * ID3v2.3/ID3v2.4 tag mappings
  */
@@ -12,7 +14,7 @@ const id3v24TagMap = {
     'TXXX:Artists': 'artists',
     TPE2: 'albumartist',
     TALB: 'album',
-    TDRV: 'date', // [ 'date', 'year' ] ToDo: improve 'year' mapping
+    TDRV: 'date',
     /**
      * Original release year
      */
@@ -21,7 +23,7 @@ const id3v24TagMap = {
     TCON: 'genre',
     APIC: 'picture',
     TCOM: 'composer',
-    USLT: 'lyrics',
+    'USLT:description': 'lyrics',
     TSOA: 'albumsort',
     TSOT: 'titlesort',
     TOAL: 'originalalbum',
@@ -85,7 +87,7 @@ const id3v24TagMap = {
     WOAR: 'website',
     // id3v2.4
     // ToDo: In same sequence as defined at http://id3.org/id3v2.4.0-frames
-    TDRC: 'date', // date YYYY-MM-DD
+    TDRC: 'date',
     TYER: 'year',
     TDOR: 'originaldate',
     // 'TMCL:instrument': 'performer:instrument',
@@ -133,18 +135,16 @@ const id3v24TagMap = {
     PCST: 'podcast',
     TCAT: 'category',
     TDES: 'description',
-    TDRL: 'releasedate',
+    TDRL: 'date',
     TGID: 'podcastId',
     TKWD: 'keywords',
-    WFED: 'podcasturl',
-    GRP1: 'grouping',
-    PCNT: 'playCounter',
+    WFED: 'podcasturl'
 };
-export class ID3v24TagMapper extends CaseInsensitiveTagMap {
+class ID3v24TagMapper extends CaseInsensitiveTagMap_1.CaseInsensitiveTagMap {
     static toRating(popm) {
         return {
             source: popm.email,
-            rating: popm.rating > 0 ? (popm.rating - 1) / 254 * CommonTagMapper.maxRatingScore : undefined
+            rating: popm.rating > 0 ? (popm.rating - 1) / 254 * GenericTagMapper_1.CommonTagMapper.maxRatingScore : undefined
         };
     }
     constructor() {
@@ -154,37 +154,34 @@ export class ID3v24TagMapper extends CaseInsensitiveTagMap {
      * Handle post mapping exceptions / correction
      * @param tag to post map
      * @param warnings Wil be used to register (collect) warnings
+     * @return Common value e.g. "Buena Vista Social Club"
      */
     postMap(tag, warnings) {
         switch (tag.id) {
-            case 'UFID':
-                {
-                    // decode MusicBrainz Recording Id
-                    const idTag = tag.value;
-                    if (idTag.owner_identifier === 'http://musicbrainz.org') {
-                        tag.id += `:${idTag.owner_identifier}`;
-                        tag.value = decodeString(idTag.identifier, 'latin1'); // latin1 == iso-8859-1
-                    }
+            case 'UFID': // decode MusicBrainz Recording Id
+                if (tag.value.owner_identifier === 'http://musicbrainz.org') {
+                    tag.id += ':' + tag.value.owner_identifier;
+                    tag.value = util.decodeString(tag.value.identifier, 'latin1'); // latin1 == iso-8859-1
                 }
                 break;
             case 'PRIV':
-                {
-                    const customTag = tag.value;
-                    switch (customTag.owner_identifier) {
-                        // decode Windows Media Player
-                        case 'AverageLevel':
-                        case 'PeakValue':
-                            tag.id += `:${customTag.owner_identifier}`;
-                            tag.value = customTag.data.length === 4 ? UINT32_LE.get(customTag.data, 0) : null;
-                            if (tag.value === null) {
-                                warnings.addWarning('Failed to parse PRIV:PeakValue');
-                            }
-                            break;
-                        default:
-                            warnings.addWarning(`Unknown PRIV owner-identifier: ${customTag.data}`);
-                    }
+                switch (tag.value.owner_identifier) {
+                    // decode Windows Media Player
+                    case 'AverageLevel':
+                    case 'PeakValue':
+                        tag.id += ':' + tag.value.owner_identifier;
+                        tag.value = tag.value.data.length === 4 ? tag.value.data.readUInt32LE(0) : null;
+                        if (tag.value === null) {
+                            warnings.addWarning(`Failed to parse PRIV:PeakValue`);
+                        }
+                        break;
+                    default:
+                        warnings.addWarning(`Unknown PRIV owner-identifier: ${tag.value.owner_identifier}`);
                 }
                 break;
+            case 'COMM':
+                tag.value = tag.value ? tag.value.text : null;
+                break;
             case 'POPM':
                 tag.value = ID3v24TagMapper.toRating(tag.value);
                 break;
@@ -193,3 +190,5 @@ export class ID3v24TagMapper extends CaseInsensitiveTagMap {
         }
     }
 }
+exports.ID3v24TagMapper = ID3v24TagMapper;
+//# sourceMappingURL=ID3v24TagMapper.js.map

package/node_modules/music-metadata/lib/id3v2/ID3v2Parser.d.ts

@@ -1,8 +1,10 @@
-import type { ITokenizer } from 'strtok3';
-import type { IOptions } from '../type.js';
-import type { INativeMetadataCollector } from '../common/MetadataCollector.js';
+import { ITokenizer } from 'strtok3/lib/core';
+import { IOptions } from '../type';
+import { INativeMetadataCollector } from '../common/MetadataCollector';
 export declare class ID3v2Parser {
     static removeUnsyncBytes(buffer: Uint8Array): Uint8Array;
+    private static getFrameHeaderLength;
+    private static readFrameFlags;
     private static readFrameData;
     /**
      * Create a combined tag key, of tag & description
@@ -20,14 +22,7 @@ export declare class ID3v2Parser {
     parseExtendedHeader(): Promise<void>;
     parseExtendedHeaderData(dataRemaining: number, extendedHeaderSize: number): Promise<void>;
     parseId3Data(dataLen: number): Promise<void>;
-    private handleTag;
     private addTag;
     private parseMetadata;
-    /**
-     * Convert parsed ID3v2 chapter frames (CHAP / CTOC) to generic `format.chapters`.
-     *
-     * This function expects the `native` tags already to contain parsed `CHAP` and `CTOC` frame values,
-     * as produced by `FrameParser.readData`.
-     */
-    private static mapId3v2Chapters;
+    private readFrameHeader;
 }

package/node_modules/music-metadata/lib/id3v2/ID3v2Parser.js

@@ -1,15 +1,11 @@
-import * as Token from 'token-types';
-import { FrameParser, Id3v2ContentError } from './FrameParser.js';
-import { ExtendedHeader, ID3v2Header } from './ID3v2Token.js';
-import { getFrameHeaderLength, readFrameHeader } from './FrameHeader.js';
-export class ID3v2Parser {
-    constructor() {
-        this.tokenizer = undefined;
-        this.id3Header = undefined;
-        this.metadata = undefined;
-        this.headerType = undefined;
-        this.options = undefined;
-    }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ID3v2Parser = void 0;
+const Token = require("token-types");
+const util = require("../common/Util");
+const FrameParser_1 = require("./FrameParser");
+const ID3v2Token_1 = require("./ID3v2Token");
+class ID3v2Parser {
     static removeUnsyncBytes(buffer) {
         let readI = 0;
         let writeI = 0;
@@ -23,24 +19,51 @@ export class ID3v2Parser {
         if (readI < buffer.length) {
             buffer[writeI++] = buffer[readI];
         }
-        return buffer.subarray(0, writeI);
+        return buffer.slice(0, writeI);
+    }
+    static getFrameHeaderLength(majorVer) {
+        switch (majorVer) {
+            case 2:
+                return 6;
+            case 3:
+            case 4:
+                return 10;
+            default:
+                throw new Error('header versionIndex is incorrect');
+        }
+    }
+    static readFrameFlags(b) {
+        return {
+            status: {
+                tag_alter_preservation: util.getBit(b, 0, 6),
+                file_alter_preservation: util.getBit(b, 0, 5),
+                read_only: util.getBit(b, 0, 4)
+            },
+            format: {
+                grouping_identity: util.getBit(b, 1, 7),
+                compression: util.getBit(b, 1, 3),
+                encryption: util.getBit(b, 1, 2),
+                unsynchronisation: util.getBit(b, 1, 1),
+                data_length_indicator: util.getBit(b, 1, 0)
+            }
+        };
     }
     static readFrameData(uint8Array, frameHeader, majorVer, includeCovers, warningCollector) {
-        const frameParser = new FrameParser(majorVer, warningCollector);
+        const frameParser = new FrameParser_1.FrameParser(majorVer, warningCollector);
         switch (majorVer) {
             case 2:
                 return frameParser.readData(uint8Array, frameHeader.id, includeCovers);
             case 3:
             case 4:
-                if (frameHeader.flags?.format.unsynchronisation) {
+                if (frameHeader.flags.format.unsynchronisation) {
                     uint8Array = ID3v2Parser.removeUnsyncBytes(uint8Array);
                 }
-                if (frameHeader.flags?.format.data_length_indicator) {
-                    uint8Array = uint8Array.subarray(4, uint8Array.length);
+                if (frameHeader.flags.format.data_length_indicator) {
+                    uint8Array = uint8Array.slice(4, uint8Array.length);
                 }
                 return frameParser.readData(uint8Array, frameHeader.id, includeCovers);
             default:
-                throw makeUnexpectedMajorVersionError(majorVer);
+                throw new Error('Unexpected majorVer: ' + majorVer);
         }
     }
     /**
@@ -50,26 +73,23 @@ export class ID3v2Parser {
      * @returns string e.g. COM:iTunPGAP
      */
     static makeDescriptionTagName(tag, description) {
-        return tag + (description ? `:${description}` : '');
+        return tag + (description ? ':' + description : '');
     }
     async parse(metadata, tokenizer, options) {
         this.tokenizer = tokenizer;
         this.metadata = metadata;
         this.options = options;
-        const id3Header = await this.tokenizer.readToken(ID3v2Header);
+        const id3Header = await this.tokenizer.readToken(ID3v2Token_1.ID3v2Header);
         if (id3Header.fileIdentifier !== 'ID3') {
-            throw new Id3v2ContentError('expected ID3-header file-identifier \'ID3\' was not found');
+            throw new Error('expected ID3-header file-identifier \'ID3\' was not found');
         }
         this.id3Header = id3Header;
-        this.headerType = (`ID3v2.${id3Header.version.major}`);
-        await (id3Header.flags.isExtendedHeader ? this.parseExtendedHeader() : this.parseId3Data(id3Header.size));
-        // Post process
-        const chapters = ID3v2Parser.mapId3v2Chapters(this.metadata.native[this.headerType]);
-        this.metadata.setFormat('chapters', chapters);
+        this.headerType = ('ID3v2.' + id3Header.version.major);
+        return id3Header.flags.isExtendedHeader ? this.parseExtendedHeader() : this.parseId3Data(id3Header.size);
     }
     async parseExtendedHeader() {
-        const extendedHeader = await this.tokenizer.readToken(ExtendedHeader);
-        const dataRemaining = extendedHeader.size - ExtendedHeader.len;
+        const extendedHeader = await this.tokenizer.readToken(ID3v2Token_1.ExtendedHeader);
+        const dataRemaining = extendedHeader.size - ID3v2Token_1.ExtendedHeader.len;
         return dataRemaining > 0 ? this.parseExtendedHeaderData(dataRemaining, extendedHeader.size) : this.parseId3Data(this.id3Header.size - extendedHeader.size);
     }
     async parseExtendedHeaderData(dataRemaining, extendedHeaderSize) {
@@ -79,22 +99,35 @@ export class ID3v2Parser {
     async parseId3Data(dataLen) {
         const uint8Array = await this.tokenizer.readToken(new Token.Uint8ArrayType(dataLen));
         for (const tag of this.parseMetadata(uint8Array)) {
-            switch (tag.id) {
-                case 'TXXX':
-                    if (tag.value) {
-                        await this.handleTag(tag, tag.value.text, () => tag.value.description);
+            if (tag.id === 'TXXX') {
+                if (tag.value) {
+                    for (const text of tag.value.text) {
+                        this.addTag(ID3v2Parser.makeDescriptionTagName(tag.id, tag.value.description), text);
                     }
-                    break;
-                default:
-                    await (Array.isArray(tag.value) ? Promise.all(tag.value.map(value => this.addTag(tag.id, value))) : this.addTag(tag.id, tag.value));
+                }
+            }
+            else if (tag.id === 'COM') {
+                for (const value of tag.value) {
+                    this.addTag(ID3v2Parser.makeDescriptionTagName(tag.id, value.description), value.text);
+                }
+            }
+            else if (tag.id === 'COMM') {
+                for (const value of tag.value) {
+                    this.addTag(ID3v2Parser.makeDescriptionTagName(tag.id, value.description), value);
+                }
+            }
+            else if (Array.isArray(tag.value)) {
+                for (const value of tag.value) {
+                    this.addTag(tag.id, value);
+                }
+            }
+            else {
+                this.addTag(tag.id, tag.value);
             }
         }
     }
-    async handleTag(tag, values, descriptor, resolveValue = value => value) {
-        await Promise.all(values.map(value => this.addTag(ID3v2Parser.makeDescriptionTagName(tag.id, descriptor(value)), resolveValue(value))));
-    }
-    async addTag(id, value) {
-        await this.metadata.addTag(this.headerType, id, value);
+    addTag(id, value) {
+        this.metadata.addTag(this.headerType, id, value);
     }
     parseMetadata(data) {
         let offset = 0;
@@ -102,16 +135,14 @@ export class ID3v2Parser {
         while (true) {
             if (offset === data.length)
                 break;
-            const frameHeaderLength = getFrameHeaderLength(this.id3Header.version.major);
+            const frameHeaderLength = ID3v2Parser.getFrameHeaderLength(this.id3Header.version.major);
             if (offset + frameHeaderLength > data.length) {
                 this.metadata.addWarning('Illegal ID3v2 tag length');
                 break;
             }
-            const frameHeaderBytes = data.subarray(offset, offset + frameHeaderLength);
-            offset += frameHeaderLength;
-            const frameHeader = readFrameHeader(frameHeaderBytes, this.id3Header.version.major, this.metadata);
-            const frameDataBytes = data.subarray(offset, offset + frameHeader.length);
-            offset += frameHeader.length;
+            const frameHeaderBytes = data.slice(offset, offset += frameHeaderLength);
+            const frameHeader = this.readFrameHeader(frameHeaderBytes, this.id3Header.version.major);
+            const frameDataBytes = data.slice(offset, offset += frameHeader.length);
             const values = ID3v2Parser.readFrameData(frameDataBytes, frameHeader, this.id3Header.version.major, !this.options.skipCovers, this.metadata);
             if (values) {
                 tags.push({ id: frameHeader.id, value: values });
@@ -119,51 +150,33 @@ export class ID3v2Parser {
         }
         return tags;
     }
-    /**
-     * Convert parsed ID3v2 chapter frames (CHAP / CTOC) to generic `format.chapters`.
-     *
-     * This function expects the `native` tags already to contain parsed `CHAP` and `CTOC` frame values,
-     * as produced by `FrameParser.readData`.
-     */
-    static mapId3v2Chapters(id3Tags) {
-        if (!id3Tags)
-            return;
-        const chapFrames = id3Tags.filter(t => t.id === 'CHAP');
-        if (!chapFrames?.length)
-            return;
-        const tocFrames = id3Tags.filter(t => t.id === 'CTOC');
-        const topLevelToc = tocFrames?.find(t => t.value.flags?.topLevel);
-        const chapterById = new Map();
-        for (const chap of chapFrames) {
-            chapterById.set(chap.value.label, chap.value);
-        }
-        const orderedIds = topLevelToc?.value.childElementIds;
-        const chapters = [];
-        const source = orderedIds ?? [...chapterById.keys()];
-        for (const id of source) {
-            const chap = chapterById.get(id);
-            if (!chap)
-                continue;
-            const frames = chap.frames;
-            const title = frames.get('TIT2');
-            if (!title)
-                continue; // title is required
-            chapters.push({
-                id,
-                title,
-                url: frames.get('WXXX'),
-                start: chap.info.startTime / 1000,
-                end: chap.info.endTime / 1000,
-                image: frames.get('APIC')
-            });
-        }
-        // If no ordered CTOC, sort by time
-        if (!orderedIds) {
-            chapters.sort((a, b) => a.start - b.start);
+    readFrameHeader(uint8Array, majorVer) {
+        let header;
+        switch (majorVer) {
+            case 2:
+                header = {
+                    id: Buffer.from(uint8Array.slice(0, 3)).toString('ascii'),
+                    length: Token.UINT24_BE.get(uint8Array, 3)
+                };
+                if (!header.id.match(/[A-Z0-9]{3}/g)) {
+                    this.metadata.addWarning(`Invalid ID3v2.${this.id3Header.version.major} frame-header-ID: ${header.id}`);
+                }
+                break;
+            case 3:
+            case 4:
+                header = {
+                    id: Buffer.from(uint8Array.slice(0, 4)).toString('ascii'),
+                    length: (majorVer === 4 ? ID3v2Token_1.UINT32SYNCSAFE : Token.UINT32_BE).get(uint8Array, 4),
+                    flags: ID3v2Parser.readFrameFlags(uint8Array.slice(8, 10))
+                };
+                if (!header.id.match(/[A-Z0-9]{4}/g)) {
+                    this.metadata.addWarning(`Invalid ID3v2.${this.id3Header.version.major} frame-header-ID: ${header.id}`);
+                }
+                break;
+            default:
+                throw new Error('Unexpected majorVer: ' + majorVer);
         }
-        return chapters.length ? chapters : undefined;
+        return header;
     }
 }
-function makeUnexpectedMajorVersionError(majorVer) {
-    throw new Id3v2ContentError(`Unexpected majorVer: ${majorVer}`);
-}
+exports.ID3v2Parser = ID3v2Parser;

package/node_modules/music-metadata/lib/id3v2/ID3v2Token.d.ts

@@ -1,32 +1,32 @@
-import type { IGetToken } from 'strtok3';
-import * as util from '../common/Util.js';
+import { IGetToken } from 'strtok3/lib/core';
+import * as util from '../common/Util';
 /**
  * The picture type according to the ID3v2 APIC frame
  * Ref: http://id3.org/id3v2.3.0#Attached_picture
  */
-export declare const AttachedPictureType: {
-    0: string;
-    1: string;
-    2: string;
-    3: string;
-    4: string;
-    5: string;
-    6: string;
-    7: string;
-    8: string;
-    9: string;
-    10: string;
-    11: string;
-    12: string;
-    13: string;
-    14: string;
-    15: string;
-    16: string;
-    17: string;
-    18: string;
-    19: string;
-    20: string;
-};
+export declare enum AttachedPictureType {
+    'Other' = 0,
+    "32x32 pixels 'file icon' (PNG only)" = 1,
+    'Other file icon' = 2,
+    'Cover (front)' = 3,
+    'Cover (back)' = 4,
+    'Leaflet page' = 5,
+    'Media (e.g. label side of CD)' = 6,
+    'Lead artist/lead performer/soloist' = 7,
+    'Artist/performer' = 8,
+    'Conductor' = 9,
+    'Band/Orchestra' = 10,
+    'Composer' = 11,
+    'Lyricist/text writer' = 12,
+    'Recording Location' = 13,
+    'During recording' = 14,
+    'During performance' = 15,
+    'Movie/video screen capture' = 16,
+    'A bright coloured fish' = 17,
+    'Illustration' = 18,
+    'Band/artist logotype' = 19,
+    'Publisher/Studio logotype' = 20
+}
 export type ID3v2MajorVersion = 2 | 3 | 4;
 export interface IExtendedHeader {
     size: number;
@@ -34,30 +34,14 @@ export interface IExtendedHeader {
     sizeOfPadding: number;
     crcDataPresent: boolean;
 }
-/**
- * https://id3.org/id3v2.3.0#Synchronised_lyrics.2Ftext
- */
-export declare const LyricsContentType: {
-    other: number;
-    lyrics: number;
-    text: number;
-    movement_part: number;
-    events: number;
-    chord: number;
-    trivia_pop: number;
-};
-export type LyricsContentType = typeof LyricsContentType[keyof typeof LyricsContentType];
-export declare const TimestampFormat: {
-    notSynchronized: number;
-    mpegFrameNumber: number;
-    milliseconds: number;
-};
-export type TimestampFormat = typeof TimestampFormat[keyof typeof TimestampFormat];
 /**
  * 28 bits (representing up to 256MB) integer, the msb is 0 to avoid 'false syncsignals'.
  * 4 * %0xxxxxxx
  */
-export declare const UINT32SYNCSAFE: IGetToken<number>;
+export declare const UINT32SYNCSAFE: {
+    get: (buf: Uint8Array, off: number) => number;
+    len: number;
+};
 /**
  * ID3v2 tag header
  */
@@ -87,25 +71,3 @@ export interface ITextEncoding {
     bom?: boolean;
 }
 export declare const TextEncodingToken: IGetToken<ITextEncoding>;
-/**
- * `USLT` frame fields
- */
-export interface ITextHeader {
-    encoding: ITextEncoding;
-    language: string;
-}
-/**
- * Used to read first portion of `SYLT` frame
- */
-export declare const TextHeader: IGetToken<ITextHeader>;
-/**
- * SYLT` frame fields
- */
-export interface ISyncTextHeader extends ITextHeader {
-    contentType: LyricsContentType;
-    timeStampFormat: TimestampFormat;
-}
-/**
- * Used to read first portion of `SYLT` frame
- */
-export declare const SyncTextHeader: IGetToken<ISyncTextHeader>;