music-routes-data 1.0.7 → 1.1.0

package/README.md

@@ -3,8 +3,6 @@ music-routes-data
 
 Music Routes Data: What musicians played on which tracks?
 
-[![Build Status](https://travis-ci.org/Trott/music-routes-data.png?branch=master)](https://travis-ci.org/Trott/music-routes-data)
-
 Schema
 ======
 

package/data/artist_track.json

@@ -54778,5 +54778,9 @@
   {
     "artist_id": "413",
     "track_id": "13477"
+  },
+  {
+    "artist_id": "1767",
+    "track_id": "13478"
   }
 ]

package/data/artists.json

@@ -10424,5 +10424,11 @@
     "names": [
       "Back Street Crawler"
     ]
+  },
+  {
+    "_id": "1767",
+    "names": [
+      "Joel Frahm"
+    ]
   }
 ]

package/data/individual_artist.json

@@ -19374,5 +19374,9 @@
   {
     "artist_id": "1766",
     "individual_id": "1960"
+  },
+  {
+    "individual_id": "11050",
+    "artist_id": "1767"
   }
 ]

package/data/individual_track.json

@@ -257171,7 +257171,7 @@
     "track_id": "13475",
     "individual_id": "4668"
   },
-    {
+  {
     "track_id": "13475",
     "individual_id": "11041"
   },
@@ -257199,7 +257199,7 @@
     "track_id": "13476",
     "individual_id": "11047"
   },
-    {
+  {
     "track_id": "13476",
     "individual_id": "1960"
   },
@@ -257219,11 +257219,11 @@
     "track_id": "13477",
     "individual_id": "6058"
   },
-    {
+  {
     "track_id": "13477",
     "individual_id": "11048"
   },
-    {
+  {
     "track_id": "13477",
     "individual_id": "11049"
   },
@@ -257239,7 +257239,7 @@
     "track_id": "13477",
     "individual_id": "6109"
   },
-    {
+  {
     "track_id": "13477",
     "individual_id": "6112"
   },
@@ -257247,16 +257247,24 @@
     "track_id": "13477",
     "individual_id": "405"
   },
-    {
+  {
     "track_id": "13477",
     "individual_id": "3190"
   },
-    {
+  {
     "track_id": "13477",
     "individual_id": "1392"
   },
   {
     "track_id": "13477",
     "individual_id": "1393"
+  },
+  {
+    "individual_id": "11050",
+    "track_id": "13478"
+  },
+  {
+    "individual_id": "8600",
+    "track_id": "13478"
   }
 ]

package/data/individuals.json

@@ -62967,5 +62967,11 @@
     "names": [
       "Vincent Bonham"
     ]
+  },
+  {
+    "_id": "11050",
+    "names": [
+      "Joel Frahm"
+    ]
   }
 ]

package/data/releases.json

@@ -14747,5 +14747,11 @@
     "names": [
       "2nd Street"
     ]
+  },
+  {
+    "_id": "2483",
+    "names": [
+      "Don't Explain"
+    ]
   }
 ]

package/data/track_release.json

@@ -54286,5 +54286,9 @@
   {
     "track_id": "13477",
     "release_id": "1242"
+  },
+  {
+    "release_id": "2483",
+    "track_id": "13478"
   }
 ]

package/data/tracks.json

@@ -80063,5 +80063,11 @@
     "names": [
       "Hummingbird"
     ]
+  },
+  {
+    "_id": "13478",
+    "names": [
+      "Don't Explain"
+    ]
   }
 ]

package/lib/Data/index.js

@@ -1,154 +1,149 @@
-var fs = require('fs');
+const fs = require('fs')
 
 function Data (options) {
-  var data = {};
-  var collectionFields = {
+  const data = {}
+  const collectionFields = {
     tracks: ['names'],
     artists: ['names'],
     individuals: ['names'],
     releases: ['names']
-  };
+  }
 
-  var linkCollectionFields = {
+  const linkCollectionFields = {
     artist_track: [],
     individual_artist: [],
     individual_track: [],
     track_release: []
-  };
+  }
 
-  this.dataCollections = Object.freeze(Object.keys(collectionFields));
-  this.linkCollections = Object.freeze(Object.keys(linkCollectionFields));
+  this.dataCollections = Object.freeze(Object.keys(collectionFields))
+  this.linkCollections = Object.freeze(Object.keys(linkCollectionFields))
 
-  var collections = this.dataCollections.concat(this.linkCollections);
+  const collections = this.dataCollections.concat(this.linkCollections)
   collections.forEach(function (value) {
-    data[value] = [];
-  });
+    data[value] = []
+  })
 
-  var makeReturnValue = function (status, message) {
-    return { status: status, message: message };
-  };
+  const makeReturnValue = function (status, message) {
+    return { status: status, message: message }
+  }
 
-  this.StatusEnum = Object.freeze({ OK: 0, ERROR: 1 });
+  this.StatusEnum = Object.freeze({ OK: 0, ERROR: 1 })
 
   this.search = function (options) {
-    var rv;
-    var collection;
-    var filterCallback;
-    var results;
-
     if (typeof options === 'undefined') {
-      return makeReturnValue(this.StatusEnum.ERROR, 'options must be specified');
+      return makeReturnValue(this.StatusEnum.ERROR, 'options must be specified')
     }
 
-    collection = options.collection;
+    const collection = options.collection
 
     if (typeof collection === 'undefined') {
-      return makeReturnValue(this.StatusEnum.ERROR, 'collection is a required option.');
+      return makeReturnValue(this.StatusEnum.ERROR, 'collection is a required option.')
     }
 
     if (collections.indexOf(collection) === -1) {
-      return makeReturnValue(this.StatusEnum.ERROR, 'collection ' + collection + ' does not exist.');
+      return makeReturnValue(this.StatusEnum.ERROR, 'collection ' + collection + ' does not exist.')
     }
 
     // If no filterCallback sent, return everything
-    filterCallback = options.filterCallback || function (value) { return true; };
+    const filterCallback = options.filterCallback || function (value) { return true }
 
     if (typeof filterCallback !== 'function') {
-      return makeReturnValue(this.StatusEnum.ERROR, 'filterCallback must be a function, got ' + typeof filterCallback);
+      return makeReturnValue(this.StatusEnum.ERROR, 'filterCallback must be a function, got ' + typeof filterCallback)
     }
 
-    results = data[collection].filter(filterCallback);
+    const results = data[collection].filter(filterCallback)
 
-    rv = makeReturnValue(this.StatusEnum.OK, '');
-    rv.results = results;
-    return rv;
-  };
+    const rv = makeReturnValue(this.StatusEnum.OK, '')
+    rv.results = results
+    return rv
+  }
 
   this.create = function (collection, entry) {
-    var newEntry = {};
-    var isFieldMissing = false;
+    const newEntry = {}
+    let isFieldMissing = false
 
     if (this.dataCollections.indexOf(collection) === -1) {
-      return makeReturnValue(this.StatusEnum.ERROR, 'Collection does not exist: ' + collection);
+      return makeReturnValue(this.StatusEnum.ERROR, 'Collection does not exist: ' + collection)
     }
 
     if (!entry._id) {
-      return makeReturnValue(this.StatusEnum.ERROR, 'Missing _id');
+      return makeReturnValue(this.StatusEnum.ERROR, 'Missing _id')
     }
 
     if (typeof entry._id !== 'string') {
-      return makeReturnValue(this.StatusEnum.ERROR, '_id must be a string, got ' + typeof entry._id);
+      return makeReturnValue(this.StatusEnum.ERROR, '_id must be a string, got ' + typeof entry._id)
     }
 
     // Check if _id already exists. It should not.
-    if (data[collection].filter(function (value) { return value._id === entry._id; }).length > 0) {
-      return makeReturnValue(this.StatusEnum.ERROR, '_id ' + entry._id + ' already exists');
+    if (data[collection].filter(function (value) { return value._id === entry._id }).length > 0) {
+      return makeReturnValue(this.StatusEnum.ERROR, '_id ' + entry._id + ' already exists')
     }
 
-    newEntry._id = entry._id;
+    newEntry._id = entry._id
 
     collectionFields[collection].forEach(function (field) {
       if (!entry[field]) {
-        isFieldMissing = true;
-        return;
+        isFieldMissing = true
+        return
       }
 
       if (!(entry[field] instanceof Array)) {
-        isFieldMissing = true;
-        return;
+        isFieldMissing = true
+        return
       }
 
       // If some element in field array is not a string, reject the entry.
-      if (entry[field].some(function (value) { return typeof value !== 'string'; })) {
-        isFieldMissing = true;
-        return;
+      if (entry[field].some(function (value) { return typeof value !== 'string' })) {
+        isFieldMissing = true
+        return
       }
 
-      newEntry[field] = entry[field];
-    });
+      newEntry[field] = entry[field]
+    })
 
     if (isFieldMissing) {
-      return makeReturnValue(this.StatusEnum.ERROR, 'Required field is missing');
+      return makeReturnValue(this.StatusEnum.ERROR, 'Required field is missing')
     }
 
-    data[collection].push(newEntry);
-    return makeReturnValue(this.StatusEnum.OK, '');
-  };
+    data[collection].push(newEntry)
+    return makeReturnValue(this.StatusEnum.OK, '')
+  }
 
   this.link = function (collection, entry) {
     // TODO: error checking for linkage that already exists
     // TODO: how to handle credits? separate command? handle it here? I guess real challenge is handling from the command line.
     if (this.linkCollections.indexOf(collection) === -1) {
-      return makeReturnValue(this.StatusEnum.ERROR, 'Invalid link collection specified');
+      return makeReturnValue(this.StatusEnum.ERROR, 'Invalid link collection specified')
     }
-    data[collection].push(entry);
-    return makeReturnValue(this.StatusEnum.OK, '');
-  };
+    data[collection].push(entry)
+    return makeReturnValue(this.StatusEnum.OK, '')
+  }
 
-  var fsOp = function (dir, callback) {
+  const fsOp = function (dir, callback) {
     if (!dir || typeof dir !== 'string') {
-      return makeReturnValue(this.StatusEnum.ERROR, 'No directory specified');
+      return makeReturnValue(this.StatusEnum.ERROR, 'No directory specified')
     }
 
     try {
-      collections.forEach(callback);
+      collections.forEach(callback)
     } catch (e) {
-      return makeReturnValue(this.StatusEnum.ERROR, e.message || 'Unknown error');
+      return makeReturnValue(this.StatusEnum.ERROR, e.message || 'Unknown error')
     }
-    return makeReturnValue(this.StatusEnum.OK, '');
-  };
+    return makeReturnValue(this.StatusEnum.OK, '')
+  }
 
   this.read = function (dir) {
     return fsOp.call(this, dir, function (collection) {
-      data[collection] = JSON.parse(fs.readFileSync(dir + '/' + collection + '.json'));
-    });
-  };
+      data[collection] = JSON.parse(fs.readFileSync(dir + '/' + collection + '.json'))
+    })
+  }
 
   this.write = function (dir) {
     return fsOp.call(this, dir, function (collection) {
-      fs.writeFileSync(dir + '/' + collection + '.json', JSON.stringify(data[collection], null, 2));
-    });
-  };
+      fs.writeFileSync(dir + '/' + collection + '.json', JSON.stringify(data[collection], null, 2))
+    })
+  }
 }
 
-module.exports = Data;
+module.exports = Data

package/lib/cli/add.js

@@ -1,3 +1,3 @@
 module.exports = function (data, collection, _id, names) {
-  return data.create(collection, { _id: _id.toString(), names: [names] });
-};
+  return data.create(collection, { _id: _id.toString(), names: [names] })
+}

package/lib/cli/argv.js

@@ -1,76 +1,74 @@
-var fs = require('fs');
-var path = require('path');
-var Data = require('../Data');
-var add = require('./add');
-var search = require('./search');
-var link = require('./link');
+const fs = require('fs')
+const path = require('path')
+const Data = require('../Data')
+const add = require('./add')
+const search = require('./search')
+const link = require('./link')
 
 module.exports = function (argv) {
-  var that = this;
-  var action = argv._[0];
-  var args = argv._.splice(1);
-  var rv = {};
-  var code;
-  var inputRv;
+  const that = this
+  const action = argv._[0]
+  const args = argv._.splice(1)
+  let rv = {}
+  let inputRv
 
-  var outputDir = argv.outputDir || argv.o;
-  var inputDir = argv.inputDir || argv.i;
+  const outputDir = argv.outputDir || argv.o
+  const inputDir = argv.inputDir || argv.i
 
-  var data = new Data();
+  const data = new Data()
 
-  var save = function () {
+  const save = function () {
     if (rv.status === data.StatusEnum.OK) {
       if (outputDir) {
-        data.write(outputDir);
+        data.write(outputDir)
       } else {
-        that.error('No output directory specified. Your data will not be saved.\nUse -o to specify an output directory.');
+        that.error('No output directory specified. Your data will not be saved.\nUse -o to specify an output directory.')
       }
     }
-  };
+  }
 
-  var run = function (actionFunction) {
-    var actionRv = actionFunction.apply(undefined, [data].concat(args));
+  const run = function (actionFunction) {
+    const actionRv = actionFunction.apply(undefined, [data].concat(args))
     if (actionRv.message) {
-      that.error(actionRv.message);
+      that.error(actionRv.message)
     }
-    return actionRv;
-  };
+    return actionRv
+  }
 
   if (inputDir) {
-    inputRv = data.read(inputDir);
+    inputRv = data.read(inputDir)
     if (inputRv.message) {
-      this.error(inputRv.message);
+      this.error(inputRv.message)
     }
     if (inputRv.status === data.StatusEnum.ERROR) {
-      this.exit(1);
+      this.exit(1)
     }
   } else {
-    this.error('No input directory specified. Operating on empty data set.\nUse -i to specify a data directory.');
+    this.error('No input directory specified. Operating on empty data set.\nUse -i to specify a data directory.')
   }
 
   switch (action) {
     case 'add':
-      rv = run(add);
-      save();
-      break;
+      rv = run(add)
+      save()
+      break
 
     case 'link':
-      rv = run(link);
-      save();
-      break;
+      rv = run(link)
+      save()
+      break
 
     case 'search':
-      rv = run(search);
+      rv = run(search)
       if (rv.status === data.StatusEnum.OK) {
-        this.dir(rv.results);
+        this.dir(rv.results)
       }
-      break;
+      break
 
     default:
-      var message = fs.readFileSync(path.join(__dirname, '..', '..', 'doc', 'cli', 'help.txt'), 'utf8');
-      this.error(message);
-      rv = { status: data.StatusEnum.ERROR };
+      this.error(fs.readFileSync(path.join(__dirname, '..', '..', 'doc', 'cli', 'help.txt'), 'utf8'))
+      rv = { status: data.StatusEnum.ERROR }
   }
-  code = rv.status === data.StatusEnum.OK ? 0 : 1;
-  this.exit(code);
-};
+  const code = rv.status === data.StatusEnum.OK ? 0 : 1
+  this.exit(code)
+}

package/lib/cli/index.js

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

package/lib/cli/link.js

@@ -1,18 +1,18 @@
 module.exports = function (data, collection1, id1, collection2, id2) {
-  var linkCollection = collection1 + '_' + collection2;
-  var field1 = collection1 + '_id';
-  var field2 = collection2 + '_id';
-  var link = {};
-  link[field1] = id1.toString();
-  link[field2] = id2.toString();
+  let linkCollection = collection1 + '_' + collection2
+  const field1 = collection1 + '_id'
+  const field2 = collection2 + '_id'
+  const link = {}
+  link[field1] = id1.toString()
+  link[field2] = id2.toString()
 
   if (data.linkCollections.indexOf(linkCollection) === -1) {
     // Try track_release if release_track is what we have
-    linkCollection = collection2 + '_' + collection1;
+    linkCollection = collection2 + '_' + collection1
     if (data.linkCollections.indexOf(linkCollection) === -1) {
-      this.error(collection1 + ' and ' + collection2 + ' cannot be linked');
-      return { status: data.StatusEnum.ERROR };
+      this.error(collection1 + ' and ' + collection2 + ' cannot be linked')
+      return { status: data.StatusEnum.ERROR }
     }
   }
-  return data.link(linkCollection, link);
-};
+  return data.link(linkCollection, link)
+}

package/lib/cli/search.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "music-routes-data",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "What musicians played on what tracks",
   "homepage": "https://github.com/Trott/music-routes-data",
   "files": [
@@ -12,7 +12,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "grunt"
+    "test": "standard && c8 jasmine spec/*.js && bin/verify"
   },
   "repository": {
     "type": "git",
@@ -30,20 +30,41 @@
     "Trott"
   ],
   "devDependencies": {
-    "glob": "^7.1.2",
-    "grunt": "^1.1.0",
-    "grunt-cli": "^1.2.0",
-    "grunt-exec": "~0.4.2",
-    "grunt-jsonlint": "~1.0.4",
-    "jasmine": "^3.4.0",
-    "semistandard": "^14.2.0"
+    "@semantic-release/changelog": "^6.0.1",
+    "@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"
   },
   "dependencies": {
     "minimist": "^1.2.5"
   },
-  "semistandard": {
-    "env": {
-      "jasmine": true
-    }
+  "release": {
+    "branches": [
+      "main"
+    ],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      [
+        "@semantic-release/changelog",
+        {
+          "changelogFile": "CHANGELOG"
+        }
+      ],
+      "@semantic-release/npm",
+      [
+        "@semantic-release/git",
+        {
+          "assets": [
+            "CHANGELOG",
+            "package.json"
+          ],
+          "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+        }
+      ]
+    ]
   }
 }