diff --git a/docs/dgeni-package/processors/readTypeScriptModules.js b/docs/dgeni-package/processors/readTypeScriptModules.js index 834c545608..303bb239d7 100644 --- a/docs/dgeni-package/processors/readTypeScriptModules.js +++ b/docs/dgeni-package/processors/readTypeScriptModules.js @@ -22,7 +22,7 @@ module.exports = function readTypeScriptModules(tsParser, readFilesProcessor, mo // The base path from which to load the source files basePath: '.', // We can ignore members of classes that are private - hidePrivateMembers: false, + hidePrivateMembers: true, // We can sort class members alphabetically sortClassMembers: true, // We can provide a collection of strings or regexes to ignore exports whose export names match diff --git a/docs/dgeni-package/templates/type-definition.template.html b/docs/dgeni-package/templates/type-definition.template.html index acd9a1d541..47007c16be 100644 --- a/docs/dgeni-package/templates/type-definition.template.html +++ b/docs/dgeni-package/templates/type-definition.template.html @@ -1,7 +1,8 @@ {%- macro commentBlock(doc, level) -%} {%- if doc.content | trim %} + {% if level > 1 %}{$ '/**' | indent(level-1, true) | replace(r/\n$/, "") $}{% else %}/**{% endif %} -{$ doc.content | replace(r/^/gm, "* ") | indent(level, true) | replace(r/\n$/, "") $} +{$ doc.content | trim | replace(r/^/gm, "* ") | indent(level, true) | replace(r/\n$/, "") $} {$ '*/' | indent(level, true) | replace(r/\n$/, "") $}{% endif -%} {%- endmacro -%} @@ -15,7 +16,6 @@ // Please do not create manual edits or send pull requests // modifying this file. // *********************************************************** - {% for module in doc.modules %} {$ commentBlock(module, 1) $} declare module "{$ module.id $}" { @@ -37,7 +37,8 @@ declare module "{$ module.id $}" { {%- else -%} {% if export.parameters %}({% for param in export.parameters %}{$ param $}{% if not loop.last %}, {% endif %}{% endfor %}){%- endif %} {%- if export.returnType %} : {$ export.returnType $} {% endif -%} - {% endif %} + ; + {%- endif %} {% endfor %} }