forms-angular 0.12.0-beta.312 → 0.12.0-beta.313

package/dist/server/data_form.js

@@ -1099,18 +1099,40 @@ class FormsAngular {
                 case "$graphLookup":
                     let needFindFunc = true;
                     if (keys[0] === "$lookup") {
-                        // For now at least, we only support simple $lookups with a single join field equality
                         let lookupProps = Object.keys(stage.$lookup);
-                        if (lookupProps.length !== 4 ||
-                            lookupProps.indexOf("from") === -1 ||
-                            lookupProps.indexOf("localField") === -1 ||
-                            lookupProps.indexOf("foreignField") === -1 ||
-                            lookupProps.indexOf("as") === -1) {
-                            throw new Error("No support for $lookup that isn't Equality Match with a Single Join Condition");
+                        // First deal with simple $lookups with a single join field equality
+                        if (lookupProps.length === 4 &&
+                            lookupProps.includes("from") &&
+                            lookupProps.includes("localField") &&
+                            lookupProps.includes("foreignField") &&
+                            lookupProps.includes("as")) {
+                            // If we are doing a lookup using an _id (so not fishing) we don't need to do the findFunc (see tkt #12399)
+                            if (stage.$lookup.foreignField === "_id") {
+                                needFindFunc = false;
+                            }
                         }
-                        // If we are doing a lookup using an _id (so not fishing) we don't need to do the findFunc (see tkt #12399)
-                        if (stage.$lookup.foreignField === "_id") {
-                            needFindFunc = false;
+                        else if (lookupProps.length === 4 &&
+                            lookupProps.includes("from") &&
+                            lookupProps.includes("let") &&
+                            lookupProps.includes("pipeline") &&
+                            lookupProps.includes("as")) {
+                            // can't think of a way to exploit this (if you add a findFunc) but it is the responsibility of the user
+                            // to ensure that the pipeline returns fields used by the findFunc
+                            console.log(`In some scenarios $lookups that use pipelines may not provide all the fields used by the 'findFunc' of a collection.
+              If you get no results returned this might be the explanation.`);
+                            /* Sanitise the pipeline we are doing a lookup with, removing hidden fields from that collection */
+                            const lookupCollectionName = stage.$lookup.from;
+                            const lookupResource = that.getResourceFromCollection(lookupCollectionName);
+                            let lookupHiddenLookupFields = {};
+                            if (lookupResource) {
+                                if (lookupResource.options?.hide?.length > 0) {
+                                    lookupHiddenLookupFields = this.generateHiddenFields(lookupResource, false);
+                                }
+                            }
+                            stage.$lookup.pipeline = await that.sanitisePipeline(stage.$lookup.pipeline, lookupHiddenLookupFields, findFuncQry, req);
+                        }
+                        else {
+                            throw new Error(`No support for $lookup of with properties ${lookupProps.join(', ')}`);
                         }
                     }
                     // hide any hiddenfields in the lookup collection

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.312",
+  "version": "0.12.0-beta.313",
   "engines": {
     "node": ">=8.x",
     "npm": ">=5.x"