functional-models 1.0.4 → 1.0.5

package/features/model.feature

@@ -0,0 +1,7 @@
+Feature: Models
+
+  Scenario: A Model With a 4 fields
+    Given TestModel1 is used
+    When TestModel1b data is inserted
+    Then TestModel1b expected fields are found
+

package/features/stepDefinitions/steps.js

@@ -2,15 +2,14 @@ const assert = require('chai').assert
 const flatMap = require('lodash/flatMap')
 const { Given, When, Then } = require('@cucumber/cucumber')
 
-const { smartObject, property, named, typed } = require('../../index')
+const { createModel, field } = require('../../index')
 
 const MODEL_DEFINITIONS = {
-  TestModel1: ({ name, type, flag }) =>
-    smartObject([
-      named({ required: true })(name),
-      typed({ required: true, isString: 'true' })(type),
-      property('flag', { required: true, isNumber: true })(flag),
-    ]),
+  TestModel1: createModel({
+    name: field({ required: true }),
+    type: field({ required: true, isString: true }),
+    flag: field({ required: true, isNumber: true }),
+  }),
 }
 
 const MODEL_INPUT_VALUES = {
@@ -26,7 +25,7 @@ const MODEL_INPUT_VALUES = {
   },
 }
 
-const EXPECTED_PROPERTIES = {
+const EXPECTED_FIELDS = {
   TestModel1b: ['getName', 'getType', 'getFlag', 'meta', 'functions'],
 }
 
@@ -46,7 +45,7 @@ Given(
 )
 
 When('functions.validate is called', function () {
-  return this.instance.functions.validate.object().then(x => {
+  return this.instance.functions.validate.model().then(x => {
     this.errors = x
   })
 })
@@ -75,10 +74,10 @@ When('{word} data is inserted', function (modelInputValues) {
   this.instance = this.modelDefinition(input)
 })
 
-Then('{word} expected properties are found', function (properties) {
-  const propertyArray = EXPECTED_PROPERTIES[properties]
+Then('{word} expected fields are found', function (fields) {
+  const propertyArray = EXPECTED_FIELDS[fields]
   if (!propertyArray) {
-    throw new Error(`${properties} did not result in properties`)
+    throw new Error(`${fields} did not result in fields`)
   }
   propertyArray.forEach(key => {
     if (!(key in this.instance)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functional-models",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A library for creating JavaScript function based models.",
   "main": "index.js",
   "scripts": {

package/src/index.js

@@ -1,5 +1,6 @@
 module.exports = {
   ...require('./fields'),
+  ...require('./models'),
   validation: require('./validation'),
   serialization: require('./serialization'),
 }

package/src/validation.js

@@ -31,14 +31,12 @@ const isInteger = _trueOrError(v => {
 const isBoolean = isType('boolean')
 const isString = isType('string')
 
-const meetsRegex = (
-  regex,
-  flags,
-  errorMessage = 'Format was invalid'
-) => value => {
-  const reg = new RegExp(regex, flags)
-  return _trueOrError(v => reg.test(v), errorMessage)(value)
-}
+const meetsRegex =
+  (regex, flags, errorMessage = 'Format was invalid') =>
+  value => {
+    const reg = new RegExp(regex, flags)
+    return _trueOrError(v => reg.test(v), errorMessage)(value)
+  }
 
 const choices = choiceArray => value => {
   if (choiceArray.includes(value) === false) {

package/features/smartObject.feature

@@ -1,7 +0,0 @@
-Feature: Smart Objects
-
-  Scenario: A Smart Object With a 4 properties
-    Given TestModel1 is used
-    When TestModel1b data is inserted
-    Then TestModel1b expected properties are found
-

package/features/smartObjectPrototypes.feature

@@ -1,8 +0,0 @@
-Feature: Smart Object Prototypes
-
-  Scenario: An example smart object prototype is created and checked for expected properties and is validated.
-    Given the prototype TestPrototype1 is used
-    When the prototype data TestPrototype1a is used to create an instance
-    Then the prototype instance has the expected properties for TestPrototype1a
-    And the prototype has the expected toJson response for TestPrototype1a
-    And the prototype has 0 errors expected