Fix anonymous template name conflict (#2595)

Co-authored-by: Dong Lei <[email protected]>
microsoft · Jul 28, 2020 · 68a52a2 · 68a52a2
1 parent f0634b0
commit 68a52a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/libraries/botbuilder-lg/src/staticChecker.ts b/libraries/botbuilder-lg/src/staticChecker.ts
@@ -310,7 +310,7 @@ export class StaticChecker extends AbstractParseTreeVisitor<Diagnostic[]> implem
         const lineOffset = this.currentTemplate !== undefined ? this.currentTemplate.sourceRange.range.start.line : 0;
 
         let templateNameInfo = '';
-        if (this.currentTemplate !== undefined && this.currentTemplate.name !== Templates.inlineTemplateId) {
+        if (this.currentTemplate !== undefined && this.currentTemplate.name.startsWith(Templates.inlineTemplateIdPrefix)) {
             templateNameInfo = `[${ this.currentTemplate.name }]`;
         }
 

diff --git a/libraries/botbuilder-lg/src/templates.ts b/libraries/botbuilder-lg/src/templates.ts
@@ -30,7 +30,7 @@ export class Templates implements Iterable<Template> {
     /**
      * Temp Template ID for inline content.
      */
-    public static readonly inlineTemplateId: string = '__temp__';
+    public static readonly inlineTemplateIdPrefix: string = '__temp__';
     private readonly newLineRegex = /(\r?\n)/g;
     private readonly newLine: string = '\r\n';
     private readonly namespaceKey = '@namespace';
@@ -246,17 +246,19 @@ export class Templates implements Iterable<Template> {
 
         this.checkErrors();
 
+        const inlineTemplateId = `${Templates.inlineTemplateIdPrefix}${this.getramdonTemplateId()}`;
+
         // wrap inline string with "# name and -" to align the evaluation process
         const multiLineMark = '```';
 
         inlineStr = !(inlineStr.trim().startsWith(multiLineMark) && inlineStr.includes('\n'))
             ? `${ multiLineMark }${ inlineStr }${ multiLineMark }` : inlineStr;
 
-        const newContent = `#${ Templates.inlineTemplateId } ${ this.newLine } - ${ inlineStr }`;
+        const newContent = `#${ inlineTemplateId } ${ this.newLine } - ${ inlineStr }`;
 
         const newTemplates = TemplatesParser.parseTextWithRef(newContent, this);
         var evalOpt = opt !== undefined ? opt.merge(this.lgOptions) : this.lgOptions;
-        return newTemplates.evaluate(Templates.inlineTemplateId, scope, evalOpt);
+        return newTemplates.evaluate(inlineTemplateId, scope, evalOpt);
     }
 
     /**
@@ -361,6 +363,15 @@ export class Templates implements Iterable<Template> {
         return this.content;
     }
 
+    private getramdonTemplateId(): string {
+        return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, (c: any): string => {
+            const r: number = Math.random() * 16 | 0;
+            const v: number = c === 'x' ? r : (r & 0x3 | 0x8);
+
+            return v.toString(16);
+        });
+    }
+
     private appendDiagnosticWithOffset(diagnostics: Diagnostic[], offset: number): void {
         if (diagnostics) {
             diagnostics.forEach((u): void => {

diff --git a/libraries/botbuilder-lg/tests/lg.test.js b/libraries/botbuilder-lg/tests/lg.test.js
@@ -161,6 +161,9 @@ describe('LG', function() {
 
         let evaled = templates.evaluate('template', scope);
         assert.strictEqual(evaled, 'hello vivian'.length);
+
+        evaled = templates.evaluateText('${length(expandText(@answer))}', scope);
+        assert.strictEqual(evaled, 'hello vivian'.length);
     });
 
     it('TestBasicTemplateRefWithParameters', function() {