@strapi/strapi 0.0.0-d0fee44d6f → 0.0.0-d36609ff26fb4e00a41a7e2b657f16c7466203fe

package/lib/core/loaders/plugins/get-enabled-plugins.js

@@ -7,7 +7,7 @@ const { get, has, pick, pickBy, defaultsDeep, map, prop, pipe } = require('lodas
 const { isKebabCase } = require('@strapi/utils');
 const getUserPluginsConfig = require('./get-user-plugins-config');
 
-const isStrapiPlugin = info => get('strapi.kind', info) === 'plugin';
+const isStrapiPlugin = (info) => get('strapi.kind', info) === 'plugin';
 const INTERNAL_PLUGINS = [
   '@strapi/plugin-content-manager',
   '@strapi/plugin-content-type-builder',
@@ -15,18 +15,18 @@ const INTERNAL_PLUGINS = [
   '@strapi/plugin-upload',
 ];
 
-const validatePluginName = pluginName => {
+const validatePluginName = (pluginName) => {
   if (!isKebabCase(pluginName)) {
     throw new Error(`Plugin name "${pluginName}" is not in kebab (an-example-of-kebab-case)`);
   }
 };
 
-const toDetailedDeclaration = declaration => {
+const toDetailedDeclaration = (declaration) => {
   if (typeof declaration === 'boolean') {
     return { enabled: declaration };
   }
 
-  let detailedDeclaration = pick(['enabled'], declaration);
+  const detailedDeclaration = pick(['enabled'], declaration);
   if (has('resolve', declaration)) {
     let pathToPlugin = '';
 
@@ -45,7 +45,7 @@ const toDetailedDeclaration = declaration => {
   return detailedDeclaration;
 };
 
-const getEnabledPlugins = async strapi => {
+const getEnabledPlugins = async (strapi) => {
   const internalPlugins = {};
   for (const dep of INTERNAL_PLUGINS) {
     const packagePath = join(dep, 'package.json');
@@ -59,7 +59,9 @@ const getEnabledPlugins = async strapi => {
   }
 
   const installedPlugins = {};
-  for (const dep in strapi.config.get('info.dependencies', {})) {
+  const dependencies = strapi.config.get('info.dependencies', {});
+
+  for (const dep of Object.keys(dependencies)) {
     const packagePath = join(dep, 'package.json');
     let packageInfo;
     try {
@@ -106,14 +108,14 @@ const getEnabledPlugins = async strapi => {
 
   const declaredPluginsResolves = map(prop('pathToPlugin'), declaredPlugins);
   const installedPluginsNotAlreadyUsed = pickBy(
-    p => !declaredPluginsResolves.includes(p.pathToPlugin),
+    (p) => !declaredPluginsResolves.includes(p.pathToPlugin),
     installedPlugins
   );
 
   const enabledPlugins = pipe(
     defaultsDeep(declaredPlugins),
     defaultsDeep(installedPluginsNotAlreadyUsed),
-    pickBy(p => p.enabled)
+    pickBy((p) => p.enabled)
   )(internalPlugins);
 
   return enabledPlugins;

package/lib/core/loaders/plugins/index.js

@@ -25,7 +25,7 @@ const defaultPlugin = {
   contentTypes: {},
 };
 
-const applyUserExtension = async plugins => {
+const applyUserExtension = async (plugins) => {
   const extensionsDir = strapi.dirs.dist.extensions;
   if (!(await fse.pathExists(extensionsDir))) {
     return;
@@ -34,17 +34,16 @@ const applyUserExtension = async plugins => {
   const extendedSchemas = await loadFiles(extensionsDir, '**/content-types/**/schema.json');
   const strapiServers = await loadFiles(extensionsDir, '**/strapi-server.js');
 
-  for (const pluginName in plugins) {
+  for (const pluginName of Object.keys(plugins)) {
     const plugin = plugins[pluginName];
     // first: load json schema
-    for (const ctName in plugin.contentTypes) {
+    for (const ctName of Object.keys(plugin.contentTypes)) {
       const extendedSchema = get([pluginName, 'content-types', ctName, 'schema'], extendedSchemas);
       if (extendedSchema) {
-        plugin.contentTypes[ctName].schema = Object.assign(
-          {},
-          plugin.contentTypes[ctName].schema,
-          extendedSchema
-        );
+        plugin.contentTypes[ctName].schema = {
+          ...plugin.contentTypes[ctName].schema,
+          ...extendedSchema,
+        };
       }
     }
     // second: execute strapi-server extension
@@ -55,10 +54,10 @@ const applyUserExtension = async plugins => {
   }
 };
 
-const applyUserConfig = async plugins => {
+const applyUserConfig = async (plugins) => {
   const userPluginsConfig = await getUserPluginsConfig();
 
-  for (const pluginName in plugins) {
+  for (const pluginName of Object.keys(plugins)) {
     const plugin = plugins[pluginName];
     const userPluginConfig = getOr({}, `${pluginName}.config`, userPluginsConfig);
     const defaultConfig =
@@ -76,14 +75,14 @@ const applyUserConfig = async plugins => {
   }
 };
 
-const loadPlugins = async strapi => {
+const loadPlugins = async (strapi) => {
   const plugins = {};
 
   const enabledPlugins = await getEnabledPlugins(strapi);
 
   strapi.config.set('enabledPlugins', enabledPlugins);
 
-  for (const pluginName in enabledPlugins) {
+  for (const pluginName of Object.keys(enabledPlugins)) {
     const enabledPlugin = enabledPlugins[pluginName];
 
     const serverEntrypointPath = join(enabledPlugin.pathToPlugin, 'strapi-server.js');
@@ -101,7 +100,7 @@ const loadPlugins = async strapi => {
   await applyUserConfig(plugins);
   await applyUserExtension(plugins);
 
-  for (const pluginName in plugins) {
+  for (const pluginName of Object.keys(plugins)) {
     strapi.container.get('plugins').add(pluginName, plugins[pluginName]);
   }
 };

package/lib/core/loaders/policies.js

@@ -2,8 +2,7 @@
 
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
-
-const { importDefault } = require('../../utils');
+const { importDefault } = require('@strapi/utils');
 
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadPolicies(strapi) {

package/lib/core/loaders/sanitizers.js

@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   strapi.container.get('sanitizers').set('content-api', { input: [], output: [] });
 };

package/lib/core/loaders/src-index.js

@@ -2,9 +2,7 @@
 
 const { resolve } = require('path');
 const { statSync, existsSync } = require('fs');
-const { yup } = require('@strapi/utils');
-
-const { importDefault } = require('../../utils');
+const { yup, importDefault } = require('@strapi/utils');
 
 const srcSchema = yup
   .object()
@@ -15,11 +13,11 @@ const srcSchema = yup
   })
   .noUnknown();
 
-const validateSrcIndex = srcIndex => {
+const validateSrcIndex = (srcIndex) => {
   return srcSchema.validateSync(srcIndex, { strict: true, abortEarly: false });
 };
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   if (!existsSync(strapi.dirs.dist.src)) {
     return;
   }

package/lib/core/registries/apis.js

@@ -2,7 +2,7 @@
 
 const { has } = require('lodash/fp');
 
-const apisRegistry = strapi => {
+const apisRegistry = (strapi) => {
   const apis = {};
 
   return {

package/lib/core/registries/config.js

@@ -3,7 +3,7 @@
 const _ = require('lodash');
 
 module.exports = (initialConfig = {}) => {
-  const _config = Object.assign({}, initialConfig); // not deep clone because it would break some config
+  const _config = { ...initialConfig }; // not deep clone because it would break some config
 
   return {
     ..._config, // TODO: to remove

package/lib/core/registries/content-types.js

@@ -4,8 +4,8 @@ const { pickBy, has } = require('lodash/fp');
 const { createContentType } = require('../domain/content-type');
 const { addNamespace, hasNamespace } = require('../utils');
 
-const validateKeySameToSingularName = contentTypes => {
-  for (const ctName in contentTypes) {
+const validateKeySameToSingularName = (contentTypes) => {
+  for (const ctName of Object.keys(contentTypes)) {
     const contentType = contentTypes[ctName];
 
     if (ctName !== contentType.schema.info.singularName) {
@@ -63,7 +63,7 @@ const contentTypesRegistry = () => {
     add(namespace, newContentTypes) {
       validateKeySameToSingularName(newContentTypes);
 
-      for (const rawCtName in newContentTypes) {
+      for (const rawCtName of Object.keys(newContentTypes)) {
         const uid = addNamespace(rawCtName, namespace);
 
         if (has(uid, contentTypes)) {

package/lib/core/registries/controllers.js

@@ -48,7 +48,7 @@ const controllersRegistry = () => {
       const filteredControllers = pickBy((_, uid) => hasNamespace(uid, namespace))(controllers);
 
       const map = {};
-      for (const uid in filteredControllers) {
+      for (const uid of Object.keys(filteredControllers)) {
         Object.defineProperty(map, uid, {
           enumerable: true,
           get: () => {
@@ -78,7 +78,7 @@ const controllersRegistry = () => {
      * @returns
      */
     add(namespace, newControllers) {
-      for (const controllerName in newControllers) {
+      for (const controllerName of Object.keys(newControllers)) {
         const controller = newControllers[controllerName];
         const uid = addNamespace(controllerName, namespace);
 

package/lib/core/registries/custom-fields.js

@@ -0,0 +1,72 @@
+'use strict';
+
+const { has } = require('lodash/fp');
+
+const ALLOWED_TYPES = [
+  'biginteger',
+  'boolean',
+  'date',
+  'datetime',
+  'decimal',
+  'email',
+  'enumeration',
+  'float',
+  'integer',
+  'json',
+  'password',
+  'richtext',
+  'string',
+  'text',
+  'time',
+  'uid',
+];
+
+const customFieldsRegistry = (strapi) => {
+  const customFields = {};
+
+  return {
+    getAll() {
+      return customFields;
+    },
+    get(customField) {
+      const registeredCustomField = customFields[customField];
+      if (!registeredCustomField) {
+        throw new Error(`Could not find Custom Field: ${customField}`);
+      }
+
+      return registeredCustomField;
+    },
+    add(customField) {
+      const customFieldList = Array.isArray(customField) ? customField : [customField];
+
+      for (const cf of customFieldList) {
+        if (!has('name', cf) || !has('type', cf)) {
+          throw new Error(`Custom fields require a 'name' and 'type' key`);
+        }
+
+        const { name, plugin, type } = cf;
+        if (!ALLOWED_TYPES.includes(type)) {
+          throw new Error(
+            `Custom field type: '${type}' is not a valid Strapi type or it can't be used with a Custom Field`
+          );
+        }
+
+        const isValidObjectKey = /^(?![0-9])[a-zA-Z0-9$_-]+$/g;
+        if (!isValidObjectKey.test(name)) {
+          throw new Error(`Custom field name: '${name}' is not a valid object key`);
+        }
+
+        // When no plugin is specified, or it isn't found in Strapi, default to global
+        const uid = strapi.plugin(plugin) ? `plugin::${plugin}.${name}` : `global::${name}`;
+
+        if (has(uid, customFields)) {
+          throw new Error(`Custom field: '${uid}' has already been registered`);
+        }
+
+        customFields[uid] = cf;
+      }
+    },
+  };
+};
+
+module.exports = customFieldsRegistry;

package/lib/core/registries/hooks.js

@@ -54,7 +54,7 @@ const hooksRegistry = () => {
      * @returns
      */
     add(namespace, hooks) {
-      for (const hookName in hooks) {
+      for (const hookName of Object.keys(hooks)) {
         const hook = hooks[hookName];
         const uid = addNamespace(hookName, namespace);
 

package/lib/core/registries/middlewares.js

@@ -54,8 +54,8 @@ const middlewaresRegistry = () => {
      * @param {{ [key: string]: Middleware }} newMiddlewares
      * @returns
      */
-    add(namespace, rawMiddlewares) {
-      for (const middlewareName in rawMiddlewares) {
+    add(namespace, rawMiddlewares = {}) {
+      for (const middlewareName of Object.keys(rawMiddlewares)) {
         const middleware = rawMiddlewares[middlewareName];
         const uid = addNamespace(middlewareName, namespace);
 

package/lib/core/registries/modules.js

@@ -3,7 +3,7 @@
 const { pickBy, has } = require('lodash/fp');
 const { createModule } = require('../domain/module');
 
-const modulesRegistry = strapi => {
+const modulesRegistry = (strapi) => {
   const modules = {};
 
   return {

package/lib/core/registries/plugins.js

@@ -2,7 +2,7 @@
 
 const { has } = require('lodash/fp');
 
-const pluginsRegistry = strapi => {
+const pluginsRegistry = (strapi) => {
   const plugins = {};
 
   return {

package/lib/core/registries/policies.js

@@ -55,7 +55,7 @@ const policiesRegistry = () => {
      * @returns
      */
     add(namespace, newPolicies) {
-      for (const policyName in newPolicies) {
+      for (const policyName of Object.keys(newPolicies)) {
         const policy = newPolicies[policyName];
         const uid = addNamespace(policyName, namespace);
 

package/lib/core/registries/services.js

@@ -8,7 +8,7 @@ const { addNamespace, hasNamespace } = require('../utils');
  * @typedef {import('./services').ServiceFactory} ServiceFactory
  */
 
-const servicesRegistry = strapi => {
+const servicesRegistry = (strapi) => {
   const services = {};
   const instantiatedServices = {};
 
@@ -48,7 +48,7 @@ const servicesRegistry = strapi => {
 
       // create lazy accessor to avoid instantiating the services;
       const map = {};
-      for (const uid in filteredServices) {
+      for (const uid of Object.keys(filteredServices)) {
         Object.defineProperty(map, uid, {
           enumerable: true,
           get: () => {
@@ -78,7 +78,7 @@ const servicesRegistry = strapi => {
      * @returns
      */
     add(namespace, newServices) {
-      for (const serviceName in newServices) {
+      for (const serviceName of Object.keys(newServices)) {
         const service = newServices[serviceName];
         const uid = addNamespace(serviceName, namespace);
 

package/lib/core/utils.js

@@ -7,25 +7,22 @@ const hasNamespace = (name, namespace) => {
 
   if (namespace.endsWith('::')) {
     return name.startsWith(namespace);
-  } else {
-    return name.startsWith(`${namespace}.`);
   }
+  return name.startsWith(`${namespace}.`);
 };
 
 const addNamespace = (name, namespace) => {
   if (namespace.endsWith('::')) {
     return `${namespace}${name}`;
-  } else {
-    return `${namespace}.${name}`;
   }
+  return `${namespace}.${name}`;
 };
 
 const removeNamespace = (name, namespace) => {
   if (namespace.endsWith('::')) {
     return name.replace(namespace, '');
-  } else {
-    return name.replace(`${namespace}.`, '');
   }
+  return name.replace(`${namespace}.`, '');
 };
 
 module.exports = {

package/lib/core-api/controller/transform.js

@@ -3,7 +3,7 @@
 const { isNil, isPlainObject } = require('lodash/fp');
 const { parseMultipartData } = require('@strapi/utils');
 
-const parseBody = ctx => {
+const parseBody = (ctx) => {
   if (ctx.is('multipart')) {
     return parseMultipartData(ctx);
   }
@@ -26,7 +26,7 @@ const transformResponse = (resource, meta = {}, { contentType } = {}) => {
 
 const transformComponent = (data, component) => {
   if (Array.isArray(data)) {
-    return data.map(datum => transformComponent(datum, component));
+    return data.map((datum) => transformComponent(datum, component));
   }
 
   const res = transformEntry(data, component);
@@ -45,7 +45,7 @@ const transformEntry = (entry, type) => {
   }
 
   if (Array.isArray(entry)) {
-    return entry.map(singleEntry => transformEntry(singleEntry, type));
+    return entry.map((singleEntry) => transformEntry(singleEntry, type));
   }
 
   if (!isPlainObject(entry)) {
@@ -56,7 +56,7 @@ const transformEntry = (entry, type) => {
 
   const attributeValues = {};
 
-  for (const key in properties) {
+  for (const key of Object.keys(properties)) {
     const property = properties[key];
     const attribute = type && type.attributes[key];
 
@@ -71,7 +71,7 @@ const transformEntry = (entry, type) => {
         attributeValues[key] = property;
       }
 
-      attributeValues[key] = property.map(subProperty => {
+      attributeValues[key] = property.map((subProperty) => {
         return transformComponent(subProperty, strapi.components[subProperty.__component]);
       });
     } else if (attribute && attribute.type === 'media') {

package/lib/core-api/service/collection-type.js

@@ -14,7 +14,7 @@ const {
   transformPaginationResponse,
 } = require('./pagination');
 
-const setPublishedAt = data => {
+const setPublishedAt = (data) => {
   data[PUBLISHED_AT_ATTRIBUTE] = propOr(new Date(), PUBLISHED_AT_ATTRIBUTE, data);
 };
 

package/lib/core-api/service/index.d.ts

@@ -12,11 +12,14 @@ export interface SingleTypeService extends BaseService {
 
 export interface CollectionTypeService extends BaseService {
   find?(params: object): Promise<Entity[]> | Entity;
-  findOne?(entityId: string,params: object): Promise<Entity> | Entity;
+  findOne?(entityId: string, params: object): Promise<Entity> | Entity;
   create?(params: object): Promise<Entity> | Entity;
-  update?(entityId: string,params: object): Promise<Entity> | Entity;
-  delete?(entityId: string,params: object): Promise<Entity> | Entity;
+  update?(entityId: string, params: object): Promise<Entity> | Entity;
+  delete?(entityId: string, params: object): Promise<Entity> | Entity;
 }
 
 export type Service = SingleTypeService | CollectionTypeService;
 
+export type GenericService = Partial<Service> & {
+  [method: string | number | symbol]: (...args: any) => any;
+};

package/lib/core-api/service/pagination.js

@@ -21,7 +21,7 @@ const getLimitConfigDefaults = () => ({
 const shouldApplyMaxLimit = (limit, maxLimit = null, { isPagedPagination = false } = {}) =>
   (!isPagedPagination && limit === -1) || (maxLimit && limit > maxLimit);
 
-const shouldCount = params => {
+const shouldCount = (params) => {
   if (has('pagination.withCount', params)) {
     const { withCount } = params.pagination;
 
@@ -45,10 +45,10 @@ const shouldCount = params => {
   return Boolean(strapi.config.get('api.rest.withCount', true));
 };
 
-const isOffsetPagination = pagination => has('start', pagination) || has('limit', pagination);
-const isPagedPagination = pagination => has('page', pagination) || has('pageSize', pagination);
+const isOffsetPagination = (pagination) => has('start', pagination) || has('limit', pagination);
+const isPagedPagination = (pagination) => has('page', pagination) || has('pageSize', pagination);
 
-const getPaginationInfo = params => {
+const getPaginationInfo = (params) => {
   const { defaultLimit, maxLimit } = getLimitConfigDefaults();
 
   const { pagination } = params;
@@ -90,7 +90,7 @@ const getPaginationInfo = params => {
   };
 };
 
-const convertPagedToStartLimit = pagination => {
+const convertPagedToStartLimit = (pagination) => {
   if (isPagedPagination(pagination)) {
     const { page, pageSize } = pagination;
     return {

package/lib/core-api/service/single-type.js

@@ -1,6 +1,16 @@
 'use strict';
 
+const { propOr } = require('lodash/fp');
+
 const { ValidationError } = require('@strapi/utils').errors;
+const {
+  hasDraftAndPublish,
+  constants: { PUBLISHED_AT_ATTRIBUTE },
+} = require('@strapi/utils').contentTypes;
+
+const setPublishedAt = (data) => {
+  data[PUBLISHED_AT_ATTRIBUTE] = propOr(new Date(), PUBLISHED_AT_ATTRIBUTE, data);
+};
 
 /**
  * Returns a single type service to handle default core-api actions
@@ -27,7 +37,7 @@ const createSingleTypeService = ({ contentType }) => {
      * @return {Promise}
      */
     async createOrUpdate({ data, ...params } = {}) {
-      const entity = await this.find(params);
+      const entity = await this.find({ ...params, publicationState: 'preview' });
 
       if (!entity) {
         const count = await strapi.query(uid).count();
@@ -35,6 +45,9 @@ const createSingleTypeService = ({ contentType }) => {
           throw new ValidationError('singleType.alreadyExists');
         }
 
+        if (hasDraftAndPublish(contentType)) {
+          setPublishedAt(data);
+        }
         return strapi.entityService.create(uid, { ...params, data });
       }
 

package/lib/factories.js

@@ -12,7 +12,7 @@ const createCoreController = (uid, cfg = {}) => {
       contentType: strapi.contentType(uid),
     });
 
-    let userCtrl = typeof cfg === 'function' ? cfg({ strapi }) : cfg;
+    const userCtrl = typeof cfg === 'function' ? cfg({ strapi }) : cfg;
 
     for (const methodName of Object.keys(baseController)) {
       if (userCtrl[methodName] === undefined) {
@@ -31,7 +31,7 @@ const createCoreService = (uid, cfg = {}) => {
       contentType: strapi.contentType(uid),
     });
 
-    let userService = typeof cfg === 'function' ? cfg({ strapi }) : cfg;
+    const userService = typeof cfg === 'function' ? cfg({ strapi }) : cfg;
 
     for (const methodName of Object.keys(baseService)) {
       if (userService[methodName] === undefined) {
@@ -58,15 +58,15 @@ const createCoreRouter = (uid, cfg = {}) => {
 
         const defaultRoutes = createRoutes({ contentType });
 
-        Object.keys(defaultRoutes).forEach(routeName => {
+        Object.keys(defaultRoutes).forEach((routeName) => {
           const defaultRoute = defaultRoutes[routeName];
 
           Object.assign(defaultRoute.config, config[routeName] || {});
         });
 
         const selectedRoutes = pipe(
-          routes => (except ? omit(except, routes) : routes),
-          routes => (only ? pick(only, routes) : routes)
+          (routes) => (except ? omit(except, routes) : routes),
+          (routes) => (only ? pick(only, routes) : routes)
         )(defaultRoutes);
 
         routes = Object.values(selectedRoutes);

package/lib/load/filepath-to-prop-path.js

@@ -8,13 +8,13 @@ const _ = require('lodash');
  * @param {boolean} useFileNameAsKey - wethear to skip the last path key
  */
 module.exports = (filePath, useFileNameAsKey = true) => {
-  let cleanPath = filePath.startsWith('./') ? filePath.slice(2) : filePath;
+  const cleanPath = filePath.startsWith('./') ? filePath.slice(2) : filePath;
 
   const prop = cleanPath
     .replace(/(\.settings|\.json|\.js)/g, '')
     .toLowerCase()
     .split('/')
-    .map(p => _.trimStart(p, '.'))
+    .map((p) => _.trimStart(p, '.'))
     .join('.')
     .split('.');
 

package/lib/load/load-files.js

@@ -4,7 +4,7 @@ const path = require('path');
 const _ = require('lodash');
 const fse = require('fs-extra');
 
-const { importDefault } = require('../utils');
+const { importDefault } = require('@strapi/utils');
 const glob = require('./glob');
 const filePathToPath = require('./filepath-to-prop-path');
 
@@ -26,7 +26,7 @@ const loadFiles = async (
   const root = {};
   const files = await glob(pattern, { cwd: dir, ...globArgs });
 
-  for (let file of files) {
+  for (const file of files) {
     const absolutePath = path.resolve(dir, file);
 
     // load module

package/lib/load/package-path.js

@@ -6,4 +6,4 @@ const path = require('path');
  * Returns the path to a node modules root directory (not the main file path)
  * @param {string} moduleName - name of a node module
  */
-module.exports = moduleName => path.dirname(require.resolve(`${moduleName}/package.json`));
+module.exports = (moduleName) => path.dirname(require.resolve(`${moduleName}/package.json`));