fix: stop using _extends

Signed-off-by: Samuel Hughes <[email protected]>

Author: s100

lib/dao.js

@@ -31,7 +31,6 @@ const sanitizeQueryOrData = utils.sanitizeQuery;
 const setScopeValuesFromWhere = utils.setScopeValuesFromWhere;
 const idEquals = utils.idEquals;
 const mergeQuery = utils.mergeQuery;
-const util = require('util');
 const assert = require('assert');
 const BaseModel = require('./model');
 const debug = require('debug')('loopback:dao');
@@ -209,9 +208,9 @@ DataAccessObject.applyProperties = function(data, inst) {
   let properties = this.definition.settings.properties;
   properties = properties || this.definition.settings.attributes;
   if (typeof properties === 'object') {
-    util._extend(data, properties);
+    Object.assign(data, properties);
   } else if (typeof properties === 'function') {
-    util._extend(data, properties.call(this, data, inst) || {});
+    Object.assign(data, properties.call(this, data, inst) || {});
   } else if (properties !== false) {
     const scope = this.defaultScope(data, inst) || {};
     if (typeof scope.where === 'object') {

lib/model.js

@@ -24,7 +24,6 @@ const DataAccessUtils = require('./model-utils');
 const Observer = require('./observer');
 const Hookable = require('./hooks');
 const validations = require('./validations');
-const _extend = util._extend;
 const utils = require('./utils');
 const fieldsToArray = utils.fieldsToArray;
 const uuid = require('uuid');
@@ -85,7 +84,7 @@ ModelBaseClass.prototype._initProperties = function(data, options) {
     // Convert the data to be plain object to avoid pollutions
     data = data.toObject(false);
   }
-  const properties = _extend({}, ctor.definition.properties);
+  const properties = Object.assign({}, ctor.definition.properties);
   data = data || {};
 
   if (typeof ctor.applyProperties === 'function') {

lib/validations.js

@@ -7,7 +7,6 @@
 
 const g = require('strong-globalize')();
 const util = require('util');
-const extend = util._extend;
 
 /*!
  * Module exports
@@ -777,7 +776,7 @@ function configure(cls, validation, args, opts) {
   conf.validation = validation;
   args.forEach(function(attr) {
     if (typeof attr === 'string') {
-      const validation = extend({}, conf);
+      const validation = Object.assign({}, conf);
       validation.options = opts || {};
       cls.validations[attr] = cls.validations[attr] || [];
       cls.validations[attr].push(validation);

test/kvao.suite.js

@@ -6,12 +6,11 @@
 'use strict';
 
 const debug = require('debug')('test');
-const extend = require('util')._extend;
 const fs = require('fs');
 const path = require('path');
 
 module.exports = function(dataSourceFactory, connectorCapabilities) {
-  connectorCapabilities = extend({
+  connectorCapabilities = Object.assign({
     // Even when the backend supports millisecond precision,
     // it's better to use intervals at least 10ms long in the tests
     ttlPrecision: 10,