@strapi/strapi 4.14.0-beta.0 → 4.14.0

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

@@ -1,72 +0,0 @@
-'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
- */
-const createSingleTypeService = ({ contentType }) => {
-  const { uid } = contentType;
-
-  /**
-   * @type {import('./').SingleTypeService}
-   */
-  return {
-    /**
-     * Returns singleType content
-     *
-     * @return {Promise}
-     */
-    find(params = {}) {
-      return strapi.entityService.findMany(uid, this.getFetchParams(params));
-    },
-
-    /**
-     * Creates or updates a singleType content
-     *
-     * @return {Promise}
-     */
-    async createOrUpdate({ data, ...params } = {}) {
-      const entity = await this.find({ ...params, publicationState: 'preview' });
-
-      if (!entity) {
-        const count = await strapi.query(uid).count();
-        if (count >= 1) {
-          throw new ValidationError('singleType.alreadyExists');
-        }
-
-        if (hasDraftAndPublish(contentType)) {
-          setPublishedAt(data);
-        }
-        return strapi.entityService.create(uid, { ...params, data });
-      }
-
-      return strapi.entityService.update(uid, entity.id, { ...params, data });
-    },
-
-    /**
-     * Deletes the singleType content
-     *
-     * @return {Promise}
-     */
-    async delete(params = {}) {
-      const entity = await this.find(params);
-
-      if (!entity) return;
-
-      return strapi.entityService.delete(uid, entity.id);
-    },
-  };
-};
-
-module.exports = createSingleTypeService;

package/lib/factories.d.ts

@@ -1,18 +0,0 @@
-import type { Common, CoreApi } from '@strapi/strapi';
-
-export declare function createCoreRouter<T extends Common.UID.ContentType>(
-  uid: T,
-  cfg?: CoreApi.Router.RouterConfig<T>
-): () => CoreApi.Router.Router;
-
-// TODO: Find a cleaner way to expose methods for customization
-export declare function createCoreController<T extends Common.UID.ContentType>(
-  uid: T,
-  config?: any
-): () => any;
-
-// TODO: Find a cleaner way to expose methods for customization
-export declare function createCoreService<T extends Common.UID.ContentType>(
-  uid: T,
-  config?: any
-): () => any;

package/lib/factories.js

@@ -1,93 +0,0 @@
-'use strict';
-
-const { pipe, omit, pick } = require('lodash/fp');
-
-const { createController } = require('./core-api/controller');
-const { createService } = require('./core-api/service');
-const { createRoutes } = require('./core-api/routes');
-
-// Content type is proxied to allow for dynamic content type updates
-const getContentTypeProxy = (strapi, uid) => {
-  return new Proxy(strapi.contentType(uid), {
-    get(target, prop) {
-      const contentType = strapi.contentType(uid);
-      return contentType[prop];
-    },
-  });
-};
-
-const createCoreController = (uid, cfg = {}) => {
-  return ({ strapi }) => {
-    const baseController = createController({
-      contentType: getContentTypeProxy(strapi, uid),
-    });
-
-    const userCtrl = typeof cfg === 'function' ? cfg({ strapi }) : cfg;
-
-    for (const methodName of Object.keys(baseController)) {
-      if (userCtrl[methodName] === undefined) {
-        userCtrl[methodName] = baseController[methodName];
-      }
-    }
-
-    Object.setPrototypeOf(userCtrl, baseController);
-    return userCtrl;
-  };
-};
-
-const createCoreService = (uid, cfg = {}) => {
-  return ({ strapi }) => {
-    const baseService = createService({
-      contentType: getContentTypeProxy(strapi, uid),
-    });
-
-    const userService = typeof cfg === 'function' ? cfg({ strapi }) : cfg;
-
-    for (const methodName of Object.keys(baseService)) {
-      if (userService[methodName] === undefined) {
-        userService[methodName] = baseService[methodName];
-      }
-    }
-
-    Object.setPrototypeOf(userService, baseService);
-    return userService;
-  };
-};
-
-const createCoreRouter = (uid, cfg = {}) => {
-  const { prefix, config = {}, only, except, type } = cfg;
-  let routes;
-
-  return {
-    type,
-    prefix,
-    get routes() {
-      if (!routes) {
-        const contentType = strapi.contentType(uid);
-
-        const defaultRoutes = createRoutes({ contentType });
-
-        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)
-        )(defaultRoutes);
-
-        routes = Object.values(selectedRoutes);
-      }
-
-      return routes;
-    },
-  };
-};
-
-module.exports = {
-  createCoreController,
-  createCoreService,
-  createCoreRouter,
-};

package/lib/global.d.ts

@@ -1,22 +0,0 @@
-import type { Strapi as StrapiInterface } from './types/core';
-
-declare global {
-  namespace Strapi {
-    /**
-     * Global shorthand to access the `StrapiInterface` type
-     */
-    type Strapi = StrapiInterface;
-  }
-
-  /**
-   * Strapi global variable definition
-   **/
-  export const strapi: StrapiInterface;
-
-  /**
-   * Adds the strapi global variable to the NodeJS Global interface
-   */
-  export interface Global {
-    strapi: StrapiInterface;
-  }
-}

package/lib/index.d.ts

@@ -1,6 +0,0 @@
-import './global';
-
-export * from './types';
-export * as factories from './factories';
-
-export default function (opts): Strapi.Strapi;

package/lib/index.js

@@ -1,8 +0,0 @@
-'use strict';
-
-const Strapi = require('./Strapi');
-
-Strapi.factories = require('./factories');
-Strapi.compile = require('./compile');
-
-module.exports = Strapi;

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

@@ -1,22 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-
-/**
- * Returns a path (as an array) from a file path
- * @param {string} filePath - a file path
- * @param {boolean} useFileNameAsKey - wethear to skip the last path key
- */
-module.exports = (filePath, useFileNameAsKey = true) => {
-  const cleanPath = filePath.startsWith('./') ? filePath.slice(2) : filePath;
-
-  const prop = cleanPath
-    .replace(/(\.settings|\.json|\.js)/g, '')
-    .toLowerCase()
-    .split('/')
-    .map((p) => _.trimStart(p, '.'))
-    .join('.')
-    .split('.');
-
-  return useFileNameAsKey === true ? prop : prop.slice(0, -1);
-};

package/lib/load/glob.js

@@ -1,15 +0,0 @@
-'use strict';
-
-const glob = require('glob');
-
-/**
- * Promise based glob
- */
-module.exports = (...args) => {
-  return new Promise((resolve, reject) => {
-    glob(...args, (err, files) => {
-      if (err) return reject(err);
-      resolve(files);
-    });
-  });
-};

package/lib/load/index.js

@@ -1,9 +0,0 @@
-'use strict';
-
-const loadFiles = require('./load-files');
-const findPackagePath = require('./package-path');
-
-module.exports = {
-  loadFiles,
-  findPackagePath,
-};

package/lib/load/load-files.js

@@ -1,58 +0,0 @@
-'use strict';
-
-const path = require('path');
-const _ = require('lodash');
-const fse = require('fs-extra');
-
-const { importDefault } = require('@strapi/utils');
-const glob = require('./glob');
-const filePathToPath = require('./filepath-to-prop-path');
-
-/**
- * Returns an Object build from a list of files matching a glob pattern in a directory
- * It builds a tree structure resembling the folder structure in dir
- * @param {string} dir - Directory to load
- * @param {string} pattern - Glob pattern to search for
- * @param {Object} options - Options
- * @param {Function} options.requireFn - Function that will require the matches files
- * @param {Function} options.shouldUseFileNameAsKey - Weather to use the filename as a key in the Object path or not
- * @param {Object} options.globArgs - extra glob function arguments
- */
-const loadFiles = async (
-  dir,
-  pattern,
-  { requireFn = importDefault, shouldUseFileNameAsKey = () => true, globArgs = {} } = {}
-) => {
-  const root = {};
-  const files = await glob(pattern, { cwd: dir, ...globArgs });
-
-  for (const file of files) {
-    const absolutePath = path.resolve(dir, file);
-
-    // load module
-    delete require.cache[absolutePath];
-    let mod;
-
-    if (path.extname(absolutePath) === '.json') {
-      mod = await fse.readJson(absolutePath);
-    } else {
-      mod = requireFn(absolutePath);
-    }
-
-    Object.defineProperty(mod, '__filename__', {
-      enumerable: true,
-      configurable: false,
-      writable: false,
-      value: path.basename(file),
-    });
-
-    const propPath = filePathToPath(file, shouldUseFileNameAsKey(file));
-
-    if (propPath.length === 0) _.merge(root, mod);
-    _.merge(root, _.setWith({}, propPath, mod, Object));
-  }
-
-  return root;
-};
-
-module.exports = loadFiles;

package/lib/load/package-path.js

@@ -1,9 +0,0 @@
-'use strict';
-
-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`));

package/lib/middlewares/body.js

@@ -1,82 +0,0 @@
-'use strict';
-
-const fse = require('fs-extra');
-const { defaultsDeep, get } = require('lodash/fp');
-const body = require('koa-body');
-const mime = require('mime-types');
-
-const defaults = {
-  multipart: true,
-  patchKoa: true,
-};
-
-function ensureFileMimeType(file) {
-  if (!file.type) {
-    file.type = mime.lookup(file.name) || 'application/octet-stream';
-  }
-}
-
-function getFiles(ctx) {
-  return get('request.files.files', ctx);
-}
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-
-module.exports = (config, { strapi }) => {
-  const bodyConfig = defaultsDeep(defaults, config);
-
-  let gqlEndpoint;
-  if (strapi.plugin('graphql')) {
-    const { config: gqlConfig } = strapi.plugin('graphql');
-    gqlEndpoint = gqlConfig('endpoint');
-  }
-
-  return async (ctx, next) => {
-    // TODO: find a better way later
-    if (gqlEndpoint && ctx.url === gqlEndpoint) {
-      await next();
-    } else {
-      try {
-        await body({ patchKoa: true, ...bodyConfig })(ctx, () => {});
-
-        const files = getFiles(ctx);
-
-        /**
-         * in case the mime-type wasn't sent, Strapi tries to guess it
-         * from the file extension, to avoid a corrupt database state
-         */
-        if (files) {
-          if (Array.isArray(files)) {
-            files.forEach(ensureFileMimeType);
-          } else {
-            ensureFileMimeType(files);
-          }
-        }
-
-        await next();
-      } catch (e) {
-        if ((e || {}).message && e.message.includes('maxFileSize exceeded')) {
-          return ctx.payloadTooLarge('FileTooBig');
-        }
-
-        throw e;
-      }
-    }
-
-    const files = getFiles(ctx);
-
-    // clean any file that was uploaded
-    if (files) {
-      if (Array.isArray(files)) {
-        // not awaiting to not slow the request
-        Promise.all(files.map((file) => fse.remove(file.path)));
-      } else if (files && files.path) {
-        // not awaiting to not slow the request
-        fse.remove(files.path);
-      }
-      delete ctx.request.files;
-    }
-  };
-};

package/lib/middlewares/compression.js

@@ -1,8 +0,0 @@
-'use strict';
-
-const compress = require('koa-compress');
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-module.exports = (config) => compress(config);

package/lib/middlewares/cors.js

@@ -1,59 +0,0 @@
-'use strict';
-
-const { defaultsDeep } = require('lodash/fp');
-const cors = require('@koa/cors');
-
-const defaults = {
-  origin: '*',
-  maxAge: 31536000,
-  credentials: true,
-  methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'],
-  headers: ['Content-Type', 'Authorization', 'Origin', 'Accept'],
-  keepHeadersOnError: false,
-};
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-module.exports = (config) => {
-  const { origin, expose, maxAge, credentials, methods, headers, keepHeadersOnError } =
-    defaultsDeep(defaults, config);
-
-  if (config.enabled !== undefined) {
-    strapi.log.warn(
-      'The strapi::cors middleware no longer supports the `enabled` option. Using it' +
-        ' to conditionally enable CORS might cause an insecure default. To disable strapi::cors, remove it from' +
-        ' the exported array in config/middleware.js'
-    );
-  }
-
-  return cors({
-    async origin(ctx) {
-      let originList;
-
-      if (typeof origin === 'function') {
-        originList = await origin(ctx);
-      } else {
-        originList = origin;
-      }
-
-      const whitelist = Array.isArray(originList) ? originList : originList.split(/\s*,\s*/);
-
-      const requestOrigin = ctx.accept.headers.origin;
-      if (whitelist.includes('*')) {
-        return credentials ? requestOrigin : '*';
-      }
-
-      if (!whitelist.includes(requestOrigin)) {
-        return ctx.throw(`${requestOrigin} is not a valid origin`);
-      }
-      return requestOrigin;
-    },
-    exposeHeaders: expose,
-    maxAge,
-    credentials,
-    allowMethods: methods,
-    allowHeaders: headers,
-    keepHeadersOnError,
-  });
-};

package/lib/middlewares/errors.js

@@ -1,40 +0,0 @@
-'use strict';
-
-const { HttpError, ApplicationError } = require('@strapi/utils').errors;
-const {
-  formatApplicationError,
-  formatHttpError,
-  formatInternalError,
-} = require('../services/errors');
-
-module.exports = (/* _, { strapi } */) => {
-  return async (ctx, next) => {
-    try {
-      await next();
-
-      if (!ctx.response._explicitStatus) {
-        return ctx.notFound();
-      }
-    } catch (error) {
-      if (error instanceof ApplicationError) {
-        const { status, body } = formatApplicationError(error);
-        ctx.status = status;
-        ctx.body = body;
-        return;
-      }
-
-      if (error instanceof HttpError) {
-        const { status, body } = formatHttpError(error);
-        ctx.status = status;
-        ctx.body = body;
-        return;
-      }
-
-      strapi.log.error(error);
-
-      const { status, body } = formatInternalError(error);
-      ctx.status = status;
-      ctx.body = body;
-    }
-  };
-};

package/lib/middlewares/favicon.js

@@ -1,32 +0,0 @@
-'use strict';
-
-const { existsSync } = require('fs');
-const { resolve } = require('path');
-const { defaultsDeep } = require('lodash/fp');
-const favicon = require('koa-favicon');
-
-const defaults = {
-  path: 'favicon.png',
-  maxAge: 86400000,
-};
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-module.exports = (config, { strapi }) => {
-  const { maxAge, path: faviconDefaultPath } = defaultsDeep(defaults, config);
-  const { root: appRoot } = strapi.dirs.app;
-  let faviconPath = faviconDefaultPath;
-
-  /** TODO (v5): Updating the favicon to use a png caused
-   *  https://github.com/strapi/strapi/issues/14693
-   *
-   *  This check ensures backwards compatibility until
-   *  the next major version
-   */
-  if (!existsSync(resolve(appRoot, faviconPath))) {
-    faviconPath = 'favicon.ico';
-  }
-
-  return favicon(resolve(appRoot, faviconPath), { maxAge });
-};

package/lib/middlewares/index.d.ts

@@ -1,5 +0,0 @@
-import { Strapi } from '../';
-import { Middleware } from 'koa';
-
-export type MiddlewareFactory = (config: any, ctx: { strapi: Strapi }) => Middleware | null;
-export type Middleware = Middleware;

package/lib/middlewares/index.js

@@ -1,33 +0,0 @@
-'use strict';
-
-const compression = require('./compression');
-const cors = require('./cors');
-const errors = require('./errors');
-const favicon = require('./favicon');
-const ip = require('./ip');
-const logger = require('./logger');
-const poweredBy = require('./powered-by');
-const body = require('./body');
-const query = require('./query');
-const responseTime = require('./response-time');
-const responses = require('./responses');
-const security = require('./security');
-const session = require('./session');
-const publicStatic = require('./public');
-
-module.exports = {
-  errors,
-  ip,
-  security,
-  cors,
-  responseTime,
-  poweredBy,
-  session,
-  logger,
-  compression,
-  responses,
-  body,
-  query,
-  favicon,
-  public: publicStatic,
-};

package/lib/middlewares/ip.js

@@ -1,8 +0,0 @@
-'use strict';
-
-const ip = require('koa-ip');
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-module.exports = (config) => ip(config);

package/lib/middlewares/logger.js

@@ -1,14 +0,0 @@
-'use strict';
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-module.exports = (_, { strapi }) => {
-  return async (ctx, next) => {
-    const start = Date.now();
-    await next();
-    const delta = Math.ceil(Date.now() - start);
-
-    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${ctx.status}`);
-  };
-};

package/lib/middlewares/powered-by.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const { defaultsDeep } = require('lodash/fp');
-
-const defaults = {
-  poweredBy: 'Strapi <strapi.io>',
-};
-
-/**
- * @type {import('./').MiddlewareFactory}
- */
-module.exports = (config) => {
-  const { poweredBy } = defaultsDeep(defaults, config);
-
-  return async (ctx, next) => {
-    await next();
-
-    ctx.set('X-Powered-By', poweredBy);
-  };
-};