Merge pull request #4 from Mansehej/dev

feat: Add support for collection group queries

index.js

@@ -21,11 +21,13 @@ async function run() {
     var queryDetails = await askQueryDetails()
     var filePath = await askIndexFilePath()
     for (var detail in queryDetails) {
-        const detailList = queryDetails[detail].split(',')
-        const whiteSpaceTrimmedList = detailList.map(element => element.trim())
-        const nonEmptyValueList = whiteSpaceTrimmedList.filter(element => element.length > 0)
-        const multipleWordParsedList = nonEmptyValueList.map(element => element.split(' ').length > 1 ? addBackticksToString(element) : element)
-        queryDetails[detail] = multipleWordParsedList
+        if (typeof queryDetails[detail] === "string") {
+            const detailList = queryDetails[detail].split(',')
+            const whiteSpaceTrimmedList = detailList.map(element => element.trim())
+            const nonEmptyValueList = whiteSpaceTrimmedList.filter(element => element.length > 0)
+            const multipleWordParsedList = nonEmptyValueList.map(element => element.split(' ').length > 1 ? addBackticksToString(element) : element)
+            queryDetails[detail] = multipleWordParsedList
+        }
     }
     const compositeIndexes = getCompositeIndexes(queryDetails)
     if (!indexFileExists(filePath.path)) {

lib/generator.js

@@ -7,6 +7,7 @@ module.exports = {
 
         const sortFields = queryDetails.sortFields
         const filterFields = queryDetails.filterFields
+        const isCollectionGroup = queryDetails.isCollectionGroup
         const collections = queryDetails.collections
 
         var ascDscCombos = [];
@@ -63,8 +64,8 @@ module.exports = {
 
             for (let collection of collections) {
                 outputObject = {
-                    "collectionGroup": collection,
-                    "queryScope": "COLLECTION",
+                    "collection": collection,
+                    "queryScope": isCollectionGroup ? "COLLECTION_GROUP" : "COLLECTION",
                     "fields": fields
                 }
                 finalOutput.push(outputObject)

lib/questions.js

@@ -13,10 +13,16 @@ module.exports = {
         type: 'input',
         message: 'Enter the fields you want to filter or search by (seperated by commas)',
       },
+      {
+        name: 'isCollectionGroup',
+        type: 'confirm',
+        default: false,
+        message: 'Is this a collectionGroup query? (N for collection query)',
+      },
       {
         name: 'collections',
         type: 'input',
-        message: 'Enter the collections you want to generate indexes for (seperated by commas)',
+        message: 'Enter the collection groups/collections you want to generate indexes for (seperated by commas)',
         validate(collectionName) {
           if(collectionName.length == 0) {
             return 'Atleast one collection must be entered.'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "firestore-cig",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A utility to create composite indexes for firestore.",
   "main": "index.js",
   "scripts": {