Migrate Storages to classes

lib/config.js

@@ -37,7 +37,7 @@ function Config(config) {
   assert.equal(typeof(config), 'object', 'CONFIG: it doesn\'t look like a valid config file')
 
   assert(self.storage, 'CONFIG: storage path not defined')
-  self.localList = LocalData(
+  self.localList = new LocalData(
     Path.join(
       Path.resolve(Path.dirname(self.self_path || ''), self.storage),
       '.sinopia-db.json'

lib/local-data.js

@@ -1,44 +1,46 @@
-var fs   = require('fs')
-var Path = require('path')
+"use strict";
 
-module.exports = LocalData
+const fs   = require('fs');
+const Path = require('path');
 
-function LocalData(path) {
-  var self = Object.create(LocalData.prototype)
-  self.path = path
-  try {
-    self.data = JSON.parse(fs.readFileSync(self.path, 'utf8'))
-  } catch(_) {
-    self.data = { list: [] }
+ class LocalData {
+
+   constructor(path) {
+    this.path = path
+    try {
+      this.data = JSON.parse(fs.readFileSync(this.path, 'utf8'))
+    } catch(_) {
+      this.data = { list: [] }
+    }
   }
-  return self
-}
 
-LocalData.prototype.add = function(name) {
-  if (this.data.list.indexOf(name) === -1) {
-    this.data.list.push(name)
+  add(name) {
+    if (this.data.list.indexOf(name) === -1) {
+      this.data.list.push(name)
+      this.sync()
+    }
+  }
+
+  remove(name) {
+    const i = this.data.list.indexOf(name)
+    if (i !== -1) {
+      this.data.list.splice(i, 1)
+    }
     this.sync()
   }
-}
 
-LocalData.prototype.remove = function(name) {
-  var i = this.data.list.indexOf(name)
-  if (i !== -1) {
-    this.data.list.splice(i, 1)
+  get() {
+    return this.data.list
+  }
+
+  sync() {
+    // Uses sync to prevent ugly race condition
+    try {
+      require('mkdirp').sync(Path.dirname(this.path))
+    } catch(err) {}
+    fs.writeFileSync(this.path, JSON.stringify(this.data))
   }
 
-  this.sync()
-}
-
-LocalData.prototype.get = function() {
-  return this.data.list
-}
-
-LocalData.prototype.sync = function() {
-  // Uses sync to prevent ugly race condition
-  try {
-    require('mkdirp').sync(Path.dirname(this.path))
-  } catch(err) {}
-  fs.writeFileSync(this.path, JSON.stringify(this.data))
 }
 
+module.exports = LocalData;

lib/local-fs.js

@@ -1,8 +1,10 @@
-var fs        = require('fs')
-var Error     = require('http-errors')
-var mkdirp    = require('mkdirp')
-var Path      = require('path')
-var MyStreams = require('./streams')
+"use strict";
+
+const fs        = require('fs')
+const Error     = require('http-errors')
+const mkdirp    = require('mkdirp')
+const Path      = require('path')
+const MyStreams = require('./streams')
 
 function FSError(code) {
   var err = Error(code)

lib/local-storage.js

@@ -19,11 +19,11 @@ var info_file  = 'package.json'
 // Implements Storage interface
 // (same for storage.js, local-storage.js, up-storage.js)
 //
-function Storage(config) {
-  var self = Object.create(Storage.prototype)
-  self.config = config
-  self.logger = Logger.logger.child({ sub: 'fs' })
-  return self
+class Storage {
+  constructor(config) {
+    this.config = config
+    this.logger = Logger.logger.child({ sub: 'fs' })
+  }
 }
 
 // returns the minimal package file

lib/search.js

@@ -15,7 +15,7 @@ class Search {
   query(q) {
 	  return q === '*'
       ? this.storage.config.localList.get().map( function( pkg ) {
-        return { ref: pkg, score: 1 }; 
+        return { ref: pkg, score: 1 };
       }) : this.index.search(q);
   }
 

lib/storage.js

@@ -27,7 +27,7 @@ function Storage(config) {
     self.uplinks[p] = Proxy(config.uplinks[p], config)
     self.uplinks[p].upname = p
   }
-  self.local = Local(config)
+  self.local = new Local(config)
   self.logger = Logger.logger.child()
 
   return self

test/unit/search.js

@@ -27,7 +27,7 @@ var packages = [
 		_npmUser: {
 			name: 'test_user',
 		}
-	}
+	},
 ]
 
 describe('search', function() {