Merge branch 'master' into feature/functional-test-bot

microsoft · May 27, 2019 · c165471 · c165471
2 parents 5199dfe + 1a0c294
commit c165471
Show file tree

Hide file tree

Showing 27 changed files with 2,523 additions and 840 deletions.
diff --git a/libraries/botbuilder-ai/package.json b/libraries/botbuilder-ai/package.json
@@ -36,7 +36,7 @@
     "codelyzer": "^4.1.0",
     "fs-extra": "^7.0.1",
     "mocha": "^5.2.0",
-    "nock": "^10.0.1",
+    "nock": "^10.0.3",
     "nyc": "^11.4.1",
     "source-map-support": "^0.5.3",
     "ts-node": "^4.1.0"

diff --git a/libraries/botbuilder-ai/src/luisRecognizer.ts b/libraries/botbuilder-ai/src/luisRecognizer.ts
@@ -518,9 +518,12 @@ export class LuisRecognizer implements LuisRecognizerTelemetryClient {
                 return;
             }
 
-            this.addProperty(entitiesAndMetadata, this.getNormalizedEntityName(entity), this.getEntityValue(entity));
-            if (verbose) {
-                this.addProperty(entitiesAndMetadata.$instance, this.getNormalizedEntityName(entity), this.getEntityMetadata(entity));
+            let val = this.getEntityValue(entity);
+            if (val != null) {
+                this.addProperty(entitiesAndMetadata, this.getNormalizedEntityName(entity), val);
+                if (verbose) {
+                    this.addProperty(entitiesAndMetadata.$instance, this.getNormalizedEntityName(entity), this.getEntityMetadata(entity));
+                }
             }
         });
 
@@ -572,11 +575,10 @@ export class LuisRecognizer implements LuisRecognizerTelemetryClient {
                         return obj;
                     }
                 default:
-                    return Object.keys(entity.resolution).length > 1 ?
-                        entity.resolution :
-                        entity.resolution.value ?
-                            entity.resolution.value :
-                            entity.resolution.values;
+                    // This will return null if there is no value/values which can happen when a new prebuilt is introduced
+                    return entity.resolution.value ?
+                        entity.resolution.value :
+                        entity.resolution.values;
             }
         }
     }
@@ -654,10 +656,13 @@ export class LuisRecognizer implements LuisRecognizerTelemetryClient {
 
                     // Add to the set to ensure that we don't consider the same child entity more than once per composite
                     coveredSet.add(i);
-                    this.addProperty(childrenEntites, this.getNormalizedEntityName(entity), this.getEntityValue(entity));
 
-                    if (verbose) {
-                        this.addProperty(childrenEntites.$instance, this.getNormalizedEntityName(entity), this.getEntityMetadata(entity));
+                    let val = this.getEntityValue(entity);
+                    if (val != null) {
+                        this.addProperty(childrenEntites, this.getNormalizedEntityName(entity), val);
+                        if (verbose) {
+                            this.addProperty(childrenEntites.$instance, this.getNormalizedEntityName(entity), this.getEntityMetadata(entity));
+                        }
                     }
                 }
             }