From dbe6cdad7e8803e3b7259b5ec6df901d8c959cd2 Mon Sep 17 00:00:00 2001
From: Peter Bacon Darwin <pete@bacondarwin.com>
Date: Tue, 10 Oct 2017 13:25:26 +0100
Subject: [PATCH] build(aio): improve accessor rendering (#19637)

Includes an update to `dgeni-packages@0.22.0` which provides more info
about accessors if required.

PR Close #19637
---
 aio/package.json                                            | 2 +-
 .../angular-api-package/processors/filterContainedDocs.js   | 2 +-
 aio/tools/transforms/templates/api/lib/memberHelpers.html   | 4 ++--
 aio/yarn.lock                                               | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aio/package.json b/aio/package.json
index e17db17c11..f13fcc711f 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -99,7 +99,7 @@
     "concurrently": "^3.4.0",
     "cross-spawn": "^5.1.0",
     "dgeni": "^0.4.7",
-    "dgeni-packages": "^0.21.4",
+    "dgeni-packages": "0.22.0",
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",
diff --git a/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js b/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js
index 7b24920d38..036f6bad85 100644
--- a/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js
+++ b/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js
@@ -4,7 +4,7 @@
  */
 module.exports = function filterContainedDocs() {
   return {
-    docTypes: ['member', 'function-overload'],
+    docTypes: ['member', 'function-overload', 'get-accessor-info', 'set-accessor-info'],
     $runAfter: ['extra-docs-added'],
     $runBefore: ['computing-paths'],
     $process: function(docs) {
diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index 2366c8c0b8..23ccbaed13 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -18,8 +18,8 @@
 
 {%- macro renderMember(member, truncateLines) -%}
     {%- if member.accessibility !== 'public' %}{$ member.accessibility $} {% endif -%}
-    {%- if member.isGetAccessor or member.isReadonly %}get {% endif -%}
-    {%- if member.isSetAccessor %}set {% endif -%}
+    {%- if (member.isGetAccessor or member.isReadonly) and not member.isSetAccessor %}get {% endif -%}
+    {%- if member.isSetAccessor and not member.isGetAccessor %}set {% endif -%}
     {%- if member.isStatic  %}static {% endif -%}
     {$ member.name $}{$ member.typeParameters | escape $}{% if not member.isGetAccessor %}{$ params.paramList(member.parameters, truncateLines) | trim $}{% endif %}
     {%- if member.isOptional  %}?{% endif -%}
diff --git a/aio/yarn.lock b/aio/yarn.lock
index 9ec508dbfc..d9ed5c7d9c 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -1998,9 +1998,9 @@ devtools-timeline-model@1.1.6:
     chrome-devtools-frontend "1.0.401423"
     resolve "1.1.7"
 
-dgeni-packages@^0.21.4:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.21.4.tgz#c77a0730b52ac5dbab00f10fae47dd148374aeb4"
+dgeni-packages@0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.22.0.tgz#7ed07af9074f6547847256c1a65b488a5a17ad03"
   dependencies:
     canonical-path "0.0.2"
     catharsis "^0.8.1"