Merge branch 'master' into 195-add-support-for-DSF-format

package.json

@@ -1,7 +1,7 @@
 {
   "name": "music-metadata",
   "description": "Streaming music metadata parser for node and the browser.",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -54,7 +54,7 @@
     "lint-ts": "tslint 'src/**/*.ts' 'example/typescript/*.ts' --exclude 'src/**/*.d.ts' 'test/**/*.ts' --exclude 'test/**/*.d.ts' 'doc-gen/**/*.ts'",
     "lint-md": "remark -u preset-lint-recommended .",
     "lint": "npm run lint-md && npm run lint-ts",
-    "test": "mocha --require ts-node/register --full-trace test",
+    "test": "mocha --compilers ts-node/register --require source-map-support/register --full-trace test/test-*.ts",
     "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",
@@ -85,6 +85,7 @@
     "nyc": "^13.1.0",
     "remark-cli": "^6.0.1",
     "remark-preset-lint-recommended": "^3.0.2",
+    "source-map-support": "^0.5.12",
     "ts-lint": "^4.5.1",
     "ts-node": "^8.0.2",
     "tslint": "^5.11.0",
@@ -113,10 +114,18 @@
     "url": "https://github.com/Borewit/music-metadata/issues"
   },
   "nyc": {
-    "check-coverage": true,
     "include": [
-      "src/**/*"
+      "src/**/*.ts",
+      "test/**/*.ts"
     ],
+    "exclude": [
+      "lib/**"
+    ],
+    "extension": [
+      ".ts"
+    ],
+    "sourceMap": true,
+    "instrument": true,
     "reporter": [
       "lcov",
       "text"

src/ogg/OggParser.ts

@@ -1,5 +1,6 @@
 import * as Token from 'token-types';
 import * as initDebug from 'debug';
+import * as assert from 'assert';
 
 import common from '../common/Util';
 import * as Ogg from './Ogg';
@@ -40,10 +41,6 @@ export class SegmentTable implements Token.IGetToken<Ogg.ISegmentTable> {
  */
 export class OggParser extends BasicParser {
 
-  public static getInstance(): OggParser {
-    return new OggParser();
-  }
-
   private static Header: Token.IGetToken<Ogg.IPageHeader> = {
     len: 27,
 
@@ -82,9 +79,7 @@ export class OggParser extends BasicParser {
       do {
         header = await this.tokenizer.readToken<Ogg.IPageHeader>(OggParser.Header);
 
-        if (header.capturePattern !== 'OggS') { // Capture pattern
-          throw new Error('expected ogg header but was not found');
-        }
+        assert.strictEqual(header.capturePattern, 'OggS', 'Ogg capture pattern');
         this.header = header;
 
         this.pageNumber = header.pageSequenceNo;
@@ -112,8 +107,8 @@ export class OggParser extends BasicParser {
             default:
               throw new Error('gg audio-codec not recognized (id=' + id + ')');
           }
+          this.metadata.setFormat('dataformat', 'Ogg/' + this.pageConsumer.codecName);
         }
-        this.metadata.setFormat('dataformat', 'Ogg/' + this.pageConsumer.codecName);
         this.pageConsumer.parsePage(header, pageData);
       } while (!header.headerType.lastPage);
     } catch (err) {

src/tsconfig.json

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

test/test-file-aiff.ts

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import {Parsers} from './metadata-parsers';
 import {assert} from 'chai';
-import {IFormat} from '../src/type';
+import {IFormat} from '../src';
 
 const t = assert;
 

test/test-file-ape.ts

@@ -2,7 +2,6 @@ import {assert} from 'chai';
 import * as mm from '../src';
 import * as path from 'path';
 import {Parsers} from './metadata-parsers';
-import {INativeTagDict} from '../src/type';
 
 const t = assert;
 
@@ -34,7 +33,7 @@ describe("Parse APE (Monkey's Audio)", () => {
     t.strictEqual(common.picture[1].data.length, 48658, 'common.picture 1 length');
   }
 
-  function checkNative(ape: INativeTagDict) {
+  function checkNative(ape: mm.INativeTagDict) {
     t.deepEqual(ape.ENSEMBLE, ['Audioslave']);
     t.deepEqual(ape.Artist, ['Audioslave', 'Chris Cornell']);
     t.strictEqual(ape['Cover Art (Front)'][0].data.length, 48658, 'raw cover art (front) length');

test/test-file-asf.ts

@@ -5,7 +5,6 @@ import GUID from "../src/asf/GUID";
 import {AsfUtil} from "../src/asf/AsfUtil";
 import {DataType} from "../src/asf/AsfObject";
 import {Parsers} from './metadata-parsers';
-import {INativeTagDict} from '../src/type';
 
 const t = assert;
 
@@ -90,7 +89,7 @@ describe("Parse ASF", () => {
       t.deepEqual(common.genre, ['Rock'], 'common.genre');
     }
 
-    function checkNative(native: INativeTagDict) {
+    function checkNative(native: mm.INativeTagDict) {
 
       t.deepEqual(native['WM/AlbumTitle'], ['Discovery'], 'native: WM/AlbumTitle');
       t.deepEqual(native['WM/BeatsPerMinute'], [117], 'native: WM/BeatsPerMinute');

test/test-id3v2.3.ts

@@ -18,7 +18,7 @@ describe("Extract metadata from ID3v2.3 header", () => {
     const metadata = new MetadataCollector({});
 
     return strtok.fromFile(filePath).then(tokenizer => {
-      return ID3v2Parser.getInstance().parse(metadata, tokenizer, {}).then(() => {
+      return new ID3v2Parser().parse(metadata, tokenizer, {}).then(() => {
 
         t.strictEqual(33, metadata.native['ID3v2.3'].length);
 

yarn.lock

@@ -3283,6 +3283,13 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@^0.5.12:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"