update route generation

packages/core/content-type-builder/server/services/content-types.js

@@ -122,9 +122,22 @@ const createContentType = async ({ contentType, components = [] }, options = {})
  * Generate an API squeleton
  * @param {string} name
  */
-const generateAPI = ({ singularName, kind = 'collectionType' }) => {
+const generateAPI = ({ singularName, kind = 'collectionType', pluralName, displayName }) => {
   const strapiGenerators = require('@strapi/generators');
-  return strapiGenerators.generate('api', { id: singularName, kind }, { dir: strapi.dirs.root });
+  return strapiGenerators.generate(
+    'api',
+    {
+      id: singularName,
+      kind,
+      singularName,
+      pluralName,
+      displayName,
+      createContentType: true,
+      generateDefaultRoutes: true,
+      attributes: [],
+    },
+    { dir: strapi.dirs.root }
+  );
 };
 
 /**

packages/generators/generators/lib/plops/api.js

@@ -3,10 +3,11 @@
 const { join } = require('path');
 const fs = require('fs-extra');
 const validateInput = require('./utils/validate-input');
-const getCtNamesPrompts = require('./utils/get-ct-names-prompts');
+const getCtNamesPrompts = require('./prompts/get-ct-names-prompts');
-const getKindPrompts = require('./utils/get-kind-prompts');
+const getKindPrompts = require('./prompts/get-kind-prompts');
-const getDraftAndPublishPrompts = require('./utils/get-draft-and-publish-prompts');
+const getDraftAndPublishPrompts = require('./prompts/get-draft-and-publish-prompts');
-const getAttributesPrompts = require('./utils/get-attributes-prompts');
+const getAttributesPrompts = require('./prompts/get-attributes-prompts');
+const getDefaultRoutesPrompts = require('./prompts/get-default-routes-prompts');
 
 module.exports = plop => {
   // API generator
@@ -48,26 +49,10 @@ module.exports = plop => {
             return pluginsDirContent;
           },
         },
-        {
-          type: 'list',
-          name: 'kind',
-          message: 'Please choose the model type',
-          default: 'collectionType',
-          choices: [
-            { name: 'Collection Type', value: 'collectionType' },
-            { name: 'Single Type', value: 'singleType' },
-          ],
-        },
-        {
-          type: 'confirm',
-          name: 'useDraftAndPublish',
-          default: false,
-          message: 'Use draft and publish?',
-        },
         {
           type: 'confirm',
           name: 'createContentType',
-          default: false,
+          default: true,
           message: 'Create a content-type?',
         },
       ]);
@@ -82,6 +67,7 @@ module.exports = plop => {
           ...getCtNamesPrompts,
           ...getKindPrompts,
           ...getDraftAndPublishPrompts,
+          ...getDefaultRoutesPrompts,
         ])),
         attributes: await getAttributesPrompts(inquirer),
       };
@@ -111,33 +97,41 @@ module.exports = plop => {
         return baseActions;
       }
 
+      if (!answers.createContentType) {
+        return [
+          {
+            type: 'add',
+            path: `${filePath}/routes/{{id}}.js`,
+            templateFile: `templates/single-route.js.hbs`,
+          },
+          ...baseActions,
+        ];
+      }
+
+      if (answers.generateDefaultRoutes) {
         const routeType =
           answers.kind === 'singleType'
             ? 'single-type-routes.js.hbs'
             : 'collection-type-routes.js.hbs';
 
-      if (answers.createContentType) {
+        baseActions.push({
-        baseActions.push(
-          ...(answers.isPluginApi && answers.plugin
-            ? plop.getGenerator('content-type').actions({
-                ...answers,
-                destination: 'plugin',
-                plugin: answers.id,
-              })
-            : plop.getGenerator('content-type').actions({
-                ...answers,
-                destination: 'new',
-              }))
-        );
-      }
-
-      return [
-        {
           type: 'add',
           path: `${filePath}/routes/{{id}}.js`,
           templateFile: `templates/${routeType}`,
-        },
+        });
+      }
+
+      const destination =
+        answers.isPluginApi && answers.plugin
+          ? { destination: 'plugin', plugin: answers.id }
+          : { destination: 'new' };
+
+      return [
         ...baseActions,
+        ...plop.getGenerator('content-type').actions({
+          ...answers,
+          ...destination,
+        }),
       ];
     },
   });

packages/generators/generators/lib/plops/content-type.js

@@ -2,12 +2,12 @@
 
 const slugify = require('@sindresorhus/slugify');
 
-const getDestinationPrompts = require('./utils/get-destination-prompts');
+const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
-const getCtNamesPrompts = require('./utils/get-ct-names-prompts');
+const getCtNamesPrompts = require('./prompts/get-ct-names-prompts');
-const getKindPrompts = require('./utils/get-kind-prompts');
+const getKindPrompts = require('./prompts/get-kind-prompts');
-const getDraftAndPublishPrompts = require('./utils/get-draft-and-publish-prompts');
+const getDraftAndPublishPrompts = require('./prompts/get-draft-and-publish-prompts');
-const getAttributesPrompts = require('./utils/get-attributes-prompts');
+const getAttributesPrompts = require('./prompts/get-attributes-prompts');
 
 module.exports = plop => {
   // Model generator

packages/generators/generators/lib/plops/controller.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const getDestinationPrompts = require('./utils/get-destination-prompts');
+const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
 const validateInput = require('./utils/validate-input');
 

packages/generators/generators/lib/plops/middleware.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const getDestinationPrompts = require('./utils/get-destination-prompts');
+const getDestinationPrompts = require('./prompts/get-destination-prompts');
 
 module.exports = plop => {
   // middleware generator

packages/generators/generators/lib/plops/policy.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const getDestinationPrompts = require('./utils/get-destination-prompts');
+const getDestinationPrompts = require('./prompts/get-destination-prompts');
 
 module.exports = plop => {
   // Policy generator

packages/generators/generators/lib/plops/prompts/get-attributes-prompts.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const validateInput = require('./validate-input');
+const validateInput = require('../utils/validate-input');
 
 const DEFAULT_TYPES = [
   // advanced types

packages/generators/generators/lib/plops/prompts/get-default-routes-prompts.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = [
+  {
+    type: 'confirm',
+    name: 'generateDefaultRoutes',
+    default: true,
+    message: 'Generate default routes?',
+  },
+];

packages/generators/generators/lib/plops/prompts/get-kind-prompts.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const validateInput = require('./validate-input');
+const validateInput = require('../utils/validate-input');
 
 module.exports = [
   {

packages/generators/generators/lib/plops/service.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const getDestinationPrompts = require('./utils/get-destination-prompts');
+const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
 
 module.exports = plop => {

packages/generators/generators/lib/templates/single-route.js.hbs

@@ -0,0 +1,12 @@
+module.exports = {
+  routes: [
+    // {
+    //  method: 'GET',
+    //  path: '/{{id}}',
+    //  handler: '{{id}}.exampleAction',
+    //  config: {
+    //    policies: [],
+    //  },
+    // },
+  ],
+};