Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions lib/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,13 @@ Builder.prototype.append = function(str){
Builder.prototype.json = function(fn){
var self = this;
var cache = this._cache;


// conf has already been validated
if (this.conf) return fn(null, this.conf);

var path = this.path('component.json');
var conf = cache[path];
if (conf) return fn(null, this.conf = conf);
if (conf) return validate(conf);

debug('reading %s', path);
fs.readFile(path, 'utf8', function(err, str){
Expand All @@ -359,11 +360,17 @@ Builder.prototype.json = function(fn){
self._emittedConfig = true;
self.emit('config');
}
fn(null, self.conf);
validate(self.conf);
} catch (err) {
fn(err);
}
});

function validate(conf){
if(!conf.name) return fn(new Error( path + " attribute \"name\" missing"));
self.conf = conf;
fn(null, conf);
}
};

/**
Expand Down