Merge branch 'master' into munozemilio/updatehack

Author: munozemilio

packages/chatdown/README.md

@@ -42,6 +42,8 @@ EXAMPLES
      $ bf chatdown --in=./path/to/file/sample.chat --out=./
      $ bf chatdown -i ./path/to/file/*.sample.chat -o ./
      $ bf chatdown -i=./path/to/file/*.sample.chat -o=./
+     $ bf chatdown --in ./path/to/directory
+     $ bf chatdown --in ./path/to/directory/*
      $ (echo user=Joe && [ConversationUpdate=MembersAdded=Joe]) | bf chatdown --static
 ```
 

packages/chatdown/src/commands/chatdown.ts

@@ -41,7 +41,6 @@ export default class Chatdown extends Command {
 
       if (inputIsDirectory) {
         let inputDir = flags.in ? flags.in.trim() : ''
-
         const len = await this.processFiles(inputDir, outputDir)
         if (len === 0) {
           throw new CLIError('No chat files found at: ' + flags.in)
@@ -93,14 +92,36 @@ export default class Chatdown extends Command {
     }
   }
 
+  private getFiles(directoryPath: any) {
+    return new Promise((resolve, reject) => {
+      let fileList: any = []
+      fs.readdir(directoryPath, (err: any, files: any) => {
+        if (err) {
+          reject('Error scanning directory' + err)
+        }
+        fileList = files.map((file: any) => path.join(directoryPath, file))
+        resolve(fileList)
+      })
+    })
+  }
+
   private getFileName(file: any) {
     let fileName = path.basename(file, path.extname(file))
     return fileName
   }
 
   private async processFiles(inputDir: any, outputDir: any) {
     return new Promise(async (resolve, reject) => {
-      let files = glob.sync(inputDir, {ignore: ['**/node_modules/**']})
+      let files: any = []
+      if (inputDir.indexOf('*') > -1) {
+        files = glob.sync(inputDir, {ignore: ['**/node_modules/**']})
+      } else {
+        try {
+          files = await this.getFiles(inputDir)
+        } catch (err) {
+          reject(new CLIError(`Failed to scan directory ${err}`))
+        }
+      }
       /* tslint:disable:prefer-for-of */
       for (let i = 0; i < files.length; i++) {
         try {

packages/chatdown/test/commands/chatdown.test.ts

@@ -44,21 +44,21 @@ describe('chatdown', () => {
     });
 
     it('should read from file when chat file is passed as an argument', done => {
-        cp.exec(`node ./bin/run chatdown --in ./test/utils/cli.sample.chat`, (error, stdout) => {
+        cp.exec(`node ./bin/run chatdown --in "./test/utils/cli.sample.chat"`, (error, stdout) => {
             assert.doesNotThrow(() => JSON.parse(stdout));
             done();
         });
     });
 
     it('should process all files when a glob is passed in with the -i argument, and the -o is passed in for the output directory', done => {
-        cp.exec(`node ./bin/run chatdown -i ./test/utils/*.sample.chat -o ./`, (error, stdout, stderr) => {
+        cp.exec(`node ./bin/run chatdown -i "./test/utils/*.sample.chat" -o ./`, (error, stdout, stderr) => {
             assert(stdout.includes('Successfully wrote'));
             done();
         });
     });
 
     it('should process all files when a glob is passed in with the -i argument', done => {
-        cp.exec(`node ./bin/run chatdown -i ./test/utils/*.sample.chat`, (error, stdout, stderr) => {
+        cp.exec(`node ./bin/run chatdown -i "./test/utils/*.sample.chat"`, (error, stdout, stderr) => {
             assert(stdout.includes('Successfully wrote'));
             done();
         });
@@ -79,7 +79,7 @@ describe('chatdown', () => {
     });
 
     it('throw error if invalid path in argument', done => {
-        cp.exec(`node ./bin/run chatdown --in aaaaa`, (error, stdout, stderr) => {
+        cp.exec(`node ./bin/run chatdown --in 'aaaaa'`, (error, stdout, stderr) => {
             assert(stderr.includes('no such file or directory') || stderr.includes('error'));
             done();
         });

packages/lu/docs/lu-file-format.md

@@ -133,7 +133,7 @@ The following LUIS prebuilt entity types are supported -
 - ordinalV2
 - percentage
 - personName
-- phoneNumber
+- phonenumber
 - temperature
 - url
 - datetime

packages/lu/src/commands/luis/convert.ts

@@ -50,9 +50,9 @@ export default class LuisConvert extends Command {
        // Add headers to Luis Json
       if (isLu) {
         result.luis_schema_version = flags.schemaversion || result.luis_schema_version || '3.2.0'
-        result.versionId = flags.versionId || result.versionId || '0.1'
+        result.versionId = flags.versionid || result.versionId || '0.1'
         result.name = flags.name || result.name || ''
-        result.desc = flags.desc || result.desc || ''
+        result.desc = flags.description || result.desc || ''
         result.culture = flags.culture || result.culture || 'en-us'
         result.culture = result.culture.toLowerCase()
         result = JSON.stringify(result, null, 2)

packages/lu/src/parser/converters/luistoluconverter.js

@@ -126,16 +126,13 @@ module.exports = {
         }
 
         if(LUISJSON.model_features && LUISJSON.model_features.length >= 0) {
-            fileContent += '> # Phrase list definitions' + NEWLINE + NEWLINE;
-            LUISJSON.model_features.forEach(function(entity) {
-                fileContent += `@ phraselist ${entity.name}${(entity.mode ? `(interchangeable)` : ``)}`;
-                if (entity.words && entity.words !== '') {
-                    fileContent += ` = ${NEWLINE}\t- ${entity.words}`;
-                }
-                fileContent += NEWLINE + NEWLINE;
-            });
-            fileContent += NEWLINE;
+            fileContent += handlePhraseLists(LUISJSON.model_features);
         }
+
+        if(LUISJSON.phraselists && LUISJSON.phraselists.length >= 0) {
+            fileContent += handlePhraseLists(LUISJSON.phraselists);
+        }
+
         if(LUISJSON.closedLists && LUISJSON.closedLists.length >= 0){
             fileContent += '> # List entities' + NEWLINE + NEWLINE;
             LUISJSON.closedLists.forEach(function(ListItem) {
@@ -188,6 +185,24 @@ module.exports = {
         return fileContent;
     }
 }
+
+/**
+ * Helper to handle phrase lists both in the new and old property.
+ * @param {Object[]} collection 
+ */
+const handlePhraseLists = function(collection) {
+    let fileContent = '> # Phrase list definitions' + NEWLINE + NEWLINE;
+    collection.forEach(function(entity) {
+        fileContent += `@ phraselist ${entity.name}${(entity.mode ? `(interchangeable)` : ``)}`;
+        if (entity.words && entity.words !== '') {
+            fileContent += ` = ${NEWLINE}\t- ${entity.words}`;
+        }
+        fileContent += NEWLINE + NEWLINE;
+    });
+    fileContent += NEWLINE;
+
+    return fileContent;
+}
 /**
  * Helper to add application inforamtion metadata
  * @param {Object} LUISJSON 
@@ -234,7 +249,7 @@ const addNDepthChildDefinitions = function(childCollection, tabStop, fileContent
         myFileContent += addRolesAndFeatures(child);
         myFileContent += NEWLINE;
         if (child.children && child.children.length !== 0) {
-            myFileContent += addNDepthChildDefinitions(child.children, ++tabStop, myFileContent);
+            myFileContent += addNDepthChildDefinitions(child.children, tabStop + 1, myFileContent);
         }
     });
     return myFileContent;

packages/lu/src/parser/converters/lutoluisconverter.js

@@ -266,7 +266,7 @@ const checkAndUpdateVersion = function(finalLUISJSON) {
                  (finalLUISJSON.intents || []).find(i => i.features) || 
                  (finalLUISJSON.composites || []).find(i => i.features);
     if (v5DefFound) {
-        finalLUISJSON.luis_schema_version = "5.0.0";
+        finalLUISJSON.luis_schema_version = "6.0.0";
         if (finalLUISJSON.model_features && finalLUISJSON.model_features.length !== 0) {
             finalLUISJSON.phraselists = [];
             finalLUISJSON.model_features.forEach(item => finalLUISJSON.phraselists.push(Object.assign({}, item)));

packages/lu/src/parser/lufile/classes/filesToParse.js

@@ -16,8 +16,4 @@ class FileToParse {
     }
 }
 
-FileToParse.stringArrayToFileToParseList = function(obj) {
-    if(Array.isArray(obj)) return obj.map(item => new FileToParse(item));
-}
-
 module.exports = FileToParse;

packages/lu/src/parser/lufile/classes/hclasses.js

@@ -132,19 +132,21 @@ const readerObj = {
         }
     },
     featureToModel: class {
-        constructor(name) {
+        constructor(name, featureType) {
             this.featureName = name ? name : '';
+            this.featureType = featureType ? featureType : '';
         }
     },
     modelToFeature: class {
-        constructor(name) {
+        constructor(name, featureType) {
             this.modelName = name ? name : '';
+            this.modelType = featureType ? featureType : '';
         }
     },
     childEntity: class {
         constructor(name, instanceOf, context, children, features) {
             this.name = name ? name : '';
-            this.instanceOf = instanceOf ? instanceOf : '';
+            this.instanceOf = instanceOf ? instanceOf : null;
             this.children = children ? children : [];
             this.features = features ? features : '';
             this.context = context ? context : '';

packages/lu/src/parser/lufile/enums/luisbuiltintypes.js

@@ -16,7 +16,7 @@ module.exports = {
         "ordinalV2",
         "percentage",
         "personName",
-        "phoneNumber",
+        "phonenumber",
         "temperature",
         "url",
         "datetime"
@@ -114,7 +114,7 @@ module.exports = {
             "ordinalV2": null,
             "percentage": null,
             "personName": null,
-            "phoneNumber": null,
+            "phonenumber": null,
             "temperature": null,
             "url": null,
             "datetime": null