forms-angular 0.12.0-beta.296 → 0.12.0-beta.297

package/dist/server/data_form.js

@@ -4,25 +4,31 @@ exports.FormsAngular = void 0;
 const mongoose_1 = require("mongoose");
 // This part of forms-angular borrows from https://github.com/Alexandre-Strzelewicz/angular-bridge
 // (now https://github.com/Unitech/angular-bridge
-const _ = require('lodash');
-const util = require('util');
-const extend = require('node.extend');
-const async = require('async');
+const _ = require("lodash");
+const util = require("util");
+const extend = require("node.extend");
+const async = require("async");
 let debug = false;
 function logTheAPICalls(req, res, next) {
-    void (res);
-    console.log('API     : ' + req.method + ' ' + req.url + '  [ ' + JSON.stringify(req.body) + ' ]');
+    void res;
+    console.log("API     : " +
+        req.method +
+        " " +
+        req.url +
+        "  [ " +
+        JSON.stringify(req.body) +
+        " ]");
     next();
 }
 var entityMap = {
-    '&': '&',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#39;',
-    '/': '&#x2F;',
-    '`': '&#x60;',
-    '=': '&#x3D;'
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&#39;",
+    "/": "&#x2F;",
+    "`": "&#x60;",
+    "=": "&#x3D;",
 };
 function escapeHtml(string) {
     return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap(s) {
@@ -31,7 +37,9 @@ function escapeHtml(string) {
 }
 function processArgs(options, array) {
     if (options.authentication) {
-        let authArray = _.isArray(options.authentication) ? options.authentication : [options.authentication];
+        let authArray = _.isArray(options.authentication)
+            ? options.authentication
+            : [options.authentication];
         for (let i = authArray.length - 1; i >= 0; i--) {
             array.splice(1, 0, authArray[i]);
         }
@@ -48,10 +56,10 @@ class FormsAngular {
         this.app = app;
         app.locals.formsAngular = app.locals.formsAngular || [];
         app.locals.formsAngular.push(this);
-        mongoose.set('debug', debug);
+        mongoose.set("debug", debug);
         mongoose.Promise = global.Promise;
         this.options = _.extend({
-            urlPrefix: '/api/'
+            urlPrefix: "/api/",
         }, options || {});
         this.resources = [];
         this.searchFunc = async.forEach;
@@ -62,41 +70,73 @@ class FormsAngular {
                 this.options.plugins[pluginName] = Object.assign(this.options.plugins[pluginName], pluginObj.plugin(this, processArgs, pluginObj.options));
             }
         }
-        const search = 'search/', schema = 'schema/', report = 'report/', resourceName = ':resourceName', id = '/:id', formName = '/:formName', newClarifier = '/new';
-        this.app.get.apply(this.app, processArgs(this.options, ['models', this.models()]));
+        const search = "search/", schema = "schema/", report = "report/", resourceName = ":resourceName", id = "/:id", formName = "/:formName", newClarifier = "/new";
+        this.app.get.apply(this.app, processArgs(this.options, ["models", this.models()]));
         this.app.get.apply(this.app, processArgs(this.options, [search + resourceName, this.search()]));
         this.app.get.apply(this.app, processArgs(this.options, [schema + resourceName, this.schema()]));
-        this.app.get.apply(this.app, processArgs(this.options, [schema + resourceName + formName, this.schema()]));
+        this.app.get.apply(this.app, processArgs(this.options, [
+            schema + resourceName + formName,
+            this.schema(),
+        ]));
         this.app.get.apply(this.app, processArgs(this.options, [report + resourceName, this.report()]));
-        this.app.get.apply(this.app, processArgs(this.options, [report + resourceName + '/:reportName', this.report()]));
+        this.app.get.apply(this.app, processArgs(this.options, [
+            report + resourceName + "/:reportName",
+            this.report(),
+        ]));
         this.app.get.apply(this.app, processArgs(this.options, [resourceName, this.collectionGet()]));
         // return the List attributes for all records - used by record-handler's setUpLookupOptions() method, for cases
-        // where there's a lookup that doesn't use the fngajax option 
-        this.app.get.apply(this.app, processArgs(this.options, [resourceName + '/listAll', this.entityListAll()]));
+        // where there's a lookup that doesn't use the fngajax option
+        this.app.get.apply(this.app, processArgs(this.options, [
+            resourceName + "/listAll",
+            this.entityListAll(),
+        ]));
         // return the List attributes for a record - used by fng-ui-select
-        this.app.get.apply(this.app, processArgs(this.options, [resourceName + id + '/list', this.entityList()]));
+        this.app.get.apply(this.app, processArgs(this.options, [
+            resourceName + id + "/list",
+            this.entityList(),
+        ]));
         // 2x get, with and without formName
         this.app.get.apply(this.app, processArgs(this.options, [resourceName + id, this.entityGet()]));
-        this.app.get.apply(this.app, processArgs(this.options, [resourceName + formName + id, this.entityGet()])); // We don't use the form name, but it can optionally be included so it can be referenced by the permissions check
+        this.app.get.apply(this.app, processArgs(this.options, [
+            resourceName + formName + id,
+            this.entityGet(),
+        ])); // We don't use the form name, but it can optionally be included so it can be referenced by the permissions check
         // 3x post (for creating a new record), with and without formName, and in the case of without, with or without /new (which isn't needed if there's no formName)
         this.app.post.apply(this.app, processArgs(this.options, [resourceName, this.collectionPost()]));
-        this.app.post.apply(this.app, processArgs(this.options, [resourceName + newClarifier, this.collectionPost()]));
-        this.app.post.apply(this.app, processArgs(this.options, [resourceName + formName + newClarifier, this.collectionPost()]));
+        this.app.post.apply(this.app, processArgs(this.options, [
+            resourceName + newClarifier,
+            this.collectionPost(),
+        ]));
+        this.app.post.apply(this.app, processArgs(this.options, [
+            resourceName + formName + newClarifier,
+            this.collectionPost(),
+        ]));
         // 2x post and 2x put (for saving modifications to existing record), with and without formName
         // (You can POST or PUT to update data)
         this.app.post.apply(this.app, processArgs(this.options, [resourceName + id, this.entityPut()]));
-        this.app.post.apply(this.app, processArgs(this.options, [resourceName + formName + id, this.entityPut()]));
+        this.app.post.apply(this.app, processArgs(this.options, [
+            resourceName + formName + id,
+            this.entityPut(),
+        ]));
         this.app.put.apply(this.app, processArgs(this.options, [resourceName + id, this.entityPut()]));
-        this.app.put.apply(this.app, processArgs(this.options, [resourceName + formName + id, this.entityPut()]));
+        this.app.put.apply(this.app, processArgs(this.options, [
+            resourceName + formName + id,
+            this.entityPut(),
+        ]));
         // 2x delete, with and without formName
         this.app.delete.apply(this.app, processArgs(this.options, [resourceName + id, this.entityDelete()]));
-        this.app.delete.apply(this.app, processArgs(this.options, [resourceName + formName + id, this.entityDelete()]));
-        this.app.get.apply(this.app, processArgs(this.options, ['search', this.searchAll()]));
+        this.app.delete.apply(this.app, processArgs(this.options, [
+            resourceName + formName + id,
+            this.entityDelete(),
+        ]));
+        this.app.get.apply(this.app, processArgs(this.options, ["search", this.searchAll()]));
     }
     getFirstMatchingField(resource, doc, keyList, type) {
         for (let i = 0; i < keyList.length; i++) {
-            let fieldDetails = resource.model.schema['tree'][keyList[i]];
-            if (fieldDetails.type && (!type || fieldDetails.type.name === type) && keyList[i] !== '_id') {
+            let fieldDetails = resource.model.schema["tree"][keyList[i]];
+            if (fieldDetails.type &&
+                (!type || fieldDetails.type.name === type) &&
+                keyList[i] !== "_id") {
                 resource.options.listFields = [{ field: keyList[i] }];
                 return doc ? doc[keyList[i]] : keyList[i];
             }
@@ -104,15 +144,15 @@ class FormsAngular {
     }
     getListFields(resource, doc, cb) {
         const that = this;
-        let display = '';
+        let display = "";
         let listFields = resource.options.listFields;
         if (listFields) {
             async.map(listFields, function (aField, cbm) {
-                if (typeof doc[aField.field] !== 'undefined') {
+                if (typeof doc[aField.field] !== "undefined") {
                     if (aField.params) {
                         if (aField.params.ref) {
-                            let fieldOptions = resource.model.schema['paths'][aField.field].options;
-                            if (typeof fieldOptions.ref === 'string') {
+                            let fieldOptions = resource.model.schema["paths"][aField.field].options;
+                            if (typeof fieldOptions.ref === "string") {
                                 let lookupResource = that.getResource(fieldOptions.ref);
                                 if (lookupResource) {
                                     let hiddenFields = that.generateHiddenFields(lookupResource, false);
@@ -129,12 +169,12 @@ class FormsAngular {
                                 }
                             }
                             else {
-                                throw new Error('No support for ref type ' + aField.params.ref.type);
+                                throw new Error("No support for ref type " + aField.params.ref.type);
                             }
                         }
-                        else if (aField.params.params === 'timestamp') {
+                        else if (aField.params.params === "timestamp") {
                             let date = that.extractTimestampFromMongoID(doc[aField.field]);
-                            cbm(null, date.toLocaleDateString() + ' ' + date.toLocaleTimeString());
+                            cbm(null, date.toLocaleDateString() + " " + date.toLocaleTimeString());
                         }
                         else if (!aField.params.params) {
                             throw new Error(`Missing idIsList params for resource ${resource.resourceName}: ${JSON.stringify(aField.params)}`);
@@ -157,7 +197,7 @@ class FormsAngular {
                     }
                 }
                 else {
-                    cbm(null, '');
+                    cbm(null, "");
                 }
             }, function (err, results) {
                 if (err) {
@@ -165,24 +205,24 @@ class FormsAngular {
                 }
                 else {
                     if (results) {
-                        cb(err, results.join(' ').trim());
+                        cb(err, results.join(" ").trim());
                     }
                     else {
-                        console.log('No results ' + listFields);
+                        console.log("No results " + listFields);
                     }
                 }
             });
         }
         else {
-            const keyList = Object.keys(resource.model.schema['tree']);
+            const keyList = Object.keys(resource.model.schema["tree"]);
             // No list field specified - use the first String field,
-            display = this.getFirstMatchingField(resource, doc, keyList, 'String') ||
-                // and if there aren't any then just take the first field
-                this.getFirstMatchingField(resource, doc, keyList);
+            display =
+                this.getFirstMatchingField(resource, doc, keyList, "String") ||
+                    // and if there aren't any then just take the first field
+                    this.getFirstMatchingField(resource, doc, keyList);
             cb(null, display.trim());
         }
     }
-    ;
     // generate a Mongo projection that can be used to restrict a query to return only those fields from the given
     // resource that are identified as "list" fields (i.e., ones that should appear whenever records of that type are
     // displayed in a list)
@@ -204,47 +244,47 @@ class FormsAngular {
             }
         }
         else {
-            const keyList = Object.keys(resource.model.schema['tree']);
-            const firstField = (
+            const keyList = Object.keys(resource.model.schema["tree"]);
+            const firstField = 
             // No list field specified - use the first String field,
-            this.getFirstMatchingField(resource, undefined, keyList, 'String') ||
+            this.getFirstMatchingField(resource, undefined, keyList, "String") ||
                 // and if there aren't any then just take the first field
-                this.getFirstMatchingField(resource, undefined, keyList));
+                this.getFirstMatchingField(resource, undefined, keyList);
             projection[firstField] = 1;
         }
         return projection;
     }
-    ;
     newResource(model, options) {
         options = options || {};
         options.suppressDeprecatedMessage = true;
         let passModel = model;
-        if (typeof model !== 'function') {
+        if (typeof model !== "function") {
             passModel = model.model;
         }
         this.addResource(passModel.modelName, passModel, options);
     }
-    ;
     //    Add a resource, specifying the model and any options.
     //    Models may include their own options, which means they can be passed through from the model file
     addResource(resourceName, model, options) {
         let resource = {
             resourceName: resourceName,
             resourceNameLower: resourceName.toLowerCase(),
-            options: options || {}
+            options: options || {},
         };
         if (!resource.options.suppressDeprecatedMessage) {
-            console.log('addResource is deprecated - see https://github.com/forms-angular/forms-angular/issues/39');
+            console.log("addResource is deprecated - see https://github.com/forms-angular/forms-angular/issues/39");
         }
         // Check all the synonyms are lower case
-        resource.options.synonyms?.forEach(s => { s.name = s.name.toLowerCase(); });
-        if (typeof model === 'function') {
+        resource.options.synonyms?.forEach((s) => {
+            s.name = s.name.toLowerCase();
+        });
+        if (typeof model === "function") {
             resource.model = model;
         }
         else {
             resource.model = model.model;
             for (const prop in model) {
-                if (model.hasOwnProperty(prop) && prop !== 'model') {
+                if (model.hasOwnProperty(prop) && prop !== "model") {
                     resource.options[prop] = model[prop];
                 }
             }
@@ -264,9 +304,10 @@ class FormsAngular {
         // }
         function addSearchFields(schema, pathSoFar) {
             for (let path in schema.paths) {
-                if (path !== '_id' && schema.paths.hasOwnProperty(path)) {
+                if (path !== "_id" && schema.paths.hasOwnProperty(path)) {
                     const qualifiedPath = pathSoFar ? pathSoFar + "." + path : path;
-                    if (schema.paths[path].options.index && !schema.paths[path].options.noSearch) {
+                    if (schema.paths[path].options.index &&
+                        !schema.paths[path].options.noSearch) {
                         if (resource.options.searchFields.indexOf(qualifiedPath) === -1) {
                             resource.options.searchFields.push(qualifiedPath);
                         }
@@ -290,19 +331,16 @@ class FormsAngular {
             this.resources.push(resource);
         }
     }
-    ;
     getResource(name) {
         return _.find(this.resources, function (resource) {
-            return resource.resourceName === name || resource.options.resourceName === name;
+            return (resource.resourceName === name || resource.options.resourceName === name);
         });
     }
-    ;
     getResourceFromCollection(name) {
         return _.find(this.resources, function (resource) {
             return resource.model.collection.collectionName === name;
         });
     }
-    ;
     // Using the given (already-populated) AmbiguousRecordStore, generate text suitable for
     // disambiguation of each ambiguous record, and pass that to the given disambiguateItemCallback
     // so our caller can decorate the ambiguous record in whatever way it deems appropriate.
@@ -330,12 +368,17 @@ class FormsAngular {
             const resource = that.getResource(resourceName);
             const projection = that.generateListFieldProjection(resource);
             resource.model
-                .find({ _id: { $in: ambiguousRecordStore[resourceName].map((sr) => sr[disambiguationField]) } })
+                .find({
+                _id: {
+                    $in: ambiguousRecordStore[resourceName].map((sr) => sr[disambiguationField]),
+                },
+            })
                 .select(projection)
                 .lean()
                 .then((disambiguationRecs) => {
                 for (const ambiguousResult of ambiguousRecordStore[resourceName]) {
-                    const disambiguator = disambiguationRecs.find((d) => d._id.toString() === ambiguousResult[disambiguationField].toString());
+                    const disambiguator = disambiguationRecs.find((d) => d._id.toString() ===
+                        ambiguousResult[disambiguationField].toString());
                     if (disambiguator) {
                         let suffix = "";
                         for (const listField in projection) {
@@ -364,15 +407,20 @@ class FormsAngular {
         });
     }
     internalSearch(req, resourcesToSearch, includeResourceInResults, limit, callback) {
-        if (typeof req.query === 'undefined') {
+        if (typeof req.query === "undefined") {
             req.query = {};
         }
-        const timestamps = { sentAt: req.query.sentAt, startedAt: new Date().valueOf(), completedAt: undefined };
-        let searches = [], resourceCount = resourcesToSearch.length, searchFor = req.query.q || '', filter = req.query.f;
+        const timestamps = {
+            sentAt: req.query.sentAt,
+            startedAt: new Date().valueOf(),
+            completedAt: undefined,
+        };
+        let searches = [], resourceCount = resourcesToSearch.length, searchFor = req.query.q || "", filter = req.query.f;
         function translate(string, array, context) {
             if (array) {
                 let translation = _.find(array, function (fromTo) {
-                    return fromTo.from === string && (!fromTo.context || fromTo.context === context);
+                    return (fromTo.from === string &&
+                        (!fromTo.context || fromTo.context === context));
                 });
                 if (translation) {
                     string = translation.to;
@@ -382,10 +430,10 @@ class FormsAngular {
         }
         // return a string that determines the sort order of the resultObject
         function calcResultValue(obj) {
-            function padLeft(score, reqLength, str = '0') {
-                return new Array(1 + reqLength - String(score).length).join(str) + score;
+            function padLeft(score, reqLength, str = "0") {
+                return (new Array(1 + reqLength - String(score).length).join(str) + score);
             }
-            let sortString = '';
+            let sortString = "";
             sortString += padLeft(obj.addHits || 9, 1);
             sortString += padLeft(obj.searchImportance || 99, 2);
             sortString += padLeft(obj.weighting || 9999, 4);
@@ -398,7 +446,7 @@ class FormsAngular {
         // See if we are narrowing down the resources
         let collectionName;
         let collectionNameLower;
-        let colonPos = searchFor.indexOf(':');
+        let colonPos = searchFor.indexOf(":");
         switch (colonPos) {
             case -1:
                 // Original behaviour = do nothing different
@@ -410,22 +458,30 @@ class FormsAngular {
                 collectionName = searchFor.slice(0, colonPos);
                 collectionNameLower = collectionName.toLowerCase();
                 searchFor = searchFor.slice(colonPos + 1, 999).trim();
-                if (searchFor === '') {
-                    searchFor = '?';
+                if (searchFor === "") {
+                    searchFor = "?";
                 }
                 break;
         }
         for (let i = 0; i < resourceCount; i++) {
             let resource = resourcesToSearch[i];
-            if (resourceCount === 1 || (resource.options.searchImportance !== false && (!collectionName || collectionNameLower === resource.resourceNameLower || resource.options?.synonyms?.find(s => s.name === collectionNameLower)))) {
+            if (resourceCount === 1 ||
+                (resource.options.searchImportance !== false &&
+                    (!collectionName ||
+                        collectionNameLower === resource.resourceNameLower ||
+                        resource.options?.synonyms?.find((s) => s.name === collectionNameLower)))) {
                 let searchFields = resource.options.searchFields;
                 if (searchFields.length === 0) {
-                    console.log('ERROR: Searching on a collection with no indexes ' + resource.resourceName);
+                    console.log("ERROR: Searching on a collection with no indexes " +
+                        resource.resourceName);
                 }
-                let synonymObj = resource.options?.synonyms?.find(s => s.name.toLowerCase() === collectionNameLower);
+                let synonymObj = resource.options?.synonyms?.find((s) => s.name.toLowerCase() === collectionNameLower);
                 const synonymFilter = synonymObj?.filter;
                 for (let m = 0; m < searchFields.length; m++) {
-                    let searchObj = { resource: resource, field: searchFields[m] };
+                    let searchObj = {
+                        resource: resource,
+                        field: searchFields[m],
+                    };
                     if (synonymFilter) {
                         searchObj.filter = synonymFilter;
                     }
@@ -439,27 +495,32 @@ class FormsAngular {
         let searchCriteria;
         let searchStrings;
         let multiMatchPossible = false;
-        if (searchFor === '?') {
+        if (searchFor === "?") {
             // interpret this as a wildcard (so there is no way to search for ?
             searchCriteria = null;
         }
         else {
             // Support for searching anywhere in a field by starting with *
-            let startAnchor = '^';
-            if (searchFor.slice(0, 1) === '*') {
-                startAnchor = '';
+            let startAnchor = "^";
+            if (searchFor.slice(0, 1) === "*") {
+                startAnchor = "";
                 searchFor = searchFor.slice(1);
             }
             // THe snippet to escape the special characters comes from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
-            searchFor = searchFor.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&');
-            multiMatchPossible = searchFor.includes(' ');
+            searchFor = searchFor.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&");
+            multiMatchPossible = searchFor.includes(" ");
             if (multiMatchPossible) {
-                searchStrings = searchFor.split(' ');
+                searchStrings = searchFor.split(" ");
             }
-            let modifiedSearchStr = multiMatchPossible ? searchStrings.join('|') : searchFor;
+            let modifiedSearchStr = multiMatchPossible
+                ? searchStrings.join("|")
+                : searchFor;
             searchFor = searchFor.toLowerCase(); // For later case-insensitive comparison
             // Removed the logic that preserved spaces when collection was specified because Louise asked me to.
-            searchCriteria = { $regex: `${startAnchor}(${modifiedSearchStr})`, $options: 'i' };
+            searchCriteria = {
+                $regex: `${startAnchor}(${modifiedSearchStr})`,
+                $options: "i",
+            };
         }
         let handleSearchResultsFromIndex = function (err, docs, item, cb) {
             function handleSingleSearchResult(aDoc, cbdoc) {
@@ -475,7 +536,8 @@ class FormsAngular {
                             }
                         }
                     }
-                    resultObject.searchImportance = item.resource.options.searchImportance || 99;
+                    resultObject.searchImportance =
+                        item.resource.options.searchImportance || 99;
                     if (item.resource.options.localisationData) {
                         resultObject.resource = translate(resultObject.resource, item.resource.options.localisationData, "resource");
                         resultObject.resourceText = translate(resultObject.resourceText, item.resource.options.localisationData, "resourceText");
@@ -496,7 +558,8 @@ class FormsAngular {
                     if (multiMatchPossible) {
                         // record the index of string that matched, so we don't count it against another field
                         for (let i = 0; i < searchStrings.length; i++) {
-                            if (!resultObject.matched.includes(i) && aDoc[item.field]?.toLowerCase().indexOf(searchStrings[i]) === 0) {
+                            if (!resultObject.matched.includes(i) &&
+                                aDoc[item.field]?.toLowerCase().indexOf(searchStrings[i]) === 0) {
                                 resultObject.matched.push(i);
                                 resultObject.addHits = Math.max((resultObject.addHits || 9) - 1, 0);
                                 // remove it from current position
@@ -527,8 +590,7 @@ class FormsAngular {
                     // Use special listings format if defined
                     let specialListingFormat = item.resource.options.searchResultFormat;
                     if (specialListingFormat) {
-                        specialListingFormat.apply(aDoc, [req])
-                            .then((resultObj) => {
+                        specialListingFormat.apply(aDoc, [req]).then((resultObj) => {
                             resultObject = resultObj;
                             resultObject.addHits = addHits;
                             resultObject.disambiguationResource = disambiguationResource;
@@ -548,10 +610,11 @@ class FormsAngular {
                                     addHits,
                                     disambiguationResource,
                                     disambiguationId,
-                                    text: description
+                                    text: description,
                                 };
                                 if (resourceCount > 1 || includeResourceInResults) {
-                                    resultObject.resource = resultObject.resourceText = item.resource.resourceName;
+                                    resultObject.resource = resultObject.resourceText =
+                                        item.resource.resourceName;
                                 }
                                 handleResultsInList();
                             }
@@ -577,7 +640,7 @@ class FormsAngular {
                     let obj1 = {}, obj2 = {};
                     obj1[item.field] = searchFilter[item.field];
                     obj2[item.field] = searchCriteria;
-                    searchDoc['$and'] = [obj1, obj2];
+                    searchDoc["$and"] = [obj1, obj2];
                 }
                 else {
                     if (searchCriteria) {
@@ -591,13 +654,13 @@ class FormsAngular {
                 }
             }
             /*
-            The +200 below line is an (imperfect) arbitrary safety zone for situations where items that match the string in more than one index get filtered out.
-            An example where it fails is searching for "e c" which fails to get a old record Emily Carpenter in a big dataset sorted by date last accessed as they
-            are not returned within the first 200 in forenames so don't get the additional hit score and languish outside the visible results, though those visible
-            results end up containing people who only match either c or e (but have been accessed much more recently).
-
-            Increasing the number would be a short term fix at the cost of slowing down the search.
-             */
+                    The +200 below line is an (imperfect) arbitrary safety zone for situations where items that match the string in more than one index get filtered out.
+                    An example where it fails is searching for "e c" which fails to get a old record Emily Carpenter in a big dataset sorted by date last accessed as they
+                    are not returned within the first 200 in forenames so don't get the additional hit score and languish outside the visible results, though those visible
+                    results end up containing people who only match either c or e (but have been accessed much more recently).
+    
+                    Increasing the number would be a short term fix at the cost of slowing down the search.
+                     */
             // TODO : Figure out a better way to deal with this
             if (item.resource.options.searchFunc) {
                 item.resource.options.searchFunc(item.resource, req, null, searchDoc, item.resource.options.searchOrder, limit ? limit + 200 : 0, null, function (err, docs) {
@@ -642,7 +705,6 @@ class FormsAngular {
             }
         });
     }
-    ;
     wrapInternalSearch(req, res, resourcesToSearch, includeResourceInResults, limit) {
         this.internalSearch(req, resourcesToSearch, includeResourceInResults, limit, function (err, resultsObject) {
             if (err) {
@@ -653,7 +715,6 @@ class FormsAngular {
             }
         });
     }
-    ;
     search() {
         return _.bind(function (req, res, next) {
             if (!(req.resource = this.getResource(req.params.resourceName))) {
@@ -662,34 +723,31 @@ class FormsAngular {
             this.wrapInternalSearch(req, res, [req.resource], false, 0);
         }, this);
     }
-    ;
     searchAll() {
         return _.bind(function (req, res) {
             this.wrapInternalSearch(req, res, this.resources, true, 10);
         }, this);
     }
-    ;
     models() {
         const that = this;
         return function (req, res) {
             // Check for optional modelFilter and call it with the request and current list.  Otherwise just return the list.
-            let resources = that.options.modelFilter ? that.options.modelFilter.call(null, req, that.resources) : that.resources;
+            let resources = that.options.modelFilter
+                ? that.options.modelFilter.call(null, req, that.resources)
+                : that.resources;
             if (req.query?.resourceNamesOnly) {
                 resources = resources.map((r) => r.resourceName);
             }
             res.send(resources);
         };
     }
-    ;
     renderError(err, redirectUrl, req, res) {
         res.statusMessage = err?.message || err;
         res.status(400).end(err?.message || err);
     }
-    ;
     redirect(address, req, res) {
         res.send(address);
     }
-    ;
     applySchemaSubset(vanilla, schema) {
         let outPath;
         if (schema) {
@@ -705,18 +763,20 @@ class FormsAngular {
                     else {
                         if (fld.slice(0, 8) === "_bespoke") {
                             outPath[fld] = {
-                                "path": fld,
-                                "instance": schema[fld]._type,
+                                path: fld,
+                                instance: schema[fld]._type,
                             };
                         }
                         else {
-                            throw new Error('No such field as ' + fld + '.  Is it part of a sub-doc? If so you need the bit before the period.');
+                            throw new Error("No such field as " +
+                                fld +
+                                ".  Is it part of a sub-doc? If so you need the bit before the period.");
                         }
                     }
                     outPath[fld].options = outPath[fld].options || {};
                     for (const override in schema[fld]) {
                         if (schema[fld].hasOwnProperty(override)) {
-                            if (override.slice(0, 1) !== '_') {
+                            if (override.slice(0, 1) !== "_") {
                                 if (schema[fld].hasOwnProperty(override)) {
                                     if (!outPath[fld].options.form) {
                                         outPath[fld].options.form = {};
@@ -734,12 +794,25 @@ class FormsAngular {
         }
         return outPath;
     }
-    ;
     preprocess(resource, paths, formName, formSchema) {
         function processInternalObject(obj) {
             return Object.keys(obj).reduce((acc, cur) => {
                 const curType = typeof obj[cur];
-                if ((!['$', '_'].includes(cur.charAt(0)) || ["$in", "$nin", "$eq", "$ne", "$gt", "$gte", "$lt", "$lte", "$regex", "$or", "$exists"].includes(cur)) && curType !== 'function') {
+                if ((!["$", "_"].includes(cur.charAt(0)) ||
+                    [
+                        "$in",
+                        "$nin",
+                        "$eq",
+                        "$ne",
+                        "$gt",
+                        "$gte",
+                        "$lt",
+                        "$lte",
+                        "$regex",
+                        "$or",
+                        "$exists",
+                    ].includes(cur)) &&
+                    curType !== "function") {
                     const val = obj[cur];
                     if (val) {
                         if (Array.isArray(val)) {
@@ -747,7 +820,9 @@ class FormsAngular {
                                 acc[cur] = val;
                             }
                         }
-                        else if (curType === 'object' && !(val instanceof Date) && !(val instanceof RegExp)) {
+                        else if (curType === "object" &&
+                            !(val instanceof Date) &&
+                            !(val instanceof RegExp)) {
                             acc[cur] = processInternalObject(obj[cur]);
                         }
                         else {
@@ -759,22 +834,27 @@ class FormsAngular {
             }, {});
         }
         let outPath = {}, hiddenFields = [], listFields = [];
-        if (resource && !resource.options?.doNotCacheSchema && resource.preprocessed && resource.preprocessed[formName || "__default"]) {
+        if (resource &&
+            !resource.options?.doNotCacheSchema &&
+            resource.preprocessed &&
+            resource.preprocessed[formName || "__default"]) {
             return resource.preprocessed[formName || "__default"].paths;
         }
         else {
             if (resource && resource.options && resource.options.idIsList) {
-                paths['_id'].options = paths['_id'].options || {};
-                paths['_id'].options.list = resource.options.idIsList;
+                paths["_id"].options = paths["_id"].options || {};
+                paths["_id"].options.list = resource.options.idIsList;
             }
             for (let element in paths) {
-                if (paths.hasOwnProperty(element) && element !== '__v') {
+                if (paths.hasOwnProperty(element) && element !== "__v") {
                     // check for schemas
                     if (paths[element].schema) {
                         let subSchemaInfo = this.preprocess(null, paths[element].schema.paths);
                         outPath[element] = { schema: subSchemaInfo.paths };
                         if (paths[element].options.form) {
-                            outPath[element].options = { form: extend(true, {}, paths[element].options.form) };
+                            outPath[element].options = {
+                                form: extend(true, {}, paths[element].options.form),
+                            };
                         }
                         // this provides support for entire nested schemas that wish to remain hidden
                         if (paths[element].options.secure) {
@@ -785,12 +865,16 @@ class FormsAngular {
                     }
                     else {
                         // check for arrays
-                        let realType = paths[element].caster ? paths[element].caster : paths[element];
+                        let realType = paths[element].caster
+                            ? paths[element].caster
+                            : paths[element];
                         if (!realType.instance) {
                             if (realType.options.type) {
                                 let type = realType.options.type(), typeType = typeof type;
-                                if (typeType === 'string') {
-                                    realType.instance = (!isNaN(Date.parse(type))) ? 'Date' : 'String';
+                                if (typeType === "string") {
+                                    realType.instance = !isNaN(Date.parse(type))
+                                        ? "Date"
+                                        : "String";
                                 }
                                 else {
                                     realType.instance = typeType;
@@ -802,12 +886,15 @@ class FormsAngular {
                             hiddenFields.push(element);
                         }
                         if (paths[element].options.match) {
-                            outPath[element].options.match = paths[element].options.match.source || paths[element].options.match;
+                            outPath[element].options.match =
+                                paths[element].options.match.source ||
+                                    paths[element].options.match;
                         }
                         let schemaListInfo = paths[element].options.list;
                         if (schemaListInfo) {
                             let listFieldInfo = { field: element };
-                            if (typeof schemaListInfo === 'object' && Object.keys(schemaListInfo).length > 0) {
+                            if (typeof schemaListInfo === "object" &&
+                                Object.keys(schemaListInfo).length > 0) {
                                 listFieldInfo.params = schemaListInfo;
                             }
                             listFields.push(listFieldInfo);
@@ -830,7 +917,6 @@ class FormsAngular {
             return returnObj;
         }
     }
-    ;
     schema() {
         return _.bind(function (req, res) {
             if (!(req.resource = this.getResource(req.params.resourceName))) {
@@ -844,7 +930,7 @@ class FormsAngular {
             else {
                 if (formName) {
                     try {
-                        formSchema = req.resource.model.schema.statics['form'](escapeHtml(formName), req);
+                        formSchema = req.resource.model.schema.statics["form"](escapeHtml(formName), req);
                     }
                     catch (e) {
                         return res.status(404).send(e.message);
@@ -855,7 +941,6 @@ class FormsAngular {
             }
         }, this);
     }
-    ;
     report() {
         return _.bind(async function (req, res, next) {
             if (!(req.resource = this.getResource(req.params.resourceName))) {
@@ -863,13 +948,13 @@ class FormsAngular {
             }
             const self = this;
             req._isReport = true; // Can be used to modify findFunc behaviour
-            if (typeof req.query === 'undefined') {
+            if (typeof req.query === "undefined") {
                 req.query = {};
             }
             let reportSchema;
             if (req.params.reportName) {
                 try {
-                    reportSchema = await req.resource.model.schema.statics['report'](req.params.reportName, req);
+                    reportSchema = await req.resource.model.schema.statics["report"](req.params.reportName, req);
                 }
                 catch (e) {
                     res.send({ success: false, error: e.message || e });
@@ -877,10 +962,10 @@ class FormsAngular {
             }
             else if (req.query.r) {
                 switch (req.query.r[0]) {
-                    case '[':
+                    case "[":
                         reportSchema = { pipeline: JSON.parse(req.query.r) };
                         break;
-                    case '{':
+                    case "{":
                         reportSchema = JSON.parse(req.query.r);
                         break;
                     default:
@@ -891,17 +976,17 @@ class FormsAngular {
                 let fields = {};
                 for (let key in req.resource.model.schema.paths) {
                     if (req.resource.model.schema.paths.hasOwnProperty(key)) {
-                        if (key !== '__v' && !req.resource.model.schema.paths[key].options.secure) {
-                            if (key.indexOf('.') === -1) {
+                        if (key !== "__v" &&
+                            !req.resource.model.schema.paths[key].options.secure) {
+                            if (key.indexOf(".") === -1) {
                                 fields[key] = 1;
                             }
                         }
                     }
                 }
                 reportSchema = {
-                    pipeline: [
-                        { $project: fields }
-                    ], drilldown: req.params.resourceName + '/|_id|/edit'
+                    pipeline: [{ $project: fields }],
+                    drilldown: req.params.resourceName + "/|_id|/edit",
                 };
             }
             // Replace parameters in pipeline
@@ -918,15 +1003,13 @@ class FormsAngular {
             });
         }, this);
     }
-    ;
     hackVariablesInPipeline(runPipeline) {
         for (let pipelineSection = 0; pipelineSection < runPipeline.length; pipelineSection++) {
-            if (runPipeline[pipelineSection]['$match']) {
-                this.hackVariables(runPipeline[pipelineSection]['$match']);
+            if (runPipeline[pipelineSection]["$match"]) {
+                this.hackVariables(runPipeline[pipelineSection]["$match"]);
             }
         }
     }
-    ;
     hackVariables(obj) {
         // Replace variables that cannot be serialised / deserialised.  Bit of a hack, but needs must...
         // Anything formatted 1800-01-01T00:00:00.000Z or 1800-01-01T00:00:00.000+0000 is converted to a Date
@@ -934,10 +1017,10 @@ class FormsAngular {
         // TODO: handle arrays etc
         for (const prop in obj) {
             if (obj.hasOwnProperty(prop)) {
-                if (typeof obj[prop] === 'string') {
+                if (typeof obj[prop] === "string") {
                     const dateTest = /^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(.\d{3})?)(Z|[+ -]\d{2}:?\d{2})$/.exec(obj[prop]);
                     if (dateTest) {
-                        obj[prop] = new Date(dateTest[1] + 'Z');
+                        obj[prop] = new Date(dateTest[1] + "Z");
                     }
                     else if (prop !== "$regex") {
                         const objectIdTest = /^([0-9a-fA-F]{24})$/.exec(obj[prop]);
@@ -952,10 +1035,11 @@ class FormsAngular {
             }
         }
     }
-    ;
     async sanitisePipeline(aggregationParam, hiddenFields, findFuncQry, req) {
         let that = this;
-        let array = Array.isArray(aggregationParam) ? aggregationParam : [aggregationParam];
+        let array = Array.isArray(aggregationParam)
+            ? aggregationParam
+            : [aggregationParam];
         let retVal = [];
         let doneHiddenFields = false;
         if (findFuncQry) {
@@ -965,12 +1049,12 @@ class FormsAngular {
             let stage = array[pipelineSection];
             let keys = Object.keys(stage);
             if (keys.length !== 1) {
-                throw new Error('Invalid pipeline instruction');
+                throw new Error("Invalid pipeline instruction");
             }
             switch (keys[0]) {
-                case '$project':
-                case '$addFields':
-                case '$count':
+                case "$project":
+                case "$addFields":
+                case "$count":
                 case "$group":
                 case "$limit":
                 case "$replaceRoot":
@@ -979,10 +1063,10 @@ class FormsAngular {
                 case "$unwind":
                     // We don't care about these - they are all (as far as we know) safe
                     break;
-                case '$unionWith':
+                case "$unionWith":
                     /*
-                      Sanitise the pipeline we are doing a union with, removing hidden fields from that collection
-                   */
+                              Sanitise the pipeline we are doing a union with, removing hidden fields from that collection
+                           */
                     if (!stage.$unionWith.coll) {
                         stage.$unionWith = { coll: stage.$unionWith, pipeline: [] };
                     }
@@ -996,10 +1080,12 @@ class FormsAngular {
                     }
                     stage.$unionWith.pipeline = await that.sanitisePipeline(stage.$unionWith.pipeline, unionHiddenLookupFields, findFuncQry, req);
                     break;
-                case '$match':
-                    this.hackVariables(array[pipelineSection]['$match']);
+                case "$match":
+                    this.hackVariables(array[pipelineSection]["$match"]);
                     retVal.push(array[pipelineSection]);
-                    if (!doneHiddenFields && Object.keys(hiddenFields) && Object.keys(hiddenFields).length > 0) {
+                    if (!doneHiddenFields &&
+                        Object.keys(hiddenFields) &&
+                        Object.keys(hiddenFields).length > 0) {
                         // We can now project out the hidden fields (we wait for the $match to make sure we don't break
                         // a select that uses a hidden field
                         retVal.push({ $project: hiddenFields });
@@ -1007,24 +1093,28 @@ class FormsAngular {
                     }
                     stage = null;
                     break;
-                case '$lookup':
-                case '$graphLookup':
+                case "$lookup":
+                case "$graphLookup":
                     let needFindFunc = true;
-                    if (keys[0] === '$lookup') {
+                    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) {
+                        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");
                         }
                         // 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') {
+                        if (stage.$lookup.foreignField === "_id") {
                             needFindFunc = false;
                         }
                     }
                     // hide any hiddenfields in the lookup collection
                     const collectionName = stage[keys[0]].from;
                     const lookupField = stage[keys[0]].as;
-                    if ((collectionName + lookupField).indexOf('$') !== -1) {
+                    if ((collectionName + lookupField).indexOf("$") !== -1) {
                         throw new Error('No support for lookups where the "from" or "as" is anything other than a simple string');
                     }
                     const resource = that.getResourceFromCollection(collectionName);
@@ -1034,7 +1124,7 @@ class FormsAngular {
                         if (resource.options?.hide?.length > 0) {
                             const hiddenLookupFields = this.generateHiddenFields(resource, false);
                             let hiddenFieldsObj = {};
-                            Object.keys(hiddenLookupFields).forEach(hf => {
+                            Object.keys(hiddenLookupFields).forEach((hf) => {
                                 hiddenFieldsObj[`${lookupField}.${hf}`] = false;
                             });
                             retVal.push({ $project: hiddenFieldsObj });
@@ -1048,13 +1138,14 @@ class FormsAngular {
                                 const nextStage = array[pipelineSection + 1];
                                 let nextKeys = Object.keys(nextStage);
                                 if (nextKeys.length !== 1) {
-                                    throw new Error('Invalid pipeline instruction');
+                                    throw new Error("Invalid pipeline instruction");
                                 }
-                                if (nextKeys[0] === '$unwind') {
+                                if (nextKeys[0] === "$unwind") {
                                     if (nextStage["$unwind"] === "$" + lookupField) {
                                         nextStageIsUnwind = true;
                                     }
-                                    if (nextStage["$unwind"] && nextStage["$unwind"].path === "$" + lookupField) {
+                                    if (nextStage["$unwind"] &&
+                                        nextStage["$unwind"].path === "$" + lookupField) {
                                         nextStageIsUnwind = true;
                                         if (nextStage["$unwind"].preserveNullAndEmptyArrays) {
                                             allowNulls = true;
@@ -1063,7 +1154,7 @@ class FormsAngular {
                                 }
                             }
                             if (!nextStageIsUnwind) {
-                                throw new Error('No support for $lookup where the next stage is not an $unwind and the resources has a findFunc');
+                                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(array[pipelineSection + 1]);
@@ -1072,12 +1163,18 @@ class FormsAngular {
                                 // Now we need to put the lookup base into the criteria
                                 for (const prop in lookedUpFindQry) {
                                     if (lookedUpFindQry.hasOwnProperty(prop)) {
-                                        lookedUpFindQry[`${lookupField}.${prop}`] = lookedUpFindQry[prop];
+                                        lookedUpFindQry[`${lookupField}.${prop}`] =
+                                            lookedUpFindQry[prop];
                                         delete lookedUpFindQry[prop];
                                     }
                                 }
                                 if (allowNulls) {
-                                    lookedUpFindQry = { $or: [lookedUpFindQry, { [lookupField]: { $exists: false } }] };
+                                    lookedUpFindQry = {
+                                        $or: [
+                                            lookedUpFindQry,
+                                            { [lookupField]: { $exists: false } },
+                                        ],
+                                    };
                                 }
                                 retVal.push({ $match: lookedUpFindQry });
                             }
@@ -1087,13 +1184,15 @@ class FormsAngular {
                     break;
                 default:
                     // anything else is either known to be dangerous, not yet needed or we don't know what it is
-                    throw new Error('Unsupported pipeline instruction ' + keys[0]);
+                    throw new Error("Unsupported pipeline instruction " + keys[0]);
             }
             if (stage) {
                 retVal.push(stage);
             }
         }
-        if (!doneHiddenFields && Object.keys(hiddenFields) && Object.keys(hiddenFields).length > 0) {
+        if (!doneHiddenFields &&
+            Object.keys(hiddenFields) &&
+            Object.keys(hiddenFields).length > 0) {
             // If there was no $match we still need to hide the hidden fields
             retVal.unshift({ $project: hiddenFields });
         }
@@ -1103,19 +1202,20 @@ class FormsAngular {
         let runPipelineStr;
         let runPipelineObj;
         let self = this;
-        if (typeof req.query === 'undefined') {
+        if (typeof req.query === "undefined") {
             req.query = {};
         }
         self.doFindFunc(req, resource, function (err, queryObj) {
             if (err) {
-                return 'There was a problem with the findFunc for model';
+                return "There was a problem with the findFunc for model";
             }
             else {
                 runPipelineStr = JSON.stringify(schema.pipeline);
                 for (let param in req.query) {
-                    if (param !== 'noinput' && req.query.hasOwnProperty(param)) {
+                    if (param !== "noinput" && req.query.hasOwnProperty(param)) {
                         if (req.query[param]) {
-                            if (param !== 'r') { // we don't want to copy the whole report schema (again!)
+                            if (param !== "r") {
+                                // we don't want to copy the whole report schema (again!)
                                 if (schema.params[param] !== undefined) {
                                     schema.params[param].value = req.query[param];
                                 }
@@ -1131,13 +1231,13 @@ class FormsAngular {
                     runPipelineStr = runPipelineStr.replace(/"\(.+?\)"/g, function (match) {
                         let sparam = schema.params[match.slice(2, -2)];
                         if (sparam !== undefined) {
-                            if (sparam.type === 'number') {
+                            if (sparam.type === "number") {
                                 return sparam.value;
                             }
                             else if (_.isObject(sparam.value)) {
                                 return JSON.stringify(sparam.value);
                             }
-                            else if (sparam.value[0] === '{') {
+                            else if (sparam.value[0] === "{") {
                                 return sparam.value;
                             }
                             else {
@@ -1154,9 +1254,11 @@ class FormsAngular {
                 let hiddenFields = self.generateHiddenFields(resource, false);
                 let toDo = {
                     runAggregation: function (cb) {
-                        self.sanitisePipeline(runPipelineObj, hiddenFields, queryObj, req)
+                        self
+                            .sanitisePipeline(runPipelineObj, hiddenFields, queryObj, req)
                             .then((runPipelineObj) => {
-                            resource.model.aggregate(runPipelineObj)
+                            resource.model
+                                .aggregate(runPipelineObj)
                                 .then((results) => {
                                 cb(null, results);
                             })
@@ -1165,22 +1267,28 @@ class FormsAngular {
                             });
                         })
                             .catch((err) => {
-                            throw new Error('Error in sanitisePipeline ' + err);
+                            throw new Error("Error in sanitisePipeline " + err);
                         });
-                    }
+                    },
                 };
                 let translations = []; // array of form {ref:'lookupname',translations:[{value:xx, display:'  '}]}
                 // if we need to do any column translations add the function to the tasks list
                 if (schema.columnTranslations) {
-                    toDo.applyTranslations = ['runAggregation', function (results, cb) {
+                    toDo.applyTranslations = [
+                        "runAggregation",
+                        function (results, cb) {
                             function doATranslate(column, theTranslation) {
-                                results['runAggregation'].forEach(function (resultRow) {
+                                results["runAggregation"].forEach(function (resultRow) {
                                     let valToTranslate = resultRow[column.field];
-                                    valToTranslate = (valToTranslate ? valToTranslate.toString() : '');
+                                    valToTranslate = valToTranslate
+                                        ? valToTranslate.toString()
+                                        : "";
                                     let thisTranslation = _.find(theTranslation.translations, function (option) {
                                         return valToTranslate === option.value.toString();
                                     });
-                                    resultRow[column.field] = thisTranslation ? thisTranslation.display : ' * Missing columnTranslation * ';
+                                    resultRow[column.field] = thisTranslation
+                                        ? thisTranslation.display
+                                        : " * Missing columnTranslation * ";
                                 });
                             }
                             schema.columnTranslations.forEach(function (columnTranslation) {
@@ -1189,18 +1297,22 @@ class FormsAngular {
                                 }
                                 if (columnTranslation.ref) {
                                     let theTranslation = _.find(translations, function (translation) {
-                                        return (translation.ref === columnTranslation.ref);
+                                        return translation.ref === columnTranslation.ref;
                                     });
                                     if (theTranslation) {
                                         doATranslate(columnTranslation, theTranslation);
                                     }
                                     else {
-                                        cb('Invalid ref property of ' + columnTranslation.ref + ' in columnTranslations ' + columnTranslation.field);
+                                        cb("Invalid ref property of " +
+                                            columnTranslation.ref +
+                                            " in columnTranslations " +
+                                            columnTranslation.field);
                                     }
                                 }
                             });
                             cb(null, null);
-                        }];
+                        },
+                    ];
                     let callFuncs = false;
                     for (let i = 0; i < schema.columnTranslations.length; i++) {
                         let thisColumnTranslation = schema.columnTranslations[i];
@@ -1217,9 +1329,13 @@ class FormsAngular {
                                         let getFunc = function (ref) {
                                             let lookup = ref;
                                             return function (cb) {
-                                                let translateObject = { ref: lookup.resourceName, translations: [] };
+                                                let translateObject = {
+                                                    ref: lookup.resourceName,
+                                                    translations: [],
+                                                };
                                                 translations.push(translateObject);
-                                                lookup.model.find({}, {})
+                                                lookup.model
+                                                    .find({}, {})
                                                     .lean()
                                                     .exec()
                                                     .then((findResults) => {
@@ -1228,7 +1344,8 @@ class FormsAngular {
                                                         cbtest(null, j < findResults.length);
                                                     }, function (cbres) {
                                                         let theResult = findResults[j];
-                                                        translateObject.translations[j] = translateObject.translations[j] || {};
+                                                        translateObject.translations[j] =
+                                                            translateObject.translations[j] || {};
                                                         let theTranslation = translateObject.translations[j];
                                                         j++;
                                                         self.getListFields(lookup, theResult, function (err, description) {
@@ -1253,19 +1370,28 @@ class FormsAngular {
                                     }
                                 }
                                 else {
-                                    return callback('Invalid ref property of ' + thisColumnTranslation.ref + ' in columnTranslations ' + thisColumnTranslation.field);
+                                    return callback("Invalid ref property of " +
+                                        thisColumnTranslation.ref +
+                                        " in columnTranslations " +
+                                        thisColumnTranslation.field);
                                 }
                             }
-                            if (!thisColumnTranslation.translations && !thisColumnTranslation.ref && !thisColumnTranslation.fn) {
-                                return callback('A column translation needs a ref, fn or a translations property - ' + thisColumnTranslation.field + ' has neither');
+                            if (!thisColumnTranslation.translations &&
+                                !thisColumnTranslation.ref &&
+                                !thisColumnTranslation.fn) {
+                                return callback("A column translation needs a ref, fn or a translations property - " +
+                                    thisColumnTranslation.field +
+                                    " has neither");
                             }
                         }
                         else {
-                            return callback('A column translation needs a field property');
+                            return callback("A column translation needs a field property");
                         }
                     }
                     if (callFuncs) {
-                        toDo['callFunctions'] = ['runAggregation', function (results, cb) {
+                        toDo["callFunctions"] = [
+                            "runAggregation",
+                            function (results, cb) {
                                 async.each(results.runAggregation, function (row, cb) {
                                     for (let i = 0; i < schema.columnTranslations.length; i++) {
                                         let thisColumnTranslation = schema.columnTranslations[i];
@@ -1276,8 +1402,9 @@ class FormsAngular {
                                 }, function () {
                                     cb(null);
                                 });
-                            }];
-                        toDo.applyTranslations.unshift('callFunctions'); // Make sure we do function before translating its result
+                            },
+                        ];
+                        toDo.applyTranslations.unshift("callFunctions"); // Make sure we do function before translating its result
                     }
                 }
                 async.auto(toDo, function (err, results) {
@@ -1289,22 +1416,36 @@ class FormsAngular {
                             success: true,
                             schema: schema,
                             report: results.runAggregation,
-                            paramsUsed: schema.params
+                            paramsUsed: schema.params,
                         });
                     }
                 });
             }
         });
     }
-    ;
     saveAndRespond(req, res, hiddenFields) {
         function internalSave(doc) {
-            doc.save()
+            function decorateError(err) {
+                let err2 = { status: "err" };
+                if (!err.errors) {
+                    err2.message = err.message;
+                }
+                else {
+                    extend(err2, err);
+                }
+                if (debug) {
+                    console.log("Error saving record: " + JSON.stringify(err2));
+                }
+                res.status(400).send(err2);
+            }
+            doc
+                .save()
                 .then((saved) => {
                 saved = saved.toObject();
                 for (const hiddenField in hiddenFields) {
-                    if (hiddenFields.hasOwnProperty(hiddenField) && hiddenFields[hiddenField]) {
-                        let parts = hiddenField.split('.');
+                    if (hiddenFields.hasOwnProperty(hiddenField) &&
+                        hiddenFields[hiddenField]) {
+                        let parts = hiddenField.split(".");
                         let lastPart = parts.length - 1;
                         let target = saved;
                         for (let i = 0; i < lastPart; i++) {
@@ -1319,29 +1460,27 @@ class FormsAngular {
                 }
                 if (doc.__toClient) {
                     /* Use this to pass anything back to the client that is not saved in the record
-                    Possible use case - sent a message saying that since this data has changed in a
-                    particular way the user should consider doing something else
-                     */
+                                Possible use case - sent a message saying that since this data has changed in a
+                                particular way the user should consider doing something else
+                                 */
                     saved.__toClient = doc.__toClient;
                 }
                 res.send(saved);
             })
                 .catch((err) => {
-                let err2 = { status: 'err' };
-                if (!err.errors) {
-                    err2.message = err.message;
+                if (req.resource.options.onSaveError) {
+                    req.resource.options.onSaveError(err, req, res)
+                        .then(() => {
+                        decorateError(err);
+                    });
                 }
                 else {
-                    extend(err2, err);
-                }
-                if (debug) {
-                    console.log('Error saving record: ' + JSON.stringify(err2));
+                    decorateError(err);
                 }
-                res.status(400).send(err2);
             });
         }
         let doc = req.doc;
-        if (typeof req.resource.options.onSave === 'function') {
+        if (typeof req.resource.options.onSave === "function") {
             req.resource.options.onSave(doc, req, function (err) {
                 if (err) {
                     throw err;
@@ -1353,14 +1492,12 @@ class FormsAngular {
             internalSave(doc);
         }
     }
-    ;
     /**
      * All entities REST functions have to go through this first.
      */
     processCollection(req) {
         req.resource = this.getResource(req.params.resourceName);
     }
-    ;
     /**
      * Renders a view with the list of docs, which may be modified by query parameters
      */
@@ -1370,7 +1507,7 @@ class FormsAngular {
             if (!req.resource) {
                 return next();
             }
-            if (typeof req.query === 'undefined') {
+            if (typeof req.query === "undefined") {
                 req.query = {};
             }
             try {
@@ -1379,7 +1516,9 @@ class FormsAngular {
                 const projectParam = req.query.p ? JSON.parse(req.query.p) : {};
                 const limitParam = req.query.l ? JSON.parse(req.query.l) : 0;
                 const skipParam = req.query.s ? JSON.parse(req.query.s) : 0;
-                const orderParam = req.query.o ? JSON.parse(req.query.o) : req.resource.options.listOrder;
+                const orderParam = req.query.o
+                    ? JSON.parse(req.query.o)
+                    : req.resource.options.listOrder;
                 // Dates in aggregation must be Dates
                 if (aggregationParam) {
                     this.hackVariablesInPipeline(aggregationParam);
@@ -1399,12 +1538,11 @@ class FormsAngular {
             }
         }, this);
     }
-    ;
     generateProjection(hiddenFields, projectParam) {
         let type;
         function setSelectType(typeChar, checkChar) {
             if (type === checkChar) {
-                throw new Error('Cannot mix include and exclude fields in select');
+                throw new Error("Cannot mix include and exclude fields in select");
             }
             else {
                 type = typeChar;
@@ -1414,18 +1552,18 @@ class FormsAngular {
         if (projectParam) {
             let projection = Object.keys(projectParam);
             if (projection.length > 0) {
-                projection.forEach(p => {
+                projection.forEach((p) => {
                     if (projectParam[p] === 0) {
-                        setSelectType('E', 'I');
+                        setSelectType("E", "I");
                     }
                     else if (projectParam[p] === 1) {
-                        setSelectType('I', 'E');
+                        setSelectType("I", "E");
                     }
                     else {
-                        throw new Error('Invalid projection: ' + projectParam);
+                        throw new Error("Invalid projection: " + projectParam);
                     }
                 });
-                if (type && type === 'E') {
+                if (type && type === "E") {
                     // We are excluding fields - can just merge with hiddenFields
                     Object.assign(retVal, projectParam, hiddenFields);
                 }
@@ -1442,17 +1580,16 @@ class FormsAngular {
         }
         return retVal;
     }
-    ;
     doFindFunc(req, resource, cb) {
         // filter out records the user has no access to unless we are just asking for list attributes
-        if (resource.options.findFunc && req?.route?.path !== "/api/:resourceName/:id/list") {
+        if (resource.options.findFunc &&
+            req?.route?.path !== "/api/:resourceName/:id/list") {
             resource.options.findFunc(req, cb);
         }
         else {
             cb(null);
         }
     }
-    ;
     async doFindFuncPromise(req, resource) {
         return new Promise((resolve, reject) => {
             this.doFindFunc(req, resource, (err, queryObj) => {
@@ -1465,7 +1602,6 @@ class FormsAngular {
             });
         });
     }
-    ;
     async filteredFind(resource, req, aggregationParam, findParam, projectParam, sortOrder, limit, skip, callback) {
         const that = this;
         let hiddenFields = this.generateHiddenFields(resource, false);
@@ -1473,13 +1609,15 @@ class FormsAngular {
         async function doAggregation(queryObj, cb) {
             if (aggregationParam) {
                 aggregationParam = await that.sanitisePipeline(aggregationParam, hiddenFields, queryObj, req);
-                resource.model.aggregate(aggregationParam)
+                resource.model
+                    .aggregate(aggregationParam)
                     .then((aggregationResults) => {
                     stashAggregationResults = aggregationResults;
                     cb(_.map(aggregationResults, function (obj) {
                         return obj._id;
                     }));
-                }).catch((err) => {
+                })
+                    .catch((err) => {
                     throw err;
                 });
             }
@@ -1499,7 +1637,7 @@ class FormsAngular {
                     else {
                         let query = resource.model.find(queryObj);
                         if (idArray.length > 0) {
-                            query = query.where('_id').in(idArray);
+                            query = query.where("_id").in(idArray);
                         }
                         if (findParam) {
                             query = query.find(findParam);
@@ -1514,13 +1652,14 @@ class FormsAngular {
                         if (sortOrder) {
                             query = query.sort(sortOrder);
                         }
-                        query.exec()
+                        query
+                            .exec()
                             .then((docs) => {
                             if (stashAggregationResults) {
                                 for (const obj of docs) {
                                     // Add any fields from the aggregation results whose field name starts __ to the mongoose Document
-                                    let aggObj = stashAggregationResults.find(a => a._id.toString() === obj._id.toString());
-                                    for (const k of Object.keys(aggObj).filter((k) => k.startsWith('__'))) {
+                                    let aggObj = stashAggregationResults.find((a) => a._id.toString() === obj._id.toString());
+                                    for (const k of Object.keys(aggObj).filter((k) => k.startsWith("__"))) {
                                         obj[k] = aggObj[k];
                                     }
                                 }
@@ -1535,7 +1674,6 @@ class FormsAngular {
             }
         });
     }
-    ;
     collectionPost() {
         return _.bind(function (req, res, next) {
             this.processCollection(req);
@@ -1544,34 +1682,32 @@ class FormsAngular {
                 return;
             }
             if (!req.body) {
-                throw new Error('Nothing submitted.');
+                throw new Error("Nothing submitted.");
             }
             let cleansedBody = this.cleanseRequest(req);
             req.doc = new req.resource.model(cleansedBody);
             this.saveAndRespond(req, res);
         }, this);
     }
-    ;
     /**
      * Generate an object of fields to not expose
      **/
     generateHiddenFields(resource, state) {
         let hiddenFields = {};
-        if (resource.options['hide'] !== undefined) {
+        if (resource.options["hide"] !== undefined) {
             resource.options.hide.forEach(function (dt) {
                 hiddenFields[dt] = state;
             });
         }
         return hiddenFields;
     }
-    ;
     /** Sec issue
      * Cleanse incoming data to avoid overwrite and POST request forgery
      * (name may seem weird but it was in French, so it is some small improvement!)
      */
     cleanseRequest(req) {
         let reqData = req.body, resource = req.resource;
-        if (typeof resource.options['hide'] === 'undefined') {
+        if (typeof resource.options["hide"] === "undefined") {
             return reqData;
         }
         let hiddenFields = resource.options.hide;
@@ -1584,7 +1720,6 @@ class FormsAngular {
         });
         return reqData;
     }
-    ;
     generateQueryForEntity(req, resource, id, cb) {
         let that = this;
         let hiddenFields = this.generateHiddenFields(resource, false);
@@ -1610,11 +1745,12 @@ class FormsAngular {
                 else {
                     crit = idSel;
                 }
-                cb(null, resource.model.findOne(crit).select(that.generateProjection(hiddenFields, req.query?.p)));
+                cb(null, resource.model
+                    .findOne(crit)
+                    .select(that.generateProjection(hiddenFields, req.query?.p)));
             }
         });
     }
-    ;
     /*
      * Entity request goes here first
      * It retrieves the resource
@@ -1627,11 +1763,12 @@ class FormsAngular {
             if (err) {
                 return res.status(500).send({
                     success: false,
-                    err: util.inspect(err)
+                    err: util.inspect(err),
                 });
             }
             else {
-                query.exec()
+                query
+                    .exec()
                     .then((doc) => {
                     if (doc) {
                         req.doc = doc;
@@ -1640,20 +1777,19 @@ class FormsAngular {
                     else {
                         return res.status(404).send({
                             success: false,
-                            err: 'Record not found'
+                            err: "Record not found",
                         });
                     }
                 })
                     .catch((err) => {
                     return res.status(400).send({
                         success: false,
-                        err: util.inspect(err)
+                        err: util.inspect(err),
                     });
                 });
             }
         });
     }
-    ;
     /**
      * Gets a single entity
      *
@@ -1676,7 +1812,6 @@ class FormsAngular {
             });
         }, this);
     }
-    ;
     replaceHiddenFields(record, data) {
         const self = this;
         if (record) {
@@ -1692,7 +1827,6 @@ class FormsAngular {
             delete record._replacingHiddenFields;
         }
     }
-    ;
     entityPut() {
         return _.bind(function (req, res, next) {
             const that = this;
@@ -1702,19 +1836,20 @@ class FormsAngular {
                     return;
                 }
                 if (!req.body) {
-                    throw new Error('Nothing submitted.');
+                    throw new Error("Nothing submitted.");
                 }
                 let cleansedBody = that.cleanseRequest(req);
                 // Merge
                 for (let prop in cleansedBody) {
                     if (cleansedBody.hasOwnProperty(prop)) {
-                        req.doc.set(prop, cleansedBody[prop] === '' ? undefined : cleansedBody[prop]);
+                        req.doc.set(prop, cleansedBody[prop] === "" ? undefined : cleansedBody[prop]);
                     }
                 }
                 if (req.resource.options.hide !== undefined) {
                     let hiddenFields = that.generateHiddenFields(req.resource, true);
                     hiddenFields._id = false;
-                    req.resource.model.findById(req.doc._id, hiddenFields)
+                    req.resource.model
+                        .findById(req.doc._id, hiddenFields)
                         .lean()
                         .exec()
                         .then((data) => {
@@ -1731,7 +1866,6 @@ class FormsAngular {
             });
         }, this);
     }
-    ;
     generateDependencyList(resource) {
         if (resource.options.dependents === undefined) {
             let that = this;
@@ -1740,18 +1874,19 @@ class FormsAngular {
                     let fldList = [];
                     for (let fld in schema.paths) {
                         if (schema.paths.hasOwnProperty(fld)) {
-                            const parts = fld.split('.');
+                            const parts = fld.split(".");
                             let schemaType = schema.tree;
                             while (parts.length > 0) {
                                 schemaType = schemaType[parts.shift()];
                             }
                             if (schemaType.type) {
-                                if (schemaType.type.name === 'ObjectId' && schemaType.ref === resource.resourceName) {
+                                if (schemaType.type.name === "ObjectId" &&
+                                    schemaType.ref === resource.resourceName) {
                                     fldList.push(prefix + fld);
                                 }
                                 else if (_.isArray(schemaType.type)) {
                                     schemaType.type.forEach(function (t) {
-                                        searchPaths(t, prefix + fld + '.');
+                                        searchPaths(t, prefix + fld + ".");
                                     });
                                 }
                             }
@@ -1761,12 +1896,13 @@ class FormsAngular {
                         acc.push({ resource: r, keys: fldList });
                     }
                 }
-                searchPaths(r.model.schema, '');
+                searchPaths(r.model.schema, "");
                 return acc;
             }, []);
             for (let pluginName in that.options.plugins) {
                 let thisPlugin = that.options.plugins[pluginName];
-                if (thisPlugin.dependencyChecks && thisPlugin.dependencyChecks[resource.resourceName]) {
+                if (thisPlugin.dependencyChecks &&
+                    thisPlugin.dependencyChecks[resource.resourceName]) {
                     resource.options.dependents = resource.options.dependents.concat(thisPlugin.dependencyChecks[resource.resourceName]);
                 }
             }
@@ -1776,20 +1912,26 @@ class FormsAngular {
         this.generateDependencyList(resource);
         let promises = [];
         let foreignKeyList = [];
-        resource.options.dependents.forEach(collection => {
-            collection.keys.forEach(key => {
+        resource.options.dependents.forEach((collection) => {
+            collection.keys.forEach((key) => {
                 promises.push({
-                    p: collection.resource.model.find({ [key]: id }).limit(1).exec(),
+                    p: collection.resource.model
+                        .find({ [key]: id })
+                        .limit(1)
+                        .exec(),
                     collection,
-                    key
+                    key,
                 });
             });
         });
-        return Promise.all(promises.map(p => p.p))
-            .then((results) => {
+        return Promise.all(promises.map((p) => p.p)).then((results) => {
             results.forEach((r, i) => {
                 if (r.length > 0) {
-                    foreignKeyList.push({ resourceName: promises[i].collection.resource.resourceName, key: promises[i].key, id: r[0]._id });
+                    foreignKeyList.push({
+                        resourceName: promises[i].collection.resource.resourceName,
+                        key: promises[i].key,
+                        id: r[0]._id,
+                    });
                 }
             });
             return foreignKeyList;
@@ -1800,14 +1942,15 @@ class FormsAngular {
         return _.bind(async function (req, res, next) {
             async function removeDoc(doc, resource) {
                 switch (resource.options.handleRemove) {
-                    case 'allow':
+                    case "allow":
                         // old behaviour - no attempt to maintain data integrity
                         return doc.deleteOne();
-                    case 'cascade':
+                    case "cascade":
                         res.status(400).send('"cascade" option not yet supported');
                         break;
                     default:
-                        return that.getDependencies(resource, doc._id)
+                        return that
+                            .getDependencies(resource, doc._id)
                             .then((dependencies) => {
                             if (dependencies.length > 0) {
                                 throw new ForeignKeyError(resource.resourceName, dependencies);
@@ -1838,7 +1981,7 @@ class FormsAngular {
                 }
                 let doc = req.doc;
                 try {
-                    void await runDeletion(doc, req.resource);
+                    void (await runDeletion(doc, req.resource));
                     res.status(200).send();
                 }
                 catch (e) {
@@ -1852,7 +1995,6 @@ class FormsAngular {
             });
         }, this);
     }
-    ;
     entityList() {
         return _.bind(function (req, res, next) {
             const that = this;
@@ -1860,7 +2002,9 @@ class FormsAngular {
                 if (!req.resource) {
                     return next();
                 }
-                const returnRawParam = req.query?.returnRaw ? !!JSON.parse(req.query.returnRaw) : false;
+                const returnRawParam = req.query?.returnRaw
+                    ? !!JSON.parse(req.query.returnRaw)
+                    : false;
                 if (returnRawParam) {
                     const result = { _id: req.doc._id };
                     for (const field of req.resource.options.listFields) {
@@ -1881,8 +2025,7 @@ class FormsAngular {
             });
         }, this);
     }
-    ;
-    // To disambiguate the contents of items - assumed to be the results of a single resource lookup or search - 
+    // To disambiguate the contents of items - assumed to be the results of a single resource lookup or search -
     // pass the result of this function as the second argument to the disambiguate() function.
     // equalityProps should identify the property(s) of the items that must ALL be equal for two items to
     // be considered ambiguous.
@@ -1916,7 +2059,8 @@ class FormsAngular {
         for (let i = 0; i < items.length - 1; i++) {
             for (let j = i + 1; j < items.length; j++) {
                 if (items[i][disambiguationResourceNameProp] &&
-                    items[i][disambiguationResourceNameProp] === items[j][disambiguationResourceNameProp] &&
+                    items[i][disambiguationResourceNameProp] ===
+                        items[j][disambiguationResourceNameProp] &&
                     !equalityProps.some((p) => items[i][p] !== items[j][p])) {
                     if (!store[items[i][disambiguationResourceNameProp]]) {
                         store[items[i][disambiguationResourceNameProp]] = [];
@@ -1952,7 +2096,9 @@ class FormsAngular {
         const findParam = req.query.f ? JSON.parse(req.query.f) : {};
         const limitParam = req.query.l ? JSON.parse(req.query.l) : 0;
         const skipParam = req.query.s ? JSON.parse(req.query.s) : 0;
-        const orderParam = req.query.o ? JSON.parse(req.query.o) : req.resource.options.listOrder;
+        const orderParam = req.query.o
+            ? JSON.parse(req.query.o)
+            : req.resource.options.listOrder;
         const concatenateParam = req.query.c ? JSON.parse(req.query.c) : true;
         const resOpts = req.resource.options;
         let disambiguationField;
@@ -1982,7 +2128,9 @@ class FormsAngular {
                                 text += doc[field];
                             }
                         }
-                        const disambiguationId = disambiguationField ? doc[disambiguationField] : undefined;
+                        const disambiguationId = disambiguationField
+                            ? doc[disambiguationField]
+                            : undefined;
                         return { id: doc._id, text, disambiguationId };
                     });
                     if (disambiguationResourceName) {
@@ -2003,7 +2151,7 @@ class FormsAngular {
                                 item[listFields[0]] += ` (${disambiguationText})`;
                             }
                             else {
-                                // store the text against hard-coded property name "disambiguation", rather than (say) using 
+                                // store the text against hard-coded property name "disambiguation", rather than (say) using
                                 // item[disambiguationResourceName], because if disambiguationResourceName === disambiguationField,
                                 // that value would end up being deleted again when the this.disambiguate() call (which we have
                                 // been called from) does its final tidy-up and deletes [disambiguationField] from all of the items in docs
@@ -2020,7 +2168,6 @@ class FormsAngular {
             }
         });
     }
-    ;
     entityListAll() {
         return _.bind(function (req, res, next) {
             if (!(req.resource = this.getResource(req.params.resourceName))) {
@@ -2036,7 +2183,6 @@ class FormsAngular {
             });
         }, this);
     }
-    ;
     extractTimestampFromMongoID(record) {
         let timestamp = record.toString().substring(0, 8);
         return new Date(parseInt(timestamp, 16) * 1000);
@@ -2045,8 +2191,8 @@ class FormsAngular {
 exports.FormsAngular = FormsAngular;
 class ForeignKeyError extends global.Error {
     constructor(resourceName, foreignKeys) {
-        super(`Cannot delete this ${resourceName}, as it is: ${foreignKeys.map(d => ` the ${d.key} on ${d.resourceName} ${d.id}`).join("; ")}`);
+        super(`Cannot delete this ${resourceName}, as it is: ${foreignKeys.map((d) => ` the ${d.key} on ${d.resourceName} ${d.id}`).join("; ")}`);
         this.name = "ForeignKeyError";
-        this.stack = new global.Error('').stack;
+        this.stack = new global.Error("").stack;
     }
 }