From 60261521cea0e714cc713967dee1aadd7a557dfe Mon Sep 17 00:00:00 2001
From: Matthew B White <mbwhite@users.noreply.github.com>
Date: Wed, 27 Jun 2018 13:41:49 +0100
Subject: [PATCH] cope with missing description property, and add in namespace
 for all assets (#4193)

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
---
 .../_bnaTemplate/phase1-markdown/assets.njk   |   5 ++-
 .../_bnaTemplate/phase1-markdown/enums.njk    |   5 ++-
 .../_bnaTemplate/phase1-markdown/events.njk   |   5 ++-
 .../_bnaTemplate/phase1-markdown/index.njk    |  14 ++++---
 .../phase1-markdown/participants.njk          |   6 +--
 .../_bnaTemplate/phase2-html/html.default.njk |   8 +++-
 .../_template/phase1-markdown/01_summary.njk  |  14 ++++---
 .../_template/phase1-markdown/02_assets.njk   |   5 ++-
 .../phase1-markdown/03_participants.njk       |   5 ++-
 .../phase1-markdown/04_transactions.njk       |   6 +--
 .../_template/phase1-markdown/05_events.njk   |   6 +--
 .../_template/phase1-markdown/06_enums.njk    |   6 +--
 .../generators/classdeclarations.js           |  39 +++++++++++-------
 .../lib/processors/hc_network.js              |   2 +-
 .../lib/processors/visitors/info.js           |   9 ++--
 .../test/carauction-network.bna               | Bin 7818 -> 7855 bytes
 16 files changed, 80 insertions(+), 55 deletions(-)

diff --git a/packages/composer-documentation/_bnaTemplate/phase1-markdown/assets.njk b/packages/composer-documentation/_bnaTemplate/phase1-markdown/assets.njk
index 06618cc274..2674e9482b 100755
--- a/packages/composer-documentation/_bnaTemplate/phase1-markdown/assets.njk
+++ b/packages/composer-documentation/_bnaTemplate/phase1-markdown/assets.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Asset Model
-
-{% for asset in types.asset %}
+{% for id,assets in types.asset %}
+{% for asset in assets %}
 #### {{asset.name}}
 **{{asset.fqn}}** - **{{asset.description}}**
 
@@ -27,6 +27,7 @@
 {% endfor %}
 
 {% endfor %}
+{% endfor %}
 
 
 
diff --git a/packages/composer-documentation/_bnaTemplate/phase1-markdown/enums.njk b/packages/composer-documentation/_bnaTemplate/phase1-markdown/enums.njk
index 438d682616..cca4e9d380 100755
--- a/packages/composer-documentation/_bnaTemplate/phase1-markdown/enums.njk
+++ b/packages/composer-documentation/_bnaTemplate/phase1-markdown/enums.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Enumeration Detail
-
-{% for enum in types.enum %}
+{% for id,enums in types.enum %}
+{% for enum in enums %}
 ### {{enum.name}}
 The fully qualified name is **{{enum.fqn}}**
 
@@ -31,3 +31,4 @@ The fully qualified name is **{{enum.fqn}}**
 {% endfor %}
 
 {% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/packages/composer-documentation/_bnaTemplate/phase1-markdown/events.njk b/packages/composer-documentation/_bnaTemplate/phase1-markdown/events.njk
index da79cc45f4..eca9f03e5d 100755
--- a/packages/composer-documentation/_bnaTemplate/phase1-markdown/events.njk
+++ b/packages/composer-documentation/_bnaTemplate/phase1-markdown/events.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Events Detail
-
-{% for evt in types.event %}
+{% for id,evts in types.event %}
+{% for evt in evts %}
 ### {{evt.name}}
 The fully qualified name is **{{evt.fqn}}**
 
@@ -31,3 +31,4 @@ The fully qualified name is **{{evt.fqn}}**
 {% endfor %}
 
 {% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/packages/composer-documentation/_bnaTemplate/phase1-markdown/index.njk b/packages/composer-documentation/_bnaTemplate/phase1-markdown/index.njk
index c3a1698c67..695feb42ec 100755
--- a/packages/composer-documentation/_bnaTemplate/phase1-markdown/index.njk
+++ b/packages/composer-documentation/_bnaTemplate/phase1-markdown/index.njk
@@ -18,20 +18,22 @@
 ## Asset Definition 
 | Namespace | Name | Description |
 | --------  | ---- | ----------- |
-{% for asset in types.asset %}| {{asset.fqn}} | {{asset.name}} | {{asset.description}}  |
-{% endfor %}
+{% for id,assets in types.asset %}{% for asset in assets %}| {{asset.fqn}} | {{asset.name}} | {{asset.description}}  |
+{% endfor %}{% endfor %}
+
 
 ## Transaction Definition 
 | Namespace | Name | Description |
 | --------  | ---- | ----------- |
-{% for tx in types.transaction %}| {{tx.fqn}} | {{tx.name}} | {{tx.description}}  |
-{% endfor %}
+{% for id,transactions in types.transaction %}{% for tx in transactions %}| {{tx.fqn}} | {{tx.name}} | {{tx.description}}  |
+{% endfor %}{% endfor %}
 
 ## Participant Definition 
 | Namespace | Name | Description |
 | --------  | ---- | ----------- |
-{% for pt in types.participant %}| {{pt.fqn}} | {{pt.name}} | {{pt.description}}  |
-{% endfor %}
+{% for id,participants in types.participant %}{% for pt in participants %}| {{pt.fqn}} | {{pt.name}} | {{pt.description}}  |
+{% endfor %}{% endfor %}
+
 
 ## ACL 
 {% for rule in acls %}- {{rule.description}}
diff --git a/packages/composer-documentation/_bnaTemplate/phase1-markdown/participants.njk b/packages/composer-documentation/_bnaTemplate/phase1-markdown/participants.njk
index a15ef0c4ea..3d17645dd4 100755
--- a/packages/composer-documentation/_bnaTemplate/phase1-markdown/participants.njk
+++ b/packages/composer-documentation/_bnaTemplate/phase1-markdown/participants.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Particpant Model
-
-{% for pt in types.participant %}
+{% for id,pts in types.participant %}
+{% for pt in pts %}
 #### {{pt.name}}
 **{{pt.fqn}}** - **{{pt.description}}**
 
@@ -22,5 +22,5 @@
 {% for id,info in pt.properties %}|{{id}}|{{info.type}}|{{info.description}}|
 {% endfor %}
 {% endfor %}
-
+{% endfor %}
 
diff --git a/packages/composer-documentation/_bnaTemplate/phase2-html/html.default.njk b/packages/composer-documentation/_bnaTemplate/phase2-html/html.default.njk
index ea88e5bcdd..cef6585e59 100755
--- a/packages/composer-documentation/_bnaTemplate/phase2-html/html.default.njk
+++ b/packages/composer-documentation/_bnaTemplate/phase2-html/html.default.njk
@@ -78,9 +78,11 @@
                   <nav class="context-nav">
                     <ul>
                     {% if 'assets' in basename %}
-                        {% for asset in types.asset %}
+                        {% for id,assets in types.asset%}
+                        {% for asset in assets %}
                            <li><p><a href="#{{asset.name | lower}}"><b>{{asset.name}}</b></a></p></li>
                         {% endfor %}
+                        {% endfor %}
                     {% elif 'transactions' in basename %}   
                             {% for fn in scripts.files %}
                                 <li><p><a href="#{{fn.identifier | lower}}"><b>{{fn.identifier}}</b></a></p>
@@ -97,9 +99,11 @@
                     {% elif 'index' in basename %}   
 
                     {% elif 'participants' in basename %}   
-                            {% for pt in types.participant %}
+                            {% for id,pts in types.participant %}
+                            {% for pt in pts %}
                             <li><p><a href="#{{pt.name | lower}}"><b>{{pt.name}}</b></a></p></li>
                             {% endfor %}
+                            {% endfor %}
                     {% elif 'queries' in basename %}   
                             {% for query in queries %}
                            <li><p><a href="#{{query.name | lower | replace("_","-") }}"><b>{{query.name }}</b></a></p></li>  
diff --git a/packages/composer-documentation/_template/phase1-markdown/01_summary.njk b/packages/composer-documentation/_template/phase1-markdown/01_summary.njk
index 3f1f389b59..644aa74f7e 100755
--- a/packages/composer-documentation/_template/phase1-markdown/01_summary.njk
+++ b/packages/composer-documentation/_template/phase1-markdown/01_summary.njk
@@ -16,19 +16,21 @@
 ## Asset Definition 
 | Namespace | Name | Description |
 | --------  | ---- | ----------- |
-{% for asset in types.asset %}| {{asset.fqn}} | {{asset.name}} | {{asset.description}}  |
-{% endfor %}
+{% for id,assets in types.asset %}
+{% for asset in assets %}| {{asset.fqn}} | {{asset.name}} | {{asset.description}}  |
+{% endfor %}{% endfor %}
+
 
 ## Transaction Definition 
 | Namespace | Name | Description |
 | --------  | ---- | ----------- |
-{% for tx in types.transaction %}| {{tx.fqn}} | {{tx.name}} | {{tx.description}}  |
-{% endfor %}
+{% for id,transactions in types.transaction %}{% for tx in transactions %}| {{tx.fqn}} | {{tx.name}} | {{tx.description}}  |
+{% endfor %}{% endfor %}
 
 ## Participant Definition 
 | Namespace | Name | Description |
 | --------  | ---- | ----------- |
-{% for pt in types.participant %}| {{pt.fqn}} | {{pt.name}} | {{pt.description}}  |
-{% endfor %}
+{% for id,participants in types.participant %}{% for pt in participants %}| {{pt.fqn}} | {{pt.name}} | {{pt.description}}  |
+{% endfor %}{% endfor %}
 
 
diff --git a/packages/composer-documentation/_template/phase1-markdown/02_assets.njk b/packages/composer-documentation/_template/phase1-markdown/02_assets.njk
index a244871a90..756559b6f3 100755
--- a/packages/composer-documentation/_template/phase1-markdown/02_assets.njk
+++ b/packages/composer-documentation/_template/phase1-markdown/02_assets.njk
@@ -13,7 +13,8 @@
 #}
 # Asset Model
 
-{% for asset in types.asset %}
+{% for id,assets in types.asset %}
+{% for asset in assets %}
 ## {{asset.name}}
 The fully qualified name is **{{asset.fqn}}**
 
@@ -38,4 +39,4 @@ The fully qualified name is **{{asset.fqn}}**
 {% if asset.decorators.docsuri %}
 [{{asset.decorators.docsuri[0]}}]({{asset.decorators.docsuri[1]}})
 {% endif %}
-{% endfor %}
+{% endfor %}{% endfor %}
diff --git a/packages/composer-documentation/_template/phase1-markdown/03_participants.njk b/packages/composer-documentation/_template/phase1-markdown/03_participants.njk
index c6263f53b3..eabc5c6e7f 100755
--- a/packages/composer-documentation/_template/phase1-markdown/03_participants.njk
+++ b/packages/composer-documentation/_template/phase1-markdown/03_participants.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Participant Model
-
-{% for pt in types.participant %}
+{% for id,participants in types.participant %}
+{% for pt in participants %}
 ### {{pt.name}}
 The fully qualified name is **{{pt.fqn}}**
 
@@ -32,3 +32,4 @@ The fully qualified name is **{{pt.fqn}}**
 
 
 {% endfor %}
+{% endfor %}
diff --git a/packages/composer-documentation/_template/phase1-markdown/04_transactions.njk b/packages/composer-documentation/_template/phase1-markdown/04_transactions.njk
index 258e1cf1ec..94388d8179 100755
--- a/packages/composer-documentation/_template/phase1-markdown/04_transactions.njk
+++ b/packages/composer-documentation/_template/phase1-markdown/04_transactions.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Transaction Functions Detail
-
-{% for tx in types.transaction %}
+{% for id,transactions in types.transaction %}
+{% for tx in transactions %}
 ### {{tx.name}}
 The fully qualified name is **{{tx.fqn}}**
 
@@ -30,4 +30,4 @@ The fully qualified name is **{{tx.fqn}}**
 {% for id,info in tx.properties %}| {{id}} | {{info.type}} | {{info.description}} |
 {% endfor %}
 
-{% endfor %}
+{% endfor %}{% endfor %}
diff --git a/packages/composer-documentation/_template/phase1-markdown/05_events.njk b/packages/composer-documentation/_template/phase1-markdown/05_events.njk
index da79cc45f4..f1afbd0f98 100755
--- a/packages/composer-documentation/_template/phase1-markdown/05_events.njk
+++ b/packages/composer-documentation/_template/phase1-markdown/05_events.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Events Detail
-
-{% for evt in types.event %}
+{% for id,events in types.event%}
+{% for evt in events %}
 ### {{evt.name}}
 The fully qualified name is **{{evt.fqn}}**
 
@@ -30,4 +30,4 @@ The fully qualified name is **{{evt.fqn}}**
 {% for id,info in evt.properties %}| {{id}} | {{info.type}} | {{info.description}} |
 {% endfor %}
 
-{% endfor %}
+{% endfor %}{% endfor %}
diff --git a/packages/composer-documentation/_template/phase1-markdown/06_enums.njk b/packages/composer-documentation/_template/phase1-markdown/06_enums.njk
index 438d682616..6d9526273a 100755
--- a/packages/composer-documentation/_template/phase1-markdown/06_enums.njk
+++ b/packages/composer-documentation/_template/phase1-markdown/06_enums.njk
@@ -12,8 +12,8 @@
     limitations under the License.
 #}
 # Enumeration Detail
-
-{% for enum in types.enum %}
+{% for id,enums in types.enum %}
+{% for enum in enums %}
 ### {{enum.name}}
 The fully qualified name is **{{enum.fqn}}**
 
@@ -30,4 +30,4 @@ The fully qualified name is **{{enum.fqn}}**
 {% for id,info in enum.properties %}| {{id}} |
 {% endfor %}
 
-{% endfor %}
+{% endfor %}{% endfor %}
diff --git a/packages/composer-documentation/lib/processors/generators/classdeclarations.js b/packages/composer-documentation/lib/processors/generators/classdeclarations.js
index 25b05ea304..4f12528025 100755
--- a/packages/composer-documentation/lib/processors/generators/classdeclarations.js
+++ b/packages/composer-documentation/lib/processors/generators/classdeclarations.js
@@ -30,7 +30,9 @@ function tagMerge(resource,tags){
         if (tags[t].title === 'param'){
             let desc = tags[t].description;
             let name = tags[t].name;
-            resource.properties[name].description = desc;
+            if (resource.properties[name]){
+                resource.properties[name].description = desc;
+            }
         }
     }
 
@@ -64,23 +66,30 @@ function classdeclarations(context,options){
 
     ['asset','concept','transaction','enum','participant','event'].forEach((t)=>{
         // need to added the parsed comments to the existing structure
-        for (let i=0; i<context.types[t].length;i++){
-            let resource = context.types[t][i];
-            if (data[resource.fqn]){
-                context.types[t][i].tags= data[resource.fqn].tags;
-                tagMerge(context.types[t][i],data[resource.fqn].tags);
-            }
 
-            // if there are decorators referring to a markdown file, load that in as well
-            let decorators = context.types[t][i].decorators;
-            if (decorators.docs){
-                for (let d = 0; d< decorators.docs.length;d++){
-                    let name = path.resolve(options.docsPrefix,decorators.docs[d]);
-                    let info = fs.readFileSync(name,'utf8');
-                    context.types[t][i].decorators[decorators.docs[d]] = info;
+        // context.types[t] gives an object whose keys are namespaces
+        let namespaces = Object.keys(context.types[t]);
+        namespaces.forEach((ns)=>{
+
+            let typesArray = context.types[t][ns];
+            for (let i=0; i<typesArray.length;i++){
+                let resource = typesArray[i];
+                if (data[resource.fqn]){
+                    typesArray[i].tags= data[resource.fqn].tags;
+                    tagMerge(typesArray[i],data[resource.fqn].tags);
+                }
+
+                // if there are decorators referring to a markdown file, load that in as well
+                let decorators = typesArray[i].decorators;
+                if (decorators.docs){
+                    for (let d = 0; d< decorators.docs.length;d++){
+                        let name = path.resolve(options.docsPrefix,decorators.docs[d]);
+                        let info = fs.readFileSync(name,'utf8');
+                        typesArray[i].decorators[decorators.docs[d]] = info;
+                    }
                 }
             }
-        }
+        });
     });
 
     return context;
diff --git a/packages/composer-documentation/lib/processors/hc_network.js b/packages/composer-documentation/lib/processors/hc_network.js
index dc357dfd84..2e9322e067 100644
--- a/packages/composer-documentation/lib/processors/hc_network.js
+++ b/packages/composer-documentation/lib/processors/hc_network.js
@@ -44,7 +44,7 @@ let process = async function(context,options){
 
     // run standard Composer Introspector
     let visitor = new InfoVisitor();
-    context.types = { asset: [], transaction: [], concept: [], enum: [], participant: [], event: [] };
+    context.types = { asset: {}, transaction: {}, concept: {}, enum: {}, participant: {}, event: {} };
     context._bnd.accept(visitor, { data: context.types, ctx: context, system: options.systemns });
 
     // run specific generators now to add extra information and structure
diff --git a/packages/composer-documentation/lib/processors/visitors/info.js b/packages/composer-documentation/lib/processors/visitors/info.js
index cdea69ce0c..6756ede19d 100644
--- a/packages/composer-documentation/lib/processors/visitors/info.js
+++ b/packages/composer-documentation/lib/processors/visitors/info.js
@@ -455,7 +455,7 @@ class InfoVisitor {
         // If this is a top level schema, now we need to write it to disk.
         if (jsonSchema.$schema) {
 
-            //     let fileName = `${classDeclaration.getFullyQualifiedName()}.json`;
+            // let fileName = `${classDeclaration.getFullyQualifiedName()}.json`;
             let newInfo = {
                 'fqn': classDeclaration.getFullyQualifiedName(),
                 'name': jsonSchema.title,
@@ -465,8 +465,11 @@ class InfoVisitor {
                 'allproperties' :jsonSchema.allproperties,
                 'decorators': jsonSchema.decorators
             };
-
-            parameters.data[jsonSchema.type].push(newInfo);
+            let ns = classDeclaration.getNamespace();
+            if (!parameters.data[jsonSchema.type][ns]){
+                parameters.data[jsonSchema.type][ns]=[];
+            }
+            parameters.data[jsonSchema.type][ns].push(newInfo);
         }
 
         // Return the created schema.
diff --git a/packages/composer-documentation/test/carauction-network.bna b/packages/composer-documentation/test/carauction-network.bna
index 50f8f93ec768b5ef220ae743cca9bae094056e9b..8a0c748dd3df7635d4648f03c919f9c6dd91f469 100644
GIT binary patch
delta 532
zcmeCOU2nUgQHX^#!Z>>JSuxqoi-f|Mc>RNK``BJ_+|k6yz_5HWtEg(d8&KW~h)XND
z85mh!Ff%ZKiM2ro{SF)O?0v3XGmqsDV^U7WY!iv3r9w^|m7Uk!vL<U4wy)}}SNFBf
z*sg7>^6~TM&&9&csz13@8%uARo|@F65Io($dAf<{!9a%}Iy&;pUfzD5w0UNJb;{l-
zoymfmYVYk)*?%xwYhQiqj+s6zJ`dJ8wX437)wIaFnK`+(dTaZH-GVP{4Q-}~nlnUA
zOx%0DaYwe(6)BFajVdi`(~k4=>7OV#$F^hFuDRB=3hdubPw4)6xnR@nXy44<C0Z+9
zB_u5giadX5m0<R&Da!Awlh#a3%+yQ_xE2(iA@S>2^7N2JddGB?Ojy3%s;{i$DmP}~
z-gDrd{emlAqE{Z-srg;oa9eqskx!&SQ)GBeey(FiL+sn1r>)M-?l?bD^P+0wrrjKC
za&J%fIacYu;p;ku6Q1do^ZkE2MaC-J{x5G~lGJ`|aY`<)joC>BtFDJ<Ri0E{o9~~$
zeY$l*;AIZ3{rXM+-iL1edbvW1UvRUGcImpCho7&qle^@%`!sLw*R;!x3mvVl@N=%+
zDL;9hm^L^9H=h;T!G;!jlVpuqK#@0@QC4*FJy{iw!(t2!IhjfNlM`h%CchHno9rOR
S!^9{)*-y@lZJ{&+5C8yo$m00`

delta 482
zcmZ2)+hx0<QHW(%&+e$rtwP02yfsN>KE9{-TE#LlFa%F#6;+*lOGvza?W91z!v;KU
z_p7^N5@Z-Nb24U|Xx#ErZ4vk+w7&O>TIi#^Rci12W~EK&3IBEB*!;Km>n~|!Tr4{<
zF*EosW4__(fUmmI4VrCyH&v70UCjAwp?}{lymH?i_Dy%!Tyu5$rvG!@56-yLZ?sPz
zh*}cZ>)F`#Bydqe`$5;ZTURGeTvcDRu{&+^@1+yfO?>8yO3mLd_3(1}l_yb!Z|1C8
zq8R#ei|RVpAXD)}3$`x2@V(%>l(&_E%FZ_qg51r)({D88ToRN!`aq+1X?l5|Va@~o
z>i-FAMHU^L7(IVSRP)Q%H{Aro&T)hUe{R0U+mw`2<(;0pLe3_hDN!*x#Yx`g#;ZcT
z<W*g-RyurdXN&CJwCZKqcI!32*gXFKZ@a5tv_Pj|Qq;!f3p*Bhi~XO;q^o=ASJnBZ
zJDjuRgrD@Ccm7?y`q;mn@k?iaxY@hoD$kFwtG`?=GyQkoh%ktDYg@GCbw9UT@%;dA
zW|qnCWW*-l6%%Bc0*Z@IVmsK-;$pk3@#Ho+(a8&BA!;S%_&DZ?F)-w0Ch1RZl#>EV
Wa7_-DlViFgHn~{NjIBnR0SEvJs@~TC