Now uses underscore for object extension, better support of different…

… field types.

index.js

@@ -1,53 +1,93 @@
 var forms = require('forms')
   , fields = forms.fields
-  , validators = forms.validators;
+  , widgets = forms.widgets
+  , validators = forms.validators
+  , _ = require('underscore');
 
-module.exports.create = function (model) {
+_fields = {
+  'String': 'string',
+  'Password': 'password',
+  'Email': 'email'
+}
+
+function convert_mongoose_field(mongoose_field) {
+  return fields[_fields[mongoose_field] || fields.string];
+}
+
+function get_field(path, form_name) {
+  var _field = null;
+  if (!(path.options && path.options.forms))
+    return null;
+  var forms = path.options.forms;
+  if (!(forms[form_name] || forms['all']))
+    return null;
+
+  var _options = _.extend({}, forms['all'], forms[form_name]);
+
+  if (_options.type)
+    _field = (typeof _options.type === 'string') ? fields[_options.type] : _options.type
+  if (!_field)
+    _field = convert_mongoose_field( path.options.type ? path.options.type.name : path.instance );
+  if (!_field)
+    throw new Error('Model does not have forms.type, probably on a virtual', path);
+  var _fields = {}
+  _fields[path.path] = _field(_options = _.defaults(_options, {
+    required: path.options.required || path.options.unique
+  }));
+  if (_options.confirm)
+    _fields[path.path + '.confirm'] = _field(_.extend({}, _options, {
+      validators: [validators.matchField(path.path)]
+    }));
+  if(_options.existing)
+    _fields[path.path + '.existing'] = _field(_.extend({}, _options, {
+      validators: [function (form, field, callback) {
+        if (!form.existing)
+          return callback('Server error');
+        var existing = form.existing[path.path];
+        if (typeof existing === 'function') {
+          existing(field.data, function (err, result) {
+            if (err) return callback('Server error: ' + err);
+            if (!result) return callback('Does not match existing value!!!');
+            callback();
+          });
+        } else if (form.existing[field.name] != field.data) {
+            return callback('Does not match existing value!');
+        } else {
+          callback();
+        }
+      }]
+    }));
+  return _fields;
+}
+
+module.exports.create = function (model, extra_params, form_name) {
   var schema = model.schema
     , paths = schema.paths
     , virtuals = schema.virtuals
     , params = {};
   for (var pathName in paths) {
     var path = paths[pathName];
-    if (path.options && path.options.forms_type) {
-      params[pathName] = fields[path.options.forms_type]({
-        required: path.options.required || path.options.unique
-      });
-    }
+    var field = get_field(path, form_name);
+    if (field)
+      params = _.extend(params, field);
   }
   for (var virtName in virtuals) {
     var virt = virtuals[virtName];
-    if (virt.options) {
-      if (virt.options.forms_type) {
-        params[virtName] = fields[virt.options.forms_type]({
-          required: virt.options.forms_required
-        });
-      }
-      if (virt.options.forms_confirm) {
-        params[virtName+'.confirm'] = fields[virt.options.forms_type]({
-          required: virt.options.forms_required,
-          validators: [validators.matchField(virtName)]
-        });
-      }
-    }
+    virt.path = virtName;
+    var field = get_field(virt, form_name);
+    if (field)
+      params = _.extend(params, field);
   }
+  params = _.extend({}, params, extra_params);
+  var form = forms.create(params);
   return forms.create(params);
 }
 
 module.exports.fields = fields;
+module.exports.widgets = widgets;
 module.exports.validators = validators;
-module.exports.createForm = forms.create;
-
-module.exports.bs_iterator = function (name, field) {
-  var label = this.label || name[0].toUpperCase() + name.substr(1).replace('_', ' ');
-  var html = '<div class="control-group'
-    + (field.error ? ' error' : '')
-    + '">'
-    + '<label class="control-label" for="'+(field.id || 'id_'+name)+'">'+label+'</label>'
-    + '<div class="controls">'
-    + field.widget.toHTML(name, field)
-    + (field.error ? '<p class="help-block">' + field.error + '</p>' : '')
-    + '</div>'
-    + '</div>'
-  return html
+module.exports.createForm = function (params, extra_params) {
+  params = _.extend({}, params, extra_params);
+  var form = forms.create(params)
+  return form;
 }

package.json

@@ -11,7 +11,8 @@
     "node": "~0.6.11"
   },
   "dependencies": {
-    "forms": "0.1.0"
+    "forms": "0.1.0",
+    "underscore": ">= 1.3.1"
   },
   "devDependencies": {},
   "optionalDependencies": {}