Migrate from CommonJS to ES Modules

.c8rc.json

@@ -0,0 +1,6 @@
+{
+  "reporter": [
+    "lcov",
+    "text"
+  ]
+}

.eslintrc.json

@@ -1,7 +1,7 @@
 {
   "env": {
     "browser": true,
-    "es6": true,
+    "es2021": true,
     "node": true
   },
   "extends": [
@@ -191,7 +191,7 @@
     "no-unused-labels": "error",
     "no-use-before-define": "off",
     "no-var": "error",
-    "node/file-extension-in-import": ["off"],
+    "node/file-extension-in-import": ["error", "always"],
     "node/no-extraneous-import": "error",
     "object-shorthand": "error",
     "one-var": [

.github/workflows/nodejs-ci.yml

@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 16.x]
+        node-version: [12.x, 14.x, 16.x, 17.x]
 
     steps:
 

.mocharc.json

@@ -0,0 +1,7 @@
+{
+  "extension": ["ts", "tsx"],
+  "watch-files": ["lib/**/*.ts", "test/**/*.ts"],
+  "spec": ["test/test-*.ts"],
+  "loader": ["ts-node/esm"],
+  "extensions": ["ts", "tsx"]
+}

doc-gen/gen.ts

@@ -1,16 +1,19 @@
-import * as path from 'path';
+import * as path from 'node:path';
-import * as fs from 'fs';
+import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
 
-import { commonTags } from '../lib/common/GenericTagTypes';
+import { commonTags } from '../lib/common/GenericTagTypes.js';
-import { CombinedTagMapper } from '../lib/common/CombinedTagMapper';
+import { CombinedTagMapper } from '../lib/common/CombinedTagMapper.js';
 
-import * as markDown from './MarkDown';
+import * as markDown from './MarkDown.js';
 
 interface ITagInfoDict {
   [key: string]: { description: string };
 }
 
 const combinedTagMapper = new CombinedTagMapper();
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
 
 function getNativeSourceTags(nativeType: string, commonTag: string): string[] {
 
@@ -27,7 +30,7 @@ function getNativeSourceTags(nativeType: string, commonTag: string): string[] {
 
 function write(out: fs.WriteStream) {
 
-  const json = fs.readFileSync(path.join(__dirname, 'common.json'));
+  const json = fs.readFileSync(path.join(dirname, 'common.json'));
   const commonDescriptionDict: ITagInfoDict = JSON.parse(json as any);
 
   const table = new markDown.Table();
@@ -55,7 +58,7 @@ function write(out: fs.WriteStream) {
   table.writeTo(out);
 }
 
-const txt = fs.createWriteStream(path.join(__dirname, '..', 'doc', 'common_metadata.md'));
+const txt = fs.createWriteStream(path.join(dirname, '..', 'doc', 'common_metadata.md'));
 
 txt.write('# Common Metadata\n\n');
 txt.write('Common tags, and _native_ to _common_ tag mappings. _n_ indicates the multiplicity.\n');

example/typescript/typescript.ts

@@ -1,4 +1,4 @@
-import * as mm from '../../lib';
+import * as mm from '../../lib.js';
 import * as util from 'util';
 
 (async () => {

lib/ParserFactory.ts

@@ -1,24 +1,26 @@
-import { IOptions, IAudioMetadata, ParserType } from './type';
+import { fileTypeFromBuffer } from 'file-type';
-import { ITokenizer } from 'strtok3/lib/core';
+import ContentType from 'content-type';
-import * as FileType from 'file-type/core';
+import MimeType from 'media-typer';
-import * as ContentType from 'content-type';
-import * as MimeType from 'media-typer';
-
 import initDebug from 'debug';
-import { INativeMetadataCollector, MetadataCollector } from './common/MetadataCollector';
+import { Buffer } from 'node:buffer';
-import { AIFFParser } from './aiff/AiffParser';
+
-import { APEv2Parser } from './apev2/APEv2Parser';
+import { INativeMetadataCollector, MetadataCollector } from './common/MetadataCollector.js';
-import { AsfParser } from './asf/AsfParser';
+import { AIFFParser } from './aiff/AiffParser.js';
-import { FlacParser } from './flac/FlacParser';
+import { APEv2Parser } from './apev2/APEv2Parser.js';
-import { MP4Parser } from './mp4/MP4Parser';
+import { AsfParser } from './asf/AsfParser.js';
-import { MpegParser } from './mpeg/MpegParser';
+import { FlacParser } from './flac/FlacParser.js';
-import MusepackParser from './musepack';
+import { MP4Parser } from './mp4/MP4Parser.js';
-import { OggParser } from './ogg/OggParser';
+import { MpegParser } from './mpeg/MpegParser.js';
-import { WaveParser } from './wav/WaveParser';
+import MusepackParser from './musepack/index.js';
-import { WavPackParser } from './wavpack/WavPackParser';
+import { OggParser } from './ogg/OggParser.js';
-import { DsfParser } from './dsf/DsfParser';
+import { WaveParser } from './wav/WaveParser.js';
-import { DsdiffParser } from './dsdiff/DsdiffParser';
+import { WavPackParser } from './wavpack/WavPackParser.js';
-import { MatroskaParser } from './matroska/MatroskaParser';
+import { DsfParser } from './dsf/DsfParser.js';
+import { DsdiffParser } from './dsdiff/DsdiffParser.js';
+import { MatroskaParser } from './matroska/MatroskaParser.js';
+
+import { IOptions, IAudioMetadata, ParserType } from './type.js';
+import { ITokenizer } from 'strtok3/core';
 
 const debug = initDebug('music-metadata:parser:factory');
 
@@ -93,7 +95,7 @@ export class ParserFactory {
         parserId = this.getParserIdForExtension(tokenizer.fileInfo.path);
       }
       if (!parserId) {
-        const guessedType = await FileType.fromBuffer(buf);
+        const guessedType = await fileTypeFromBuffer(buf);
         if (!guessedType) {
           throw new Error('Failed to determine audio format');
         }

lib/aiff/AiffParser.ts

@@ -1,13 +1,13 @@
 import * as Token from 'token-types';
 import initDebug from 'debug';
-import * as strtok3 from 'strtok3/lib/core';
+import * as strtok3 from 'strtok3/core';
 
-import { ID3v2Parser } from '../id3v2/ID3v2Parser';
+import { ID3v2Parser } from '../id3v2/ID3v2Parser.js';
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
 
-import * as AiffToken from './AiffToken';
+import * as AiffToken from './AiffToken.js';
-import * as iff from '../iff';
+import * as iff from '../iff/index.js';
 
 const debug = initDebug('music-metadata:parser:aiff');
 

lib/aiff/AiffToken.ts

@@ -1,8 +1,10 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3';
+import { Buffer } from 'node:buffer';
 
-import {FourCcToken} from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import * as iff from '../iff';
+import * as iff from '../iff/index.js';
+
+import { IGetToken } from 'strtok3';
 
 /**
  * The Common Chunk.

lib/apev2/APEv2Parser.ts

@@ -1,11 +1,12 @@
 import initDebug from 'debug';
-import * as strtok3 from 'strtok3/lib/core';
+import * as strtok3 from 'strtok3/core';
 import { StringType } from 'token-types';
+import { Buffer } from 'node:buffer';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { IOptions, IRandomReader, IApeHeader } from '../type';
+import { IOptions, IRandomReader, IApeHeader } from '../type.js';
-import { INativeMetadataCollector } from '../common/MetadataCollector';
+import { INativeMetadataCollector } from '../common/MetadataCollector.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
 import {
   DataType,
   DescriptorParser,
@@ -15,7 +16,7 @@ import {
   IHeader, ITagItemHeader,
   TagFooter,
   TagItemHeader
-} from './APEv2Token';
+} from './APEv2Token.js';
 
 const debug = initDebug('music-metadata:parser:APEv2');
 

lib/apev2/APEv2TagMapper.ts

@@ -1,5 +1,5 @@
-import {INativeTagMap} from '../common/GenericTagTypes';
+import {INativeTagMap} from '../common/GenericTagTypes.js';
-import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap';
+import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap.js';
 
 /**
  * ID3v2.2 tag mappings

lib/apev2/APEv2Token.ts

@@ -1,7 +1,8 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
+import { Buffer } from 'node:buffer';
 
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
 
 /**
  * APETag versionIndex history / supported formats

lib/asf/AsfObject.ts

@@ -1,13 +1,14 @@
 // ASF Objects
 
-import { IGetToken, ITokenizer } from 'strtok3/lib/core';
-
-import * as util from '../common/Util';
-import { IPicture, ITag } from '../type';
 import * as Token from 'token-types';
-import GUID from './GUID';
+import { IGetToken, ITokenizer } from 'strtok3/core';
-import { AsfUtil } from './AsfUtil';
+import { Buffer } from 'node:buffer';
-import { AttachedPictureType } from '../id3v2/ID3v2Token';
+
+import * as util from '../common/Util.js';
+import { IPicture, ITag } from '../type.js';
+import GUID from './GUID.js';
+import { AsfUtil } from './AsfUtil.js';
+import { AttachedPictureType } from '../id3v2/ID3v2Token.js';
 
 /**
  * Data Type: Specifies the type of information being stored. The following values are recognized.

lib/asf/AsfParser.ts

@@ -1,9 +1,9 @@
 import initDebug from 'debug';
 
-import { ITag, TrackType } from '../type';
+import { ITag, TrackType } from '../type.js';
-import GUID from './GUID';
+import GUID from './GUID.js';
-import * as AsfObject from './AsfObject';
+import * as AsfObject from './AsfObject.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
 
 const debug = initDebug('music-metadata:parser:ASF');
 const headerType = 'asf';

lib/asf/AsfTagMapper.ts

@@ -1,6 +1,6 @@
-import {INativeTagMap} from '../common/GenericTagTypes';
+import {INativeTagMap} from '../common/GenericTagTypes.js';
-import {CommonTagMapper} from '../common/GenericTagMapper';
+import {CommonTagMapper} from '../common/GenericTagMapper.js';
-import {IRating, ITag} from '../type';
+import {IRating, ITag} from '../type.js';
 
 /**
  * ASF Metadata tag mappings.

lib/asf/AsfUtil.ts

@@ -1,7 +1,8 @@
 import * as Token from 'token-types';
+import { Buffer } from 'node:buffer';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { DataType } from './AsfObject';
+import { DataType } from './AsfObject.js';
 
 export type AttributeParser = (buf: Buffer) => boolean | string | number | bigint | Buffer;
 

lib/common/BasicParser.ts

@@ -1,8 +1,8 @@
-import { ITokenizer } from 'strtok3/lib/core';
+import { ITokenizer } from 'strtok3/core';
 
-import { ITokenParser } from '../ParserFactory';
+import { ITokenParser } from '../ParserFactory.js';
-import { IOptions, IPrivateOptions } from '../type';
+import { IOptions, IPrivateOptions } from '../type.js';
-import { INativeMetadataCollector } from './MetadataCollector';
+import { INativeMetadataCollector } from './MetadataCollector.js';
 
 export abstract class BasicParser implements ITokenParser {
 

lib/common/CaseInsensitiveTagMap.ts

@@ -1,5 +1,5 @@
-import { INativeTagMap, TagType } from './GenericTagTypes';
+import { INativeTagMap, TagType } from './GenericTagTypes.js';
-import { CommonTagMapper } from './GenericTagMapper';
+import { CommonTagMapper } from './GenericTagMapper.js';
 
 export class CaseInsensitiveTagMap extends CommonTagMapper {
 

lib/common/CombinedTagMapper.ts

@@ -1,16 +1,16 @@
-import { ID3v1TagMapper } from '../id3v1/ID3v1TagMap';
+import { ID3v1TagMapper } from '../id3v1/ID3v1TagMap.js';
-import { ID3v24TagMapper } from '../id3v2/ID3v24TagMapper';
+import { ID3v24TagMapper } from '../id3v2/ID3v24TagMapper.js';
-import { AsfTagMapper } from '../asf/AsfTagMapper';
+import { AsfTagMapper } from '../asf/AsfTagMapper.js';
-import { IGenericTag, TagType } from './GenericTagTypes';
+import { IGenericTag, TagType } from './GenericTagTypes.js';
-import { ID3v22TagMapper } from '../id3v2/ID3v22TagMapper';
+import { ID3v22TagMapper } from '../id3v2/ID3v22TagMapper.js';
-import { APEv2TagMapper } from '../apev2/APEv2TagMapper';
+import { APEv2TagMapper } from '../apev2/APEv2TagMapper.js';
-import { IGenericTagMapper } from './GenericTagMapper';
+import { IGenericTagMapper } from './GenericTagMapper.js';
-import { MP4TagMapper } from '../mp4/MP4TagMapper';
+import { MP4TagMapper } from '../mp4/MP4TagMapper.js';
-import { VorbisTagMapper } from '../ogg/vorbis/VorbisTagMapper';
+import { VorbisTagMapper } from '../ogg/vorbis/VorbisTagMapper.js';
-import { RiffInfoTagMapper } from '../riff/RiffInfoTagMap';
+import { RiffInfoTagMapper } from '../riff/RiffInfoTagMap.js';
-import { ITag } from '../type';
+import { ITag } from '../type.js';
-import { INativeMetadataCollector } from './MetadataCollector';
+import { INativeMetadataCollector } from './MetadataCollector.js';
-import { MatroskaTagMapper } from '../matroska/MatroskaTagMapper';
+import { MatroskaTagMapper } from '../matroska/MatroskaTagMapper.js';
 
 export class CombinedTagMapper {
 

lib/common/FourCC.ts

@@ -1,5 +1,6 @@
-import * as util from './Util';
+import { IToken } from 'strtok3/core';
-import { IToken } from 'strtok3/lib/core';
+
+import * as util from './Util.js';
 
 const validFourCC = /^[\x21-\x7e©][\x20-\x7e\x00()]{3}/;
 

lib/common/GenericTagMapper.ts

@@ -1,6 +1,6 @@
-import * as generic from './GenericTagTypes';
+import * as generic from './GenericTagTypes.js';
-import { ITag } from '../type';
+import {ITag} from '../type.js';
-import { INativeMetadataCollector, IWarningCollector } from './MetadataCollector';
+import { INativeMetadataCollector, IWarningCollector } from './MetadataCollector.js';
 
 export interface IGenericTagMapper {
 
@@ -66,7 +66,7 @@ export class CommonTagMapper implements IGenericTagMapper {
 
   /**
    * Convert native tag key to common tag key
-   * @tag  Native header tag
+   * @param tag Native header tag
    * @return common tag name (alias)
    */
   protected getCommonName(tag: string): generic.GenericTagId {

lib/common/MetadataCollector.ts

@@ -3,14 +3,14 @@ import {
   IAudioMetadata, ICommonTagsResult,
   IFormat,
   INativeTags, IOptions, IQualityInformation, IPicture, ITrackInfo, TrackType
-} from '../type';
+} from '../type.js';
 
 import initDebug from 'debug';
-import { IGenericTag, TagType, isSingleton, isUnique } from './GenericTagTypes';
+import { IGenericTag, TagType, isSingleton, isUnique } from './GenericTagTypes.js';
-import { CombinedTagMapper } from './CombinedTagMapper';
+import { CombinedTagMapper } from './CombinedTagMapper.js';
-import { CommonTagMapper } from './GenericTagMapper';
+import { CommonTagMapper } from './GenericTagMapper.js';
-import { toRatio } from './Util';
+import { toRatio } from './Util.js';
-import * as FileType from 'file-type/core';
+import { fileTypeFromBuffer } from 'file-type';
 
 const debug = initDebug('music-metadata:collector');
 
@@ -281,7 +281,7 @@ export class MetadataCollector implements INativeMetadataCollector {
   private async postFixPicture(picture: IPicture): Promise<IPicture> {
     if (picture.data && picture.data.length > 0) {
       if (!picture.format) {
-        const fileType = await FileType.fromBuffer(picture.data);
+        const fileType = await fileTypeFromBuffer(picture.data);
         if (fileType) {
           picture.format = fileType.mime;
         } else {

lib/common/RandomFileReader.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 
-import { IRandomReader } from '../type';
+import { IRandomReader } from '../type.js';
 
 /**
  * Provides abstract file access via the IRandomRead interface

lib/common/RandomUint8ArrayReader.ts

@@ -1,4 +1,4 @@
-import { IRandomReader } from '../type';
+import { IRandomReader } from '../type.js';
 
 /**
  * Provides abstract Uint8Array access via the IRandomRead interface

lib/common/Util.ts

@@ -1,4 +1,4 @@
-import { IRatio } from '../type';
+import { IRatio } from '../type.js';
 
 export type StringEncoding =
   'ascii' // Use  'utf-8' or latin1 instead

lib/core.ts

@@ -1,14 +1,15 @@
 import { Readable } from 'stream';
-import * as strtok3 from 'strtok3/lib/core';
+import * as strtok3 from 'strtok3/core';
 
-import { ParserFactory } from './ParserFactory';
+import { ParserFactory } from './ParserFactory.js';
-import { IAudioMetadata, INativeTagDict, IOptions, IPicture, IPrivateOptions, IRandomReader, ITag } from './type';
+import { RandomUint8ArrayReader } from './common/RandomUint8ArrayReader.js';
-import { RandomUint8ArrayReader } from './common/RandomUint8ArrayReader';
+import { APEv2Parser } from './apev2/APEv2Parser.js';
-import { APEv2Parser } from './apev2/APEv2Parser';
+import { hasID3v1Header } from './id3v1/ID3v1Parser.js';
-import { hasID3v1Header } from './id3v1/ID3v1Parser';
+import { getLyricsHeaderLength } from './lyrics3/Lyrics3.js';
-import { getLyricsHeaderLength } from './lyrics3/Lyrics3';
 
-export { IFileInfo } from 'strtok3/lib/core';
+import { IAudioMetadata, INativeTagDict, IOptions, IPicture, IPrivateOptions, IRandomReader, ITag } from './type.js';
+
+export { IFileInfo } from 'strtok3/core';
 
 /**
  * Parse audio from Node Stream.Readable

lib/dsdiff/DsdiffParser.ts

@@ -1,12 +1,12 @@
 import * as Token from 'token-types';
 import initDebug from 'debug';
-import * as strtok3 from 'strtok3/lib/core';
+import * as strtok3 from 'strtok3/core';
 
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
-import { ID3v2Parser } from '../id3v2/ID3v2Parser';
+import { ID3v2Parser } from '../id3v2/ID3v2Parser.js';
 
-import { ChunkHeader64, IChunkHeader64 } from './DsdiffToken';
+import { ChunkHeader64, IChunkHeader64 } from './DsdiffToken.js';
 
 const debug = initDebug('music-metadata:parser:aiff');
 

lib/dsdiff/DsdiffToken.ts

@@ -1,9 +1,9 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import { IChunkHeader64 } from '../iff';
+import { IChunkHeader64 } from '../iff/index.js';
-export { IChunkHeader64 } from '../iff';
+export { IChunkHeader64 } from '../iff/index.js';
 
 /**
  * DSDIFF chunk header

lib/dsf/DsfChunk.ts

@@ -1,7 +1,7 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
 
 /**
  * Common interface for the common chunk DSD header

lib/dsf/DsfParser.ts

@@ -1,8 +1,8 @@
 import initDebug from 'debug';
 
-import { AbstractID3Parser } from '../id3v2/AbstractID3Parser';
+import { AbstractID3Parser } from '../id3v2/AbstractID3Parser.js';
-import { ChunkHeader, DsdChunk, FormatChunk, IChunkHeader, IDsdChunk, IFormatChunk } from './DsfChunk';
+import { ChunkHeader, DsdChunk, FormatChunk, IChunkHeader, IDsdChunk, IFormatChunk } from './DsfChunk.js';
-import { ID3v2Parser } from "../id3v2/ID3v2Parser";
+import { ID3v2Parser } from "../id3v2/ID3v2Parser.js";
 
 const debug = initDebug('music-metadata:parser:DSF');
 

lib/flac/FlacParser.ts

@@ -1,16 +1,16 @@
 import { UINT16_BE, UINT24_BE, Uint8ArrayType } from 'token-types';
 import initDebug from 'debug';
-import { ITokenizer, IGetToken } from 'strtok3/lib/core';
+import { ITokenizer, IGetToken } from 'strtok3/core';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { IVorbisPicture, VorbisPictureToken } from '../ogg/vorbis/Vorbis';
+import { IVorbisPicture, VorbisPictureToken } from '../ogg/vorbis/Vorbis.js';
-import { AbstractID3Parser } from '../id3v2/AbstractID3Parser';
+import { AbstractID3Parser } from '../id3v2/AbstractID3Parser.js';
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import { VorbisParser } from '../ogg/vorbis/VorbisParser';
+import { VorbisParser } from '../ogg/vorbis/VorbisParser.js';
-import { INativeMetadataCollector } from '../common/MetadataCollector';
+import { INativeMetadataCollector } from '../common/MetadataCollector.js';
-import { IOptions } from '../type';
+import { IOptions } from '../type.js';
-import { ITokenParser } from '../ParserFactory';
+import { ITokenParser } from '../ParserFactory.js';
-import { VorbisDecoder } from '../ogg/vorbis/VorbisDecoder';
+import { VorbisDecoder } from '../ogg/vorbis/VorbisDecoder.js';
 
 const debug = initDebug('music-metadata:parser:FLAC');
 

lib/id3v1/ID3v1Parser.ts

@@ -1,11 +1,12 @@
 import initDebug from 'debug';
 import { StringType, UINT8 } from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { BasicParser } from '../common/BasicParser';
+
-import { APEv2Parser } from '../apev2/APEv2Parser';
+import { IGetToken } from 'strtok3/core';
-import { IRandomReader } from '../type';
+import { BasicParser } from '../common/BasicParser.js';
+import { APEv2Parser } from '../apev2/APEv2Parser.js';
+import { IRandomReader } from '../type.js';
 
 const debug = initDebug('music-metadata:parser:ID3v1');
 

lib/id3v1/ID3v1TagMap.ts

@@ -1,5 +1,5 @@
-import { INativeTagMap } from '../common/GenericTagTypes';
+import { INativeTagMap } from '../common/GenericTagTypes.js';
-import { CommonTagMapper } from '../common/GenericTagMapper';
+import { CommonTagMapper } from '../common/GenericTagMapper.js';
 
 /**
  * ID3v1 tag mappings

lib/id3v2/AbstractID3Parser.ts

@@ -1,10 +1,10 @@
-import { EndOfStreamError, ITokenizer } from 'strtok3/lib/core';
+import { EndOfStreamError, ITokenizer } from 'strtok3/core';
 import initDebug from 'debug';
 
-import { ID3v2Header } from './ID3v2Token';
+import { ID3v2Header } from './ID3v2Token.js';
-import { ID3v2Parser } from './ID3v2Parser';
+import { ID3v2Parser } from './ID3v2Parser.js';
-import { ID3v1Parser } from '../id3v1/ID3v1Parser';
+import { ID3v1Parser } from '../id3v1/ID3v1Parser.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
 
 const debug = initDebug('music-metadata:parser:ID3');
 

lib/id3v2/FrameParser.ts

@@ -1,10 +1,11 @@
 import initDebug from 'debug';
 import * as Token from 'token-types';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { AttachedPictureType, ID3v2MajorVersion, TextEncodingToken } from './ID3v2Token';
+import { AttachedPictureType, ID3v2MajorVersion, TextEncodingToken } from './ID3v2Token.js';
-import { IWarningCollector } from '../common/MetadataCollector';
+import { Genres } from '../id3v1/ID3v1Parser.js';
-import { Genres } from '../id3v1/ID3v1Parser';
+
+import { IWarningCollector } from '../common/MetadataCollector.js';
 
 const debug = initDebug('music-metadata:id3v2:frame-parser');
 

lib/id3v2/ID3v22TagMapper.ts

@@ -1,5 +1,5 @@
-import {INativeTagMap} from '../common/GenericTagTypes';
+import {INativeTagMap} from '../common/GenericTagTypes.js';
-import {CaseInsensitiveTagMap} from '../common/CaseInsensitiveTagMap';
+import {CaseInsensitiveTagMap} from '../common/CaseInsensitiveTagMap.js';
 
 /**
  * ID3v2.2 tag mappings

lib/id3v2/ID3v24TagMapper.ts

@@ -1,10 +1,10 @@
-import { INativeTagMap } from '../common/GenericTagTypes';
+import { INativeTagMap } from '../common/GenericTagTypes.js';
-import { CommonTagMapper } from '../common/GenericTagMapper';
+import { CommonTagMapper } from '../common/GenericTagMapper.js';
-import { INativeMetadataCollector } from '../common/MetadataCollector';
+import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap.js';
-import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap';
+import * as util from '../common/Util.js';
-import * as util from '../common/Util';
 
-import { IRating, ITag } from '../type';
+import { INativeMetadataCollector } from '../common/MetadataCollector.js';
+import { IRating, ITag } from '../type.js';
 
 /**
  * ID3v2.3/ID3v2.4 tag mappings

lib/id3v2/ID3v2Parser.ts

@@ -1,12 +1,13 @@
-import { ITokenizer } from 'strtok3/lib/core';
+import { ITokenizer } from 'strtok3/core';
 import * as Token from 'token-types';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { TagType } from '../common/GenericTagTypes';
+import { TagType } from '../common/GenericTagTypes.js';
-import { ITag, IOptions } from '../type';
+import { FrameParser } from './FrameParser.js';
-import { FrameParser } from './FrameParser';
+import { ExtendedHeader, ID3v2Header, ID3v2MajorVersion, IID3v2header, UINT32SYNCSAFE } from './ID3v2Token.js';
-import { ExtendedHeader, ID3v2Header, ID3v2MajorVersion, IID3v2header, UINT32SYNCSAFE } from './ID3v2Token';
+
-import { INativeMetadataCollector, IWarningCollector } from '../common/MetadataCollector';
+import { ITag, IOptions } from '../type.js';
+import { INativeMetadataCollector, IWarningCollector } from '../common/MetadataCollector.js';
 
 interface IFrameFlags {
   status: {

lib/id3v2/ID3v2Token.ts

@@ -1,7 +1,7 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
 
 /**
  * The picture type according to the ID3v2 APIC frame

lib/iff/index.ts

@@ -1,7 +1,7 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
 
 /**
  * "EA IFF 85" Standard for Interchange Format Files

lib/index.ts

@@ -1,17 +1,16 @@
 import * as Stream from 'stream';
 import * as strtok3 from 'strtok3';
-
-import * as Core from './core';
-import { ParserFactory } from './ParserFactory';
-import { IAudioMetadata, IOptions } from './type';
 import initDebug from 'debug';
-import { RandomFileReader } from './common/RandomFileReader';
 
-export { IAudioMetadata, IOptions, ITag, INativeTagDict, ICommonTagsResult, IFormat, IPicture, IRatio, IChapter } from './type';
+import { parseFromTokenizer, scanAppendingHeaders } from './core.js';
+import { ParserFactory } from './ParserFactory.js';
+import { IAudioMetadata, IOptions } from './type.js';
+import { RandomFileReader } from './common/RandomFileReader.js';
 
-const debug = initDebug("music-metadata:parser");
+export { IAudioMetadata, IOptions, ITag, INativeTagDict, ICommonTagsResult, IFormat, IPicture, IRatio, IChapter } from './type.js';
+export { parseFromTokenizer, parseBuffer, selectCover, orderTags, ratingToStars, IFileInfo } from './core.js';
 
-export { parseFromTokenizer, parseBuffer, IFileInfo, selectCover } from './core';
+const debug = initDebug('music-metadata:parser');
 
 /**
  * Parse audio from Node Stream.Readable
@@ -22,7 +21,7 @@ export { parseFromTokenizer, parseBuffer, IFileInfo, selectCover } from './core'
  */
 export async function parseStream(stream: Stream.Readable, fileInfo?: strtok3.IFileInfo | string, options: IOptions = {}): Promise<IAudioMetadata> {
   const tokenizer = await strtok3.fromStream(stream, typeof fileInfo === 'string' ? {mimeType: fileInfo} : fileInfo);
-  return Core.parseFromTokenizer(tokenizer, options);
+  return parseFromTokenizer(tokenizer, options);
 }
 
 /**
@@ -39,7 +38,7 @@ export async function parseFile(filePath: string, options: IOptions = {}): Promi
 
   const fileReader = await RandomFileReader.init(filePath, fileTokenizer.fileInfo.size);
   try {
-    await Core.scanAppendingHeaders(fileReader, options);
+    await scanAppendingHeaders(fileReader, options);
   } finally {
     await fileReader.close();
   }
@@ -54,28 +53,3 @@ export async function parseFile(filePath: string, options: IOptions = {}): Promi
     await fileTokenizer.close();
   }
 }
-
-/**
- * Create a dictionary ordered by their tag id (key)
- * @param nativeTags - List of tags
- * @returns Tags indexed by id
- */
-export const orderTags = Core.orderTags;
-
-/**
- * Convert rating to 1-5 star rating
- * @param rating - Normalized rating [0..1] (common.rating[n].rating)
- * @returns Number of stars: 1, 2, 3, 4 or 5 stars
- */
-export const ratingToStars = Core.ratingToStars;
-
-/**
- * Define default module exports
- */
-export default {
-  parseStream,
-  parseFile,
-  parseFromTokenizer: Core.parseFromTokenizer,
-  parseBuffer: Core.parseBuffer,
-  selectCover: Core.selectCover
-};

lib/lyrics3/Lyrics3.ts

@@ -1,4 +1,4 @@
-import { IRandomReader } from '../type';
+import { IRandomReader } from '../type.js';
 
 export const endTag2 = 'LYRICS200';
 

lib/matroska/MatroskaDtd.ts

@@ -1,4 +1,4 @@
-import { DataType, IContainerType } from './types';
+import { DataType, IContainerType } from './types.js';
 
 /**
  * Elements of document type description

lib/matroska/MatroskaParser.ts

@@ -1,14 +1,14 @@
 import { Float32_BE, Float64_BE, StringType, UINT8 } from 'token-types';
 import initDebug from 'debug';
-import { ITokenizer } from 'strtok3/lib/core';
+import { ITokenizer } from 'strtok3/core';
 
-import { INativeMetadataCollector } from '../common/MetadataCollector';
+import { INativeMetadataCollector } from '../common/MetadataCollector.js';
-import { IOptions, ITrackInfo } from '../type';
+import { BasicParser } from '../common/BasicParser.js';
-import { ITokenParser } from '../ParserFactory';
+import * as matroskaDtd from './MatroskaDtd.js';
-import { BasicParser } from '../common/BasicParser';
+import { DataType, IContainerType, IHeader, IMatroskaDoc, ITree, TargetType, TrackType } from './types.js';
 
-import { DataType, IContainerType, IHeader, IMatroskaDoc, ITree, TargetType, TrackType } from './types';
+import { IOptions, ITrackInfo } from '../type.js';
-import * as matroskaDtd from './MatroskaDtd';
+import { ITokenParser } from '../ParserFactory.js';
 
 const debug = initDebug('music-metadata:parser:matroska');
 

lib/matroska/MatroskaTagMapper.ts

@@ -1,5 +1,5 @@
-import { INativeTagMap } from '../common/GenericTagTypes';
+import {INativeTagMap} from '../common/GenericTagTypes.js';
-import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap';
+import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap.js';
 
 /**
  * EBML Tag map

lib/mp4/Atom.ts

@@ -1,7 +1,7 @@
-import { ITokenizer } from 'strtok3/lib/core';
 import initDebug from 'debug';
+import * as AtomToken from './AtomToken.js';
 
-import * as AtomToken from './AtomToken';
+import { ITokenizer } from 'strtok3/core';
 
 export type AtomDataHandler = (atom: Atom, remaining: number) => Promise<void>;
 

lib/mp4/AtomToken.ts

@@ -1,8 +1,9 @@
 import * as Token from 'token-types';
 import initDebug from 'debug';
-import { IToken, IGetToken } from 'strtok3/lib/core';
 
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
+
+import { IToken, IGetToken } from 'strtok3/core';
 
 const debug = initDebug('music-metadata:parser:MP4:atom');
 

lib/mp4/MP4Parser.ts

@@ -1,14 +1,14 @@
 import initDebug from 'debug';
 import * as Token from 'token-types';
+
+import { BasicParser } from '../common/BasicParser.js';
+import { Genres } from '../id3v1/ID3v1Parser.js';
+import { Atom } from './Atom.js';
+import * as AtomToken from './AtomToken.js';
+import { IChapter, ITrackInfo, TrackType } from '../type.js';
+
 import { IGetToken } from '@tokenizer/token';
 
-import { BasicParser } from '../common/BasicParser';
-import { Genres } from '../id3v1/ID3v1Parser';
-import { IChapter, ITrackInfo, TrackType } from '../type';
-
-import { Atom } from './Atom';
-import * as AtomToken from './AtomToken';
-
 const debug = initDebug('music-metadata:parser:MP4');
 const tagFormat = 'iTunes';
 

lib/mp4/MP4TagMapper.ts

@@ -1,5 +1,5 @@
-import {INativeTagMap} from '../common/GenericTagTypes';
+import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap.js';
-import {CaseInsensitiveTagMap} from '../common/CaseInsensitiveTagMap';
+import { INativeTagMap } from '../common/GenericTagTypes.js';
 
 /**
  * Ref: https://github.com/sergiomb2/libmp4v2/wiki/iTunesMetadata
@@ -112,7 +112,7 @@ export const tagType = 'iTunes';
 export class MP4TagMapper extends CaseInsensitiveTagMap {
 
   public constructor() {
-    super([tagType],  mp4TagMap);
+    super([tagType], mp4TagMap);
   }
 
 }

lib/mpeg/ExtendedLameHeader.ts

@@ -2,10 +2,11 @@
  * Extended Lame Header
  */
 
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 import * as Token from 'token-types';
-import * as common from '../common/Util';
+
-import { ReplayGain, IReplayGain } from './ReplayGainDataFormat';
+import * as common from '../common/Util.js';
+import { ReplayGain, IReplayGain } from './ReplayGainDataFormat.js';
 
 /**
  * LAME Tag, extends the Xing header format

lib/mpeg/MpegParser.ts

@@ -1,10 +1,10 @@
 import * as Token from 'token-types';
-import { EndOfStreamError } from 'strtok3/lib/core';
+import { EndOfStreamError } from 'strtok3/core';
 import initDebug from 'debug';
 
-import * as common from '../common/Util';
+import * as common from '../common/Util.js';
-import { AbstractID3Parser } from '../id3v2/AbstractID3Parser';
+import { AbstractID3Parser } from '../id3v2/AbstractID3Parser.js';
-import { InfoTagHeaderTag, IXingInfoTag, LameEncoderVersion, readXingHeader } from './XingTag';
+import { InfoTagHeaderTag, IXingInfoTag, LameEncoderVersion, readXingHeader } from './XingTag.js';
 
 const debug = initDebug('music-metadata:parser:mpeg');
 

lib/mpeg/ReplayGainDataFormat.ts

@@ -1,5 +1,5 @@
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
-import * as common from '../common/Util';
+import * as common from '../common/Util.js';
 
 export interface IReplayGain {
   type: NameCode;

lib/mpeg/XingTag.ts

@@ -1,7 +1,8 @@
 import * as Token from 'token-types';
-import { IGetToken, ITokenizer } from 'strtok3/lib/core';
+import { IGetToken, ITokenizer } from 'strtok3/core';
-import * as util from '../common/Util';
+
-import { ExtendedLameHeader, IExtendedLameHeader } from './ExtendedLameHeader';
+import * as util from '../common/Util.js';
+import { ExtendedLameHeader, IExtendedLameHeader } from './ExtendedLameHeader.js';
 
 export interface IXingHeaderFlags {
   frames: boolean;

lib/musepack/index.ts

@@ -1,11 +1,11 @@
 import initDebug from 'debug';
 import * as Token from 'token-types';
 
-import { ITokenParser } from '../ParserFactory';
+import { ITokenParser } from '../ParserFactory.js';
-import { AbstractID3Parser } from '../id3v2/AbstractID3Parser';
+import { AbstractID3Parser } from '../id3v2/AbstractID3Parser.js';
 
-import { MpcSv8Parser } from './sv8/MpcSv8Parser';
+import { MpcSv8Parser } from './sv8/MpcSv8Parser.js';
-import { MpcSv7Parser } from './sv7/MpcSv7Parser';
+import { MpcSv7Parser } from './sv7/MpcSv7Parser.js';
 
 const debug = initDebug('music-metadata:parser:musepack');
 

lib/musepack/sv7/BitReader.ts

@@ -1,4 +1,4 @@
-import { ITokenizer } from 'strtok3/lib/core';
+import { ITokenizer } from 'strtok3/core';
 import * as Token from 'token-types';
 
 export class BitReader {

lib/musepack/sv7/MpcSv7Parser.ts

@@ -1,10 +1,9 @@
 import initDebug from 'debug';
 
-import { BasicParser } from '../../common/BasicParser';
+import { BasicParser } from '../../common/BasicParser.js';
-import { APEv2Parser } from '../../apev2/APEv2Parser';
+import { APEv2Parser } from '../../apev2/APEv2Parser.js';
-
+import { BitReader } from './BitReader.js';
-import { BitReader } from './BitReader';
+import * as SV7 from './StreamVersion7.js';
-import * as SV7 from './StreamVersion7';
 
 const debug = initDebug('music-metadata:parser:musepack');
 

lib/musepack/sv7/StreamVersion7.ts

@@ -1,7 +1,7 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
-import * as util from '../../common/Util';
+import * as util from '../../common/Util.js';
 
 /**
  * MusePack stream version 7 format specification

lib/musepack/sv8/MpcSv8Parser.ts

@@ -1,10 +1,9 @@
 import initDebug from 'debug';
 
-import { BasicParser } from '../../common/BasicParser';
+import { BasicParser } from '../../common/BasicParser.js';
-import { APEv2Parser } from '../../apev2/APEv2Parser';
+import { APEv2Parser } from '../../apev2/APEv2Parser.js';
-import { FourCcToken } from '../../common/FourCC';
+import { FourCcToken } from '../../common/FourCC.js';
-
+import * as SV8 from './StreamVersion8.js';
-import * as SV8 from './StreamVersion8';
 
 const debug = initDebug('music-metadata:parser:musepack');
 

lib/musepack/sv8/StreamVersion8.ts

@@ -1,8 +1,8 @@
 import * as Token from 'token-types';
-import { ITokenizer, IGetToken } from 'strtok3/lib/core';
+import { ITokenizer, IGetToken } from 'strtok3/core';
 import initDebug from 'debug';
 
-import * as util from '../../common/Util';
+import * as util from '../../common/Util.js';
 
 const debug = initDebug('music-metadata:parser:musepack:sv8');
 

lib/ogg/OggParser.ts

@@ -1,17 +1,17 @@
 import * as Token from 'token-types';
-import { IGetToken, EndOfStreamError } from 'strtok3/lib/core';
+import { IGetToken, EndOfStreamError } from 'strtok3/core';
 import initDebug from 'debug';
 
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
 
-import { VorbisParser } from './vorbis/VorbisParser';
+import { VorbisParser } from './vorbis/VorbisParser.js';
-import { OpusParser } from './opus/OpusParser';
+import { OpusParser } from './opus/OpusParser.js';
-import { SpeexParser } from './speex/SpeexParser';
+import { SpeexParser } from './speex/SpeexParser.js';
-import { TheoraParser } from './theora/TheoraParser';
+import { TheoraParser } from './theora/TheoraParser.js';
 
-import * as Ogg from './Ogg';
+import * as Ogg from './Ogg.js';
 
 const debug = initDebug('music-metadata:parser:ogg');
 

lib/ogg/opus/Opus.ts

@@ -1,5 +1,5 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
 /**
  * Opus ID Header interface

lib/ogg/opus/OpusParser.ts

@@ -1,12 +1,12 @@
 import * as Token from 'token-types';
-import {ITokenizer} from 'strtok3/lib/core';
+import {ITokenizer} from 'strtok3/core';
 
-import {IPageHeader} from '../Ogg';
+import {IPageHeader} from '../Ogg.js';
-import {VorbisParser} from '../vorbis/VorbisParser';
+import {VorbisParser} from '../vorbis/VorbisParser.js';
-import {IOptions} from '../../type';
+import {IOptions} from '../../type.js';
-import {INativeMetadataCollector} from '../../common/MetadataCollector';
+import {INativeMetadataCollector} from '../../common/MetadataCollector.js';
 
-import * as Opus from './Opus';
+import * as Opus from './Opus.js';
 
 /**
  * Opus parser

lib/ogg/speex/Speex.ts

@@ -1,7 +1,7 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
-import * as util from '../../common/Util';
+import * as util from '../../common/Util.js';
 
 /**
  * Speex Header Packet

lib/ogg/speex/SpeexParser.ts

@@ -1,12 +1,12 @@
-import {ITokenizer} from 'strtok3/lib/core';
+import { ITokenizer } from 'strtok3/core';
 import initDebug from 'debug';
 
-import {IPageHeader} from '../Ogg';
+import { IPageHeader } from '../Ogg.js';
-import {VorbisParser} from '../vorbis/VorbisParser';
+import { VorbisParser } from '../vorbis/VorbisParser.js';
-import {IOptions} from '../../type';
+import * as Speex from './Speex.js';
-import {INativeMetadataCollector} from '../../common/MetadataCollector';
 
-import * as Speex from './Speex';
+import { IOptions } from '../../type.js';
+import { INativeMetadataCollector } from '../../common/MetadataCollector.js';
 
 const debug = initDebug('music-metadata:parser:ogg:speex');
 

lib/ogg/theora/Theora.ts

@@ -1,5 +1,5 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/core';
 
 /**
  * 6.2 Identification Header

lib/ogg/theora/TheoraParser.ts

@@ -1,11 +1,10 @@
-import { ITokenizer } from 'strtok3/lib/core';
+import { ITokenizer } from 'strtok3/core';
 import initDebug from 'debug';
 
-import { IOptions } from '../../type';
+import * as Ogg from '../Ogg.js';
-import { INativeMetadataCollector } from '../../common/MetadataCollector';
+import { IOptions } from '../../type.js';
-import * as Ogg from '../Ogg';
+import { INativeMetadataCollector } from '../../common/MetadataCollector.js';
-
+import { IdentificationHeader } from './Theora.js';
-import { IdentificationHeader } from './Theora';
 
 const debug = initDebug('music-metadata:parser:ogg:theora');
 

lib/ogg/vorbis/Vorbis.ts

@@ -1,8 +1,9 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
 
-import {AttachedPictureType} from '../../id3v2/ID3v2Token';
+import { AttachedPictureType } from '../../id3v2/ID3v2Token.js';
-import {IPicture} from '../../type';
+
+import { IPicture } from '../../type.js';
+import { IGetToken } from 'strtok3/core';
 
 /**
  * Interface to parsed result of METADATA_BLOCK_PICTURE
@@ -40,6 +41,7 @@ export class VorbisPictureToken implements IGetToken<IVorbisPicture> {
     const pic = new VorbisPictureToken(buffer.length);
     return pic.get(buffer, 0);
   }
+
   constructor(public len) {
   }
 

lib/ogg/vorbis/VorbisParser.ts

@@ -1,20 +1,20 @@
 import * as Token from 'token-types';
-import initDebug from 'debug';
+import debugInit from 'debug';
 
-import {IOptions} from '../../type';
+import { VorbisDecoder } from './VorbisDecoder.js';
-import {INativeMetadataCollector} from '../../common/MetadataCollector';
+import { CommonHeader, IdentificationHeader, IVorbisPicture, VorbisPictureToken } from './Vorbis.js';
-import * as Ogg from '../Ogg';
 
-import { VorbisDecoder } from './VorbisDecoder';
+import { IPageConsumer, IPageHeader } from '../Ogg.js';
-import { CommonHeader, IdentificationHeader, IVorbisPicture, VorbisPictureToken } from './Vorbis';
+import { IOptions } from '../../type.js';
+import { INativeMetadataCollector } from '../../common/MetadataCollector.js';
 
-const debug = initDebug('music-metadata:parser:ogg:vorbis1');
+const debug = debugInit('music-metadata:parser:ogg:vorbis1');
 
 /**
  * Vorbis 1 Parser.
  * Used by OggParser
  */
-export class VorbisParser implements Ogg.IPageConsumer {
+export class VorbisParser implements IPageConsumer {
 
   private pageSegments: Buffer[] = [];
 
@@ -26,13 +26,13 @@ export class VorbisParser implements Ogg.IPageConsumer {
    * @param header Ogg Page Header
    * @param pageData Page data
    */
-  public parsePage(header: Ogg.IPageHeader, pageData: Buffer) {
+  public parsePage(header: IPageHeader, pageData: Buffer) {
     if (header.headerType.firstPage) {
       this.parseFirstPage(header, pageData);
     } 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);
       }
@@ -79,22 +79,22 @@ export class VorbisParser implements Ogg.IPageConsumer {
     this.metadata.addTag('vorbis', id, value);
   }
 
-  public calculateDuration(header: Ogg.IPageHeader) {
+  public calculateDuration(header: IPageHeader) {
     if (this.metadata.format.sampleRate && header.absoluteGranulePosition >= 0) {
       // Calculate duration
       this.metadata.setFormat('numberOfSamples', header.absoluteGranulePosition);
-      this.metadata.setFormat('duration',  this.metadata.format.numberOfSamples / this.metadata.format.sampleRate);
+      this.metadata.setFormat('duration', this.metadata.format.numberOfSamples / this.metadata.format.sampleRate);
     }
   }
 
   /**
    * Parse first Ogg/Vorbis page
-   * @param {IPageHeader} header
+   * @param header
-   * @param {Buffer} pageData
+   * @param pageData
    */
-  protected parseFirstPage(header: Ogg.IPageHeader, pageData: Buffer) {
+  protected parseFirstPage(header: IPageHeader, pageData: Buffer) {
     this.metadata.setFormat('codec', 'Vorbis I');
-    debug("Parse first page");
+    debug('Parse first page');
     // Parse  Vorbis common header
     const commonHeader = CommonHeader.get(pageData, 0);
     if (commonHeader.vorbis !== 'vorbis')
@@ -105,14 +105,14 @@ export class VorbisParser implements Ogg.IPageConsumer {
       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');
   }
 
   protected parseFullPage(pageData: Buffer) {
     // New page
     const commonHeader = CommonHeader.get(pageData, 0);
-    debug("Parse full page: type=%s, byteLength=%s", commonHeader.packetType, pageData.byteLength);
+    debug('Parse full page: type=%s, byteLength=%s', commonHeader.packetType, pageData.byteLength);
     switch (commonHeader.packetType) {
 
       case 3: //  type 3: comment header

lib/ogg/vorbis/VorbisTagMapper.ts

@@ -1,6 +1,7 @@
-import { INativeTagMap } from '../../common/GenericTagTypes';
+import { INativeTagMap } from '../../common/GenericTagTypes.js';
-import { CommonTagMapper } from '../../common/GenericTagMapper';
+import { CommonTagMapper } from '../../common/GenericTagMapper.js';
-import { IRating, ITag } from '../../type';
+
+import { IRating, ITag } from '../../type.js';
 
 /**
  * Vorbis tag mappings

lib/riff/RiffChunk.ts

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

lib/riff/RiffInfoTagMap.ts

@@ -1,5 +1,5 @@
-import {INativeTagMap} from '../common/GenericTagTypes';
+import {INativeTagMap} from '../common/GenericTagTypes.js';
-import {CommonTagMapper} from '../common/GenericTagMapper';
+import {CommonTagMapper} from '../common/GenericTagMapper.js';
 
 /**
  * RIFF Info Tags; part of the EXIF 2.3

lib/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "declaration": true
+
   }
 }
 

lib/type.ts

@@ -1,8 +1,10 @@
-import { GenericTagId, TagType } from './common/GenericTagTypes';
+import { Buffer } from 'node:buffer';
-import { IFooter } from './apev2/APEv2Token';
-import { TrackType } from './matroska/types';
 
-export { TrackType } from './matroska/types';
+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

lib/wav/BwfChunk.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/lib/core';
+import { IGetToken } from 'strtok3/lib/core.js';
 import * as Token from 'token-types';
 
 export interface IBroadcastAudioExtensionChunk {

lib/wav/WaveChunk.ts

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

lib/wav/WaveParser.ts

@@ -1,14 +1,14 @@
-import * as strtok3 from 'strtok3/lib/core';
+import * as strtok3 from 'strtok3/core';
 import * as Token from 'token-types';
 import initDebug from 'debug';
 
-import * as riff from '../riff/RiffChunk';
+import * as riff from '../riff/RiffChunk.js';
-import * as WaveChunk from './../wav/WaveChunk';
+import * as WaveChunk from './../wav/WaveChunk.js';
-import { ID3v2Parser } from '../id3v2/ID3v2Parser';
+import { ID3v2Parser } from '../id3v2/ID3v2Parser.js';
-import * as util from '../common/Util';
+import * as util from '../common/Util.js';
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
-import { BroadcastAudioExtensionChunk } from '../wav/BwfChunk';
+import { BroadcastAudioExtensionChunk } from '../wav/BwfChunk.js';
 
 const debug = initDebug('music-metadata:parser:RIFF');
 

lib/wavpack/WavPackParser.ts

@@ -1,10 +1,9 @@
 import * as Token from 'token-types';
 
-import { APEv2Parser } from '../apev2/APEv2Parser';
+import { APEv2Parser } from '../apev2/APEv2Parser.js';
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
-import { BasicParser } from '../common/BasicParser';
+import { BasicParser } from '../common/BasicParser.js';
-
+import { IBlockHeader, IMetadataId, WavPack } from './WavPackToken.js';
-import { IBlockHeader, IMetadataId, WavPack } from './WavPackToken';
 
 import initDebug from 'debug';
 

lib/wavpack/WavPackToken.ts

@@ -1,7 +1,8 @@
 import * as Token from 'token-types';
-import { IGetToken } from 'strtok3/lib/core';
 
-import { FourCcToken } from '../common/FourCC';
+import { FourCcToken } from '../common/FourCC.js';
+
+import { IGetToken } from 'strtok3/core';
 
 /**
  * WavPack Block Header

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.1",
+  "version": "8.0.0-alpha.0",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -10,6 +10,18 @@
     "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",
@@ -60,12 +72,6 @@
     "parser",
     "bwf"
   ],
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/**/*.js",
-    "lib/**/*.d.ts"
-  ],
   "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",
@@ -75,22 +81,22 @@
     "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 --require ts-node/register --require source-map-support/register --full-trace test/test-*.ts",
+    "test": "mocha",
     "build": "npm run clean && npm run compile && npm run doc-gen",
     "start": "npm-run-all compile lint cover-test",
-    "test-coverage": "nyc npm run test",
+    "test-coverage": "c8 npm run test",
-    "send-coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "send-coveralls": "c8 report --reporter=text-lcov | coveralls",
-    "send-codacy": "nyc report --reporter=text-lcov | codacy-coverage",
+    "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.3",
-    "file-type": "16.5.3",
+    "file-type": "^17.1.1",
     "media-typer": "^1.1.0",
-    "strtok3": "^6.2.4",
+    "strtok3": "^7.0.0-alpha.8",
-    "token-types": "^4.2.0"
+    "token-types": "^5.0.0-alpha.2"
   },
   "devDependencies": {
     "@types/chai": "^4.3.0",
@@ -100,6 +106,7 @@
     "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
+    "c8": "^7.10.0",
     "chai": "^4.3.6",
     "coveralls": "^3.1.1",
     "del-cli": "4.0.1",
@@ -113,15 +120,14 @@
     "mime": "^3.0.0",
     "mocha": "^9.2.1",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
+    "prettier": "^2.5.1",
     "remark-cli": "^10.0.1",
     "remark-preset-lint-recommended": "^6.1.2",
-    "source-map-support": "^0.5.21",
     "ts-node": "^10.5.0",
     "typescript": "^4.5.5"
   },
   "engines": {
-    "node": ">=10"
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
   },
   "repository": {
     "type": "git",
@@ -130,21 +136,5 @@
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/Borewit/music-metadata/issues"
-  },
-  "nyc": {
-    "exclude": [
-      "test/**/*.ts",
-      "src/**/*.js"
-    ],
-    "extension": [
-      ".ts"
-    ],
-    "sourceMap": true,
-    "instrument": true,
-    "reporter": [
-      "lcov",
-      "text"
-    ],
-    "report-dir": "coverage"
   }
 }

test/metadata-parsers.ts

@@ -1,7 +1,7 @@
-import * as fs from 'fs';
+import fs from 'node:fs';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { IAudioMetadata, IOptions } from '../lib/type';
+import { IAudioMetadata, IOptions } from '../lib/index.js';
 
 type ParseFileMethod = (filePath: string, mimeType?: string, options?: IOptions) => Promise<IAudioMetadata>;
 

test/test-async.ts

@@ -1,8 +1,8 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 describe('Asynchronous observer updates', () => {
 

test/test-comment-mapping.ts

@@ -1,8 +1,8 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import { samplePath } from './util';
+import { samplePath } from './util.js';
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
 
 const t = assert;
 

test/test-common.ts

@@ -1,13 +1,13 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import { commonTags, isSingleton } from '../lib/common/GenericTagTypes';
+import { commonTags, isSingleton } from '../lib/common/GenericTagTypes.js';
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { CombinedTagMapper } from '../lib/common/CombinedTagMapper';
+import { CombinedTagMapper } from '../lib/common/CombinedTagMapper.js';
-import { joinArtists } from '../lib/common/MetadataCollector';
+import { joinArtists } from '../lib/common/MetadataCollector.js';
-import { parseHttpContentType } from '../lib/ParserFactory';
+import { parseHttpContentType } from '../lib/ParserFactory.js';
 
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 describe('GenericTagMap', () => {
 
@@ -45,7 +45,7 @@ describe('GenericTagMap', () => {
 
     it('parse RIFF tags', async () => {
 
-      const filePath = path.join(__dirname, 'samples', 'issue-89 no-artist.aiff');
+      const filePath = path.join(samplePath, 'issue-89 no-artist.aiff');
 
       const metadata = await mm.parseFile(filePath, {duration: true});
       assert.deepEqual(metadata.common.artists, ['Beth Hart', 'Joe Bonamassa'], 'common.artists directly via WM/ARTISTS');

test/test-concurrent-picture.ts

@@ -1,14 +1,14 @@
 import {assert} from 'chai';
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import * as fs from 'fs';
+import fs from 'node:fs';
-import * as path from 'path';
+import path from 'node:path';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 const t = assert;
 
 it("should handle concurrent parsing of pictures", () => {
 
-  const files = [path.join(samplePath, 'flac.flac'), path.join(__dirname, 'samples', 'flac-bug.flac')];
+  const files = [path.join(samplePath, 'flac.flac'), path.join(samplePath, 'flac-bug.flac')];
 
   return Promise.all<any>(files.map(file => {
     return mm.parseFile(file).then(result => {

test/test-discogs.ts

@@ -1,10 +1,10 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { ID3v24TagMapper } from '../lib/id3v2/ID3v24TagMapper';
+import { ID3v24TagMapper } from '../lib/id3v2/ID3v24TagMapper.js';
-import { VorbisTagMapper } from '../lib/ogg/vorbis/VorbisTagMapper';
+import { VorbisTagMapper } from '../lib/ogg/vorbis/VorbisTagMapper.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 describe('Discogs mappings', () => {
 

test/test-dsdiff.ts

@@ -1,8 +1,9 @@
 import {assert} from 'chai';
-import * as path from 'path';
 
-import * as mm from '../lib';
+import path from 'node:path';
-import { samplePath } from './util';
+
+import * as mm from '../lib/index.js';
+import { samplePath } from './util.js';
 
 describe('Parse Philips DSDIFF', () => {
 

test/test-file-aac.ts

@@ -1,8 +1,10 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
-import { Parsers } from './metadata-parsers';
+
-import { IFormat } from '../lib';
+import { Parsers } from './metadata-parsers.js';
-import { samplePath } from './util';
+
+import { IFormat } from '../lib/index.js';
+import { samplePath } from './util.js';
 
 const aacSamplePath = path.join(samplePath, 'aac');
 

test/test-file-aiff.ts

@@ -1,8 +1,8 @@
-import * as path from 'path';
+import path from 'node:path';
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
 import { assert } from 'chai';
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { samplePath } from './util';
+import { samplePath} from './util.js';
 
 describe('Parse AIFF (Audio Interchange File Format)', () => {
 

test/test-file-ape.ts

@@ -1,9 +1,9 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 describe('Parse APE (Monkey\'s Audio)', () => {
 

test/test-file-asf.ts

@@ -1,11 +1,12 @@
 import { assert } from 'chai';
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import * as path from 'path';
+import path from 'node:path';
-import GUID from '../lib/asf/GUID';
+import GUID from '../lib/asf/GUID.js';
-import { AsfUtil } from '../lib/asf/AsfUtil';
+import { AsfUtil } from '../lib/asf/AsfUtil.js';
-import { DataType } from '../lib/asf/AsfObject';
+import { DataType } from '../lib/asf/AsfObject.js';
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import { samplePath } from './util';
+
+import { samplePath } from './util.js';
 
 describe('Parse ASF', () => {
 

test/test-file-dsf.ts

@@ -1,8 +1,8 @@
 import {assert} from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 describe('Parse Sony DSF (DSD Stream File)', () => {
 

test/test-file-flac.ts

@@ -1,9 +1,10 @@
 import { assert } from 'chai';
-import * as mm from '../lib';
+import fs from 'node:fs';
-import * as fs from 'fs';
+import * as path from 'node:path';
-import * as path from 'path';
+
-import { Parsers } from './metadata-parsers';
+import * as mm from '../lib/index.js';
-import { samplePath } from './util';
+import { Parsers } from './metadata-parsers.js';
+import { samplePath } from './util.js';
 
 const t = assert;
 

test/test-file-matroska.ts

@@ -1,7 +1,8 @@
-import * as path from 'path';
+import path from 'node:path';
-import * as mm from '../lib';
 import { assert } from 'chai';
-import { samplePath } from './util';
+
+import * as mm from '../lib/index.js';
+import { samplePath } from './util.js';
 
 describe('Matroska formats', () => {
 

test/test-file-mp3.ts

@@ -1,9 +1,9 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 describe('Parse MP3 files', () => {
 

test/test-file-mp4.ts

@@ -1,10 +1,10 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
-import * as fs from 'fs';
+import fs from 'node:fs';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 const t = assert;
 

test/test-file-mpeg.ts

@@ -1,11 +1,11 @@
 import { assert } from 'chai';
-import * as fs from 'fs';
+import fs from 'node:fs';
-import * as path from 'path';
+import path from 'node:path';
 
-import { samplePath, SourceStream } from './util';
+import { samplePath, SourceStream } from './util.js';
-import { ID3v24TagMapper } from '../lib/id3v2/ID3v24TagMapper';
+import { ID3v24TagMapper } from '../lib/id3v2/ID3v24TagMapper.js';
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
 
 const t = assert;
 

test/test-file-musepack.ts

@@ -1,8 +1,8 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 describe('Parse Musepack (.mpc)', () => {
 

test/test-file-ogg.ts

@@ -1,10 +1,10 @@
 import { assert, expect } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
-import { IdHeader } from '../lib/ogg/opus/Opus';
+import { IdHeader } from '../lib/ogg/opus/Opus.js';
 
 const oggSamplePath = path.join(samplePath, 'ogg');
 

test/test-file-wav.ts

@@ -1,10 +1,10 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import * as mm from '../lib';
+import * as mm from '../lib/index.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
-import { IFormat, INativeTagDict } from '../lib/type';
+import { IFormat, INativeTagDict } from '../lib/index.js';
 
 const wavSamples = path.join(samplePath, 'wav');
 
@@ -61,7 +61,7 @@ describe('Parse RIFF/WAVE audio format', () => {
   it('should map RIFF tags to common', async () => {
 
     // Metadata edited with Adobe Audition CC 2018.1
-    const filePath = path.join(__dirname, 'samples', 'riff_adobe_audition.wav');
+    const filePath = path.join(samplePath, 'riff_adobe_audition.wav');
 
     const metadata = await mm.parseFile(filePath);
     const format = metadata.format;

test/test-file-wavpack.ts

@@ -1,8 +1,8 @@
 import { assert } from 'chai';
-import * as path from 'path';
+import path from 'node:path';
 
-import { Parsers } from './metadata-parsers';
+import { Parsers } from './metadata-parsers.js';
-import { samplePath } from './util';
+import { samplePath } from './util.js';
 
 const t = assert;