Update lg package in MSLG

.gitignore

@@ -308,3 +308,4 @@ packages/lubuild/bin/**
 packages/lubuild/lib/**
 packages/lubuild/typings/**
 
+packages/MSLG/.vscode/launch.json

packages/MSLG/package.json

@@ -31,7 +31,8 @@
   },
   "dependencies": {
     "@types/fs-extra": "^5.0.5",
-    "botbuilder-lg": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-lg/-/4.5.1.tgz",
+    "@types/lru-cache": "^5.1.0",
+    "botbuilder-lg": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-lg/-/4.6.2.tgz",
     "chalk": "^2.4.2",
     "commander": "^2.19.0",
     "fs-extra": "^7.0.1",

packages/MSLG/src/Expander.ts

@@ -82,6 +82,7 @@ export class Expander {
 
     private parseFile(fileName: string, inlineExpression: any = undefined): string[] {
         let fileContent: string = '';
+        let filePath: string = '';
         if (fileName !== undefined) {
             if (!fs.existsSync(path.resolve(fileName))) {
                 throw new Error('unable to open file: ' + fileName);
@@ -91,15 +92,18 @@ export class Expander {
             if (!fileContent) {
                 throw new Error('unable to read file: ' + fileName);
             }
+
+            filePath = path.resolve(fileName)
         }
 
         if (inlineExpression !== undefined) {
             const fakeTemplateId: string = '__temp__';
             const wrappedStr: string = `\n# ${fakeTemplateId} \r\n - ${inlineExpression}`;
             fileContent += wrappedStr;
+            filePath = path.resolve('./');
         }
 
-        const errors: string[] = this.tool.ValidateFile(fileContent);
+        const errors: string[] = this.tool.ValidateFile(fileContent, filePath);
         if (errors.length > 0) {
             errors.forEach(error => {
                 if (error.startsWith(ErrorType.Error)) {

packages/MSLG/src/Parser.ts

@@ -142,7 +142,7 @@ export class Parser {
 
         if (verbose) process.stdout.write(chalk.default.whiteBright('Parsing file: ' + fileName + '\n'));
 
-        const errors: string[] = this.tool.ValidateFile(fileContent);
+        const errors: string[] = this.tool.ValidateFile(fileContent, path.resolve(fileName));
         if (errors.length > 0) {
             errors.forEach(error => {
                 if (error.startsWith(ErrorType.Error)) {
@@ -159,7 +159,7 @@ export class Parser {
     private parseStream(fileContent: string, verbose: boolean): string[] {
         if (verbose) process.stdout.write(chalk.default.whiteBright('Parsing from stdin.\n'));
 
-        const errors: string[] = this.tool.ValidateFile(fileContent);
+        const errors: string[] = this.tool.ValidateFile(fileContent, path.resolve('./'));
         if (errors.length > 0) {
             errors.forEach(error => {
                 process.stderr.write(chalk.default.redBright(error + '\n'));

packages/MSLG/test/mslg.cli.test.suite.js

@@ -95,7 +95,8 @@ describe('The mslg cli tool', function () {
             let filePath = resolvePath('examples/exceptionExamples/EmptyTemplate.lg');
             exec(`node ${mslg} parse --in ${filePath}`, (error, stdout, stderr) => {
                 try {
-                    assert.equal(stderr.includes('[Error] line 1:0 - line 1:2: There is no template body in template template'), true);
+                    assert.equal(stderr.includes('[Error] line 2:0 - line 2:10:'), true);
+                    assert.equal(stderr.includes('error message: There is no template body in template template'), true);
                     done();
                 } catch (err) {
                     done(err);
@@ -200,7 +201,6 @@ describe('The mslg cli tool', function () {
         });
 
         it('should expand inline expression successfully', function (done) {
-            let filePath = resolvePath('examples/validExamples/simple.lg');
             exec(`node ${mslg} expand --inline '{1+1}'`, (error, stdout, stderr) => {
                 try {
                     assert.equal(stdout.includes('2'), true);