@strapi/utils 4.0.0-beta.12 → 4.0.0-beta.16

package/lib/content-types.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const { has } = require('lodash/fp');
 
 const SINGLE_TYPE = 'singleType';
 const COLLECTION_TYPE = 'collectionType';
@@ -31,8 +32,18 @@ const constants = {
   COLLECTION_TYPE,
 };
 
-const getTimestamps = () => {
-  return [CREATED_AT_ATTRIBUTE, UPDATED_AT_ATTRIBUTE];
+const getTimestamps = model => {
+  const attributes = [];
+
+  if (has(CREATED_AT_ATTRIBUTE, model.attributes)) {
+    attributes.push(CREATED_AT_ATTRIBUTE);
+  }
+
+  if (has(UPDATED_AT_ATTRIBUTE, model.attributes)) {
+    attributes.push(UPDATED_AT_ATTRIBUTE);
+  }
+
+  return attributes;
 };
 
 const getNonWritableAttributes = (model = {}) => {
@@ -42,7 +53,7 @@ const getNonWritableAttributes = (model = {}) => {
     []
   );
 
-  return _.uniq([ID_ATTRIBUTE, ...getTimestamps(), ...nonWritableAttributes]);
+  return _.uniq([ID_ATTRIBUTE, ...getTimestamps(model), ...nonWritableAttributes]);
 };
 
 const getWritableAttributes = (model = {}) => {
@@ -60,7 +71,7 @@ const getNonVisibleAttributes = model => {
     []
   );
 
-  return _.uniq([ID_ATTRIBUTE, ...getTimestamps(), ...nonVisibleAttributes]);
+  return _.uniq([ID_ATTRIBUTE, ...getTimestamps(model), ...nonVisibleAttributes]);
 };
 
 const getVisibleAttributes = model => {
@@ -137,6 +148,7 @@ module.exports = {
   isWritableAttribute,
   getNonVisibleAttributes,
   getVisibleAttributes,
+  getTimestamps,
   isVisibleAttribute,
   hasDraftAndPublish,
   isDraft,

package/lib/index.js

@@ -33,6 +33,7 @@ const providerFactory = require('./provider-factory');
 const pagination = require('./pagination');
 const sanitize = require('./sanitize');
 const traverseEntity = require('./traverse-entity');
+const pipeAsync = require('./pipe-async');
 
 module.exports = {
   yup,
@@ -66,6 +67,7 @@ module.exports = {
   hooks,
   providerFactory,
   pagination,
+  pipeAsync,
   errors,
   validateYupSchema,
   validateYupSchemaSync,

package/lib/{sanitize/utils.js → pipe-async.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const pipeAsync = (...methods) => async data => {
+module.exports = (...methods) => async data => {
   let res = data;
 
   for (const method of methods) {
@@ -9,7 +9,3 @@ const pipeAsync = (...methods) => async data => {
 
   return res;
 };
-
-module.exports = {
-  pipeAsync,
-};

package/lib/sanitize/index.js

@@ -4,8 +4,10 @@ const { isArray } = require('lodash/fp');
 
 const traverseEntity = require('../traverse-entity');
 const { getNonWritableAttributes } = require('../content-types');
+const pipeAsync = require('../pipe-async');
+
 const visitors = require('./visitors');
-const utils = require('./utils');
+const sanitizers = require('./sanitizers');
 
 module.exports = {
   contentAPI: {
@@ -26,7 +28,7 @@ module.exports = {
         transforms.push(traverseEntity(visitors.removeRestrictedRelations(auth), { schema }));
       }
 
-      return utils.pipeAsync(...transforms)(data);
+      return pipeAsync(...transforms)(data);
     },
 
     output(data, schema, { auth } = {}) {
@@ -34,30 +36,16 @@ module.exports = {
         return Promise.all(data.map(entry => this.output(entry, schema, { auth })));
       }
 
-      const transforms = [
-        traverseEntity(visitors.removePassword, { schema }),
-        traverseEntity(visitors.removePrivate, { schema }),
-      ];
+      const transforms = [sanitizers.defaultSanitizeOutput(schema)];
 
       if (auth) {
         transforms.push(traverseEntity(visitors.removeRestrictedRelations(auth), { schema }));
       }
 
-      return utils.pipeAsync(...transforms)(data);
+      return pipeAsync(...transforms)(data);
     },
   },
 
-  eventHub(data, schema) {
-    if (isArray(data)) {
-      return Promise.all(data.map(entry => this.eventHub(entry, schema)));
-    }
-
-    return utils.pipeAsync(
-      traverseEntity(visitors.removePassword, { schema }),
-      traverseEntity(visitors.removePrivate, { schema })
-    )(data);
-  },
-
-  utils,
+  sanitizers,
   visitors,
 };

package/lib/sanitize/sanitizers.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const { curry } = require('lodash/fp');
+
+const pipeAsync = require('../pipe-async');
+const traverseEntity = require('../traverse-entity');
+
+const { removePassword, removePrivate } = require('./visitors');
+
+const sanitizePasswords = curry((schema, entity) => {
+  return traverseEntity(removePassword, { schema }, entity);
+});
+
+const sanitizePrivates = curry((schema, entity) => {
+  return traverseEntity(removePrivate, { schema }, entity);
+});
+
+const defaultSanitizeOutput = curry((schema, entity) => {
+  return pipeAsync(sanitizePrivates(schema), sanitizePasswords(schema))(entity);
+});
+
+module.exports = {
+  sanitizePasswords,
+  sanitizePrivates,
+  defaultSanitizeOutput,
+};

package/lib/sanitize/visitors/allowed-fields.js

@@ -16,7 +16,7 @@ module.exports = (allowedFields = null) => ({ key, path }, { remove }) => {
   const containedPaths = getContainedPaths(path);
 
   /**
-   * Tells if the current path should be keeped or not based
+   * Tells if the current path should be kept or not based
    * on the success of the check functions for any of the allowed paths.
    *
    * The check functions are defined as follow:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.0.0-beta.12",
+  "version": "4.0.0-beta.16",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -42,5 +42,5 @@
     "npm": ">=6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "67fee6f3d59df974e8770bb123549f972edda905"
+  "gitHead": "71bdfa34637832e8e78a6cf1b57c8c6dbadf133d"
 }