music-routes-data 3.4.0 → 4.0.0

package/README.md

@@ -6,19 +6,18 @@ Music Routes Data: What musicians played on which tracks?
 Schema
 ======
 
-Data is stored in eight JSON files in the `data` directory.
+Data is stored in JSON files in the `data` directory.
 
-Four of the files contain basic data:
+These files contain basic data:
 
 * `tracks.json` contains the `names` and unique `id` string for a track.
 * `releases.json` contains the `names` and unique `id` string for a release.
 * `artists.json` contains the `names` and unique `id` string for an artist.
 * `individuals.json` contains the `names` and unique `id` string for an individual.
 
-Four of the files describe relationships between the basic data and sometimes include extra data relevant to the relationship:
+These files describe relationships between the basic data and sometimes include extra data relevant to the relationship:
 
 * `artist_track.json` contains `artistId` and `trackId` pairs where a track is attributed to an artist.
-* `individual_artist.json` contains `individualId` and `artistId` pairs where an individual is a member of an artist.
 * `individual_track.json` contains `individualId` and `trackId` pairs where the individual performed on the track. There is also an optional `credits` array that explains the person's role on the track (e.g., `["vocals","guitar"]`).
 * `track_release.json` contains `trackId` and `releaseId` pairs where a track appears on a release.
 

package/bin/verify

@@ -15,7 +15,7 @@ if (rv.status === data.StatusEnum.ERROR) {
 
 var dump = {}; // local copy of all collections
 
-collections = ["tracks", "artists", "releases", "individuals", "artist_track", "individual_artist", "individual_track", "track_release"];
+collections = ["tracks", "artists", "releases", "individuals", "artist_track", "individual_track", "track_release"];
 
 collections.forEach(function(collection) {
   var rv = data.search({collection: collection});
@@ -51,8 +51,6 @@ dump.included = function (basic, relation, propName) {
 assert.ok(dump.included("artists", "artist_track", "artist_id"));
 // All tracks should have artists.
 assert.ok(dump.included("tracks", "artist_track", "track_id"));
-// All artists have individuals. (Not all individuals are members of artists, though.)
-// assert.ok(dump.included("artists", "individual_artist", "artist_id"));
 // All individuals are associated with at least one track.
 // assert.ok(dump.included("individuals", "individual_track", "individual_id"));
 // All tracks are on at least one release.

package/lib/Data/index.js

@@ -11,7 +11,6 @@ function Data (options) {
 
   const linkCollectionFields = {
     artist_track: [],
-    individual_artist: [],
     individual_track: [],
     track_release: []
   }

package/lib/cli/index.js

@@ -1,15 +1,6 @@
 module.exports = {
-  dir: function (output) {
-    console.dir(output)
-  },
-
-  exit: function (code) {
-    process.exit(code)
-  },
-
-  error: function (message) {
-    console.error(message)
-  },
-
+  dir: console.dir,
+  exit: process.exit,
+  error: console.error,
   argv: require('./argv')
 }

package/lib/cli/link.js

@@ -10,8 +10,8 @@ module.exports = function (data, collection1, id1, collection2, id2) {
     // Try track_release if release_track is what we have
     linkCollection = collection2 + '_' + collection1
     if (data.linkCollections.indexOf(linkCollection) === -1) {
-      console.error(collection1 + ' and ' + collection2 + ' cannot be linked')
-      return { status: data.StatusEnum.ERROR }
+      const message = `${collection1} and ${collection2} cannot be linked`
+      return { status: data.StatusEnum.ERROR, message }
     }
   }
   return data.link(linkCollection, link)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "music-routes-data",
-  "version": "3.4.0",
+  "version": "4.0.0",
   "description": "What musicians played on what tracks",
   "homepage": "https://github.com/Trott/music-routes-data",
   "files": [
@@ -11,7 +11,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "standard && c8 jasmine spec/*.js && bin/verify"
+    "test": "standard && c8 --100 jasmine spec/*.js && bin/verify"
   },
   "repository": {
     "type": "git",