@stoker-platform/cli 0.5.140 → 0.5.142

package/lib/package.json

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

package/lib/src/lint/lintSchema.js

@@ -1690,7 +1690,10 @@ export const lintSchema = async (noLog = false) => {
                         if (filter.roles && !filter.roles.includes(role))
                             continue;
                         if (filter.type === "relation" && hasArrayContains) {
-                            errors.push(`Collection ${collectionName} has a relation filter for role ${role} on field ${filter.field} that uses an array-contains filter, but an array-contains filter has already been used. This can be resolved by using the preload cache.`);
+                            const field = getField(fields, filter.field);
+                            if (["ManyToOne", "ManyToMany"].includes(field.type)) {
+                                errors.push(`Collection ${collectionName} has a relation filter for role ${role} on field ${filter.field} that uses an array-contains filter, but an array-contains filter has already been used. This can be resolved by using the preload cache.`);
+                            }
                         }
                         if (filter.type === "select") {
                             const field = getField(fields, filter.field);

package/lib/src/migration/firestore/operations/replayProjections.js

@@ -1,5 +1,5 @@
 import { getFirestorePathRef, getStokerFirestore } from "@stoker-platform/node-client";
-import { addDenormalized, getAllRoleGroups, getDependencyIndexFields, getFieldAccessGroupFields, getRoleGroups, isDependencyField, } from "@stoker-platform/utils";
+import { addDenormalized, getAllRoleGroups, getDependencyIndexFields, getFieldAccessGroupFields, getFieldAccessGroupIndexFields, getFieldAccessGroupKey, getRoleGroups, isDependencyField, } from "@stoker-platform/utils";
 import { FieldValue } from "firebase-admin/firestore";
 import isEqual from "lodash/isEqual.js";
 const getUniqueFieldNames = (collectionSchema) => collectionSchema.fields
@@ -32,6 +32,31 @@ const getFieldAccessGroupFieldShape = (collectionSchema) => {
     }
     return shape;
 };
+const getProjectionKeys = (collectionSchema, schema) => {
+    const keys = new Set();
+    const roleGroups = getRoleGroups(collectionSchema, schema);
+    for (const group of roleGroups) {
+        keys.add(group.key);
+    }
+    const fieldAccessGroups = getFieldAccessGroupFields(collectionSchema);
+    for (const [groupKey, groupFields] of Object.entries(fieldAccessGroups)) {
+        if (groupFields.length === 0)
+            continue;
+        for (const group of roleGroups) {
+            const indexFields = getFieldAccessGroupIndexFields(groupKey, collectionSchema, group);
+            if (indexFields.length === 0)
+                continue;
+            const overlayKey = getFieldAccessGroupKey(groupKey, group.key);
+            keys.add(overlayKey);
+        }
+    }
+    for (const field of collectionSchema.fields) {
+        if (isDependencyField(field, collectionSchema, schema)) {
+            keys.add(field.name);
+        }
+    }
+    return keys;
+};
 const replayProjectionsForCollection = async (collection, currentSchema, lastSchema) => {
     console.log(`Projections for collection ${collection} have changed. Replaying...`);
     const db = getStokerFirestore();
@@ -44,8 +69,24 @@ const replayProjectionsForCollection = async (collection, currentSchema, lastSch
     const lastCollectionSchema = lastSchema.collections[collection];
     // eslint-disable-next-line security/detect-object-injection
     const currentCollectionSchema = currentSchema.collections[collection];
-    const lastRoleGroups = getAllRoleGroups(lastSchema);
     const currentRoleGroups = getAllRoleGroups(currentSchema);
+    const projectionKeys = new Set([
+        ...getProjectionKeys(lastCollectionSchema, lastSchema),
+        ...getProjectionKeys(currentCollectionSchema, currentSchema),
+    ]);
+    const uniqueFieldNames = new Set([
+        ...getUniqueFieldNames(lastCollectionSchema),
+        ...getUniqueFieldNames(currentCollectionSchema),
+    ]);
+    const tenants = await db.collection("tenants").listDocuments();
+    for (const tenant of tenants) {
+        for (const key of projectionKeys) {
+            await db.recursiveDelete(tenant.collection("system_fields").doc(collection).collection(`${collection}-${key}`));
+        }
+        for (const fieldName of uniqueFieldNames) {
+            await db.recursiveDelete(tenant.collection("system_unique").doc(collection).collection(`Unique-${collection}-${fieldName}`));
+        }
+    }
     const querySnapshot = await db.collectionGroup(collection).get();
     for (const doc of querySnapshot.docs) {
         const tenantId = doc.ref.path.split("/")[1];
@@ -93,14 +134,6 @@ const replayProjectionsForCollection = async (collection, currentSchema, lastSch
             .doc(field.collection)
             .collection(`${field.collection}-${role.replaceAll(" ", "-")}`)
             .doc(id);
-        for (const field of lastCollectionSchema.fields) {
-            if ("unique" in field &&
-                field.unique &&
-                (typeof record[field.name] === "string" || typeof record[field.name] === "number")) {
-                bulkWriter.delete(uniqueRef(field, record[field.name].toString().toLowerCase().replace(/\s/g, "---").replaceAll("/", "|||")));
-            }
-        }
-        addDenormalized("delete", bulkWriter, path, doc.id, record, lastSchema, lastCollectionSchema, { noTwoWay: true }, lastRoleGroups, FieldValue.arrayUnion, FieldValue.arrayRemove, FieldValue.delete, dependencyRef, uniqueRef, privateRef, twoWayIncludeRef, twoWayDependencyRef, twoWayPrivateRef);
         addDenormalized("create", bulkWriter, path, doc.id, record, currentSchema, currentCollectionSchema, { noTwoWay: true }, currentRoleGroups, FieldValue.arrayUnion, FieldValue.arrayRemove, FieldValue.delete, dependencyRef, uniqueRef, privateRef, twoWayIncludeRef, twoWayDependencyRef, twoWayPrivateRef);
     }
     await bulkWriter.close();

package/package.json

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