From b47526fb4299a1d0df6708ccbdab94029a564bc9 Mon Sep 17 00:00:00 2001 From: Esteban Ordano Date: Tue, 20 Jan 2015 11:16:15 -0300 Subject: [PATCH] Use the new error building system --- lib/errors.js | 8 ++++++++ lib/errors/build.js | 47 --------------------------------------------- lib/errors/spec.js | 13 ------------- package.json | 2 +- 4 files changed, 9 insertions(+), 61 deletions(-) create mode 100644 lib/errors.js delete mode 100644 lib/errors/build.js delete mode 100644 lib/errors/spec.js diff --git a/lib/errors.js b/lib/errors.js new file mode 100644 index 0000000..aa461a5 --- /dev/null +++ b/lib/errors.js @@ -0,0 +1,8 @@ +'use strict'; + +var spec = { + name: 'P2P', + message: 'Internal Error on bitcore-p2p Module {0}' +}; + +module.exports = require('bitcore').errors.extend(spec); diff --git a/lib/errors/build.js b/lib/errors/build.js deleted file mode 100644 index fe9dc8a..0000000 --- a/lib/errors/build.js +++ /dev/null @@ -1,47 +0,0 @@ -'use strict'; - -var _ = require('lodash'); -var fs = require('fs'); - -var defineElement = function(fullName, baseClass, message) { - return fullName + ' = function() {\n' + - ' this.message = ' + message + ';\n' + - ' this.stack = this.message + \'\\n\' + (new Error()).stack;\n' + - '};\n' + - fullName + '.prototype = Object.create(' + baseClass + '.prototype);\n' + - fullName + '.prototype.name = "' + fullName + '";\n\n'; -}; - -var traverseNode = function(baseClass, errorDefinition) { - var className = baseClass + '.' + errorDefinition.name; - var generated = defineElement(className, baseClass, errorDefinition.message); - if (errorDefinition.errors) { - generated += childDefinitions(className, errorDefinition.errors); - } - return generated; -}; - -/* jshint latedef: false */ -var childDefinitions = function(parent, childDefinitions) { - var generated = ''; - _.each(childDefinitions, function(childDefinition) { - generated += traverseNode(parent, childDefinition); - }); - return generated; -}; -/* jshint latedef: true */ - -var traverseRoot = function(errorsDefinition) { - var fullName = 'bitcore.errors'; - var generated = '\'use strict\';\n\n'; - generated += '/* jshint maxlen: 300 */\n'; - generated += '/* jshint quotmark: false */\n'; - generated += '/* AUTOGENERATED FILE. DON\'T EDIT, MODIFY "lib/errors/spec.js" INSTEAD */\n\n'; - generated += 'var bitcore = require(\'bitcore\');\n\n'; - generated += childDefinitions(fullName, errorsDefinition); - generated += 'module.exports = bitcore.errors;\n'; - return generated; -}; - -var data = require('./spec'); -fs.writeFileSync(__dirname + '/index.js', traverseRoot(data)); diff --git a/lib/errors/spec.js b/lib/errors/spec.js deleted file mode 100644 index d49c0ac..0000000 --- a/lib/errors/spec.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -function format(arg) { - return '\'' + arg - .replace('{0}', '\' + arguments[0] + \'') - .replace('{1}', '\' + arguments[1] + \'') - .replace('{2}', '\' + arguments[2] + \'') + '\''; -} - -module.exports = [{ - name: 'P2P', - message: format('Internal Error on bitcore-p2p Module {0}') -}]; diff --git a/package.json b/package.json index 38981ce..a8382bf 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "socks5-client": "^0.3.6" }, "devDependencies": { - "bitcore-build": "=0.4.2", + "bitcore-build": "^0.4.2", "brfs": "^1.2.0", "chai": "~1.10.0", "gulp": "^3.8.10",