forms-angular 0.12.0-beta.249 → 0.12.0-beta.250

package/dist/server/data_form.js

@@ -989,6 +989,7 @@ class FormsAngular {
                         }
                         // Now we need to make sure that we restrict the lookup to documents we have access to
                         if (resource.options.findFunc) {
+                            let allowNulls = false;
                             // If the next stage is an $unwind
                             let nextStageIsUnwind = false;
                             if (array.length >= pipelineSection) {
@@ -1003,6 +1004,9 @@ class FormsAngular {
                                     }
                                     if (nextStage["$unwind"] && nextStage["$unwind"].path === "$" + lookupField) {
                                         nextStageIsUnwind = true;
+                                        if (nextStage["$unwind"].preserveNullAndEmptyArrays) {
+                                            allowNulls = true;
+                                        }
                                     }
                                 }
                             }
@@ -1010,8 +1014,8 @@ class FormsAngular {
                                 throw new Error('No support for $lookup where the next stage is not an $unwind and the resources has a findFunc');
                             }
                             // Push the $unwind, add our own findFunc, and increment the pipelineStage counter
-                            retVal.push({ $unwind: "$" + lookupField });
-                            const lookedUpFindQry = await this.doFindFuncPromise(req, resource);
+                            retVal.push(array[pipelineSection + 1]);
+                            let lookedUpFindQry = await this.doFindFuncPromise(req, resource);
                             // Now we need to put the lookup base into the criteria
                             for (const prop in lookedUpFindQry) {
                                 if (lookedUpFindQry.hasOwnProperty(prop)) {
@@ -1019,7 +1023,11 @@ class FormsAngular {
                                     delete lookedUpFindQry[prop];
                                 }
                             }
+                            if (allowNulls) {
+                                lookedUpFindQry = { $or: [lookedUpFindQry, { [lookupField]: { $exists: false } }] };
+                            }
                             retVal.push({ $match: lookedUpFindQry });
+                            pipelineSection++;
                         }
                     }
                     break;

package/package.json

@@ -3,7 +3,7 @@
   "author": "Mark Chapman <support@forms-angular.org>",
   "description": "A form builder that sits on top of Angular.js, Twitter Bootstrap, jQuery UI, Angular-UI, Express and Mongoose.  Opinionated or what?",
   "homepage": "http://forms-angular.org",
-  "version": "0.12.0-beta.249",
+  "version": "0.12.0-beta.250",
   "engines": {
     "node": ">=8.x",
     "npm": ">=5.x"