@flowerforce/flowerbase 1.7.3 → 1.7.4-beta.0

package/dist/features/functions/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AA2ChD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAmKjC,CAAA"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AA8ChD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAqKjC,CAAA"}

package/dist/features/functions/controller.js

@@ -46,6 +46,7 @@ const isReturnedError = (value) => {
     const candidate = value;
     return typeof candidate.message === 'string' && typeof candidate.name === 'string';
 };
+const serializeEjson = (value) => JSON.stringify(bson_1.EJSON.serialize(value, { relaxed: false }));
 /**
  * > Creates a pre handler for every query
  * @param app -> the fastify instance
@@ -89,7 +90,9 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
                 pipeline,
                 isClient: true
             });
-            return operatorsByType[method]();
+            const serviceResult = yield operatorsByType[method]();
+            res.type('application/json');
+            return serializeEjson(serviceResult);
         }
         const currentFunction = functionsList[method];
         if (!currentFunction) {
@@ -115,7 +118,7 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
                 return JSON.stringify({ message: result.message, name: result.name });
             }
             res.type('application/json');
-            return JSON.stringify(bson_1.EJSON.serialize(result, { relaxed: false }));
+            return serializeEjson(result);
         }
         catch (error) {
             res.status(400);
@@ -157,7 +160,7 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
         const changeStream = streams[requestKey];
         if (changeStream) {
             changeStream.on('change', (change) => {
-                res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+                res.raw.write(`data: ${serializeEjson(change)}\n\n`);
             });
             req.raw.on('close', () => {
                 var _a;
@@ -175,7 +178,7 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
             .collection(collection)
             .watch([], { fullDocument: 'whenAvailable' });
         streams[requestKey].on('change', (change) => {
-            res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+            res.raw.write(`data: ${serializeEjson(change)}\n\n`);
         });
     }));
 });

package/dist/services/mongodb-atlas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAuBA,OAAO,EAGL,oBAAoB,EAErB,MAAM,SAAS,CAAA;AA6tChB,QAAA,MAAM,YAAY,EAAE,oBA6BlB,CAAA;AAEF,eAAe,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAuBA,OAAO,EAGL,oBAAoB,EAErB,MAAM,SAAS,CAAA;AA0uChB,QAAA,MAAM,YAAY,EAAE,oBA6BlB,CAAA;AAEF,eAAe,YAAY,CAAA"}

package/dist/services/mongodb-atlas/index.js

@@ -597,27 +597,40 @@ const getOperators = (collection, { rules, collName, user, run_as_system, monito
                     const safeQuery = Array.isArray(formattedQuery)
                         ? (0, utils_3.normalizeQuery)(formattedQuery)
                         : formattedQuery;
-                    const result = yield collection.findOne(buildAndQuery(safeQuery));
-                    if (!result) {
-                        throw new Error('Update not permitted');
-                    }
-                    const winningRole = (0, utils_2.getWinningRole)(result, user, roles);
                     const normalizedData = Array.isArray(data)
                         ? data
                         : normalizeUpdatePayload(data);
+                    const currentDoc = yield collection.findOne(buildAndQuery(safeQuery));
                     const updatedPaths = Array.isArray(normalizedData)
                         ? []
                         : getUpdatedPaths(normalizedData);
-                    const [docToCheck] = Array.isArray(normalizedData)
-                        ? yield collection.aggregate([
-                            { $match: buildAndQuery(safeQuery) },
-                            { $limit: 1 },
-                            ...normalizedData
-                        ]).toArray()
-                        : [applyDocumentUpdateOperators(result, normalizedData)];
+                    let docToCheck;
+                    let validationType = 'write';
+                    if (!currentDoc) {
+                        if (!(normalizedOptions === null || normalizedOptions === void 0 ? void 0 : normalizedOptions.upsert) || Array.isArray(normalizedData)) {
+                            throw new Error('Update not permitted');
+                        }
+                        const updateDocument = normalizedData;
+                        const setOnInsertSeed = isPlainObject(updateDocument.$setOnInsert)
+                            ? updateDocument.$setOnInsert
+                            : {};
+                        docToCheck = applyDocumentUpdateOperators(setOnInsertSeed, updateDocument);
+                        validationType = 'insert';
+                    }
+                    else {
+                        const [computedDoc] = Array.isArray(normalizedData)
+                            ? yield collection.aggregate([
+                                { $match: buildAndQuery(safeQuery) },
+                                { $limit: 1 },
+                                ...normalizedData
+                            ]).toArray()
+                            : [applyDocumentUpdateOperators(currentDoc, normalizedData)];
+                        docToCheck = computedDoc;
+                    }
+                    const winningRole = (0, utils_2.getWinningRole)(docToCheck, user, roles);
                     const { status, document } = winningRole
                         ? yield (0, machines_1.checkValidation)(winningRole, {
-                            type: 'write',
+                            type: validationType,
                             roles,
                             cursor: docToCheck,
                             expansions: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.7.3",
+  "version": "1.7.4-beta.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/features/functions/controller.ts

@@ -48,6 +48,9 @@ const isReturnedError = (value: unknown): value is { message: string; name: stri
   return typeof candidate.message === 'string' && typeof candidate.name === 'string'
 }
 
+const serializeEjson = (value: unknown) =>
+  JSON.stringify(EJSON.serialize(value, { relaxed: false }))
+
 /**
  * > Creates a pre handler for every query
  * @param app -> the fastify instance
@@ -111,7 +114,9 @@ export const functionsController: FunctionController = async (
         pipeline,
         isClient: true
       })
-      return operatorsByType[method as keyof typeof operatorsByType]()
+      const serviceResult = await operatorsByType[method as keyof typeof operatorsByType]()
+      res.type('application/json')
+      return serializeEjson(serviceResult)
     }
 
     const currentFunction = functionsList[method]
@@ -141,7 +146,7 @@ export const functionsController: FunctionController = async (
         return JSON.stringify({ message: result.message, name: result.name })
       }
       res.type('application/json')
-      return JSON.stringify(EJSON.serialize(result, { relaxed: false }));
+      return serializeEjson(result)
     } catch (error) {
       res.status(400)
       res.type('application/json')
@@ -193,7 +198,7 @@ export const functionsController: FunctionController = async (
 
     if (changeStream) {
       changeStream.on('change', (change) => {
-        res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+        res.raw.write(`data: ${serializeEjson(change)}\n\n`);
       });
 
       req.raw.on('close', () => {
@@ -214,7 +219,7 @@ export const functionsController: FunctionController = async (
 
 
     streams[requestKey].on('change', (change) => {
-      res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+      res.raw.write(`data: ${serializeEjson(change)}\n\n`);
     });
   })
 }

package/src/services/mongodb-atlas/__tests__/findOneAndUpdate.test.ts

@@ -125,4 +125,66 @@ describe('mongodb-atlas findOneAndUpdate', () => {
       { returnDocument: 'after' }
     )
   })
+
+  it('allows upsert when no document matches', async () => {
+    const id = new ObjectId()
+    const insertedDoc = { _id: id, title: 'Created', userId: 'user-1' }
+    const findOne = jest.fn().mockResolvedValue(null)
+    const findOneAndUpdate = jest.fn().mockResolvedValue(insertedDoc)
+    const collection = {
+      collectionName: 'todos',
+      findOne,
+      findOneAndUpdate
+    }
+
+    const app = createAppWithCollection(collection)
+    const operators = MongoDbAtlas(app as any, {
+      rules: createRules(),
+      user: { id: 'user-1' }
+    })
+      .db('db')
+      .collection('todos')
+
+    const result = await operators.findOneAndUpdate(
+      { _id: id },
+      { $set: { title: 'Created' } },
+      { upsert: true }
+    )
+
+    expect(result).toEqual(insertedDoc)
+    expect(findOneAndUpdate).toHaveBeenCalledWith(
+      { $and: [{ _id: id }] },
+      { $set: { title: 'Created' } },
+      { upsert: true }
+    )
+  })
+
+  it('rejects upsert when insert permission is denied', async () => {
+    const id = new ObjectId()
+    const findOne = jest.fn().mockResolvedValue(null)
+    const findOneAndUpdate = jest.fn()
+    const collection = {
+      collectionName: 'todos',
+      findOne,
+      findOneAndUpdate
+    }
+
+    const app = createAppWithCollection(collection)
+    const operators = MongoDbAtlas(app as any, {
+      rules: createRules({ insert: false }),
+      user: { id: 'user-1' }
+    })
+      .db('db')
+      .collection('todos')
+
+    await expect(
+      operators.findOneAndUpdate(
+        { _id: id },
+        { $set: { title: 'Created' }, $setOnInsert: { createdAt: new Date() } } as any,
+        { upsert: true }
+      )
+    ).rejects.toThrow('Update not permitted')
+
+    expect(findOneAndUpdate).not.toHaveBeenCalled()
+  })
 })

package/src/services/mongodb-atlas/index.ts

@@ -687,33 +687,46 @@ const getOperators: GetOperatorsFunction = (
           const safeQuery = Array.isArray(formattedQuery)
             ? normalizeQuery(formattedQuery)
             : formattedQuery
-
-          const result = await collection.findOne(buildAndQuery(safeQuery))
-
-          if (!result) {
-            throw new Error('Update not permitted')
-          }
-
-          const winningRole = getWinningRole(result, user, roles)
           const normalizedData = Array.isArray(data)
             ? data
             : normalizeUpdatePayload(data as Document)
+          const currentDoc = await collection.findOne(buildAndQuery(safeQuery))
           const updatedPaths = Array.isArray(normalizedData)
             ? []
             : getUpdatedPaths(normalizedData as Document)
-          const [docToCheck] = Array.isArray(normalizedData)
-            ? await collection.aggregate([
-              { $match: buildAndQuery(safeQuery) },
-              { $limit: 1 },
-              ...normalizedData
-            ]).toArray()
-            : [applyDocumentUpdateOperators(result, normalizedData as Document)]
+          let docToCheck: Document
+          let validationType: 'write' | 'insert' = 'write'
+
+          if (!currentDoc) {
+            if (!normalizedOptions?.upsert || Array.isArray(normalizedData)) {
+              throw new Error('Update not permitted')
+            }
+
+            const updateDocument = normalizedData as Document
+            const setOnInsertSeed =
+              isPlainObject(updateDocument.$setOnInsert)
+                ? (updateDocument.$setOnInsert as Document)
+                : {}
+            docToCheck = applyDocumentUpdateOperators(setOnInsertSeed, updateDocument)
+            validationType = 'insert'
+          } else {
+            const [computedDoc] = Array.isArray(normalizedData)
+              ? await collection.aggregate([
+                { $match: buildAndQuery(safeQuery) },
+                { $limit: 1 },
+                ...normalizedData
+              ]).toArray()
+              : [applyDocumentUpdateOperators(currentDoc, normalizedData as Document)]
+            docToCheck = computedDoc
+          }
+
+          const winningRole = getWinningRole(docToCheck, user, roles)
 
           const { status, document } = winningRole
             ? await checkValidation(
               winningRole,
               {
-                type: 'write',
+                type: validationType,
                 roles,
                 cursor: docToCheck,
                 expansions: {}