Migrate code and remove auto generation of controller and services in memory

examples/getstarted/src/api/category/controllers/category.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::category.category');

examples/getstarted/src/api/category/routes/category.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::category.category');
-      method: 'GET',
-      path: '/categories',
-      handler: 'category.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/categories/:id',
-      handler: 'category.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/categories',
-      handler: 'category.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/categories/:id',
-      handler: 'category.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/categories/:id',
-      handler: 'category.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/category/services/category.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::category.category');

examples/getstarted/src/api/country/controllers/country.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::country.country');

examples/getstarted/src/api/country/routes/country.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::country.country');
-      method: 'GET',
-      path: '/countries',
-      handler: 'country.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/countries/:id',
-      handler: 'country.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/countries',
-      handler: 'country.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/countries/:id',
-      handler: 'country.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/countries/:id',
-      handler: 'country.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/country/services/country.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::country.country');

examples/getstarted/src/api/homepage/controllers/homepage.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::homepage.homepage');

examples/getstarted/src/api/homepage/routes/homepage.js

@@ -1,30 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::homepage.homepage');
-      method: 'GET',
-      path: '/homepage',
-      handler: 'homepage.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/homepage',
-      handler: 'homepage.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/homepage',
-      handler: 'homepage.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/homepage/services/homepage.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::homepage.homepage');

examples/getstarted/src/api/kitchensink/controllers/kitchensink.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::kitchensink.kitchensink');

examples/getstarted/src/api/kitchensink/routes/kitchensink.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::kitchensink.kitchensink');
-      method: 'GET',
-      path: '/kitchensinks',
-      handler: 'kitchensink.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/kitchensinks/:id',
-      handler: 'kitchensink.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/kitchensinks',
-      handler: 'kitchensink.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/kitchensinks/:id',
-      handler: 'kitchensink.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/kitchensinks/:id',
-      handler: 'kitchensink.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/kitchensink/services/kitchensink.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::kitchensink.kitchensink');

examples/getstarted/src/api/like/controllers/like.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::like.like');

examples/getstarted/src/api/like/routes/like.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::like.like');
-      method: 'GET',
-      path: '/likes',
-      handler: 'like.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/likes/:id',
-      handler: 'like.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/likes',
-      handler: 'like.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/likes/:id',
-      handler: 'like.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/likes/:id',
-      handler: 'like.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/like/services/like.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::like.like');

examples/getstarted/src/api/menu/controllers/menu.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::menu.menu');

examples/getstarted/src/api/menu/routes/menu.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::menu.menu');
-      method: 'GET',
-      path: '/menus',
-      handler: 'menu.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/menus/:id',
-      handler: 'menu.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/menus',
-      handler: 'menu.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/menus/:id',
-      handler: 'menu.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/menus/:id',
-      handler: 'menu.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/menu/services/menu.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::menu.menu');

examples/getstarted/src/api/menusection/controllers/menusection.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::menusection.menusection');

examples/getstarted/src/api/menusection/routes/menusection.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::menusection.menusection');
-      method: 'GET',
-      path: '/menusections',
-      handler: 'menusection.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/menusections/:id',
-      handler: 'menusection.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/menusections',
-      handler: 'menusection.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/menusections/:id',
-      handler: 'menusection.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/menusections/:id',
-      handler: 'menusection.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/menusection/services/menusection.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::menusection.menusection');

examples/getstarted/src/api/restaurant/controllers/restaurant.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::restaurant.restaurant');

examples/getstarted/src/api/restaurant/routes/restaurant.js

@@ -1,47 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  prefix: '/restaurants',
+
-  routes: [
+module.exports = createCoreRouter('api::restaurant.restaurant');
-    {
-      method: 'GET',
-      path: '/',
-      handler: 'restaurant.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/:id',
-      handler: 'restaurant.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/',
-      handler: 'restaurant.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/:id',
-      handler: 'restaurant.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/:id',
-      handler: 'restaurant.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/restaurant/services/restaurant.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::restaurant.restaurant');

examples/getstarted/src/api/review/controllers/review.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::review.review');

examples/getstarted/src/api/review/routes/review.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::review.review');
-      method: 'GET',
-      path: '/reviews',
-      handler: 'review.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/reviews/:id',
-      handler: 'review.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/reviews',
-      handler: 'review.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/reviews/:id',
-      handler: 'review.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/reviews/:id',
-      handler: 'review.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/review/services/review.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::review.review');

examples/getstarted/src/api/tag/controllers/tag.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::tag.tag');

examples/getstarted/src/api/tag/routes/tag.js

@@ -1,46 +1,5 @@
 'use strict';
 
-module.exports = {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-  routes: [
+
-    {
+module.exports = createCoreRouter('api::tag.tag');
-      method: 'GET',
-      path: '/tags',
-      handler: 'tag.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/tags/:id',
-      handler: 'tag.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/tags',
-      handler: 'tag.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/tags/:id',
-      handler: 'tag.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/tags/:id',
-      handler: 'tag.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/tag/services/tag.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::tag.tag');

examples/getstarted/src/api/temp/controllers/temp.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::temp.temp');

examples/getstarted/src/api/temp/routes/temp.js

@@ -1,44 +1,5 @@
-module.exports = {
+'use strict';
-  routes: [
+
-    {
+const { createCoreRouter } = require('@strapi/strapi').factories;
-      method: 'GET',
+
-      path: '/temps',
+module.exports = createCoreRouter('api::temp.temp');
-      handler: 'temp.find',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'GET',
-      path: '/temps/:id',
-      handler: 'temp.findOne',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'POST',
-      path: '/temps',
-      handler: 'temp.create',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'PUT',
-      path: '/temps/:id',
-      handler: 'temp.update',
-      config: {
-        policies: [],
-      },
-    },
-    {
-      method: 'DELETE',
-      path: '/temps/:id',
-      handler: 'temp.delete',
-      config: {
-        policies: [],
-      },
-    },
-  ],
-};

examples/getstarted/src/api/temp/services/temp.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::temp.temp');

packages/core/strapi/lib/core/registries/apis.js

@@ -1,8 +1,6 @@
 'use strict';
 
 const { has } = require('lodash/fp');
-const { createService } = require('../../core-api/service');
-const { createController } = require('../../core-api/controller');
 
 const apisRegistry = strapi => {
   const apis = {};
@@ -21,22 +19,6 @@ const apisRegistry = strapi => {
 
       const api = strapi.container.get('modules').add(`api::${apiName}`, apiConfig);
 
-      for (const ctName in api.contentTypes || {}) {
-        const contentType = api.contentTypes[ctName];
-
-        const uid = `api::${apiName}.${ctName}`;
-
-        if (!has(contentType.modelName, api.services)) {
-          const service = createService({ contentType });
-          strapi.container.get('services').set(uid, service);
-        }
-
-        if (!has(contentType.modelName, api.controllers)) {
-          const controller = createController({ contentType });
-          strapi.container.get('controllers').set(uid, controller);
-        }
-      }
-
       apis[apiName] = api;
 
       return apis[apiName];

packages/core/strapi/lib/factories.d.ts

@@ -1,5 +1,7 @@
 import { Service } from './core-api/service';
 import { Controller } from './core-api/controller';
+import { Middleware } from './middlewares';
+import { Policy } from './core/registries/policies';
 
 type ControllerConfig = Controller;
 
@@ -7,8 +9,8 @@ type ServiceConfig = Service;
 
 type HandlerConfig = {
   auth: false | { scope: string[] };
-  policies: string[];
+  policies: Array<string | Policy>;
-  middlewares: string[];
+  middlewares: Array<string | Middleware>;
 };
 
 type SingleTypeRouterConfig = {

packages/core/strapi/lib/middlewares/index.d.ts

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