Port of botbuilder-tools #1305 to bf-cli (#163)

vishwacsena · web-flow · commit 1dd626dc1eb9 · 2019-09-26T10:51:25.000-07:00
* fixup

* For BB-tools#1305
diff --git a/packages/luis/src/parser/lufile/parseFileContents.js b/packages/luis/src/parser/lufile/parseFileContents.js
@@ -255,12 +255,6 @@ const parseAndHandleIntent = function (parsedContent, luResource) {
                                 }
                             }
                         });
-
-                        // if this intent does not have any utterances, push this pattern as an utterance as well. 
-                        let intentInUtterance = helpers.filterMatch(parsedContent.LUISJsonStructure.utterances, 'intent', intentName);
-                        if (intentInUtterance.length === 0) {
-                            parsedContent.LUISJsonStructure.utterances.push(new helperClass.uttereances(utterance, intentName, []));
-                        }
                     } else {
                         entitiesFound.forEach(entity => {
                             // throw an error if phraselist entity is explicitly labelled in an utterance
diff --git a/packages/luis/test/fixtures/verified/11.json b/packages/luis/test/fixtures/verified/11.json
@@ -180,11 +180,6 @@
       "intent": "CreateAlarm",
       "entities": []
     },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "DeleteAlarm",
-      "entities": []
-    },
     {
       "text": "set phone call as my communication preference",
       "intent": "CommunicationPreference",
diff --git a/packages/luis/test/fixtures/verified/7.json b/packages/luis/test/fixtures/verified/7.json
@@ -143,11 +143,6 @@
       "text": "set an alarm for 7AM next thursday",
       "intent": "CreateAlarm",
       "entities": []
-    },
-    {	
-      "text": "delete the {alarmTime} alarm",	
-      "intent": "DeleteAlarm",	
-      "entities": []	
     }
   ],
   "patterns": [
diff --git a/packages/luis/test/fixtures/verified/9.json b/packages/luis/test/fixtures/verified/9.json
@@ -174,11 +174,6 @@
       "intent": "CreateAlarm",
       "entities": []
     },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "DeleteAlarm",
-      "entities": []
-    },
     {
       "text": "set phone call as my communication preference",
       "intent": "CommunicationPreference",
diff --git a/packages/luis/test/fixtures/verified/9a.json b/packages/luis/test/fixtures/verified/9a.json
@@ -174,11 +174,6 @@
       "intent": "CreateAlarm",
       "entities": []
     },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "DeleteAlarm",
-      "entities": []
-    },
     {
       "text": "set phone call as my communication preference",
       "intent": "CommunicationPreference",
diff --git a/packages/luis/test/fixtures/verified/all.json b/packages/luis/test/fixtures/verified/all.json
@@ -200,11 +200,6 @@
       "intent": "CreateAlarm",
       "entities": []
     },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "DeleteAlarm",
-      "entities": []
-    },
     {
       "text": "set phone call as my communication preference",
       "intent": "CommunicationPreference",
diff --git a/packages/luis/test/fixtures/verified/collated-luis.json b/packages/luis/test/fixtures/verified/collated-luis.json
@@ -226,11 +226,6 @@
       "intent": "CreateAlarm",
       "entities": []
     },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "DeleteAlarm",
-      "entities": []
-    },
     {
       "text": "set phone call as my communication preference",
       "intent": "CommunicationPreference",
@@ -291,11 +286,6 @@
       "intent": "AskForUserName",
       "entities": []
     },
-    {
-      "text": "set {commPreference} as my communication preference",
-      "intent": "CommunicationPreference",
-      "entities": []
-    },
     {
       "text": "can I get some m&m",
       "intent": "Buy chocolate",
diff --git a/packages/luis/test/fixtures/verified/ref6.json b/packages/luis/test/fixtures/verified/ref6.json
@@ -90,16 +90,6 @@
       "text": "set an alarm for 7AM next thursday",
       "intent": "All",
       "entities": []
-    },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "All",
-      "entities": []
-    },
-    {
-      "text": "set {commPreference} as my communication preference",
-      "intent": "All",
-      "entities": []
     }
   ],
   "patterns": [],
diff --git a/packages/luis/test/fixtures/verified/ref8.json b/packages/luis/test/fixtures/verified/ref8.json
@@ -90,26 +90,6 @@
       "text": "set an alarm for 7AM next thursday",
       "intent": "All",
       "entities": []
-    },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "All",
-      "entities": []
-    },
-    {
-      "text": "set {commPreference} as my communication preference",
-      "intent": "All",
-      "entities": []
-    },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "All",
-      "entities": []
-    },
-    {
-      "text": "set {commPreference} as my communication preference",
-      "intent": "All",
-      "entities": []
     }
   ],
   "patterns": [],
diff --git a/packages/luis/test/fixtures/verified/root2_luis.json b/packages/luis/test/fixtures/verified/root2_luis.json
@@ -177,11 +177,6 @@
       "intent": "CreateAlarm",
       "entities": []
     },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "DeleteAlarm",
-      "entities": []
-    },
     {
       "text": "set phone call as my communication preference",
       "intent": "CommunicationPreference",
diff --git a/packages/luis/test/fixtures/verified/root_luis.json b/packages/luis/test/fixtures/verified/root_luis.json
@@ -174,11 +174,6 @@
       "intent": "CreateAlarm",
       "entities": []
     },
-    {
-      "text": "delete the {alarmTime} alarm",
-      "intent": "DeleteAlarm",
-      "entities": []
-    },
     {
       "text": "set phone call as my communication preference",
       "intent": "CommunicationPreference",
diff --git a/packages/luis/test/parser/lufile/parseFileContents.parseFile.test.js b/packages/luis/test/parser/lufile/parseFileContents.parseFile.test.js
@@ -520,8 +520,6 @@ describe('parseFile correctly parses utterances', function () {
                 - I want {foodType}`;
                 parseFile.parseFile(testLUFile, false)
                         .then(res => {
-                                assert.equal(res.LUISJsonStructure.utterances.length, 1);
-                                assert.equal(res.LUISJsonStructure.utterances[0].text, "I want {foodType}");
                                 assert.equal(res.LUISJsonStructure.patterns.length, 1);
                                 assert.equal(res.LUISJsonStructure.patterns[0].pattern, "I want {foodType}");
                                 assert.equal(res.LUISJsonStructure.patternAnyEntities.length, 1);
@@ -572,8 +570,6 @@ describe('parseFile correctly parses utterances', function () {
                 - I want {foodType} and {foodType}`;
                 parseFile.parseFile(testLUFile, false)
                         .then(res => {
-                                assert.equal(res.LUISJsonStructure.utterances.length, 1);
-                                assert.equal(res.LUISJsonStructure.utterances[0].text, "I want {foodType} and {foodType}");
                                 assert.equal(res.LUISJsonStructure.patterns.length, 1);
                                 assert.equal(res.LUISJsonStructure.patterns[0].pattern, "I want {foodType} and {foodType}");
                                 assert.equal(res.LUISJsonStructure.patternAnyEntities.length, 1);
@@ -620,8 +616,6 @@ describe('parseFile correctly parses utterances', function () {
                 - {userName}`;
                 parseFile.parseFile(testLUFile, false)
                         .then(res => {
-                                assert.equal(res.LUISJsonStructure.utterances.length, 1);
-                                assert.equal(res.LUISJsonStructure.utterances[0].text, "{userName}");
                                 assert.equal(res.LUISJsonStructure.patterns.length, 1);
                                 assert.equal(res.LUISJsonStructure.patterns[0].pattern, "{userName}");
                                 assert.equal(res.LUISJsonStructure.patternAnyEntities.length, 1);

Original file line number	Diff line number	Diff line change
`@@ -255,12 +255,6 @@ const parseAndHandleIntent = function (parsedContent, luResource) {`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`	`});`
`258`		`-`
`259`		`- // if this intent does not have any utterances, push this pattern as an utterance as well.`
`260`		`- let intentInUtterance = helpers.filterMatch(parsedContent.LUISJsonStructure.utterances, 'intent', intentName);`
`261`		`- if (intentInUtterance.length === 0) {`
`262`		`- parsedContent.LUISJsonStructure.utterances.push(new helperClass.uttereances(utterance, intentName, []));`
`263`		`- }`
`264`	`258`	`} else {`
`265`	`259`	`entitiesFound.forEach(entity => {`
`266`	`260`	`// throw an error if phraselist entity is explicitly labelled in an utterance`