model-types - npm Package Compare versions

Comparing version 1.0.0 to 1.1.0

dist/model-types.js

@@ -149,2 +149,10 @@ 'use strict';
         }
+    }, {
+        key: 'default',
+        get: function get$$1() {
+            return this._default;
+        },
+        set: function set$$1(value) {
+            throw new Error('Cannot set default value after initialization');
+        }
     }]);
@@ -338,3 +346,6 @@ return DataType;
             var parsed = [];
-            for (var i in unparsed) {}
+            for (var i in unparsed) {
+                parsed.push(this._arraytype.parse(unparsed[i]));
+            }
+            return parsed;
         }
@@ -444,5 +455,9 @@ }, {
         var enums = args.enums;
-        if (!(enums instanceof Array) || enums.length == 0) throw new Error('Enum constructor expects an array of at least one emun (strings/numbers)');
+        if (!(enums instanceof Array) || enums.length == 0) {
+            throw new Error('Enum constructor expects an array of at least one emun (strings/numbers)');
+        }
         var type = _typeof(enums[0]);
-        if (type !== 'string' || type !== 'number') throw new Error('Enum value expects a string or a number, but got ' + type);
+        if (type !== 'string' && type !== 'number') {
+            throw new Error('Enum value expects a string or a number, but got ' + type);
+        }
         enums.map(function (en) {
@@ -464,3 +479,7 @@ if (type !== (typeof en === 'undefined' ? 'undefined' : _typeof(en))) throw new Error('All enum values must be the same type, either strings or numbers');
             if (unparsed === undefined) {
-                return this._enums[0];
+                if (this._null === false) {
+                    return this._enums[0];
+                } else {
+                    return null;
+                }
             } else if (this._enums.indexOf(unparsed) == -1) {
@@ -496,10 +515,46 @@ throw new Error('Value ' + unparsed + ' is not an enum.');
             var type = obj[i].toLowerCase();
-            if (type === 'string') parsed[i] = new Types.String();else if (type === 'number') parsed[i] = new Types.Number();else if (type === 'boolean' || type === 'bool') parsed[i] = new Types.Boolean();else if (type === 'date') parsed[i] = new Types.Date();else if (type === 'array') parsed[i] = new Types.Array();else if (type === 'mixed' || type === 'any') parsed[i] = new Types.Mixed();
+            if (type === 'string') {
+                parsed[i] = new Types.String();
+            } else if (type === 'number') {
+                parsed[i] = new Types.Number();
+            } else if (type === 'boolean' || type === 'bool') {
+                parsed[i] = new Types.Boolean();
+            } else if (type === 'date') {
+                parsed[i] = new Types.Date();
+            } else if (type === 'array') {
+                parsed[i] = new Types.Array();
+            } else if (type === 'mixed' || type === 'any') {
+                parsed[i] = new Types.Mixed();
+            }
         } else if (typeof obj[i] === 'function') {
-            if (obj[i].__type === 'DataType') parsed[i] = new obj[i]();else if (obj[i].name == 'String') parsed[i] = new Types.String();else if (obj[i].name === 'Number') parsed[i] = new Types.Number();else if (obj[i].name === 'Boolean') parsed[i] = new Types.Boolean();else if (obj[i].name === 'Date') parsed[i] = new Types.Date();else if (obj[i].name === 'Array') parsed[i] = new Types.Array();else throw new Error('Invalid function used as type in model schema.');
+            if (obj[i].__type === 'DataType') {
+                parsed[i] = new obj[i]();
+            } else if (obj[i].name == 'String') {
+                parsed[i] = new Types.String();
+            } else if (obj[i].name === 'Number') {
+                parsed[i] = new Types.Number();
+            } else if (obj[i].name === 'Boolean') {
+                parsed[i] = new Types.Boolean();
+            } else if (obj[i].name === 'Date') {
+                parsed[i] = new Types.Date();
+            } else if (obj[i].name === 'Array') {
+                parsed[i] = new Types.Array();
+            } else {
+                throw new Error('Invalid function used as type in model schema.');
+            }
         } else if (obj[i].__type === 'datatype') {
             parsed[i] = obj[i];
+        } else if (obj[i] instanceof Array) {
+            if (obj[i].length == 0) {
+                parsed[i] = new Types.Array();
+            } else if (obj[i].length == 1) {
+                parsed[i] = new Types.Array({ arraytype: obj[i][0] });
+            } else {
+                parsed[i] = new Types.Enum({ enums: obj[i] });
+            }
         } else if (obj[i] instanceof Object) {
             if (obj[i].type) {
-                if (typeof obj[i].type === 'string') {
+                if (obj[i].__type === 'datatype') {
+                    parsed[i] = obj[i];
+                } else if (typeof obj[i].type === 'string') {
                     var _type = obj[i].type.toLowerCase();
@@ -518,16 +573,24 @@ if (_type === 'string') {
                         parsed[i] = new Types.Mixed(obj[i]);
+                    } else if (_type === 'enum') {
+                        parsed[i] = new Types.Enum(obj[i]);
                     }
                 } else if (typeof obj[i].type === 'function') {
-                    var _type2 = obj[i].name;
-                    if (_type2 === 'string') {
-                        parsed[i] = new Types.String();
-                    } else if (_type2 === 'number') {
-                        parsed[i] = new Types.Number();
-                    } else if (_type2 === 'boolean') {
-                        parsed[i] = new Types.Boolean();
-                    } else if (_type2 === 'date') {
-                        parsed[i] = new Types.Date();
+                    var _type2 = obj[i].type.name;
+                    if (obj[i].type.__type === 'DataType') {
+                        parsed[i] = new obj[i].type(obj[i]);
+                    } else if (_type2 === 'String') {
+                        parsed[i] = new Types.String(obj[i]);
+                    } else if (_type2 === 'Number') {
+                        parsed[i] = new Types.Number(obj[i]);
+                    } else if (_type2 === 'Boolean') {
+                        parsed[i] = new Types.Boolean(obj[i]);
+                    } else if (_type2 === 'Array') {
+                        parsed[i] = new Types.Array(obj[i]);
+                    } else if (_type2 === 'Date') {
+                        parsed[i] = new Types.Date(obj[i]);
                     } else if (obj[i] instanceof Array) {
-                        parsed[i] = new Types.Array();
+                        parsed[i] = new Types.Array(obj[i]);
                     }
+                } else {
+                    parsed[i] = parseSchema(obj[i]);
                 }
@@ -537,10 +600,2 @@ } else {
             }
-        } else if (obj[i] instanceof Array) {
-            if (obj[i].length == 0) {
-                parsed[i] = new Types.Array();
-            } else if (obj[i].length == 1) {
-                parsed[i] = new Types.Array(obj[i][0]);
-            } else {
-                parsed[i] = new Types.Enum({ enums: obj[i] });
-            }
         } else {
@@ -553,10 +608,99 @@ throw new Error('Could not parse model schema.');
 
-var Model = function Model(schema) {
-    classCallCheck(this, Model);
-    this._schema = null;
+function _parse(schema, state) {
+    var parsed = {};
+    if (!(state instanceof Object)) {
+        throw new Error('model.parse expects a valid object');
+    }
+    for (var i in state) {
+        if (schema[i]) {
+            if (state[i] instanceof Object) {
+                parsed[i] = _parse(schema[i], state[i]);
+            } else {
+                parsed[i] = schema[i].parse(state[i]);
+            }
+        }
+    }
+    for (var _i in schema) {
+        if (parsed[_i] === undefined) {
+            if (schema[_i].__type === 'datatype') {
+                parsed[_i] = schema[_i].default;
+            } else if (schema[_i] instanceof Object) {
+                parsed[_i] = _parse(schema[_i], {});
+            }
+        }
+    }
+    return parsed;
+}
 
-    if (!(schema instanceof Object)) throw new Error('Model expects a schema to be an object');
-    this._schema = parseSchema(schema);
-};
+function setter(obj, fields, value) {
+    var updated = Object.assign({}, obj);
+    if (fields.length == 1) {
+        updated[fields[0]] = value;
+    } else {
+        updated[fields[0]] = setter(updated[fields[0]], fields.slice(1), value);
+    }
+    return updated;
+}
 
+function createInitialState(schema) {
+    var state = {};
+    if (!(schema instanceof Object)) {
+        throw new Error('createInitialState(schema) expects a valid object');
+    }
+    for (var i in schema) {
+        if (schema[i].__type === 'datatype') {
+            state[i] = schema[i].default;
+        } else if (schema[i] instanceof Object) {
+            state[i] = createInitialState(schema[i]);
+        } else {
+            throw new Error('Invalid propetry in model._schema');
+        }
+    }
+    return state;
+}
+
+var Model = function () {
+    function Model(schema) {
+        classCallCheck(this, Model);
+        this._schema = {};
+        this._initialState = null;
+        this._state = this._initialState;
+
+        if (!(schema instanceof Object)) throw new Error('Model expects a schema to be an object');
+        this._schema = parseSchema(schema);
+        this._state = createInitialState(this._schema);
+    }
+
+    createClass(Model, [{
+        key: 'set',
+        value: function set$$1(field, value) {
+            var fields = String(field).split('.');
+            this._state = setter(this._state, fields, value);
+        }
+    }, {
+        key: 'get',
+        value: function get$$1(field) {
+            return String(field).split('.').reduce(function (o, i) {
+                return o[i];
+            }, this._state);
+        }
+    }, {
+        key: 'setState',
+        value: function setState(state) {
+            this._state = this.parse(state);
+        }
+    }, {
+        key: 'getState',
+        value: function getState() {
+            return this._state;
+        }
+    }, {
+        key: 'parse',
+        value: function parse(state) {
+            return _parse(this._schema, state);
+        }
+    }]);
+    return Model;
+}();
+
 function model(schema) {
@@ -563,0 +707,0 @@ return new Model(schema);

package.json

 {
   "name": "model-types",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Javascript library for typed object modeling.",
@@ -5,0 +5,0 @@ "main": "dist/model-types.js",

rollup.config.js

@@ -10,5 +10,6 @@
         babel({
-            exclude: 'node_modules/**'
+            exclude: 'node_modules/**',
+            presets: ['es2015-rollup', 'stage-0']
         })
     ]
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

26203

increased by18.46%

Lines of code

610

increased by29.51%

Worsened metrics

Number of package files

4

decreased by-20%

No dependency changes