not-node 4.0.11 → 4.0.12

package/index.js

@@ -30,7 +30,9 @@ module.exports.Common = require('./src/common');
 /** Fields library manager */
 module.exports.Fields = require('./src/fields');
 /** Form validation template **/
-module.exports.Form = require('./src/form');
+module.exports.Form = require('./src/form').Form;
+/** Form validation template fabric **/
+module.exports.FormFabric = require('./src/form').FormFabric;
 /** Application initialization procedures */
 module.exports.Init = require('./src/init').Init;
 /** Application object */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {

package/src/form/fabric.js

@@ -0,0 +1,28 @@
+const Form = require('./form');
+
+module.exports = class FormFabric {
+  static create({
+    FIELDS,
+    MODULE_NAME,
+    FORM_NAME,
+    exractor
+  }) {
+    return class extends Form {
+      constructor() {
+        super({
+          FIELDS,
+          FORM_NAME: `${MODULE_NAME}:${FORM_NAME}`
+        });
+      }
+
+      /**
+       * Extracts data
+       * @param {ExpressRequest} req expressjs request object
+       * @return {Object}        forma data
+       **/
+      extract(req) {
+        return exractor(req);
+      }
+    };
+  }
+};

package/src/form/form.js

@@ -0,0 +1,93 @@
+//DB related validation tools
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+//not-node
+const initFields = require('../fields').initFields;
+
+const FormFabric = require('./fabric');
+
+const {
+  byFieldsValidators
+} = require('../model/enrich');
+
+const {
+  notValidationError,
+  notError
+} = require('not-error');
+
+
+/**
+ * Generic form validation class
+ **/
+class Form {
+  constructor({
+    FIELDS,
+    FORM_NAME
+  }) {
+    this.FORM_NAME = FORM_NAME;
+    this.FIELDS = FIELDS;
+    this.SCHEMA = byFieldsValidators(initFields(FIELDS, 'model'));
+    if (mongoose.modelNames().indexOf(FORM_NAME)===-1){
+      this.MODEL = mongoose.model(FORM_NAME, Schema(this.SCHEMA));
+    }else{
+      this.MODEL = mongoose.connection.model(FORM_NAME);
+    }
+  }
+
+  /**
+   * Extract data from ExpressRequest object and validates it
+   * returns it or throws
+   * @param {ExpressRequest} req expressjs request object
+   * @return {Promise<Object>} form data
+   * @throws {notValidationError}
+   **/
+  async run(req) {
+    let data = await this.extract(req);
+    await this.validate(data);
+    return data;
+  }
+
+  /**
+   * Extracts data, should be overriden
+   * @param {ExpressRequest} req expressjs request object
+   * @return {Object}        forma data
+   **/
+  async extract( /*req*/ ) {
+    return {};
+  }
+
+  /**
+   * Validates form data or throws
+   * @param {Object} data    form data
+   * @return {Object}
+   * @throws {notValidationError}
+   **/
+  async validate(data) {
+    try {
+      await this.MODEL.validate(data, this.FIELDS);
+    } catch (e) {
+      let fields = {};
+      if (e instanceof mongoose.Error.ValidationError) {
+        Object.keys(e.errors).forEach(name => {
+          fields[name] = [e.errors[name].message];
+        });
+        throw new notValidationError(e.message, fields, e, data);
+      } else {
+        throw new notError(
+          'core:form_validation_error', {
+            FORM_NAME: this.FORM_NAME,
+            FIELDS: this.FIELDS,
+            data
+          },
+          e
+        );
+      }
+    }
+  }
+
+  static fabric(){
+    return FormFabric;
+  }
+}
+
+module.exports = Form;

package/src/form/index.js

@@ -1,82 +1,4 @@
-//DB related validation tools
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-//not-node
-const initFields = require('../fields').initFields;
-const {
-  byFieldsValidators
-} = require('../model/enrich');
-const {
-  notValidationError,
-  notError
-} = require('not-error');
-
-/**
- * Generic form validation class
- **/
-module.exports = class Form {
-  constructor({
-    FIELDS,
-    FORM_NAME
-  }) {
-    this.FORM_NAME = FORM_NAME;
-    this.FIELDS = FIELDS;
-    this.SCHEMA = byFieldsValidators(initFields(FIELDS, 'model'));
-    if (mongoose.modelNames().indexOf(FORM_NAME)===-1){
-      this.MODEL = mongoose.model(FORM_NAME, Schema(this.SCHEMA));
-    }else{
-      this.MODEL = mongoose.connection.model(FORM_NAME);
-    }
-  }
-
-  /**
-   * Extract data from ExpressRequest object and validates it
-   * returns it or throws
-   * @param {ExpressRequest} req expressjs request object
-   * @return {Promise<Object>} form data
-   * @throws {notValidationError}
-   **/
-  async run(req) {
-    let data = await this.extract(req);
-    await this.validate(data);
-    return data;
-  }
-
-  /**
-   * Extracts data, should be overriden
-   * @param {ExpressRequest} req expressjs request object
-   * @return {Object}        forma data
-   **/
-  async extract( /*req*/ ) {
-    return {};
-  }
-
-  /**
-   * Validates form data or throws
-   * @param {Object} data    form data
-   * @return {Object}
-   * @throws {notValidationError}
-   **/
-  async validate(data) {
-    try {
-      await this.MODEL.validate(data, this.FIELDS);
-    } catch (e) {
-      let fields = {};
-      if (e instanceof mongoose.Error.ValidationError) {
-        Object.keys(e.errors).forEach(name => {
-          fields[name] = [e.errors[name].message];
-        });
-        throw new notValidationError(e.message, fields, e, data);
-      } else {
-        throw new notError(
-          'core:form_validation_error', {
-            FORM_NAME: this.FORM_NAME,
-            FIELDS: this.FIELDS,
-            data
-          },
-          e
-        );
-      }
-    }
-  }
+module.exports = {
+  Form: require('./form'),
+  FormFabric: require('./fabric'),
 };