musicbrainz-api 0.7.2 → 0.8.0

package/README.md

@@ -94,13 +94,13 @@ Arguments:
 *   MBID [(MusicBrainz identifier)](https://wiki.musicbrainz.org/MusicBrainz_Identifier)
 
 ```js
-const artist = await mbApi.getEntity('artist', {query: 'ab2528d9-719f-4261-8098-21849222a0f2'});
+const artist = await mbApi.lookupEntity('artist', {query: 'ab2528d9-719f-4261-8098-21849222a0f2'});
 ```
 
 ### Lookup area
 
 ```js
-const area = await mbApi.getArea({query: 'ab2528d9-719f-4261-8098-21849222a0f2'});
+const area = await mbApi.lookupArea({query: 'ab2528d9-719f-4261-8098-21849222a0f2'});
 ```
 
 ### Lookup artist
@@ -108,40 +108,61 @@ const area = await mbApi.getArea({query: 'ab2528d9-719f-4261-8098-21849222a0f2'}
 Lookup an `artist` and include their `releases`, `release-groups` and `aliases`
 
 ```js
-const artist = await mbApi.getArtist({query: 'ab2528d9-719f-4261-8098-21849222a0f2'});
+const artist = await mbApi.lookupArtist({query: 'ab2528d9-719f-4261-8098-21849222a0f2'});
 ```
 
-or use the browse API:
+### Lookup instrument
+
+Lookup an instrument
 
 ```js
-const artist = await mbApi.getArtist({artist: 'ab2528d9-719f-4261-8098-21849222a0f2'});
+const artist = await mbApi.lookupInstrument({query: 'b3eac5f9-7859-4416-ac39-7154e2e8d348'});
+```
+
+### Lookup label
+
+Lookup a label
+
+```js
+const artist = await mbApi.lookupInstrument({query: '25dda9f9-f069-4898-82f0-59330a106c7f'});
+```
+
+### Lookup place
+
+```js
+const artist = await mbApi.lookupPlace({query: 'e6cfb74d-d69b-44c3-b890-1b3f509816e4'});
 ```
 
 The second argument can be used to pass [subqueries](https://wiki.musicbrainz.org/Development/XML_Web_Service/Version_2#Subqueries), which will return more (nested) information:
 ```js
-const artist = await mbApi.getArtist('ab2528d9-719f-4261-8098-21849222a0f2', ['releases', 'recordings', 'url-rels']);
+const artist = await mbApi.lookupArtist('ab2528d9-719f-4261-8098-21849222a0f2', ['releases', 'recordings', 'url-rels']);
 ```
 
 ### Lookup recording
 
 The second argument can be used to pass [subqueries](https://wiki.musicbrainz.org/Development/XML_Web_Service/Version_2#Subqueries):
 ```js
-const artist = await mbApi.getRecording({query: '16afa384-174e-435e-bfa3-5591accda31c'}, ['artists', 'url-rels']);
+const artist = await mbApi.lookupRecording({query: '16afa384-174e-435e-bfa3-5591accda31c'}, ['artists', 'url-rels']);
 ```
 
 ### Lookup release
 ```js
-const release = await mbApi.getRelease({query: '976e0677-a480-4a5e-a177-6a86c1900bbf'}, ['artists', 'url-rels']);
+const release = await mbApi.lookupRelease({query: '976e0677-a480-4a5e-a177-6a86c1900bbf'}, ['artists', 'url-rels']);
 ```
 
 ### Lookup release-group
 ```js
-const releaseGroup = await mbApi.getReleaseGroup({query: '19099ea5-3600-4154-b482-2ec68815883e'});
+const releaseGroup = await mbApi.lookupReleaseGroup({query: '19099ea5-3600-4154-b482-2ec68815883e'});
 ```
 
 ### Lookup work
 ```js
-const work = await mbApi.getWork({query: 'b2aa02f4-6c95-43be-a426-aedb9f9a3805'});
+const work = await mbApi.lookupWork({query: 'b2aa02f4-6c95-43be-a426-aedb9f9a3805'});
+```
+
+### Lookup URL
+```js
+const url = await mbApi.lookupUrl({query: 'c69556a6-7ded-4c54-809c-afb45a1abe7d'});
 ```
 
 ## Search (query)
@@ -251,7 +272,7 @@ const mbid_Formidable = '16afa384-174e-435e-bfa3-5591accda31c';
 const isrc_Formidable = 'BET671300161';
 
     
-const recording = await mbApi.getRecording(mbid_Formidable);
+const recording = await mbApi.lookupRecording(mbid_Formidable);
 
 // Authentication the http-session against MusicBrainz (as defined in config.baseUrl)
 const succeed = await mbApi.login();
@@ -264,7 +285,7 @@ await mbApi.addIsrc(recording, isrc_Formidable);
 ### Submit recording URL
 
 ```js
-const recording = await mbApi.getRecording('16afa384-174e-435e-bfa3-5591accda31c');
+const recording = await mbApi.lookupRecording('16afa384-174e-435e-bfa3-5591accda31c');
 
 const succeed = await mbApi.login();
 assert.isTrue(succeed, 'Login successful');
@@ -277,7 +298,7 @@ await mbApi.addUrlToRecording(recording, {
 
 Actually a Spotify-track-ID can be submitted easier: 
 ```js
-const recording = await mbApi.getRecording('16afa384-174e-435e-bfa3-5591accda31c');
+const recording = await mbApi.lookupRecording('16afa384-174e-435e-bfa3-5591accda31c');
 
 const succeed = await mbApi.login();
 assert.isTrue(succeed, 'Login successful');

package/lib/digest-auth.js

@@ -23,12 +23,7 @@ class DigestAuth {
      */
     static ha1Compute(algorithm, user, realm, pass, nonce, cnonce) {
         const ha1 = md5(user + ':' + realm + ':' + pass); // lgtm [js/insufficient-password-hash]
-        if (algorithm && algorithm.toLowerCase() === 'md5-sess') {
-            return md5(ha1 + ':' + nonce + ':' + cnonce);
-        }
-        else {
-            return ha1;
-        }
+        return algorithm && algorithm.toLowerCase() === 'md5-sess' ? md5(ha1 + ':' + nonce + ':' + cnonce) : ha1;
     }
     digest(method, path, authHeader) {
         // TODO: More complete implementation of RFC 2617.

package/lib/musicbrainz-api.d.ts

@@ -58,48 +58,66 @@ export declare class MusicBrainzApi {
      * @param mbid
      * @param inc
      */
-    getEntity<T>(entity: mb.EntityType, mbid: string, inc?: Includes[]): Promise<T>;
+    lookupEntity<T>(entity: mb.EntityType, mbid: string, inc?: Includes[]): Promise<T>;
     /**
      * Lookup area
      * @param areaId Area MBID
      * @param inc Sub-queries
      */
-    getArea(areaId: string, inc?: Includes[]): Promise<mb.IArea>;
+    lookupArea(areaId: string, inc?: Includes[]): Promise<mb.IArea>;
     /**
      * Lookup artist
      * @param artistId Artist MBID
      * @param inc Sub-queries
      */
-    getArtist(artistId: string, inc?: Includes[]): Promise<mb.IArtist>;
+    lookupArtist(artistId: string, inc?: Includes[]): Promise<mb.IArtist>;
+    /**
+     * Lookup instrument
+     * @param artistId Instrument MBID
+     * @param inc Sub-queries
+     */
+    lookupInstrument(instrumentId: string, inc?: Includes[]): Promise<mb.IInstrument>;
+    /**
+     * Lookup label
+     * @param labelId Area MBID
+     * @param inc Sub-queries
+     */
+    lookupLabel(labelId: string, inc?: Includes[]): Promise<mb.ILabel>;
+    /**
+     * Lookup place
+     * @param placeId Area MBID
+     * @param inc Sub-queries
+     */
+    lookupPlace(placeId: string, inc?: Includes[]): Promise<mb.IPlace>;
     /**
      * Lookup release
      * @param releaseId Release MBID
      * @param inc Include: artist-credits, labels, recordings, release-groups, media, discids, isrcs (with recordings)
      * ToDo: ['recordings', 'artists', 'artist-credits', 'isrcs', 'url-rels', 'release-groups']
      */
-    getRelease(releaseId: string, inc?: Includes[]): Promise<mb.IRelease>;
+    lookupRelease(releaseId: string, inc?: Includes[]): Promise<mb.IRelease>;
     /**
      * Lookup release-group
      * @param releaseGroupId Release-group MBID
      * @param inc Include: ToDo
      */
-    getReleaseGroup(releaseGroupId: string, inc?: Includes[]): Promise<mb.IReleaseGroup>;
+    lookupReleaseGroup(releaseGroupId: string, inc?: Includes[]): Promise<mb.IReleaseGroup>;
     /**
-     * Lookup work
-     * @param workId Work MBID
+     * Lookup recording
+     * @param recordingId Label MBID
+     * @param inc Include: artist-credits, isrcs
      */
-    getWork(workId: string): Promise<mb.IWork>;
+    lookupRecording(recordingId: string, inc?: Includes[]): Promise<mb.IRecording>;
     /**
-     * Lookup label
-     * @param labelId Label MBID
+     * Lookup work
+     * @param workId Work MBID
      */
-    getLabel(labelId: string): Promise<mb.ILabel>;
+    lookupWork(workId: string): Promise<mb.IWork>;
     /**
-     * Lookup recording
-     * @param recordingId Label MBID
-     * @param inc Include: artist-credits, isrcs
+     * Lookup URL
+     * @param urlId URL MBID
      */
-    getRecording(recordingId: string, inc?: Includes[]): Promise<mb.IRecording>;
+    lookupUrl(urlId: string): Promise<mb.IUrl>;
     postRecording(xmlMetadata: XmlMetadata): Promise<void>;
     post(entity: mb.EntityType, xmlMetadata: XmlMetadata): Promise<void>;
     login(): Promise<boolean>;

package/lib/musicbrainz-api.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -134,7 +138,7 @@ class MusicBrainzApi {
      * @param mbid
      * @param inc
      */
-    getEntity(entity, mbid, inc = []) {
+    lookupEntity(entity, mbid, inc = []) {
         return this.restGet(`/${entity}/${mbid}`, { inc: inc.join(' ') });
     }
     /**
@@ -142,16 +146,40 @@ class MusicBrainzApi {
      * @param areaId Area MBID
      * @param inc Sub-queries
      */
-    getArea(areaId, inc = []) {
-        return this.getEntity('area', areaId, inc);
+    lookupArea(areaId, inc = []) {
+        return this.lookupEntity('area', areaId, inc);
     }
     /**
      * Lookup artist
      * @param artistId Artist MBID
      * @param inc Sub-queries
      */
-    getArtist(artistId, inc = []) {
-        return this.getEntity('artist', artistId, inc);
+    lookupArtist(artistId, inc = []) {
+        return this.lookupEntity('artist', artistId, inc);
+    }
+    /**
+     * Lookup instrument
+     * @param artistId Instrument MBID
+     * @param inc Sub-queries
+     */
+    lookupInstrument(instrumentId, inc = []) {
+        return this.lookupEntity('instrument', instrumentId, inc);
+    }
+    /**
+     * Lookup label
+     * @param labelId Area MBID
+     * @param inc Sub-queries
+     */
+    lookupLabel(labelId, inc = []) {
+        return this.lookupEntity('label', labelId, inc);
+    }
+    /**
+     * Lookup place
+     * @param placeId Area MBID
+     * @param inc Sub-queries
+     */
+    lookupPlace(placeId, inc = []) {
+        return this.lookupEntity('place', placeId, inc);
     }
     /**
      * Lookup release
@@ -159,38 +187,38 @@ class MusicBrainzApi {
      * @param inc Include: artist-credits, labels, recordings, release-groups, media, discids, isrcs (with recordings)
      * ToDo: ['recordings', 'artists', 'artist-credits', 'isrcs', 'url-rels', 'release-groups']
      */
-    getRelease(releaseId, inc = []) {
-        return this.getEntity('release', releaseId, inc);
+    lookupRelease(releaseId, inc = []) {
+        return this.lookupEntity('release', releaseId, inc);
     }
     /**
      * Lookup release-group
      * @param releaseGroupId Release-group MBID
      * @param inc Include: ToDo
      */
-    getReleaseGroup(releaseGroupId, inc = []) {
-        return this.getEntity('release-group', releaseGroupId, inc);
+    lookupReleaseGroup(releaseGroupId, inc = []) {
+        return this.lookupEntity('release-group', releaseGroupId, inc);
     }
     /**
-     * Lookup work
-     * @param workId Work MBID
+     * Lookup recording
+     * @param recordingId Label MBID
+     * @param inc Include: artist-credits, isrcs
      */
-    getWork(workId) {
-        return this.getEntity('work', workId);
+    lookupRecording(recordingId, inc = []) {
+        return this.lookupEntity('recording', recordingId, inc);
     }
     /**
-     * Lookup label
-     * @param labelId Label MBID
+     * Lookup work
+     * @param workId Work MBID
      */
-    getLabel(labelId) {
-        return this.getEntity('label', labelId);
+    lookupWork(workId) {
+        return this.lookupEntity('work', workId);
     }
     /**
-     * Lookup recording
-     * @param recordingId Label MBID
-     * @param inc Include: artist-credits, isrcs
+     * Lookup URL
+     * @param urlId URL MBID
      */
-    getRecording(recordingId, inc = []) {
-        return this.getEntity('recording', recordingId, inc);
+    lookupUrl(urlId) {
+        return this.lookupEntity('url', urlId);
     }
     async postRecording(xmlMetadata) {
         return this.post('recording', xmlMetadata);

package/lib/musicbrainz.types.d.ts

@@ -5,14 +5,16 @@ export interface IPeriod {
     'ended': boolean;
     'end': string;
 }
-export interface IArea {
+export interface IEntity {
     id: string;
+}
+export interface IArea extends IEntity {
     'iso-3166-1-codes': string[];
     name: string;
     'sort-name': string;
     disambiguation: string;
 }
-export interface IAlias {
+export interface IAlias extends IEntity {
     name: string;
     'sort-name': string;
     ended: boolean;
@@ -26,8 +28,7 @@ export interface IAlias {
 export interface IMatch {
     score: number;
 }
-export interface IArtist {
-    id: string;
+export interface IArtist extends IEntity {
     name: string;
     disambiguation: string;
     'sort-name': string;
@@ -55,9 +56,25 @@ export interface IArtistCredit {
     joinphrase: string;
     name: string;
 }
+export interface IEvent extends IEntity {
+    cancelled: boolean;
+    type: string;
+    'life-span': IPeriod;
+    disambiguation: string;
+    'type-id': string;
+    time: string;
+    setlist: string;
+    name: string;
+}
+export interface IInstrument extends IEntity {
+    disambiguation: string;
+    name: string;
+    'type-id': string;
+    type: string;
+    description: string;
+}
 export declare type ReleaseQuality = 'normal';
-export interface IRelease {
-    id: string;
+export interface IRelease extends IEntity {
     title: string;
     'text-representation': {
         'language': string;
@@ -85,23 +102,21 @@ export interface IReleaseEvent {
     date?: string;
 }
 export declare type MediaFormatType = 'Digital Media';
-export interface IRecording {
-    id: string;
+export interface IRecording extends IEntity {
     video: boolean;
     length: number;
     title: string;
     disambiguation: string;
     isrcs?: string[];
-    releases?: IRelease;
+    releases?: IRelease[];
     relations?: IRelation[];
     'artist-credit'?: IArtistCredit[];
     aliases?: IAlias[];
 }
-export interface ITrack {
-    id: string;
+export interface ITrack extends IEntity {
     position: number;
     recording: IRecording;
-    number: string;
+    'number': string;
     length: number;
     title: string;
     'artist-credit'?: IArtistCredit[];
@@ -110,10 +125,10 @@ export interface IMedium {
     title: string;
     format?: string;
     'format-id': string;
-    'tracks': ITrack[];
+    tracks: ITrack[];
     'track-count': number;
     'track-offset': number;
-    'position': number;
+    position: number;
 }
 export interface ICoverArtArchive {
     count: number;
@@ -122,15 +137,16 @@ export interface ICoverArtArchive {
     artwork: boolean;
     back: boolean;
 }
-export interface IReleaseGroup {
-    id: string;
+export interface IReleaseGroup extends IEntity {
     count: number;
     title: string;
     'primary-type': string;
     'sort-name': string;
-    'artist-credit': [{
+    'artist-credit': {
         artist: IArtist;
-    }];
+        name: string;
+        joinphrase: string;
+    }[];
     releases?: IRelease[];
 }
 export interface IArtistMatch extends IArtist, IMatch {
@@ -163,7 +179,7 @@ export interface IUrlList extends ISearchResult {
 }
 export declare type RelationDirection = 'backward' | 'forward';
 export interface IRelation {
-    'attribute-ids': {};
+    'attribute-ids': any;
     direction: RelationDirection;
     'target-credit': string;
     end: null | object;
@@ -175,35 +191,32 @@ export interface IRelation {
     begin?: null | object;
     'target-type'?: 'url';
     'type-id': string;
-    url?: IURL;
+    url?: IUrl;
     release?: IRelease;
 }
-export interface IURL {
-    id: string;
-    resource: string;
-}
 export interface IRelationList {
     relations: IRelation[];
 }
-export interface IWork {
-    id: string;
+export interface IWork extends IEntity {
     title: string;
 }
-export interface ILabel {
-    id: string;
+export interface ILabel extends IEntity {
+    name: string;
+}
+export interface IPlace extends IEntity {
     name: string;
 }
-export interface IUrl {
+export interface IUrl extends IEntity {
     id: string;
     resource: string;
-    'relation-list': IRelationList[];
+    'relation-list'?: IRelationList[];
 }
 export interface IUrlMatch extends IMatch, IUrl {
 }
 export interface IUrlSearchResult extends ISearchResult {
     urls?: IUrlMatch[];
 }
-export interface IIsrcSearchResult {
+export interface IIsrcSearchResult extends ISearchResult {
     'isrc': string;
     'recordings': IRecording[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musicbrainz-api",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "MusicBrainz API client for reading and submitting metadata",
   "main": "lib/musicbrainz-api",
   "types": "lib/musicbrainz-api",
@@ -24,21 +24,6 @@
   ],
   "license": "MIT",
   "private": false,
-  "devDependencies": {
-    "@types/chai": "^4.2.5",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^17.0.8",
-    "chai": "^4.2.0",
-    "coveralls": "^3.0.9",
-    "del-cli": "^4.0.1",
-    "mocha": "^9.0.1",
-    "nyc": "^15.0.0",
-    "remark-cli": "^10.0.1",
-    "remark-preset-lint-recommended": "^6.1.2",
-    "ts-node": "^10.0.0",
-    "tslint": "^6.1.1",
-    "typescript": "^4.0.2"
-  },
   "engines": {
     "node": "*"
   },
@@ -63,14 +48,38 @@
     "tough-cookie": "^4.0.0",
     "uuid": "^8.3.2"
   },
+  "devDependencies": {
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^17.0.8",
+    "@typescript-eslint/eslint-plugin": "^5.13.0",
+    "@typescript-eslint/parser": "^5.13.0",
+    "chai": "^4.2.0",
+    "coveralls": "^3.0.9",
+    "del-cli": "^4.0.1",
+    "eslint": "^8.10.0",
+    "eslint-config-prettier": "^8.4.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsdoc": "^37.9.5",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-unicorn": "^41.0.0",
+    "mocha": "^9.0.1",
+    "nyc": "^15.0.0",
+    "remark-cli": "^10.0.1",
+    "remark-preset-lint-recommended": "^6.1.2",
+    "ts-node": "^10.0.0",
+    "tslint": "^6.1.1",
+    "typescript": "^4.0.2"
+  },
   "scripts": {
-    "clean": "del-cli lib/** src/**/*.js src/**/*.js.map src/**/*.d.ts test/**/*.js test/**/*.js.map",
+    "clean": "del-cli src/**/*.js src/**/*.js.map src/**/*.d.ts test/**/*.js test/**/*.js.map",
     "compile-src": "tsc -p src",
     "compile-test": "tsc -p test",
     "compile": "npm run compile-src && npm run compile-test",
-    "lint-ts": "tslint 'src/**/*.ts' --exclude 'src/**/*.d.ts' 'test/**/*.ts' --exclude 'test/**/*.d.ts'",
+    "eslint": "eslint src/**/*.ts --ignore-pattern src/**/*.d.ts test/**/*.ts",
     "lint-md": "remark -u preset-lint-recommended .",
-    "lint": "npm run lint-md && npm run lint-ts",
+    "lint": "npm run lint-md && npm run eslint",
     "test": "mocha --require ts-node/register --require source-map-support/register --full-trace test/test-*.ts",
     "build": "npm run clean && npm run compile",
     "start": "npm-run-all compile lint cover-test",
@@ -80,7 +89,6 @@
   },
   "nyc": {
     "exclude": [
-      "lib/**",
       "test/**/*.ts",
       "src/**/*.js"
     ],