music-routes-data 1.1.0 → 1.2.0

package/data/artist_track.json

@@ -54782,5 +54782,17 @@
   {
     "artist_id": "1767",
     "track_id": "13478"
+  },
+  {
+    "track_id": "13479",
+    "artist_id": "622"
+  },
+  {
+    "track_id": "13479",
+    "artist_id": "1768"
+  },
+  {
+    "artist_id": "1769",
+    "track_id": "13480"
   }
 ]

package/data/artists.json

@@ -10430,5 +10430,17 @@
     "names": [
       "Joel Frahm"
     ]
+  },
+  {
+    "_id": "1768",
+    "names": [
+      "Cal Tjader"
+    ]
+  },
+  {
+    "_id": "1769",
+    "names": [
+      "Woody Herman"
+    ]
   }
 ]

package/data/individual_artist.json

@@ -19378,5 +19378,9 @@
   {
     "individual_id": "11050",
     "artist_id": "1767"
+  },
+  {
+    "artist_id": "1769",
+    "individual_id": "11055"
   }
 ]

package/data/individual_track.json

@@ -257266,5 +257266,101 @@
   {
     "individual_id": "8600",
     "track_id": "13478"
+  },
+  {
+    "track_id": "13479",
+    "individual_id": "4089"
+  },
+  {
+    "track_id": "13479",
+    "individual_id": "11051"
+  },
+  {
+    "track_id": "13479",
+    "individual_id": "11052"
+  },
+  {
+    "track_id": "13479",
+    "individual_id": "11053"
+  },
+  {
+    "track_id": "13479",
+    "individual_id": "11054"
+  },
+  {
+    "track_id": "13479",
+    "individual_id": "10763"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11055"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11056"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11057"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11058"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "8398"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11059"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "8671"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11060"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11061"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11062"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11063"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11064"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "470"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "396"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11052"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11065"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11066"
+  },
+  {
+    "track_id": "13480",
+    "individual_id": "11067"
   }
 ]

package/data/individuals.json

@@ -62973,5 +62973,107 @@
     "names": [
       "Joel Frahm"
     ]
+  },
+  {
+    "_id": "11051",
+    "names": [
+      "Cal Tjader"
+    ]
+  },
+  {
+    "_id": "11052",
+    "names": [
+      "Vince Guaraldi"
+    ]
+  },
+  {
+    "_id": "11053",
+    "names": [
+      "Scott LaFaro"
+    ]
+  },
+  {
+    "_id": "11054",
+    "names": [
+      "Eddie Duran"
+    ]
+  },
+  {
+    "_id": "11055",
+    "names": [
+      "Woody Herman"
+    ]
+  },
+  {
+    "_id": "11056",
+    "names": [
+      "Dick Collins"
+    ]
+  },
+  {
+    "_id": "11057",
+    "names": [
+      "Johnny Coppola"
+    ]
+  },
+  {
+    "_id": "11058",
+    "names": [
+      "Bill Castagnino"
+    ]
+  },
+  {
+    "_id": "11059",
+    "names": [
+      "Dud Harvey"
+    ]
+  },
+  {
+    "_id": "11060",
+    "names": [
+      "Arno Marsh"
+    ]
+  },
+  {
+    "_id": "11061",
+    "names": [
+      "Bob Hardaway"
+    ]
+  },
+  {
+    "_id": "11062",
+    "names": [
+      "Jay Cameron"
+    ]
+  },
+  {
+    "_id": "11063",
+    "names": [
+      "Bill Harris"
+    ]
+  },
+  {
+    "_id": "11064",
+    "names": [
+      "Bob Lamb"
+    ]
+  },
+  {
+    "_id": "11065",
+    "names": [
+      "Remo Biondi"
+    ]
+  },
+  {
+    "_id": "11066",
+    "names": [
+      "Monty Budwig"
+    ]
+  },
+  {
+    "_id": "11067",
+    "names": [
+      "Gus Gustafson"
+    ]
   }
 ]

package/data/releases.json

@@ -14753,5 +14753,17 @@
     "names": [
       "Don't Explain"
     ]
+  },
+  {
+    "_id": "2484",
+    "names": [
+      "Cal Tjader-Stan Getz Sextet"
+    ]
+  },
+  {
+    "_id": "2485",
+    "names": [
+      "Blues Groove"
+    ]
   }
 ]

package/data/track_release.json

@@ -54290,5 +54290,13 @@
   {
     "release_id": "2483",
     "track_id": "13478"
+  },
+  {
+    "track_id": "13479",
+    "release_id": "2484"
+  },
+  {
+    "release_id": "2485",
+    "track_id": "13480"
   }
 ]

package/data/tracks.json

@@ -80069,5 +80069,17 @@
     "names": [
       "Don't Explain"
     ]
+  },
+  {
+    "_id": "13479",
+    "names": [
+      "Ginza Samba"
+    ]
+  },
+  {
+    "_id": "13480",
+    "names": [
+      "Blues Groove"
+    ]
   }
 ]

package/lib/Data/index.js

@@ -25,7 +25,7 @@ function Data (options) {
   })
 
   const makeReturnValue = function (status, message) {
-    return { status: status, message: message }
+    return { status, message }
   }
 
   this.StatusEnum = Object.freeze({ OK: 0, ERROR: 1 })

package/lib/cli/link.js

@@ -10,7 +10,7 @@ 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) {
-      this.error(collection1 + ' and ' + collection2 + ' cannot be linked')
+      console.error(collection1 + ' and ' + collection2 + ' cannot be linked')
       return { status: data.StatusEnum.ERROR }
     }
   }

package/lib/cli/search.js

@@ -3,5 +3,5 @@ module.exports = function (data, collection, searchTerm) {
     const names = value.names
     return names.indexOf(searchTerm) !== -1
   }
-  return data.search({ collection: collection, filterCallback: filterCallback })
+  return data.search({ collection, filterCallback })
 }

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "music-routes-data",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "What musicians played on what tracks",
   "homepage": "https://github.com/Trott/music-routes-data",
   "files": [
     "/bin",
     "/data",
     "/doc",
-    "/example",
     "/lib",
     "README.md"
   ],
@@ -30,16 +29,16 @@
     "Trott"
   ],
   "devDependencies": {
-    "@semantic-release/changelog": "^6.0.1",
+    "@semantic-release/changelog": "^6.0.2",
     "@semantic-release/git": "^10.0.1",
-    "c8": "^7.11.0",
-    "glob": "^7.2.0",
-    "jasmine": "^4.0.2",
-    "semantic-release": "^19.0.2",
-    "standard": "^16.0.4"
+    "c8": "7.12",
+    "glob": "8.1",
+    "jasmine": "4.5",
+    "semantic-release": "^20.0.2",
+    "standard": "^17.0.0"
   },
   "dependencies": {
-    "minimist": "^1.2.5"
+    "minimist": "^1.2.7"
   },
   "release": {
     "branches": [

package/example/printAllIndividualsInfo

@@ -1,64 +0,0 @@
-#!/usr/bin/env node
-
-var data = {};
-
-// Load basic info.
-data.tracks = require('../data/tracks.json');
-data.artists = require('../data/artists.json');
-data.individuals = require('../data/individuals.json');
-data.releases = require('../data/releases.json');
-
-// Load relation data
-data.at = require('../data/artist_track.json');
-data.ia = require('../data/individual_artist.json');
-data.it = require('../data/individual_track.json');
-data.tr = require('../data/track_release.json');
-
-data.printIndividualDiscography = function (individual) {
-  console.log('Individual ID: ' + individual._id);
-
-  individual.names.forEach(function (name) {
-    console.log('\tName: ' + name);
-  });
-
-  data.printRelatedInfoForIndividual({
-    individual_id: individual._id,
-    relatedInfo: 'artists',
-    relatedField: 'names',
-    relationData: 'ia',
-    relationDataId: 'artist_id',
-    label: 'Member of',
-  });
-
-  data.printRelatedInfoForIndividual({
-    individual_id: individual._id,
-    relatedInfo: 'tracks',
-    relatedField: 'names',
-    relationData: 'it',
-    relationDataId: 'track_id',
-    label: 'Performed on'
-  });
-};
-
-data.printRelatedInfoForIndividual = function (options) {
-
-  var relatedIds = data[options.relationData].filter(function (value) {
-    return value.individual_id === options.individual_id;
-  });
-
-  relatedIds = relatedIds.map(function (value) {
-    return value[options.relationDataId];
-  });
-
-  var relatedData = data[options.relatedInfo].filter(function (value) {
-    return relatedIds.indexOf(value._id) > -1;
-  });
-
-  relatedData.forEach(function (value) {
-    for (var i=0, l=value[options.relatedField].length; i<l; i++) {
-      console.log('\t' + options.label + ': ' + value[options.relatedField][i] + ' [' + value._id + ']');
-    }
-  });
-};
-
-data.individuals.forEach(data.printIndividualDiscography);

package/example/printAllTracksInfo

@@ -1,90 +0,0 @@
-#!/usr/bin/env node
-
-var data = {};
-
-// Load basic info.
-data.tracks = require('../data/tracks.json');
-data.artists = require('../data/artists.json');
-data.individuals = require('../data/individuals.json');
-data.releases = require('../data/releases.json');
-
-// Load relation data
-data.at = require('../data/artist_track.json');
-data.ia = require('../data/individual_artist.json');
-data.it = require('../data/individual_track.json');
-data.tr = require('../data/track_release.json');
-
-data.printTrackInfo = function (track) {
-  console.log('Track ID: ' + track._id);
-
-  track.names.forEach(function (title) {
-    console.log('\tTitle: ' + title);
-  });
-
-  data.printRelatedInfoForTrack({
-    track_id: track._id,
-    relatedInfo: 'artists',
-    relatedField: 'names',
-    relationData: 'at',
-    relationDataId: 'artist_id',
-    label: 'Artist',
-  });
-
-  data.printRelatedInfoForTrack({
-    track_id: track._id,
-    relatedInfo: 'releases',
-    relatedField: 'names',
-    relationData: 'tr',
-    relationDataId: 'release_id',
-    label: 'Release',
-  });
-
-  data.printRelatedInfoForTrack({
-    track_id: track._id,
-    relatedInfo: 'individuals',
-    relatedField: 'names',
-    additionalInfo: 'credits',
-    relationData: 'it',
-    relationDataId: 'individual_id',
-    label: 'Individual',
-  });
-};
-
-data.printRelatedInfoForTrack = function (options) {
-
-  var extras={};
-
-  // Get all the entries from the relation data structure that are related to this one.
-  var relatedIdsAndExtra = data[options.relationData].filter(function (value) {
-    return value.track_id === options.track_id;
-  });
-
-  // If we want additional info (like credits), grab that now too.
-  if (options.additionalInfo) {
-    for (var i=0, l=relatedIdsAndExtra.length; i<l; i++) {
-      extras[relatedIdsAndExtra[i][options.relationDataId]] =  relatedIdsAndExtra[i][options.additionalInfo] || [];
-    }
-  }
-
-  // Strip down to just the IDs we requested.
-  var relatedIds = relatedIdsAndExtra.map(function (value) {
-    return value[options.relationDataId];
-  });
-
-  // Get the actual data we want specified by the related IDs.
-  var relatedData = data[options.relatedInfo].filter(function (value) {
-    return relatedIds.indexOf(value._id) > -1;
-  });
-
-  relatedData.forEach(function (value) {
-    var extra = '';
-    if (extras[value._id] && extras[value._id].length>0) {
-      extra = ' (' + extras[value._id].join(', ') + ')';
-    }
-    for (var i=0, l=value[options.relatedField].length; i<l; i++) {
-      console.log('\t' + options.label + ': ' + value[options.relatedField][i] + extra + ' [' + value._id + ']');
-    }
-  });
-};
-
-data.tracks.forEach(data.printTrackInfo);