Removed check-types dependency, re-check

Author: Alexandre Germain

Gruntfile.js

@@ -77,10 +77,6 @@ module.exports = function gruntInit( grunt ) {
 						entry:  true,
 						expose: 'Promise',
 					}],
-					[ 'check-types', {
-						entry:  true,
-						expose: 'c',
-					}],
 					[ 'sequential-event', {
 						entry:  true,
 						expose: 'SequentialEvent',
@@ -90,7 +86,7 @@ module.exports = function gruntInit( grunt ) {
 			},
 			isolated: {
 				options: {
-					external: [ 'lodash', 'bluebird', 'check-types', 'sequential-event' ],
+					external: [ 'lodash', 'bluebird', 'sequential-event' ],
 				},
 				src:  [ 'diaspora.js' ],
 				dest: 'build/isolated/src/diaspora.js',	
@@ -218,4 +214,8 @@ module.exports = function gruntInit( grunt ) {
 	grunt.registerTask( 'lint', [
 		'eslint:info',
 	]);
+	grunt.registerTask( 'all', [
+		'refreshScripts',
+		'documentate',
+	]);
 };

build/isolated/dist/diaspora.js

@@ -256,36 +256,36 @@ class DiasporaAdapter extends SequentialEvent {
 	 */
 	matchEntity( query, entity ) {
 		const matchResult = _.every( _.toPairs( query ), ([ key, desc ]) => {
-			if ( c.object( desc )) {
+			if ( _.isObject( desc )) {
 				const entityVal = entity[key];
 				return _.every( desc, ( val, operation ) => {
 					switch ( operation ) {
 						case '$exists': {
-							return val === !c.undefined( entityVal );
+							return val === !_.isUndefined( entityVal );
 						}
 
 						case '$equal': {
-							return !c.undefined( entityVal ) && entityVal === val;
+							return !_.isUndefined( entityVal ) && entityVal === val;
 						}
 
 						case '$diff': {
-							return !c.undefined( entityVal ) && entityVal !== val;
+							return !_.isUndefined( entityVal ) && entityVal !== val;
 						}
 
 						case '$less': {
-							return !c.undefined( entityVal ) && entityVal < val;
+							return !_.isUndefined( entityVal ) && entityVal < val;
 						}
 
 						case '$lessEqual': {
-							return !c.undefined( entityVal ) && entityVal <= val;
+							return !_.isUndefined( entityVal ) && entityVal <= val;
 						}
 
 						case '$greater': {
-							return !c.undefined( entityVal ) && entityVal > val;
+							return !_.isUndefined( entityVal ) && entityVal > val;
 						}
 
 						case '$greaterEqual': {
-							return !c.undefined( entityVal ) && entityVal >= val;
+							return !_.isUndefined( entityVal ) && entityVal >= val;
 						}
 									   }
 					return false;
@@ -298,7 +298,7 @@ class DiasporaAdapter extends SequentialEvent {
 
 	applyUpdateEntity( update, entity ) {
 		_.forEach( update, ( val, key ) => {
-			if ( c.undefined( val )) {
+			if ( _.isUndefined( val )) {
 				delete entity[key];
 			} else {
 				entity[key] = val;
@@ -322,7 +322,7 @@ class DiasporaAdapter extends SequentialEvent {
 			if ( _.isString( limitOpt )) {
 				limitOpt = parseInt( limitOpt );
 			}
-			if ( !( c.integer( limitOpt ) || Infinity === limitOpt ) || limitOpt < 0 ) {
+			if ( !( _.isInteger( limitOpt ) || Infinity === limitOpt ) || limitOpt < 0 ) {
 				throw new TypeError( `Expect "options.limit" to be an integer equal to or above 0, have ${ limitOpt }` );
 			}
 			opts.limit = limitOpt;
@@ -332,7 +332,7 @@ class DiasporaAdapter extends SequentialEvent {
 			if ( _.isString( skipOpt )) {
 				skipOpt = parseInt( skipOpt );
 			}
-			if ( !c.integer( skipOpt ) || skipOpt < 0 || !isFinite( skipOpt )) {
+			if ( !_.isInteger( skipOpt ) || skipOpt < 0 || !isFinite( skipOpt )) {
 				throw new TypeError( `Expect "options.skip" to be a finite integer equal to or above 0, have ${ skipOpt }` );
 			}
 			opts.skip = skipOpt;
@@ -351,7 +351,7 @@ class DiasporaAdapter extends SequentialEvent {
 			if ( _.isString( pageOpt )) {
 				pageOpt = parseInt( pageOpt );
 			}
-			if ( !c.integer( pageOpt ) || pageOpt < 0 ) {
+			if ( !_.isInteger( pageOpt ) || pageOpt < 0 ) {
 				throw new TypeError( `Expect "options.page" to be an integer equal to or above 0, have ${ pageOpt }` );
 			}
 			opts.skip = pageOpt * opts.limit;
@@ -403,7 +403,7 @@ class DiasporaAdapter extends SequentialEvent {
 				});
 				// For arithmetic comparison, check if values are numeric (TODO later: support date)
 				_.forEach([ '$less', '$lessEqual', '$greater', '$greaterEqual' ], operation => {
-					if ( attrSearch.hasOwnProperty( operation ) && !c.number( attrSearch[operation])) {
+					if ( attrSearch.hasOwnProperty( operation ) && !_.isNumber( attrSearch[operation])) {
 						throw new TypeError( `Expect "${ operation }" in ${ JSON.stringify( attrSearch ) } to be a numeric value` );
 					}
 				});
@@ -992,7 +992,7 @@ class LocalStorageDiasporaAdapter extends DiasporaAdapter {
 	 */
 	static applyOptionsToSet( set, options ) {
 		if ( options.hasOwnProperty( 'limit' )) {
-			if ( c.integer( options.limit )) {
+			if ( _.isInteger( options.limit )) {
 				set = set.slice( 0, options.limit );
 			} else {
 				ModelExtension.log.warn( `Trying to apply a non-integer limit "${ options.limit }".` );
@@ -1104,7 +1104,7 @@ class LocalStorageDiasporaAdapter extends DiasporaAdapter {
 		_.defaults( options, {
 			skip: 0,
 		});
-		if ( !c.object( queryFind )) {
+		if ( !_.isObject( queryFind )) {
 			return this.findOneById( table, queryFind );
 		} else if ( _.isEqual( _.keys( queryFind ), [ 'id' ]) && _.isEqual( _.keys( queryFind.id ), [ '$equal' ])) {
 			return this.findOneById( table, queryFind.id.$equal );
@@ -1457,7 +1457,7 @@ const Diaspora = {
 	 * @returns {Error[]} Array of errors
 	 */
 	checkField( value, fieldDesc, keys ) {
-		if ( !c.object( fieldDesc )) {
+		if ( !_.isObject( fieldDesc )) {
 			return;
 		}
 		_.defaults( fieldDesc, {
@@ -1530,7 +1530,7 @@ const Diaspora = {
 						if ( !tester.object( value )) {
 							errors.push( `${ keys.join( '.' ) } expected to be a ${ fieldDesc.type }` );
 						} else {
-							const deepTest = c.object(
+							const deepTest = _.isObject(
 								fieldDesc.attributes
 							) ? _( value ).mapValues(
 									( propVal, propName ) => this.checkField(
@@ -1549,7 +1549,7 @@ const Diaspora = {
 						if ( !tester.array( value )) {
 							errors.push( `${ keys.join( '.' ) } expected to be a ${ fieldDesc.type }` );
 						} else {
-							const deepTest = c.object(
+							const deepTest = _.isObject(
 								fieldDesc.of
 							) ? _( value ).map(
 									( propVal, propName ) => {
@@ -1586,9 +1586,9 @@ const Diaspora = {
 		if ( !_.isNil( fieldDesc.enum )) {
 			const result = _.some( fieldDesc.enum, enumVal => {
 				if ( c.instance( enumVal, RegExp )) {
-					return c.match( value, enumVal );
+					return null !== enumVal.exec( value );
 				} else {
-					return c.equal( value, enumVal );
+					return value === enumVal;
 				}
 			});
 			if ( false === result ) {
@@ -1634,7 +1634,7 @@ const Diaspora = {
 	 */
 	defaultField( value, fieldDesc ) {
 		let out;
-		if ( c.not.undefined( value )) {
+		if ( !_.isUndefined( value )) {
 			out = value;
 		} else {
 			out = _.isFunction( fieldDesc.default ) ? fieldDesc.default() : fieldDesc.default;
@@ -1720,7 +1720,7 @@ const Diaspora = {
 		if ( !_.isString( name ) && name.length > 0 ) {
 			throw new Error( `DataSource name must be a non empty string, had "${ name }"` );
 		}
-		if ( !c.object( modelDesc )) {
+		if ( !_.isObject( modelDesc )) {
 			throw new Error( '"modelDesc" must be an object' );
 		}
 		const model = new Model( moduleName, name, modelDesc );
@@ -2033,14 +2033,14 @@ class Model {
 		if ( 0 !== reservedPropIntersect.length ) {
 			throw new Error( `${ JSON.stringify( reservedPropIntersect ) } is/are reserved property names. To match those column names in data source, please use the data source mapper property` );
 		}
-		if ( !modelDesc.hasOwnProperty( 'sources' ) || !( _.isArrayLike( modelDesc.sources ) || c.object( modelDesc.sources ))) {
+		if ( !modelDesc.hasOwnProperty( 'sources' ) || !( _.isArrayLike( modelDesc.sources ) || _.isObject( modelDesc.sources ))) {
 			throw new TypeError( `Expect model sources to be either an array or an object, had ${ JSON.stringify( modelDesc.sources ) }.` );
 		}
 		// Normalize our sources: normalized form is an object with keys corresponding to source name, and key corresponding to remaps
 		const sourcesNormalized = _.isArrayLike( modelDesc.sources ) ? _.zipObject( modelDesc.sources, _.times( modelDesc.sources.length, _.constant({}))) : _.mapValues( modelDesc.sources, ( remap, dataSourceName ) => {
 			if ( true === remap ) {
 				return {};
-			} else if ( c.object( remap )) {
+			} else if ( _.isObject( remap )) {
 				return remap;
 			} else {
 				throw new TypeError( `Datasource "${ dataSourceName }" value is invalid: expect \`true\` or a remap hash, but have ${ JSON.stringify( remap ) }` );