@strapi/utils 4.3.4 → 4.3.7

package/README.md

@@ -1,10 +1,7 @@
 # strapi-utils
 
-[![npm version](https://img.shields.io/npm/v/strapi-utils.svg)](https://www.npmjs.org/package/strapi-utils)
-[![npm downloads](https://img.shields.io/npm/dm/strapi-utils.svg)](https://www.npmjs.org/package/strapi-utils)
-[![npm dependencies](https://david-dm.org/strapi/strapi-utils.svg)](https://david-dm.org/strapi/strapi-utils)
-[![Build status](https://travis-ci.org/strapi/strapi-utils.svg?branch=master)](https://travis-ci.org/strapi/strapi-utils)
-[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io)
+[![npm version](https://img.shields.io/npm/v/@strapi/utils.svg)](https://www.npmjs.org/package/@strapi/utils)
+[![npm downloads](https://img.shields.io/npm/dm/@strapi/utils.svg)](https://www.npmjs.org/package/@strapi/utils)
 
 Shared utilities between Strapi packages.
 

package/lib/build-query.js

@@ -1,6 +1,6 @@
 'use strict';
 
-//TODO: move to dbal
+// TODO: move to dbal
 
 const _ = require('lodash');
 const parseType = require('./parse-type');
@@ -25,7 +25,7 @@ const getAssociationFromFieldKey = ({ model, field }) => {
     const part = fieldParts[i];
     attribute = part;
 
-    const assoc = tmpModel.associations.find(ast => ast.alias === part);
+    const assoc = tmpModel.associations.find((ast) => ast.alias === part);
 
     if (assoc) {
       association = assoc;
@@ -59,7 +59,7 @@ const getAssociationFromFieldKey = ({ model, field }) => {
  */
 const castInput = ({ type, value, operator }) => {
   return Array.isArray(value)
-    ? value.map(val => castValue({ type, operator, value: val }))
+    ? value.map((val) => castValue({ type, operator, value: val }))
     : castValue({ type, operator, value });
 };
 
@@ -84,9 +84,7 @@ const castValue = ({ type, value, operator }) => {
 const normalizeFieldName = ({ model, field }) => {
   const fieldPath = field.split('.');
   return _.last(fieldPath) === 'id'
-    ? _.initial(fieldPath)
-        .concat(model.primaryKey)
-        .join('.')
+    ? _.initial(fieldPath).concat(model.primaryKey).join('.')
     : fieldPath.join('.');
 };
 
@@ -100,7 +98,7 @@ const hasDeepFilters = ({ where = [], sort = [] }, { minDepth = 1 } = {}) => {
 
   const hasDeepWhereClauses = where.some(({ field, operator, value }) => {
     if (BOOLEAN_OPERATORS.includes(operator)) {
-      return value.some(clauses => hasDeepFilters({ where: clauses }));
+      return value.some((clauses) => hasDeepFilters({ where: clauses }));
     }
 
     return field.split('.').length > minDepth;
@@ -114,7 +112,8 @@ const normalizeWhereClauses = (whereClauses, { model }) => {
     .filter(({ field, value }) => {
       if (_.isNull(value)) {
         return false;
-      } else if (_.isUndefined(value)) {
+      }
+      if (_.isUndefined(value)) {
         strapi.log.warn(`The value of field: '${field}', in your where filter, is undefined.`);
         return false;
       }
@@ -125,7 +124,7 @@ const normalizeWhereClauses = (whereClauses, { model }) => {
         return {
           field,
           operator,
-          value: value.map(clauses => normalizeWhereClauses(clauses, { model })),
+          value: value.map((clauses) => normalizeWhereClauses(clauses, { model })),
         };
       }
 

package/lib/code-generator.js

@@ -2,7 +2,7 @@
 
 // Using timestamp (milliseconds) to be sure it is unique
 // + converting timestamp to base 36 for better readibility
-const generateTimestampCode = date => {
+const generateTimestampCode = (date) => {
   const referDate = date || new Date();
 
   return referDate.getTime().toString(36);

package/lib/config.js

@@ -62,22 +62,24 @@ const getConfigUrls = (config, forAdminBuild = false) => {
   };
 };
 
-const getAbsoluteUrl = adminOrServer => (config, forAdminBuild = false) => {
-  const { serverUrl, adminUrl } = getConfigUrls(config, forAdminBuild);
-  let url = adminOrServer === 'server' ? serverUrl : adminUrl;
+const getAbsoluteUrl =
+  (adminOrServer) =>
+  (config, forAdminBuild = false) => {
+    const { serverUrl, adminUrl } = getConfigUrls(config, forAdminBuild);
+    const url = adminOrServer === 'server' ? serverUrl : adminUrl;
 
-  if (url.startsWith('http')) {
-    return url;
-  }
+    if (url.startsWith('http')) {
+      return url;
+    }
 
-  let hostname =
-    config.get('environment') === 'development' &&
-    ['127.0.0.1', '0.0.0.0'].includes(config.get('server.host'))
-      ? 'localhost'
-      : config.get('server.host');
+    const hostname =
+      config.get('environment') === 'development' &&
+      ['127.0.0.1', '0.0.0.0'].includes(config.get('server.host'))
+        ? 'localhost'
+        : config.get('server.host');
 
-  return `http://${hostname}:${config.get('server.port')}${url}`;
-};
+    return `http://${hostname}:${config.get('server.port')}${url}`;
+  };
 
 module.exports = {
   getConfigUrls,

package/lib/content-types.js

@@ -32,7 +32,7 @@ const constants = {
   COLLECTION_TYPE,
 };
 
-const getTimestamps = model => {
+const getTimestamps = (model) => {
   const attributes = [];
 
   if (has(CREATED_AT_ATTRIBUTE, model.attributes)) {
@@ -64,7 +64,7 @@ const isWritableAttribute = (model, attributeName) => {
   return getWritableAttributes(model).includes(attributeName);
 };
 
-const getNonVisibleAttributes = model => {
+const getNonVisibleAttributes = (model) => {
   const nonVisibleAttributes = _.reduce(
     model.attributes,
     (acc, attr, attrName) => (attr.visible === false ? acc.concat(attrName) : acc),
@@ -74,7 +74,7 @@ const getNonVisibleAttributes = model => {
   return _.uniq([ID_ATTRIBUTE, ...getTimestamps(model), ...nonVisibleAttributes]);
 };
 
-const getVisibleAttributes = model => {
+const getVisibleAttributes = (model) => {
   return _.difference(_.keys(model.attributes), getNonVisibleAttributes(model));
 };
 
@@ -82,20 +82,20 @@ const isVisibleAttribute = (model, attributeName) => {
   return getVisibleAttributes(model).includes(attributeName);
 };
 
-const hasDraftAndPublish = model => _.get(model, 'options.draftAndPublish', false) === true;
+const hasDraftAndPublish = (model) => _.get(model, 'options.draftAndPublish', false) === true;
 
 const isDraft = (data, model) =>
   hasDraftAndPublish(model) && _.get(data, PUBLISHED_AT_ATTRIBUTE) === null;
 
 const isSingleType = ({ kind = COLLECTION_TYPE }) => kind === SINGLE_TYPE;
 const isCollectionType = ({ kind = COLLECTION_TYPE }) => kind === COLLECTION_TYPE;
-const isKind = kind => model => model.kind === kind;
+const isKind = (kind) => (model) => model.kind === kind;
 
 const getPrivateAttributes = (model = {}) => {
   return _.union(
     strapi.config.get('api.responses.privateAttributes', []),
     _.get(model, 'options.privateAttributes', []),
-    _.keys(_.pickBy(model.attributes, attr => !!attr.private))
+    _.keys(_.pickBy(model.attributes, (attr) => !!attr.private))
   );
 };
 
@@ -103,24 +103,34 @@ const isPrivateAttribute = (model = {}, attributeName) => {
   return model && model.privateAttributes && model.privateAttributes.includes(attributeName);
 };
 
-const isScalarAttribute = attribute => {
+const isScalarAttribute = (attribute) => {
   return !['media', 'component', 'relation', 'dynamiczone'].includes(attribute.type);
 };
+const isMediaAttribute = (attribute) => attribute.type === 'media';
+const isRelationalAttribute = (attribute) => attribute.type === 'relation';
+const isComponentAttribute = (attribute) => ['component', 'dynamiczone'].includes(attribute.type);
 
-const getScalarAttributes = schema => {
+const getComponentAttributes = (schema) => {
   return _.reduce(
     schema.attributes,
     (acc, attr, attrName) => {
-      if (isScalarAttribute(attr)) acc.push(attrName);
+      if (isComponentAttribute(attr)) acc.push(attrName);
       return acc;
     },
     []
   );
 };
 
-const isMediaAttribute = attribute => attribute.type === 'media';
-const isRelationalAttribute = attribute => attribute.type === 'relation';
-const isComponentAttribute = attribute => ['component', 'dynamiczone'].includes(attribute.type);
+const getScalarAttributes = (schema) => {
+  return _.reduce(
+    schema.attributes,
+    (acc, attr, attrName) => {
+      if (isScalarAttribute(attr)) acc.push(attrName);
+      return acc;
+    },
+    []
+  );
+};
 
 /**
  * Checks if an attribute is of type `type`
@@ -136,7 +146,7 @@ const isTypedAttribute = (attribute, type) => {
  * @param {object} contentType
  * @returns {string}
  */
-const getContentTypeRoutePrefix = contentType => {
+const getContentTypeRoutePrefix = (contentType) => {
   return isSingleType(contentType)
     ? _.kebabCase(contentType.info.singularName)
     : _.kebabCase(contentType.info.pluralName);
@@ -152,6 +162,7 @@ module.exports = {
   isPrivateAttribute,
   constants,
   getNonWritableAttributes,
+  getComponentAttributes,
   getScalarAttributes,
   getWritableAttributes,
   isWritableAttribute,

package/lib/convert-query-params.js

@@ -1,3 +1,5 @@
+/* eslint-disable max-classes-per-file */
+
 'use strict';
 
 /**
@@ -25,13 +27,13 @@ class InvalidSortError extends Error {
   }
 }
 
-const validateOrder = order => {
+const validateOrder = (order) => {
   if (!['asc', 'desc'].includes(order.toLocaleLowerCase())) {
     throw new InvalidOrderError();
   }
 };
 
-const convertCountQueryParams = countQuery => {
+const convertCountQueryParams = (countQuery) => {
   return parseType({ type: 'boolean', value: countQuery });
 };
 
@@ -39,13 +41,13 @@ const convertCountQueryParams = countQuery => {
  * Sort query parser
  * @param {string} sortQuery - ex: id:asc,price:desc
  */
-const convertSortQueryParams = sortQuery => {
+const convertSortQueryParams = (sortQuery) => {
   if (typeof sortQuery === 'string') {
-    return sortQuery.split(',').map(value => convertSingleSortQueryParam(value));
+    return sortQuery.split(',').map((value) => convertSingleSortQueryParam(value));
   }
 
   if (Array.isArray(sortQuery)) {
-    return sortQuery.flatMap(sortValue => convertSortQueryParams(sortValue));
+    return sortQuery.flatMap((sortValue) => convertSortQueryParams(sortValue));
   }
 
   if (_.isPlainObject(sortQuery)) {
@@ -55,7 +57,7 @@ const convertSortQueryParams = sortQuery => {
   throw new InvalidSortError();
 };
 
-const convertSingleSortQueryParam = sortQuery => {
+const convertSingleSortQueryParam = (sortQuery) => {
   // split field and order param with default order to ascending
   const [field, order = 'asc'] = sortQuery.split(':');
 
@@ -68,9 +70,9 @@ const convertSingleSortQueryParam = sortQuery => {
   return _.set({}, field, order);
 };
 
-const convertNestedSortQueryParam = sortQuery => {
+const convertNestedSortQueryParam = (sortQuery) => {
   const transformedSort = {};
-  for (const field in sortQuery) {
+  for (const field of Object.keys(sortQuery)) {
     const order = sortQuery[field];
 
     // this is a deep sort
@@ -89,7 +91,7 @@ const convertNestedSortQueryParam = sortQuery => {
  * Start query parser
  * @param {string} startQuery
  */
-const convertStartQueryParams = startQuery => {
+const convertStartQueryParams = (startQuery) => {
   const startAsANumber = _.toNumber(startQuery);
 
   if (!_.isInteger(startAsANumber) || startAsANumber < 0) {
@@ -103,7 +105,7 @@ const convertStartQueryParams = startQuery => {
  * Limit query parser
  * @param {string} limitQuery
  */
-const convertLimitQueryParams = limitQuery => {
+const convertLimitQueryParams = (limitQuery) => {
   const limitAsANumber = _.toNumber(limitQuery);
 
   if (!_.isInteger(limitAsANumber) || (limitAsANumber !== -1 && limitAsANumber < 0)) {
@@ -130,18 +132,18 @@ const convertPopulateQueryParams = (populate, schema, depth = 0) => {
   }
 
   if (typeof populate === 'string') {
-    return populate.split(',').map(value => _.trim(value));
+    return populate.split(',').map((value) => _.trim(value));
   }
 
   if (Array.isArray(populate)) {
     // map convert
     return _.uniq(
-      populate.flatMap(value => {
+      populate.flatMap((value) => {
         if (typeof value !== 'string') {
           throw new InvalidPopulateError();
         }
 
-        return value.split(',').map(value => _.trim(value));
+        return value.split(',').map((value) => _.trim(value));
       })
     );
   }
@@ -171,8 +173,14 @@ const convertPopulateObject = (populate, schema) => {
     // fixed when we'll implement a more accurate way to query them
     if (attribute.type === 'dynamiczone') {
       const populates = attribute.components
-        .map(uid => strapi.getModel(uid))
-        .map(schema => convertNestedPopulate(subPopulate, schema));
+        .map((uid) => strapi.getModel(uid))
+        .map((schema) => convertNestedPopulate(subPopulate, schema))
+        .map((populate) => (populate === true ? {} : populate)) // cast boolean to empty object to avoid merging issues
+        .filter((populate) => populate !== false);
+
+      if (isEmpty(populates)) {
+        return acc;
+      }
 
       return {
         ...acc,
@@ -201,16 +209,22 @@ const convertPopulateObject = (populate, schema) => {
       return acc;
     }
 
+    const populateObject = convertNestedPopulate(subPopulate, targetSchema);
+
+    if (!populateObject) {
+      return acc;
+    }
+
     return {
       ...acc,
-      [key]: convertNestedPopulate(subPopulate, targetSchema),
+      [key]: populateObject,
     };
   }, {});
 };
 
 const convertNestedPopulate = (subPopulate, schema) => {
-  if (subPopulate === '*') {
-    return true;
+  if (_.isString(subPopulate)) {
+    return parseType({ type: 'boolean', value: subPopulate, forceCast: true });
   }
 
   if (_.isBoolean(subPopulate)) {
@@ -255,13 +269,13 @@ const convertFieldsQueryParams = (fields, depth = 0) => {
   }
 
   if (typeof fields === 'string') {
-    const fieldsValues = fields.split(',').map(value => _.trim(value));
+    const fieldsValues = fields.split(',').map((value) => _.trim(value));
     return _.uniq(['id', ...fieldsValues]);
   }
 
   if (Array.isArray(fields)) {
     // map convert
-    const fieldsValues = fields.flatMap(value => convertFieldsQueryParams(value, depth + 1));
+    const fieldsValues = fields.flatMap((value) => convertFieldsQueryParams(value, depth + 1));
     return _.uniq(['id', ...fieldsValues]);
   }
 
@@ -290,13 +304,13 @@ const convertAndSanitizeFilters = (filters, schema) => {
     return (
       filters
         // Sanitize each filter
-        .map(filter => convertAndSanitizeFilters(filter, schema))
+        .map((filter) => convertAndSanitizeFilters(filter, schema))
         // Filter out empty filters
-        .filter(filter => !isObject(filter) || !isEmpty(filter))
+        .filter((filter) => !isObject(filter) || !isEmpty(filter))
     );
   }
 
-  const removeOperator = operator => delete filters[operator];
+  const removeOperator = (operator) => delete filters[operator];
 
   // Here, `key` can either be an operator or an attribute name
   for (const [key, value] of Object.entries(filters)) {
@@ -324,24 +338,23 @@ const convertAndSanitizeFilters = (filters, schema) => {
         removeOperator(key);
       }
 
+      // Password attributes
+      else if (attribute.type === 'password') {
+        // Always remove password attributes from filters object
+        removeOperator(key);
+      }
+
       // Scalar attributes
       else {
-        // Always remove password attributes from filters object
-        if (attribute.type === 'password') {
-          removeOperator(key);
-        } else {
-          filters[key] = convertAndSanitizeFilters(value, schema);
-        }
+        filters[key] = convertAndSanitizeFilters(value, schema);
       }
     }
 
     // Handle operators
-    else {
-      if (['$null', '$notNull'].includes(key)) {
-        filters[key] = parseType({ type: 'boolean', value: filters[key], forceCast: true });
-      } else if (isObject(value)) {
-        filters[key] = convertAndSanitizeFilters(value, schema);
-      }
+    else if (['$null', '$notNull'].includes(key)) {
+      filters[key] = parseType({ type: 'boolean', value: filters[key], forceCast: true });
+    } else if (isObject(value)) {
+      filters[key] = convertAndSanitizeFilters(value, schema);
     }
 
     // Remove empty objects & arrays

package/lib/env-helper.js

@@ -58,7 +58,7 @@ const utils = {
       value = value.substring(1, value.length - 1);
     }
 
-    return value.split(',').map(v => {
+    return value.split(',').map((v) => {
       return _.trim(_.trim(v, ' '), '"');
     });
   },

package/lib/errors.js

@@ -1,3 +1,5 @@
+/* eslint-disable max-classes-per-file */
+
 'use strict';
 
 const { HttpError } = require('http-errors');

package/lib/format-yup-error.js

@@ -2,13 +2,13 @@
 
 const { isEmpty, toPath } = require('lodash/fp');
 
-const formatYupInnerError = yupError => ({
+const formatYupInnerError = (yupError) => ({
   path: toPath(yupError.path),
   message: yupError.message,
   name: yupError.name,
 });
 
-const formatYupErrors = yupError => ({
+const formatYupErrors = (yupError) => ({
   errors: isEmpty(yupError.inner)
     ? [formatYupInnerError(yupError)]
     : yupError.inner.map(formatYupInnerError),

package/lib/hooks.js

@@ -85,7 +85,7 @@ const createAsyncParallelHook = () => ({
   ...createHook(),
 
   async call(context) {
-    const promises = this.getHandlers().map(handler => handler(cloneDeep(context)));
+    const promises = this.getHandlers().map((handler) => handler(cloneDeep(context)));
 
     return Promise.all(promises);
   },

package/lib/object-formatting.js

@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 
-const removeUndefined = obj => _.pickBy(obj, value => typeof value !== 'undefined');
+const removeUndefined = (obj) => _.pickBy(obj, (value) => typeof value !== 'undefined');
 
 module.exports = {
   removeUndefined,

package/lib/pagination.js

@@ -30,10 +30,12 @@ const ensureMinValues = ({ start, limit }) => ({
   limit: limit === -1 ? limit : Math.max(limit, 1),
 });
 
-const ensureMaxValues = (maxLimit = -1) => ({ start, limit }) => ({
-  start,
-  limit: withMaxLimit(limit, maxLimit),
-});
+const ensureMaxValues =
+  (maxLimit = -1) =>
+  ({ start, limit }) => ({
+    start,
+    limit: withMaxLimit(limit, maxLimit),
+  });
 
 // Apply maxLimit as the limit when limit is -1
 const withNoLimit = (pagination, maxLimit = -1) => ({

package/lib/parse-multipart.js

@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 
-module.exports = ctx => {
+module.exports = (ctx) => {
   if (!ctx.is('multipart')) {
     return { data: ctx.request.body, files: {} };
   }

package/lib/parse-type.js

@@ -3,9 +3,9 @@
 const _ = require('lodash');
 const dates = require('date-fns');
 
-const timeRegex = new RegExp('^(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]{1,3})?$');
+const timeRegex = /^(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]{1,3})?$/;
 
-const parseTime = value => {
+const parseTime = (value) => {
   if (dates.isDate(value)) return dates.format(value, 'HH:mm:ss.SSS');
 
   if (typeof value !== 'string') {
@@ -23,10 +23,10 @@ const parseTime = value => {
   return `${hours}:${minutes}:${seconds}.${fractionPart}`;
 };
 
-const parseDate = value => {
+const parseDate = (value) => {
   if (dates.isDate(value)) return dates.format(value, 'yyyy-MM-dd');
   try {
-    let date = dates.parseISO(value);
+    const date = dates.parseISO(value);
 
     if (dates.isValid(date)) return dates.format(date, 'yyyy-MM-dd');
 
@@ -36,7 +36,7 @@ const parseDate = value => {
   }
 };
 
-const parseDateTimeOrTimestamp = value => {
+const parseDateTimeOrTimestamp = (value) => {
   if (dates.isDate(value)) return value;
   try {
     const date = dates.parseISO(value);

package/lib/pipe-async.js

@@ -1,11 +1,13 @@
 'use strict';
 
-module.exports = (...methods) => async data => {
-  let res = data;
+module.exports =
+  (...methods) =>
+  async (data) => {
+    let res = data;
 
-  for (const method of methods) {
-    res = await method(res);
-  }
+    for (const method of methods) {
+      res = await method(res);
+    }
 
-  return res;
-};
+    return res;
+  };

package/lib/policy.js

@@ -1,6 +1,7 @@
 /**
  * Policies util
  */
+
 'use strict';
 
 const _ = require('lodash');
@@ -9,7 +10,7 @@ const { eq } = require('lodash/fp');
 const PLUGIN_PREFIX = 'plugin::';
 const API_PREFIX = 'api::';
 
-const parsePolicy = policy => {
+const parsePolicy = (policy) => {
   if (typeof policy === 'string') {
     return { policyName: policy, config: {} };
   }
@@ -43,7 +44,7 @@ const globalPolicy = ({ method, endpoint, controller, action, plugin }) => {
 };
 
 const resolvePolicies = (config, { pluginName, apiName } = {}) => {
-  return config.map(policyConfig => {
+  return config.map((policyConfig) => {
     return {
       handler: getPolicy(policyConfig, { pluginName, apiName }),
       config: policyConfig.config || {},
@@ -87,10 +88,10 @@ const getPolicy = (policyConfig, { pluginName, apiName } = {}) => {
   return policy.handler;
 };
 
-const createPolicy = options => {
+const createPolicy = (options) => {
   const { name = 'unnamed', validator, handler } = options;
 
-  const wrappedValidator = config => {
+  const wrappedValidator = (config) => {
     if (validator) {
       try {
         validator(config);

package/lib/print-value.js

@@ -3,7 +3,7 @@
 // Code copied from the yup library (https://github.com/jquense/yup)
 // https://github.com/jquense/yup/blob/2778b88bdacd5260d593c6468793da2e77daf21f/src/util/printValue.ts
 
-const toString = Object.prototype.toString;
+const { toString } = Object.prototype;
 const errorToString = Error.prototype.toString;
 const regExpToString = RegExp.prototype.toString;
 const symbolToString = typeof Symbol !== 'undefined' ? Symbol.prototype.toString : () => '';
@@ -13,34 +13,34 @@ const SYMBOL_REGEXP = /^Symbol\((.*)\)(.*)$/;
 function printNumber(val) {
   if (val != +val) return 'NaN';
   const isNegativeZero = val === 0 && 1 / val < 0;
-  return isNegativeZero ? '-0' : '' + val;
+  return isNegativeZero ? '-0' : `${val}`;
 }
 
 function printSimpleValue(val, quoteStrings = false) {
-  if (val == null || val === true || val === false) return '' + val;
+  if (val == null || val === true || val === false) return `${val}`;
 
   const typeOf = typeof val;
   if (typeOf === 'number') return printNumber(val);
   if (typeOf === 'string') return quoteStrings ? `"${val}"` : val;
-  if (typeOf === 'function') return '[Function ' + (val.name || 'anonymous') + ']';
+  if (typeOf === 'function') return `[Function ${val.name || 'anonymous'}]`;
   if (typeOf === 'symbol') return symbolToString.call(val).replace(SYMBOL_REGEXP, 'Symbol($1)');
 
   const tag = toString.call(val).slice(8, -1);
-  if (tag === 'Date') return isNaN(val.getTime()) ? '' + val : val.toISOString(val);
-  if (tag === 'Error' || val instanceof Error) return '[' + errorToString.call(val) + ']';
+  if (tag === 'Date') return Number.isNaN(val.getTime()) ? `${val}` : val.toISOString(val);
+  if (tag === 'Error' || val instanceof Error) return `[${errorToString.call(val)}]`;
   if (tag === 'RegExp') return regExpToString.call(val);
 
   return null;
 }
 
 function printValue(value, quoteStrings) {
-  let result = printSimpleValue(value, quoteStrings);
+  const result = printSimpleValue(value, quoteStrings);
   if (result !== null) return result;
 
   return JSON.stringify(
     value,
-    function(key, value) {
-      let result = printSimpleValue(this[key], quoteStrings);
+    function replacer(key, value) {
+      const result = printSimpleValue(this[key], quoteStrings);
       if (result !== null) return result;
       return value;
     },