Rename items attribute to itemType

talyssonoc · Dec 28, 2016 · 065414e · 065414e
1 parent 659fa4c
commit 065414e
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 35 deletions.
diff --git a/src/schemaNormalization.js b/src/schemaNormalization.js
@@ -13,12 +13,12 @@ function normalizeAttribute(attribute, attributeName) {
       throw new Error(`Attribute type must be a constructor: ${ attributeName }.`);
     }
 
-    if(attribute.items) {
-      attribute.items = normalizeAttribute(attribute.items, 'items');
+    if(attribute.itemType) {
+      attribute.itemType = normalizeAttribute(attribute.itemType, 'itemType');
     }
 
     return Object.assign({}, attribute, {
-      coerce: coercionFor(attribute, attribute.items),
+      coerce: coercionFor(attribute, attribute.itemType),
       validation: validationForAttribute(attribute)
     });
 

diff --git a/src/serialization.js b/src/serialization.js
@@ -17,7 +17,7 @@ function serialize(structure) {
 
     let serializedValue;
 
-    if(schema[attrName].items && schema[attrName].items.type[SCHEMA] !== undefined) {
+    if(schema[attrName].itemType && schema[attrName].itemType.type[SCHEMA] !== undefined) {
       serializedValue = attribute.map(serialize);
     } else if(schema[attrName].type[SCHEMA] !== undefined) {
       serializedValue = serialize(attribute);

diff --git a/src/typeCoercion/array.js b/src/typeCoercion/array.js
@@ -1,4 +1,4 @@
-module.exports = function arrayCoercionFor(typeDescriptor, itemsTypeDescriptor) {
+module.exports = function arrayCoercionFor(typeDescriptor, itemTypeDescriptor) {
   return function coerceArray(value) {
     if(value === undefined) {
       return;
@@ -15,7 +15,7 @@ module.exports = function arrayCoercionFor(typeDescriptor, itemsTypeDescriptor)
     const coercedValue = new typeDescriptor.type();
 
     for(let i = 0; i < value.length; i++) {
-      coercedValue.push(itemsTypeDescriptor.coerce(value[i]));
+      coercedValue.push(itemTypeDescriptor.coerce(value[i]));
     }
 
     return coercedValue;

diff --git a/src/typeCoercion/index.js b/src/typeCoercion/index.js
@@ -7,9 +7,9 @@ const types = [
   require('./boolean')
 ];
 
-function coercionFor(typeDescriptor, itemsTypeDescriptor) {
-  if(itemsTypeDescriptor) {
-    return arrayCoercionFor(typeDescriptor, itemsTypeDescriptor);
+function coercionFor(typeDescriptor, itemTypeDescriptor) {
+  if(itemTypeDescriptor) {
+    return arrayCoercionFor(typeDescriptor, itemTypeDescriptor);
   }
 
   const coercion = types.find((c) => c.type === typeDescriptor.type);

diff --git a/src/validation/array.js b/src/validation/array.js
@@ -8,8 +8,8 @@ const joiMappings = [
   ['exactLength', 'length', true]
 ];
 
-module.exports = function arrayValidation(typeDescriptor, itemsTypeDescriptor) {
-  var joiSchema = joi.array().items(itemsTypeDescriptor.validation);
+module.exports = function arrayValidation(typeDescriptor, itemTypeDescriptor) {
+  var joiSchema = joi.array().items(itemTypeDescriptor.validation);
   const canBeSparse = typeDescriptor.sparse === undefined || typeDescriptor.sparse;
 
   joiSchema = joiSchema.sparse(canBeSparse);

diff --git a/src/validation/index.js b/src/validation/index.js
@@ -11,8 +11,8 @@ const nestedValidation = require('./nested');
 const arrayValidation = require('./array');
 
 function validationForAttribute(typeDescriptor) {
-  if(typeDescriptor.items !== undefined) {
-    return arrayValidation(typeDescriptor, typeDescriptor.items);
+  if(typeDescriptor.itemType !== undefined) {
+    return arrayValidation(typeDescriptor, typeDescriptor.itemType);
   }
 
   const validation = validations.find((v) => v.type === typeDescriptor.type);

diff --git a/test/unit/schemaNormalization.spec.js b/test/unit/schemaNormalization.spec.js
@@ -62,30 +62,30 @@ describe('schema normalization', () => {
     });
   });
 
-  context('when attribute has items type', () => {
-    context('when items type is an object with type attribute', () => {
-      it('does not change the items type object', () => {
+  context('when attribute has itemType', () => {
+    context('when itemType is an object with type attribute', () => {
+      it('does not change the itemType object', () => {
         const schema = {
           name: {
             type: Array,
-            items: { type: String }
+            itemType: { type: String }
           }
         };
 
-        expect(normalizeSchema(schema).name.items.type).to.eql(String);
+        expect(normalizeSchema(schema).name.itemType.type).to.eql(String);
       });
     });
 
-    context('when items type is an constructor', () => {
-      it('normalizes items type to an object with type field being equal to passed constructor', () => {
+    context('when itemType is an constructor', () => {
+      it('normalizes itemType to an object with type field being equal to passed constructor', () => {
         const schema = {
           name: {
             type: Array,
-            items: String
+            itemType: String
           }
         };
 
-        expect(normalizeSchema(schema).name.items.type).to.eql(String);
+        expect(normalizeSchema(schema).name.itemType.type).to.eql(String);
       });
     });
   });

diff --git a/test/unit/serialization/array.spec.js b/test/unit/serialization/array.spec.js
@@ -12,7 +12,7 @@ describe('serialization', () => {
       name: String,
       books: {
         type: Array,
-        items: Book
+        itemType: Book
       }
     })(class User {});
 

diff --git a/test/unit/typeCoercion/array.spec.js b/test/unit/typeCoercion/array.spec.js
@@ -6,7 +6,7 @@ describe('type coercion', () => {
     const User = attributes({
       books: {
         type: Array,
-        items: String
+        itemType: String
       }
     })(class User {});
 
@@ -66,7 +66,7 @@ describe('type coercion', () => {
         const Library = attributes({
           bookIds: {
             type: Array,
-            items: Number
+            itemType: Number
           }
         })(class Library {});
 

diff --git a/test/unit/typeCoercion/arraySubclass.spec.js b/test/unit/typeCoercion/arraySubclass.spec.js
@@ -8,7 +8,7 @@ describe('type coercion', () => {
     const User = attributes({
       books: {
         type: Collection,
-        items: String
+        itemType: String
       }
     })(class User {});
 
@@ -76,7 +76,7 @@ describe('type coercion', () => {
         const Library = attributes({
           bookIds: {
             type: Array,
-            items: Number
+            itemType: Number
           }
         })(class Library {});
 

diff --git a/test/unit/validation/array.spec.js b/test/unit/validation/array.spec.js
@@ -7,7 +7,7 @@ describe('validation', () => {
       const User = attributes({
         books: {
           type: Array,
-          items: String
+          itemType: String
         }
       })(class User {});
 
@@ -38,7 +38,7 @@ describe('validation', () => {
       const User = attributes({
         books: {
           type: Array,
-          items: String,
+          itemType: String,
           required: true
         }
       })(class User {});
@@ -73,7 +73,7 @@ describe('validation', () => {
         const User = attributes({
           books: {
             type: Array,
-            items: String,
+            itemType: String,
             sparse: false
           }
         })(class User {});
@@ -107,7 +107,7 @@ describe('validation', () => {
         const User = attributes({
           books: {
             type: Array,
-            items: String,
+            itemType: String,
             sparse: true
           }
         })(class User {});
@@ -147,7 +147,7 @@ describe('validation', () => {
       const User = attributes({
         books: {
           type: Array,
-          items: Book,
+          itemType: Book,
           required: true
         }
       })(class User {});
@@ -187,7 +187,7 @@ describe('validation', () => {
       const User = attributes({
         books: {
           type: Array,
-          items: String,
+          itemType: String,
           minLength: 2
         }
       })(class User {});
@@ -226,7 +226,7 @@ describe('validation', () => {
       const User = attributes({
         books: {
           type: Array,
-          items: String,
+          itemType: String,
           maxLength: 2
         }
       })(class User {});
@@ -266,7 +266,7 @@ describe('validation', () => {
       const User = attributes({
         books: {
           type: Array,
-          items: String,
+          itemType: String,
           exactLength: 2
         }
       })(class User {});