forms-angular 0.12.0-beta.243 → 0.12.0-beta.245

package/dist/server/data_form.js

@@ -220,7 +220,7 @@ class FormsAngular {
                 }
             }
         }
-        extend(resource.options, this.preprocess(resource, resource.model.schema['paths'], null));
+        extend(resource.options, this.preprocess(resource, resource.model.schema['paths']));
         if (resource.options.searchImportance) {
             this.searchFunc = async.forEachSeries;
         }
@@ -695,69 +695,100 @@ class FormsAngular {
         return outPath;
     }
     ;
-    preprocess(resource, paths, formSchema) {
-        let outPath = {}, hiddenFields = [], listFields = [];
-        if (resource && resource.options && 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') {
-                // 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) };
-                    }
-                    // this provides support for entire nested schemas that wish to remain hidden
-                    if (paths[element].options.secure) {
-                        hiddenFields.push(element);
-                    }
-                    // to support hiding individual properties of nested schema would require us
-                    // to do something with subSchemaInfo.hide here
-                }
-                else {
-                    // check for arrays
-                    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';
-                            }
-                            else {
-                                realType.instance = typeType;
+    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)) && curType !== 'function') {
+                    const val = obj[cur];
+                    if (val) {
+                        if (Array.isArray(val)) {
+                            if (val.length > 0) {
+                                acc[cur] = val;
                             }
                         }
+                        else if (curType === 'object') {
+                            acc[cur] = processInternalObject(obj[cur]);
+                        }
+                        else {
+                            acc[cur] = obj[cur];
+                        }
                     }
-                    outPath[element] = extend(true, {}, paths[element]);
-                    if (paths[element].options.secure) {
-                        hiddenFields.push(element);
-                    }
-                    if (paths[element].options.match) {
-                        outPath[element].options.match = paths[element].options.match.source || paths[element].options.match;
+                }
+                return acc;
+            }, {});
+        }
+        let outPath = {}, hiddenFields = [], listFields = [];
+        if (resource && 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;
+            }
+            for (let element in paths) {
+                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) };
+                        }
+                        // this provides support for entire nested schemas that wish to remain hidden
+                        if (paths[element].options.secure) {
+                            hiddenFields.push(element);
+                        }
+                        // to support hiding individual properties of nested schema would require us
+                        // to do something with subSchemaInfo.hide here
                     }
-                    let schemaListInfo = paths[element].options.list;
-                    if (schemaListInfo) {
-                        let listFieldInfo = { field: element };
-                        if (typeof schemaListInfo === 'object' && Object.keys(schemaListInfo).length > 0) {
-                            listFieldInfo.params = schemaListInfo;
+                    else {
+                        // check for arrays
+                        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';
+                                }
+                                else {
+                                    realType.instance = typeType;
+                                }
+                            }
+                        }
+                        outPath[element] = processInternalObject(paths[element]);
+                        if (paths[element].options.secure) {
+                            hiddenFields.push(element);
+                        }
+                        if (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) {
+                                listFieldInfo.params = schemaListInfo;
+                            }
+                            listFields.push(listFieldInfo);
                         }
-                        listFields.push(listFieldInfo);
                     }
                 }
             }
+            outPath = this.applySchemaSubset(outPath, formSchema);
+            let returnObj = { paths: outPath };
+            if (hiddenFields.length > 0) {
+                returnObj.hide = hiddenFields;
+            }
+            if (listFields.length > 0) {
+                returnObj.listFields = listFields;
+            }
+            if (resource) {
+                resource.preprocessed = resource.preprocessed || {};
+                resource.preprocessed[formName || "__default"] = returnObj;
+            }
+            return returnObj;
         }
-        outPath = this.applySchemaSubset(outPath, formSchema);
-        let returnObj = { paths: outPath };
-        if (hiddenFields.length > 0) {
-            returnObj.hide = hiddenFields;
-        }
-        if (listFields.length > 0) {
-            returnObj.listFields = listFields;
-        }
-        return returnObj;
     }
     ;
     schema() {
@@ -766,16 +797,22 @@ class FormsAngular {
                 return res.status(404).end();
             }
             let formSchema = null;
-            if (req.params.formName) {
-                try {
-                    formSchema = req.resource.model.schema.statics['form'](req.params.formName, req);
-                }
-                catch (e) {
-                    return res.status(500).send(e.message);
+            const formName = req.params.formName;
+            if (req.resource.preprocessed?.[formName || "__default"]) {
+                res.send(req.resource.preprocessed[formName || "__default"].paths);
+            }
+            else {
+                if (formName) {
+                    try {
+                        formSchema = req.resource.model.schema.statics['form'](formName, req);
+                    }
+                    catch (e) {
+                        return res.status(500).send(e.message);
+                    }
                 }
+                let paths = this.preprocess(req.resource, req.resource.model.schema.paths, formName, formSchema).paths;
+                res.send(paths);
             }
-            let paths = this.preprocess(req.resource, req.resource.model.schema.paths, formSchema).paths;
-            res.send(paths);
         }, this);
     }
     ;

package/dist/server/index.d.ts

@@ -93,6 +93,7 @@ declare module fngServer {
     interface Resource extends ResourceExport {
         resourceName: string;
         resourceNameLower: string;
+        preprocessed?: {[formName: string] : any};
     }
 
     interface ListParams {

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.243",
+  "version": "0.12.0-beta.245",
   "engines": {
     "node": ">=8.x",
     "npm": ">=5.x"
@@ -46,56 +46,51 @@
     "angular-messages": "1.8.3",
     "angular-sanitize": "1.8.3",
     "angular-ui-bootstrap": "1.3.2 || 2.5.6",
-    "angular-ui-grid": "4.11.1",
-    "async": "3.2.4",
+    "angular-ui-grid": "4.12.4",
+    "async": "3.2.5",
     "lodash": "^4.17.21",
     "ng-infinite-scroll": "1.3.0",
-    "node.extend": "2.0.2"
+    "node.extend": "2.0.3"
   },
   "peerDependencies": {
     "express": "^4",
-    "mongoose": "=7.3.2"
+    "mongoose": "^7.3.3 || ^8"
   },
-  "devDependenciesComments": [
-    "mongoose pinned to 7.3.2 to avoid problem testing fng-ui-select:",
-    "  Converting circular structure to JSON --> starting at object with constructor DocumentArrayPath    property $embeddedSchemaType -> object with constructor DocumentArrayElement  --- property $parentSchemaType closes the circle",
-    "  Must be a way we can work around it in time, but trying to get releases out atm"
-  ],
   "devDependencies": {
-    "@types/angular": "1.8.4",
-    "@types/lodash": "4.14.191",
-    "@types/mocha": "^10.0.1",
+    "@types/angular": "1.8.9",
+    "@types/lodash": "4.14.202",
+    "@types/mocha": "^10.0.6",
     "@types/node": "^18.11.13",
     "angular-mocks": "1.8.3",
-    "body-parser": "1.20.1",
+    "body-parser": "1.20.2",
     "bower": "^1.8.14",
-    "del": "6.0.0",
+    "del": "6.1.1",
     "express": "4.18.2",
     "gulp": "^4.0.2",
     "gulp-angular-templatecache": "3.0.1",
     "gulp-clean-css": "4.3.0",
     "gulp-concat": "2.6.1",
     "gulp-less": "5.0.0",
-    "gulp-mocha": "8.0.0",
+    "gulp-mocha": "9.0.0",
     "gulp-ng-annotate": "2.1.0",
     "gulp-rename": "2.0.0",
-    "gulp-replace": "^1.1.3",
+    "gulp-replace": "^1.1.4",
     "gulp-typescript": "5.0.1",
     "gulp-uglify": "3.0.2",
     "gulp-umd": "2.0.0",
-    "jasmine-core": "4.5.0",
-    "karma": "^6.4.1",
-    "karma-chrome-launcher": "^3.1.1",
+    "jasmine-core": "5.1.1",
+    "karma": "^6.4.2",
+    "karma-chrome-launcher": "^3.2.0",
     "karma-firefox-launcher": "^2.1.2",
     "karma-jasmine": "5.1.0",
     "karma-junit-reporter": "2.0.1",
     "karma-ng-html2js-preprocessor": "1.0.0",
     "matchdep": "2.0.0",
     "mocha": "^10.2.0",
-    "mongoose": "=7.3.2",
-    "prettier": "2.8.1",
+    "mongoose": "^8",
+    "prettier": "3.1.1",
     "pump": "3.0.0",
-    "typescript": "4.6.3"
+    "typescript": "=4.9.5"
   },
   "license": "MIT"
 }