Handle interfaces in the generate-externs task
This commit is contained in:
@@ -11,6 +11,7 @@
|
|||||||
},
|
},
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"config/jsdoc/info/api-plugin",
|
"config/jsdoc/info/api-plugin",
|
||||||
"config/jsdoc/info/define-plugin"
|
"config/jsdoc/info/define-plugin",
|
||||||
|
"config/jsdoc/info/interface-plugin"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
16
config/jsdoc/info/interface-plugin.js
Normal file
16
config/jsdoc/info/interface-plugin.js
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
/**
|
||||||
|
* Handle the interface annotation.
|
||||||
|
* @param {Object} dictionary The tag dictionary.
|
||||||
|
*/
|
||||||
|
exports.defineTags = function(dictionary) {
|
||||||
|
|
||||||
|
var classTag = dictionary.lookUp('class');
|
||||||
|
dictionary.defineTag('interface', {
|
||||||
|
mustHaveValue: false,
|
||||||
|
onTagged: function(doclet, tag) {
|
||||||
|
classTag.onTagged.apply(this, arguments);
|
||||||
|
doclet.interface = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
};
|
||||||
@@ -28,6 +28,7 @@ exports.publish = function(data, opts) {
|
|||||||
[
|
[
|
||||||
{define: {isObject: true}},
|
{define: {isObject: true}},
|
||||||
{api: {isString: true}},
|
{api: {isString: true}},
|
||||||
|
{'interface': {is: true}},
|
||||||
function() {
|
function() {
|
||||||
return this.meta && (/[\\\/]externs$/).test(this.meta.path);
|
return this.meta && (/[\\\/]externs$/).test(this.meta.path);
|
||||||
}
|
}
|
||||||
@@ -40,6 +41,7 @@ exports.publish = function(data, opts) {
|
|||||||
var defines = [];
|
var defines = [];
|
||||||
var typedefs = [];
|
var typedefs = [];
|
||||||
var externs = [];
|
var externs = [];
|
||||||
|
var interfaces = [];
|
||||||
docs.filter(function(doc) {
|
docs.filter(function(doc) {
|
||||||
var include = true;
|
var include = true;
|
||||||
var constructor = doc.memberof;
|
var constructor = doc.memberof;
|
||||||
@@ -118,7 +120,7 @@ exports.publish = function(data, opts) {
|
|||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
var target = isExterns ? externs : symbols;
|
var target = isExterns ? externs : (doc.interface ? interfaces : symbols);
|
||||||
target.push(symbol);
|
target.push(symbol);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -128,7 +130,8 @@ exports.publish = function(data, opts) {
|
|||||||
symbols: symbols,
|
symbols: symbols,
|
||||||
defines: defines,
|
defines: defines,
|
||||||
typedefs: typedefs,
|
typedefs: typedefs,
|
||||||
externs: externs
|
externs: externs,
|
||||||
|
interfaces: interfaces
|
||||||
}, null, 2));
|
}, null, 2));
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -18,10 +18,8 @@ function getInfo(callback) {
|
|||||||
callback(new Error('Trouble generating info: ' + err.message));
|
callback(new Error('Trouble generating info: ' + err.message));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var typedefs = require('../build/info.json').typedefs;
|
var info = require('../build/info.json');
|
||||||
var symbols = require('../build/info.json').symbols;
|
callback(null, info.typedefs, info.symbols, info.externs, info.interfaces);
|
||||||
var externs = require('../build/info.json').externs;
|
|
||||||
callback(null, typedefs, symbols, externs);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,10 +29,11 @@ function getInfo(callback) {
|
|||||||
* @param {Array.<Object>} typedefs List of typedefs.
|
* @param {Array.<Object>} typedefs List of typedefs.
|
||||||
* @param {Array.<Object>} symbols List of symbols.
|
* @param {Array.<Object>} symbols List of symbols.
|
||||||
* @param {Array.<Object>} externs List of externs.
|
* @param {Array.<Object>} externs List of externs.
|
||||||
|
* @param {Array.<Object>} externs List of interfaces.
|
||||||
* @param {string|undefined} namespace Target object for exported symbols.
|
* @param {string|undefined} namespace Target object for exported symbols.
|
||||||
* @return {string} Export code.
|
* @return {string} Export code.
|
||||||
*/
|
*/
|
||||||
function generateExterns(typedefs, symbols, externs) {
|
function generateExterns(typedefs, symbols, externs, interfaces) {
|
||||||
var lines = [];
|
var lines = [];
|
||||||
var processedSymbols = {};
|
var processedSymbols = {};
|
||||||
var constructors = {};
|
var constructors = {};
|
||||||
@@ -126,6 +125,8 @@ function generateExterns(typedefs, symbols, externs) {
|
|||||||
|
|
||||||
externs.forEach(processSymbol);
|
externs.forEach(processSymbol);
|
||||||
|
|
||||||
|
interfaces.forEach(processSymbol);
|
||||||
|
|
||||||
symbols.forEach(processSymbol);
|
symbols.forEach(processSymbol);
|
||||||
|
|
||||||
typedefs.forEach(function(typedef) {
|
typedefs.forEach(function(typedef) {
|
||||||
@@ -150,10 +151,10 @@ function generateExterns(typedefs, symbols, externs) {
|
|||||||
function main(callback) {
|
function main(callback) {
|
||||||
async.waterfall([
|
async.waterfall([
|
||||||
getInfo,
|
getInfo,
|
||||||
function(typedefs, symbols, externs, done) {
|
function(typedefs, symbols, externs, interfaces, done) {
|
||||||
var code, err;
|
var code, err;
|
||||||
try {
|
try {
|
||||||
code = generateExterns(typedefs, symbols, externs);
|
code = generateExterns(typedefs, symbols, externs, interfaces);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
err = e;
|
err = e;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user