diff --git a/package.json b/package.json index d44dcff27e..e0f8a735a6 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "cpr": "2.0.0", "del": "2.2.2", "dgeni": "0.4.2", - "dgeni-packages": "0.10.18", + "dgeni-packages": "0.16.0", "event-stream": "3.3.4", "file-loader": "0.9.0", "github": "0.2.4", diff --git a/scripts/docs/dgeni-config.js b/scripts/docs/dgeni-config.js index c12d178ce7..5c5c239589 100644 --- a/scripts/docs/dgeni-config.js +++ b/scripts/docs/dgeni-config.js @@ -137,6 +137,13 @@ module.exports = function(currentVersion, initialVersionBuild) { // }); // }) +// Configure allowedDocTypes +.config(function(extractAccessTransform) { + var allowedDocTypes = ['member']; + allowedDocTypes.forEach(function(docType) { + extractAccessTransform.allowedDocTypes.add(docType); + }); +}) // Configure links .config(function(getLinkInfo) { diff --git a/scripts/docs/links-package/index.js b/scripts/docs/links-package/index.js index a3ffc71991..ddb2053149 100644 --- a/scripts/docs/links-package/index.js +++ b/scripts/docs/links-package/index.js @@ -3,8 +3,8 @@ var Package = require('dgeni').Package; module.exports = new Package('links', []) .factory(require('./inline-tag-defs/link')) -.factory(require('dgeni-packages/ngdoc/services/getAliases')) -.factory(require('dgeni-packages/ngdoc/services/getDocFromAlias')) +.factory(require('dgeni-packages/links/services/getAliases')) +.factory(require('dgeni-packages/links/services/getDocFromAlias')) .factory(require('./services/getLinkInfo')) .config(function(inlineTagProcessor, linkInlineTagDef) { diff --git a/scripts/docs/typescript-package/processors/readTypeScriptModules.js b/scripts/docs/typescript-package/processors/readTypeScriptModules.js index aa80c7a15c..8d10ce2158 100755 --- a/scripts/docs/typescript-package/processors/readTypeScriptModules.js +++ b/scripts/docs/typescript-package/processors/readTypeScriptModules.js @@ -70,6 +70,13 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo, if (!resolvedExport.declarations) return; var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker); + + // Ignore exports marked as "@private" in jsDoc content + var jsDocContainsPrivate = (exportDoc.content || '').split('\n').some(function(commentRow) { + return commentRow.search(/@private|@access private/) >= 0; + }); + if (jsDocContainsPrivate) return; + log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id); // Add this export doc to its module doc