@strapi/strapi 4.0.0-next.6 → 4.0.0

package/lib/commands/generate-template.js

@@ -6,7 +6,7 @@ const chalk = require('chalk');
 const inquirer = require('inquirer');
 
 // All directories that a template could need
-const TEMPLATE_CONTENT = ['api', 'components', 'config/functions/bootstrap.js', 'data'];
+const TEMPLATE_CONTENT = ['src', 'data'];
 
 /**
  *
@@ -54,10 +54,9 @@ async function writeTemplateJson(rootPath) {
  * @returns boolean
  */
 async function templateConfigExists(rootPath) {
-  const jsonConfig = await fse.pathExists(join(rootPath, 'template.json'));
-  const functionConfig = await fse.pathExists(join(rootPath, 'template.js'));
-
-  return jsonConfig || functionConfig;
+  const configExists = await fse.pathExists(join(rootPath, 'template.json'));
+  console.log(`checking: ${join(rootPath, 'template.json')}. result ${configExists}`);
+  return configExists;
 }
 
 module.exports = async function generateTemplate(directory) {

package/lib/commands/hooks/list.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const CLITable = require('cli-table3');
+const chalk = require('chalk');
+
+const strapi = require('../../index');
+
+module.exports = async function() {
+  const app = await strapi().register();
+
+  const list = app.container.get('hooks').keys();
+
+  const infoTable = new CLITable({
+    head: [chalk.blue('Name')],
+  });
+
+  list.forEach(name => infoTable.push([name]));
+
+  console.log(infoTable.toString());
+
+  await app.destroy();
+};

package/lib/commands/middlewares/list.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const CLITable = require('cli-table3');
+const chalk = require('chalk');
+
+const strapi = require('../../index');
+
+module.exports = async function() {
+  const app = await strapi().register();
+
+  const list = app.container.get('middlewares').keys();
+
+  const infoTable = new CLITable({
+    head: [chalk.blue('Name')],
+  });
+
+  list.forEach(name => infoTable.push([name]));
+
+  console.log(infoTable.toString());
+
+  await app.destroy();
+};

package/lib/commands/new.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { generateNewApp } = require('@strapi/generate-new');
+
 /**
  * `$ strapi new`
  *
@@ -7,5 +9,5 @@
  */
 
 module.exports = function(...args) {
-  return require('@strapi/generate-new')(...args);
+  return generateNewApp(...args);
 };

package/lib/commands/policies/list.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const CLITable = require('cli-table3');
+const chalk = require('chalk');
+
+const strapi = require('../../index');
+
+module.exports = async function() {
+  const app = await strapi().register();
+
+  const list = app.container.get('policies').keys();
+
+  const infoTable = new CLITable({
+    head: [chalk.blue('Name')],
+  });
+
+  list.forEach(name => infoTable.push([name]));
+
+  console.log(infoTable.toString());
+
+  await app.destroy();
+};

package/lib/commands/routes/list.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const CLITable = require('cli-table3');
+const chalk = require('chalk');
+const { toUpper } = require('lodash/fp');
+
+const strapi = require('../../index');
+
+module.exports = async function() {
+  const app = await strapi().load();
+
+  const list = app.server.listRoutes();
+
+  const infoTable = new CLITable({
+    head: [chalk.blue('Method'), chalk.blue('Path')],
+    colWidths: [20],
+  });
+
+  list
+    .filter(route => route.methods.length)
+    .forEach(route => {
+      infoTable.push([route.methods.map(toUpper).join('|'), route.path]);
+    });
+
+  console.log(infoTable.toString());
+
+  await app.destroy();
+};

package/lib/commands/services/list.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const CLITable = require('cli-table3');
+const chalk = require('chalk');
+
+const strapi = require('../../index');
+
+module.exports = async function() {
+  const app = await strapi().register();
+
+  const list = app.container.get('services').keys();
+
+  const infoTable = new CLITable({
+    head: [chalk.blue('Name')],
+  });
+
+  list.forEach(name => infoTable.push([name]));
+
+  console.log(infoTable.toString());
+
+  await app.destroy();
+};

package/lib/commands/watchAdmin.js

@@ -1,32 +1,42 @@
 'use strict';
 
-// eslint-disable-next-line node/no-extraneous-require
 const strapiAdmin = require('@strapi/admin');
 const { getConfigUrls, getAbsoluteServerUrl } = require('@strapi/utils');
-const loadConfiguration = require('../core/app-configuration');
+
 const ee = require('../utils/ee');
 const addSlash = require('../utils/addSlash');
+const strapi = require('../index');
+const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins');
 
 module.exports = async function({ browser }) {
   const dir = process.cwd();
 
-  const config = loadConfiguration(dir);
+  const strapiInstance = strapi({
+    dir,
+    autoReload: true,
+    serveAdminPanel: false,
+  });
+
+  const plugins = await getEnabledPlugins(strapiInstance);
+
+  const { adminPath } = getConfigUrls(strapiInstance.config, true);
 
-  const { adminPath } = getConfigUrls(config.get('server'), true);
+  const adminPort = strapiInstance.config.get('admin.port', 8000);
+  const adminHost = strapiInstance.config.get('admin.host', 'localhost');
+  const adminWatchIgnoreFiles = strapiInstance.config.get('admin.watchIgnoreFiles', []);
 
-  const adminPort = config.get('server.admin.port', 8000);
-  const adminHost = config.get('server.admin.host', 'localhost');
-  const adminWatchIgnoreFiles = config.get('server.admin.watchIgnoreFiles', []);
+  const backendURL = getAbsoluteServerUrl(strapiInstance.config, true);
 
   ee({ dir });
 
   strapiAdmin.watchAdmin({
     dir,
+    plugins,
     port: adminPort,
     host: adminHost,
     browser,
     options: {
-      backend: getAbsoluteServerUrl(config, true),
+      backend: backendURL,
       adminPath: addSlash(adminPath),
       watchIgnoreFiles: adminWatchIgnoreFiles,
       features: ee.isEE ? ee.features.getEnabled() : [],

package/lib/container.js

@@ -1,16 +1,16 @@
 'use strict';
 
 const createContainer = strapi => {
-  const registerd = new Map();
+  const registered = new Map();
   const resolved = new Map();
 
   return {
     register(name, resolver) {
-      if (registerd.has(name)) {
+      if (registered.has(name)) {
         throw new Error(`Cannot register already registered service ${name}`);
       }
 
-      registerd.set(name, resolver);
+      registered.set(name, resolver);
       return this;
     },
 
@@ -20,8 +20,8 @@ const createContainer = strapi => {
         return resolved.get(name);
       }
 
-      if (registerd.has(name)) {
-        const resolver = registerd.get(name);
+      if (registered.has(name)) {
+        const resolver = registered.get(name);
 
         if (typeof resolver === 'function') {
           resolved.set(name, resolver({ strapi }, args));
@@ -32,7 +32,7 @@ const createContainer = strapi => {
         return resolved.get(name);
       }
 
-      throw new Error(`Could not resovle service ${name}`);
+      throw new Error(`Could not resolve service ${name}`);
     },
 
     // TODO: implement

package/lib/core/app-configuration/config-loader.js

@@ -2,7 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
-const { templateConfiguration, env } = require('@strapi/utils');
+const loadFile = require('./load-config-file');
 
 module.exports = dir => {
   if (!fs.existsSync(dir)) return {};
@@ -18,39 +18,3 @@ module.exports = dir => {
       return acc;
     }, {});
 };
-
-const loadFile = file => {
-  const ext = path.extname(file);
-
-  switch (ext) {
-    case '.js':
-      return loadJsFile(file);
-    case '.json':
-      return loadJSONFile(file);
-    default:
-      return {};
-  }
-};
-
-const loadJsFile = file => {
-  try {
-    const jsModule = require(file);
-
-    // call if function
-    if (typeof jsModule === 'function') {
-      return jsModule({ env });
-    }
-
-    return jsModule;
-  } catch (error) {
-    throw new Error(`Could not load js config file ${file}: ${error.message}`);
-  }
-};
-
-const loadJSONFile = file => {
-  try {
-    return templateConfiguration(JSON.parse(fs.readFileSync(file)));
-  } catch (error) {
-    throw new Error(`Could not load json config file ${file}: ${error.message}`);
-  }
-};

package/lib/core/app-configuration/index.js

@@ -3,35 +3,17 @@
 const os = require('os');
 const path = require('path');
 const _ = require('lodash');
+const { omit } = require('lodash/fp');
 const dotenv = require('dotenv');
 
 dotenv.config({ path: process.env.ENV_PATH });
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const getPrefixedDeps = require('../../utils/get-prefixed-dependencies');
-const loadPolicies = require('../load-policies');
-const loadFunctions = require('../load-functions');
 const loadConfigDir = require('./config-loader');
-const createConfigProvider = require('./config-provider');
 
 const { version: strapiVersion } = require(path.join(__dirname, '../../../package.json'));
 
-const CONFIG_PATHS = {
-  admin: 'admin',
-  api: 'api',
-  config: 'config',
-  controllers: 'controllers',
-  models: 'models',
-  plugins: 'plugins',
-  policies: 'policies',
-  tmp: '.tmp',
-  services: 'services',
-  static: 'public',
-  validators: 'validators',
-  views: 'views',
-};
-
 const defaultConfig = {
   server: {
     host: process.env.HOST || os.hostname() || 'localhost',
@@ -41,23 +23,11 @@ const defaultConfig = {
     admin: { autoOpen: false },
   },
   admin: {},
-  middleware: {
-    timeout: 1000,
-    load: {
-      before: ['responseTime', 'logger', 'cors', 'responses', 'gzip'],
-      order: [],
-      after: ['parser', 'router'],
+  api: {
+    rest: {
+      prefix: '/api',
     },
-    settings: {},
   },
-  hook: {
-    timeout: 1000,
-    load: { before: [], order: [], after: [] },
-    settings: {},
-  },
-  routes: {},
-  functions: {},
-  policies: {},
 };
 
 module.exports = (dir, initialConfig = {}) => {
@@ -69,8 +39,6 @@ module.exports = (dir, initialConfig = {}) => {
 
   const rootConfig = {
     launchedAt: Date.now(),
-    appPath: dir,
-    paths: CONFIG_PATHS,
     serveAdminPanel,
     autoReload,
     environment: process.env.NODE_ENV,
@@ -80,20 +48,12 @@ module.exports = (dir, initialConfig = {}) => {
       ...pkgJSON,
       strapi: strapiVersion,
     },
-    installedPlugins: getPrefixedDeps('@strapi/plugin', pkgJSON),
-    installedMiddlewares: getPrefixedDeps('@strapi/middleware', pkgJSON),
-    installedHooks: getPrefixedDeps('@strapi/hook', pkgJSON),
-    installedProviders: getPrefixedDeps('@strapi/provider', pkgJSON),
   };
 
-  const baseConfig = {
-    ...loadConfigDir(configDir),
-    policies: loadPolicies(path.resolve(configDir, 'policies')),
-    functions: loadFunctions(path.resolve(configDir, 'functions')),
-  };
+  const baseConfig = omit('plugins', loadConfigDir(configDir)); // plugin config will be loaded later
 
   const envDir = path.resolve(configDir, 'env', process.env.NODE_ENV);
   const envConfig = loadConfigDir(envDir);
 
-  return createConfigProvider(_.merge(rootConfig, defaultConfig, baseConfig, envConfig));
+  return _.merge(rootConfig, defaultConfig, baseConfig, envConfig);
 };

package/lib/core/app-configuration/load-config-file.js

@@ -0,0 +1,43 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const { templateConfiguration, env } = require('@strapi/utils');
+
+const loadJsFile = file => {
+  try {
+    const jsModule = require(file);
+
+    // call if function
+    if (typeof jsModule === 'function') {
+      return jsModule({ env });
+    }
+
+    return jsModule;
+  } catch (error) {
+    throw new Error(`Could not load js config file ${file}: ${error.message}`);
+  }
+};
+
+const loadJSONFile = file => {
+  try {
+    return templateConfiguration(JSON.parse(fs.readFileSync(file)));
+  } catch (error) {
+    throw new Error(`Could not load json config file ${file}: ${error.message}`);
+  }
+};
+
+const loadFile = file => {
+  const ext = path.extname(file);
+
+  switch (ext) {
+    case '.js':
+      return loadJsFile(file);
+    case '.json':
+      return loadJSONFile(file);
+    default:
+      return {};
+  }
+};
+
+module.exports = loadFile;

package/lib/core/bootstrap.js

@@ -1,124 +1,12 @@
 'use strict';
 
-const _ = require('lodash');
-const { getConfigUrls, contentTypes: contentTypesUtils } = require('@strapi/utils');
+const { getConfigUrls } = require('@strapi/utils');
 
-const { createCoreApi } = require('../core-api');
-
-module.exports = function(strapi) {
-  strapi.contentTypes = {};
-
-  // Set models.
-  strapi.models = Object.keys(strapi.api || []).reduce((acc, apiName) => {
-    const api = strapi.api[apiName];
-
-    for (let modelName in api.models) {
-      let model = strapi.api[apiName].models[modelName];
-
-      // mutate model
-      contentTypesUtils.createContentType(model, { modelName }, { apiName });
-
-      strapi.contentTypes[model.uid] = model;
-
-      const { service, controller } = createCoreApi({ model, api, strapi });
-
-      _.set(strapi.api[apiName], ['services', modelName], service);
-      _.set(strapi.api[apiName], ['controllers', modelName], controller);
-
-      acc[modelName] = model;
-    }
-    return acc;
-  }, {});
-
-  // Set controllers.
-  strapi.controllers = Object.keys(strapi.api || []).reduce((acc, key) => {
-    for (let index in strapi.api[key].controllers) {
-      let controller = strapi.api[key].controllers[index];
-      controller.identity = controller.identity || _.upperFirst(index);
-      acc[index] = controller;
-    }
-
-    return acc;
-  }, {});
-
-  // Set services.
-  strapi.services = Object.keys(strapi.api || []).reduce((acc, key) => {
-    for (let index in strapi.api[key].services) {
-      acc[index] = strapi.api[key].services[index];
-    }
-
-    return acc;
-  }, {});
-
-  // Set routes.
-  strapi.config.routes = Object.keys(strapi.api || []).reduce((acc, key) => {
-    return acc.concat(_.get(strapi.api[key], 'config.routes') || {});
-  }, []);
-
-  // Init admin controllers.
-  Object.keys(strapi.admin.controllers || []).forEach(key => {
-    if (!strapi.admin.controllers[key].identity) {
-      strapi.admin.controllers[key].identity = key;
-    }
-  });
-
-  // Init admin models.
-  Object.keys(strapi.admin.models || []).forEach(modelName => {
-    let model = strapi.admin.models[modelName];
-
-    // mutate model
-    contentTypesUtils.createContentType(model, { modelName });
-
-    strapi.contentTypes[model.uid] = model;
-  });
-
-  Object.keys(strapi.plugins).forEach(pluginName => {
-    let plugin = strapi.plugins[pluginName];
-    Object.assign(plugin, {
-      controllers: plugin.controllers || [],
-      services: plugin.services || [],
-      models: plugin.models || [],
-    });
-
-    Object.keys(plugin.controllers).forEach(key => {
-      let controller = plugin.controllers[key];
-
-      Object.assign(controller, {
-        identity: controller.identity || key,
-      });
-    });
-
-    Object.keys(plugin.models || []).forEach(modelName => {
-      let model = plugin.models[modelName];
-
-      // mutate model
-      contentTypesUtils.createContentType(model, { modelName }, { pluginName });
-
-      strapi.contentTypes[model.uid] = model;
-    });
-  });
-
-  // Preset config in alphabetical order.
-  strapi.config.middleware.settings = Object.keys(strapi.middleware).reduce((acc, current) => {
-    // Try to find the settings in the current environment, then in the main configurations.
-    const currentSettings = _.merge(
-      _.cloneDeep(_.get(strapi.middleware[current], ['defaults', current], {})),
-      strapi.config.get(['middleware', 'settings', current], {})
-    );
-
-    acc[current] = !_.isObject(currentSettings) ? {} : currentSettings;
-
-    // Ensure that enabled key exist by forcing to false.
-    _.defaults(acc[current], { enabled: false });
-
-    return acc;
-  }, {});
-
-  // default settings
+module.exports = function({ strapi }) {
   strapi.config.port = strapi.config.get('server.port') || strapi.config.port;
   strapi.config.host = strapi.config.get('server.host') || strapi.config.host;
 
-  const { serverUrl, adminUrl, adminPath } = getConfigUrls(strapi.config.get('server'));
+  const { serverUrl, adminUrl, adminPath } = getConfigUrls(strapi.config);
 
   strapi.config.server = strapi.config.server || {};
   strapi.config.server.url = serverUrl;
@@ -127,8 +15,8 @@ module.exports = function(strapi) {
 
   // check if we should serve admin panel
   const shouldServeAdmin = strapi.config.get(
-    'server.admin.serveAdminPanel',
-    strapi.config.serveAdminPanel
+    'admin.serveAdminPanel',
+    strapi.config.get('serveAdminPanel')
   );
 
   if (!shouldServeAdmin) {

package/lib/core/domain/component/index.js

@@ -0,0 +1,24 @@
+'use strict';
+
+const { cloneDeep, camelCase } = require('lodash/fp');
+const { validateComponentDefinition } = require('./validator');
+
+const createComponent = (definition = {}) => {
+  validateComponentDefinition(definition);
+
+  const createdComponent = cloneDeep(definition);
+  const category = camelCase(definition.info.category);
+
+  const uid = `${category}.${definition.info.singularModelName}`;
+
+  Object.assign(createdComponent, {
+    uid,
+    category,
+  });
+
+  return createdComponent;
+};
+
+module.exports = {
+  createComponent,
+};

package/lib/core/domain/component/validator.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const { yup } = require('@strapi/utils');
+
+const componentSchemaValidator = () =>
+  yup.object().shape({
+    info: yup
+      .object()
+      .shape({
+        singularName: yup
+          .string()
+          .isCamelCase()
+          .required(),
+        pluralName: yup
+          .string()
+          .isCamelCase()
+          .required(),
+        displayName: yup.string().required(),
+      })
+      .required(),
+  });
+
+const validateComponentDefinition = data => {
+  return componentSchemaValidator.validateSync(data, { strict: true, abortEarly: false });
+};
+
+module.exports = {
+  validateComponentDefinition,
+};