@strapi/utils 4.10.0-beta.0 → 4.10.0

package/coverage/lcov-report/sorter.js

@@ -0,0 +1,196 @@
+/* eslint-disable */
+var addSorting = (function() {
+    'use strict';
+    var cols,
+        currentSort = {
+            index: 0,
+            desc: false
+        };
+
+    // returns the summary table element
+    function getTable() {
+        return document.querySelector('.coverage-summary');
+    }
+    // returns the thead element of the summary table
+    function getTableHeader() {
+        return getTable().querySelector('thead tr');
+    }
+    // returns the tbody element of the summary table
+    function getTableBody() {
+        return getTable().querySelector('tbody');
+    }
+    // returns the th element for nth column
+    function getNthColumn(n) {
+        return getTableHeader().querySelectorAll('th')[n];
+    }
+
+    function onFilterInput() {
+        const searchValue = document.getElementById('fileSearch').value;
+        const rows = document.getElementsByTagName('tbody')[0].children;
+        for (let i = 0; i < rows.length; i++) {
+            const row = rows[i];
+            if (
+                row.textContent
+                    .toLowerCase()
+                    .includes(searchValue.toLowerCase())
+            ) {
+                row.style.display = '';
+            } else {
+                row.style.display = 'none';
+            }
+        }
+    }
+
+    // loads the search box
+    function addSearchBox() {
+        var template = document.getElementById('filterTemplate');
+        var templateClone = template.content.cloneNode(true);
+        templateClone.getElementById('fileSearch').oninput = onFilterInput;
+        template.parentElement.appendChild(templateClone);
+    }
+
+    // loads all columns
+    function loadColumns() {
+        var colNodes = getTableHeader().querySelectorAll('th'),
+            colNode,
+            cols = [],
+            col,
+            i;
+
+        for (i = 0; i < colNodes.length; i += 1) {
+            colNode = colNodes[i];
+            col = {
+                key: colNode.getAttribute('data-col'),
+                sortable: !colNode.getAttribute('data-nosort'),
+                type: colNode.getAttribute('data-type') || 'string'
+            };
+            cols.push(col);
+            if (col.sortable) {
+                col.defaultDescSort = col.type === 'number';
+                colNode.innerHTML =
+                    colNode.innerHTML + '<span class="sorter"></span>';
+            }
+        }
+        return cols;
+    }
+    // attaches a data attribute to every tr element with an object
+    // of data values keyed by column name
+    function loadRowData(tableRow) {
+        var tableCols = tableRow.querySelectorAll('td'),
+            colNode,
+            col,
+            data = {},
+            i,
+            val;
+        for (i = 0; i < tableCols.length; i += 1) {
+            colNode = tableCols[i];
+            col = cols[i];
+            val = colNode.getAttribute('data-value');
+            if (col.type === 'number') {
+                val = Number(val);
+            }
+            data[col.key] = val;
+        }
+        return data;
+    }
+    // loads all row data
+    function loadData() {
+        var rows = getTableBody().querySelectorAll('tr'),
+            i;
+
+        for (i = 0; i < rows.length; i += 1) {
+            rows[i].data = loadRowData(rows[i]);
+        }
+    }
+    // sorts the table using the data for the ith column
+    function sortByIndex(index, desc) {
+        var key = cols[index].key,
+            sorter = function(a, b) {
+                a = a.data[key];
+                b = b.data[key];
+                return a < b ? -1 : a > b ? 1 : 0;
+            },
+            finalSorter = sorter,
+            tableBody = document.querySelector('.coverage-summary tbody'),
+            rowNodes = tableBody.querySelectorAll('tr'),
+            rows = [],
+            i;
+
+        if (desc) {
+            finalSorter = function(a, b) {
+                return -1 * sorter(a, b);
+            };
+        }
+
+        for (i = 0; i < rowNodes.length; i += 1) {
+            rows.push(rowNodes[i]);
+            tableBody.removeChild(rowNodes[i]);
+        }
+
+        rows.sort(finalSorter);
+
+        for (i = 0; i < rows.length; i += 1) {
+            tableBody.appendChild(rows[i]);
+        }
+    }
+    // removes sort indicators for current column being sorted
+    function removeSortIndicators() {
+        var col = getNthColumn(currentSort.index),
+            cls = col.className;
+
+        cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, '');
+        col.className = cls;
+    }
+    // adds sort indicators for current column being sorted
+    function addSortIndicators() {
+        getNthColumn(currentSort.index).className += currentSort.desc
+            ? ' sorted-desc'
+            : ' sorted';
+    }
+    // adds event listeners for all sorter widgets
+    function enableUI() {
+        var i,
+            el,
+            ithSorter = function ithSorter(i) {
+                var col = cols[i];
+
+                return function() {
+                    var desc = col.defaultDescSort;
+
+                    if (currentSort.index === i) {
+                        desc = !currentSort.desc;
+                    }
+                    sortByIndex(i, desc);
+                    removeSortIndicators();
+                    currentSort.index = i;
+                    currentSort.desc = desc;
+                    addSortIndicators();
+                };
+            };
+        for (i = 0; i < cols.length; i += 1) {
+            if (cols[i].sortable) {
+                // add the click event handler on the th so users
+                // dont have to click on those tiny arrows
+                el = getNthColumn(i).querySelector('.sorter').parentElement;
+                if (el.addEventListener) {
+                    el.addEventListener('click', ithSorter(i));
+                } else {
+                    el.attachEvent('onclick', ithSorter(i));
+                }
+            }
+        }
+    }
+    // adds sorting functionality to the UI
+    return function() {
+        if (!getTable()) {
+            return;
+        }
+        cols = loadColumns();
+        loadData();
+        addSearchBox();
+        addSortIndicators();
+        enableUI();
+    };
+})();
+
+window.addEventListener('load', addSorting);

package/index.d.ts

@@ -0,0 +1,3 @@
+const utils: any;
+
+export default utils;

package/lib/async.js

@@ -6,9 +6,8 @@ const { curry, curryN } = require('lodash/fp');
 function pipeAsync(...methods) {
   return async (data) => {
     let res = data;
-
-    for (const method of methods) {
-      res = await method(res);
+    for (let i = 0; i < methods.length; i += 1) {
+      res = await methods[i](res);
     }
 
     return res;

package/lib/sanitize/index.js

@@ -37,12 +37,16 @@ const createContentAPISanitizers = () => {
     return pipeAsync(...transforms)(data);
   };
 
-  const sanitizeOuput = (data, schema, { auth } = {}) => {
+  const sanitizeOutput = async (data, schema, { auth } = {}) => {
     if (isArray(data)) {
-      return Promise.all(data.map((entry) => sanitizeOuput(entry, schema, { auth })));
+      const res = new Array(data.length);
+      for (let i = 0; i < data.length; i += 1) {
+        res[i] = await sanitizeOutput(data[i], schema, { auth });
+      }
+      return res;
     }
 
-    const transforms = [sanitizers.defaultSanitizeOutput(schema)];
+    const transforms = [(data) => sanitizers.defaultSanitizeOutput(schema, data)];
 
     if (auth) {
       transforms.push(traverseEntity(visitors.removeRestrictedRelations(auth), { schema }));
@@ -122,7 +126,7 @@ const createContentAPISanitizers = () => {
 
   return {
     input: sanitizeInput,
-    output: sanitizeOuput,
+    output: sanitizeOutput,
     query: sanitizeQuery,
     filters: sanitizeFilters,
     sort: sanitizeSort,

package/lib/sanitize/sanitizers.js

@@ -20,17 +20,20 @@ const {
   removeMorphToRelations,
 } = require('./visitors');
 
-const sanitizePasswords = curry((schema, entity) => {
+const sanitizePasswords = (schema) => async (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);
-});
+const defaultSanitizeOutput = async (schema, entity) => {
+  return traverseEntity(
+    (...args) => {
+      removePassword(...args);
+      removePrivate(...args);
+    },
+    { schema },
+    entity
+  );
+};
 
 const defaultSanitizeFilters = curry((schema, filters) => {
   return pipeAsync(
@@ -140,7 +143,6 @@ const defaultSanitizePopulate = curry((schema, populate) => {
 
 module.exports = {
   sanitizePasswords,
-  sanitizePrivates,
   defaultSanitizeOutput,
   defaultSanitizeFilters,
   defaultSanitizeSort,

package/lib/traverse-entity.js

@@ -1,6 +1,42 @@
 'use strict';
 
-const { cloneDeep, isObject, isArray, isNil, curry } = require('lodash/fp');
+const { clone, isObject, isArray, isNil, curry } = require('lodash/fp');
+
+const traverseMorphRelationTarget = async (visitor, path, entry) => {
+  const targetSchema = strapi.getModel(entry.__type);
+
+  const traverseOptions = { schema: targetSchema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const traverseRelationTarget = (schema) => async (visitor, path, entry) => {
+  const traverseOptions = { schema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const traverseMediaTarget = async (visitor, path, entry) => {
+  const targetSchemaUID = 'plugin::upload.file';
+  const targetSchema = strapi.getModel(targetSchemaUID);
+
+  const traverseOptions = { schema: targetSchema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const traverseComponent = async (visitor, path, schema, entry) => {
+  const traverseOptions = { schema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const visitDynamicZoneEntry = async (visitor, path, entry) => {
+  const targetSchema = strapi.getModel(entry.__component);
+  const traverseOptions = { schema: targetSchema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
 
 const traverseEntity = async (visitor, options, entity) => {
   const { path = { raw: null, attribute: null }, schema } = options;
@@ -11,9 +47,13 @@ const traverseEntity = async (visitor, options, entity) => {
   }
 
   // Don't mutate the original entity object
-  const copy = cloneDeep(entity);
+  // only clone at 1st level as the next level will get clone when traversed
+  const copy = clone(entity);
+  const visitorUtils = createVisitorUtils({ data: copy });
 
-  for (const key of Object.keys(copy)) {
+  const keys = Object.keys(copy);
+  for (let i = 0; i < keys.length; i += 1) {
+    const key = keys[i];
     // Retrieve the attribute definition associated to the key from the schema
     const attribute = schema.attributes[key];
 
@@ -32,7 +72,6 @@ const traverseEntity = async (visitor, options, entity) => {
 
     // Visit the current attribute
     const visitorOptions = { data: copy, schema, key, value: copy[key], attribute, path: newPath };
-    const visitorUtils = createVisitorUtils({ data: copy });
 
     await visitor(visitorOptions, visitorUtils);
 
@@ -52,58 +91,62 @@ const traverseEntity = async (visitor, options, entity) => {
     if (isRelation) {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith('morph');
 
-      const traverseTarget = (entry) => {
-        // Handle polymorphic relationships
-        const targetSchemaUID = isMorphRelation ? entry.__type : attribute.target;
-        const targetSchema = strapi.getModel(targetSchemaUID);
-
-        const traverseOptions = { schema: targetSchema, path: newPath };
+      const method = isMorphRelation
+        ? traverseMorphRelationTarget
+        : traverseRelationTarget(strapi.getModel(attribute.target));
 
-        return traverseEntity(visitor, traverseOptions, entry);
-      };
+      if (isArray(value)) {
+        const res = new Array(value.length);
+        for (let i = 0; i < value.length; i += 1) {
+          res[i] = await method(visitor, newPath, value[i]);
+        }
+        copy[key] = res;
+      } else {
+        copy[key] = await method(visitor, newPath, value);
+      }
 
-      // need to update copy
-      copy[key] = isArray(value)
-        ? await Promise.all(value.map(traverseTarget))
-        : await traverseTarget(value);
+      continue;
     }
 
     if (isMedia) {
-      const traverseTarget = (entry) => {
-        const targetSchemaUID = 'plugin::upload.file';
-        const targetSchema = strapi.getModel(targetSchemaUID);
-
-        const traverseOptions = { schema: targetSchema, path: newPath };
-
-        return traverseEntity(visitor, traverseOptions, entry);
-      };
-
       // need to update copy
-      copy[key] = isArray(value)
-        ? await Promise.all(value.map(traverseTarget))
-        : await traverseTarget(value);
+      if (isArray(value)) {
+        const res = new Array(value.length);
+        for (let i = 0; i < value.length; i += 1) {
+          res[i] = await traverseMediaTarget(visitor, newPath, value[i]);
+        }
+        copy[key] = res;
+      } else {
+        copy[key] = await traverseMediaTarget(visitor, newPath, value);
+      }
+
+      continue;
     }
 
     if (isComponent) {
       const targetSchema = strapi.getModel(attribute.component);
-      const traverseOptions = { schema: targetSchema, path: newPath };
 
-      const traverseComponent = (entry) => traverseEntity(visitor, traverseOptions, entry);
+      if (isArray(value)) {
+        const res = new Array(value.length);
+        for (let i = 0; i < value.length; i += 1) {
+          res[i] = await traverseComponent(visitor, newPath, targetSchema, value[i]);
+        }
+        copy[key] = res;
+      } else {
+        copy[key] = await traverseComponent(visitor, newPath, targetSchema, value);
+      }
 
-      copy[key] = isArray(value)
-        ? await Promise.all(value.map(traverseComponent))
-        : await traverseComponent(value);
+      continue;
     }
 
     if (isDynamicZone && isArray(value)) {
-      const visitDynamicZoneEntry = (entry) => {
-        const targetSchema = strapi.getModel(entry.__component);
-        const traverseOptions = { schema: targetSchema, path: newPath };
-
-        return traverseEntity(visitor, traverseOptions, entry);
-      };
+      const res = new Array(value.length);
+      for (let i = 0; i < value.length; i += 1) {
+        res[i] = await visitDynamicZoneEntry(visitor, newPath, value[i]);
+      }
+      copy[key] = res;
 
-      copy[key] = await Promise.all(value.map(visitDynamicZoneEntry));
+      continue;
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.10.0-beta.0",
+  "version": "4.10.0",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -28,11 +28,14 @@
     }
   ],
   "main": "./lib",
+  "types": "./index.d.ts",
   "directories": {
     "lib": "./lib"
   },
   "scripts": {
-    "test:unit": "jest --verbose"
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch",
+    "lint": "run -T eslint ."
   },
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
@@ -46,5 +49,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
+  "gitHead": "9b5519778faaedfb837879f9c6f7e28fdfd6750d"
 }