bf-lu: support new link reference format (#961)

* add reference support

* optimize and add tests

* add test case to verify reference can be a URL

* add negative tests

Author: feich-ms

packages/lu/src/parser/lu/luMerger.js

@@ -463,8 +463,7 @@ const resolveLuUriContent = async function(srcId, toResolve, luObjects) {
             // throw, invalid URI
             let errorMsg = `URI: "${uri}" appears to be invalid. Please double check the URI or re-try this parse when you are connected to the internet.`;
             let error = BuildDiagnostic({
-                message: errorMsg,
-                range: luImport.Range
+                message: errorMsg
             })
 
             throw (new exception(retCode.errorCode.INVALID_URI, error.toString(), [error]));

packages/lu/src/parser/lufile/LUFileLexer.g4

@@ -78,7 +78,11 @@ AT
   ;
 
 IMPORT
-  : '[' ~[\r\n[\]]*? ']' '(' ~[\r\n()]*? ')'
+  : '[' ~[\r\n[\]]*? ']' ('(' ~[\r\n()]*? ')' | '[' ~[\r\n[\]]*? ']')
+  ;
+
+REFERENCE
+  : '[' ~[\r\n[\]]*? ']' WS* ':' WS* ~[\r\n]*
   ;
 
 FILTER_MARK

packages/lu/src/parser/lufile/LUFileParser.g4

@@ -13,6 +13,7 @@ paragraph
     | entitySection
     | newEntitySection
     | importSection
+    | referenceSection
     | qnaSection
     | modelInfoSection
     ;
@@ -172,6 +173,14 @@ importDefinition
     : WS* IMPORT WS*
     ;
 
+referenceSection
+    : referenceDefinition
+    ;
+
+referenceDefinition
+    : WS* REFERENCE WS*
+    ;
+
 qnaSection
     : qnaDefinition
     ;

packages/lu/src/parser/lufile/generated/LUFileLexer.interp

@@ -9,37 +9,38 @@ DASH=8
 DOLLAR=9
 AT=10
 IMPORT=11
-FILTER_MARK=12
-QNA_ID_MARK=13
-MULTI_LINE_TEXT=14
-PROMPT_MARK=15
-INVALID_TOKEN_DEFAULT_MODE=16
-EQUAL=17
-COMMA=18
-HAS_ROLES_LABEL=19
-HAS_FEATURES_LABEL=20
-NEW_ENTITY_TYPE_IDENTIFIER=21
-PHRASE_LIST_LABEL=22
-NEW_COMPOSITE_ENTITY=23
-NEW_REGEX_ENTITY=24
-NEW_ENTITY_IDENTIFIER=25
-NEW_ENTITY_IDENTIFIER_WITH_WS=26
-NEWLINE_IN_NAME=27
-IDENTIFIER=28
-DOT=29
-ESCAPE_CHARACTER=30
-EXPRESSION=31
-TEXT=32
-NEWLINE_IN_ENTITY=33
-COMPOSITE_ENTITY=34
-REGEX_ENTITY=35
-ENTITY_TEXT=36
-COLON_MARK=37
-NEWLINE_IN_QNA=38
-QNA_TEXT=39
+REFERENCE=12
+FILTER_MARK=13
+QNA_ID_MARK=14
+MULTI_LINE_TEXT=15
+PROMPT_MARK=16
+INVALID_TOKEN_DEFAULT_MODE=17
+EQUAL=18
+COMMA=19
+HAS_ROLES_LABEL=20
+HAS_FEATURES_LABEL=21
+NEW_ENTITY_TYPE_IDENTIFIER=22
+PHRASE_LIST_LABEL=23
+NEW_COMPOSITE_ENTITY=24
+NEW_REGEX_ENTITY=25
+NEW_ENTITY_IDENTIFIER=26
+NEW_ENTITY_IDENTIFIER_WITH_WS=27
+NEWLINE_IN_NAME=28
+IDENTIFIER=29
+DOT=30
+ESCAPE_CHARACTER=31
+EXPRESSION=32
+TEXT=33
+NEWLINE_IN_ENTITY=34
+COMPOSITE_ENTITY=35
+REGEX_ENTITY=36
+ENTITY_TEXT=37
+COLON_MARK=38
+NEWLINE_IN_QNA=39
+QNA_TEXT=40
 '$'=9
 '@'=10
-'='=17
-','=18
-'.'=29
-':'=37
+'='=18
+','=19
+'.'=30
+':'=38

packages/lu/src/parser/lufile/generated/LUFileLexer.js

@@ -9,37 +9,38 @@ DASH=8
 DOLLAR=9
 AT=10
 IMPORT=11
-FILTER_MARK=12
-QNA_ID_MARK=13
-MULTI_LINE_TEXT=14
-PROMPT_MARK=15
-INVALID_TOKEN_DEFAULT_MODE=16
-EQUAL=17
-COMMA=18
-HAS_ROLES_LABEL=19
-HAS_FEATURES_LABEL=20
-NEW_ENTITY_TYPE_IDENTIFIER=21
-PHRASE_LIST_LABEL=22
-NEW_COMPOSITE_ENTITY=23
-NEW_REGEX_ENTITY=24
-NEW_ENTITY_IDENTIFIER=25
-NEW_ENTITY_IDENTIFIER_WITH_WS=26
-NEWLINE_IN_NAME=27
-IDENTIFIER=28
-DOT=29
-ESCAPE_CHARACTER=30
-EXPRESSION=31
-TEXT=32
-NEWLINE_IN_ENTITY=33
-COMPOSITE_ENTITY=34
-REGEX_ENTITY=35
-ENTITY_TEXT=36
-COLON_MARK=37
-NEWLINE_IN_QNA=38
-QNA_TEXT=39
+REFERENCE=12
+FILTER_MARK=13
+QNA_ID_MARK=14
+MULTI_LINE_TEXT=15
+PROMPT_MARK=16
+INVALID_TOKEN_DEFAULT_MODE=17
+EQUAL=18
+COMMA=19
+HAS_ROLES_LABEL=20
+HAS_FEATURES_LABEL=21
+NEW_ENTITY_TYPE_IDENTIFIER=22
+PHRASE_LIST_LABEL=23
+NEW_COMPOSITE_ENTITY=24
+NEW_REGEX_ENTITY=25
+NEW_ENTITY_IDENTIFIER=26
+NEW_ENTITY_IDENTIFIER_WITH_WS=27
+NEWLINE_IN_NAME=28
+IDENTIFIER=29
+DOT=30
+ESCAPE_CHARACTER=31
+EXPRESSION=32
+TEXT=33
+NEWLINE_IN_ENTITY=34
+COMPOSITE_ENTITY=35
+REGEX_ENTITY=36
+ENTITY_TEXT=37
+COLON_MARK=38
+NEWLINE_IN_QNA=39
+QNA_TEXT=40
 '$'=9
 '@'=10
-'='=17
-','=18
-'.'=29
-':'=37
+'='=18
+','=19
+'.'=30
+':'=38

packages/lu/src/parser/lufile/generated/LUFileLexer.tokens

@@ -371,6 +371,24 @@ LUFileParserListener.prototype.exitImportDefinition = function(ctx) {
 };
 
 
+// Enter a parse tree produced by LUFileParser#referenceSection.
+LUFileParserListener.prototype.enterReferenceSection = function(ctx) {
+};
+
+// Exit a parse tree produced by LUFileParser#referenceSection.
+LUFileParserListener.prototype.exitReferenceSection = function(ctx) {
+};
+
+
+// Enter a parse tree produced by LUFileParser#referenceDefinition.
+LUFileParserListener.prototype.enterReferenceDefinition = function(ctx) {
+};
+
+// Exit a parse tree produced by LUFileParser#referenceDefinition.
+LUFileParserListener.prototype.exitReferenceDefinition = function(ctx) {
+};
+
+
 // Enter a parse tree produced by LUFileParser#qnaSection.
 LUFileParserListener.prototype.enterQnaSection = function(ctx) {
 };