@stoker-platform/cli 0.5.72 → 0.5.74

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/cli",
-    "version": "0.5.71",
+    "version": "0.5.74",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "./lib/src/main.js",
@@ -24,9 +24,9 @@
         "@google-cloud/secret-manager": "^6.1.1",
         "@google-cloud/storage": "^7.19.0",
         "@inquirer/prompts": "^8.4.2",
-        "@stoker-platform/node-client": "0.5.51",
-        "@stoker-platform/types": "0.5.32",
-        "@stoker-platform/utils": "0.5.43",
+        "@stoker-platform/node-client": "0.5.52",
+        "@stoker-platform/types": "0.5.33",
+        "@stoker-platform/utils": "0.5.44",
         "algoliasearch": "^5.51.0",
         "commander": "^14.0.0",
         "cross-spawn": "^7.0.6",

package/lib/src/deploy/rules-indexes/generateFirestoreIndexes.js

@@ -26,5 +26,24 @@ export const generateFirestoreIndexes = async () => {
         indexes.indexes = [...indexes.indexes, ...customIndexes.indexes];
         indexes.fieldOverrides = [...indexes.fieldOverrides, ...customIndexes.fieldOverrides];
     }
+    for (const fieldOverride of indexes.fieldOverrides) {
+        const mainOverride = fieldOverride;
+        if (fieldOverride.indexes.length === 0)
+            continue;
+        const mainQueryScope = fieldOverride.indexes[0].queryScope;
+        const mainPath = `${fieldOverride.collectionGroup}:${fieldOverride.fieldPath}:${mainQueryScope}`;
+        for (const fieldOverride of indexes.fieldOverrides) {
+            if (fieldOverride.indexes.length === 0)
+                continue;
+            const queryScope = fieldOverride.indexes[0].queryScope;
+            const path = `${fieldOverride.collectionGroup}:${fieldOverride.fieldPath}:${queryScope}`;
+            if (fieldOverride.collectionGroup === mainOverride.collectionGroup &&
+                fieldOverride.fieldPath === mainOverride.fieldPath &&
+                mainPath !== path) {
+                mainOverride.indexes.push(...fieldOverride.indexes);
+                indexes.fieldOverrides.splice(indexes.fieldOverrides.indexOf(fieldOverride), 1);
+            }
+        }
+    }
     writeFileSync(resolve(__dirname, process.cwd(), "firebase-rules", "firestore.indexes.json"), JSON.stringify(indexes, null, 4));
 };

package/lib/src/lint/lintSchema.js

@@ -422,11 +422,13 @@ export const lintSchema = async (noLog = false) => {
                 errors.push(`Collection ${collectionName} has a default sort field ${defaultSort.field} that does not exist`);
             }
             else {
-                for (const role of readRoles) {
-                    if (!(preloadCache?.roles.includes(role) || serverReadOnly?.includes(role)) &&
-                        !(fieldSchema.name === recordTitleField || fieldSchema.sorting)) {
+                if (!preloadCache?.roles.every((role) => preloadCache?.roles.includes(role) || serverReadOnly?.includes(role))) {
+                    if (!(fieldSchema.name === recordTitleField || fieldSchema.sorting)) {
                         errors.push(`Collection ${collectionName} has a default sort field ${defaultSort.field} that must have sorting enabled.`);
                     }
+                    if (!(fieldSchema.required || fieldSchema.nullable)) {
+                        errors.push(`Collection ${collectionName} has a default sort field ${defaultSort.field} that must be required or nullable.`);
+                    }
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/cli",
-    "version": "0.5.72",
+    "version": "0.5.74",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "./lib/src/main.js",