@strapi/generators 4.0.0-beta.12 → 4.0.0-beta.16

package/lib/files/plugin/server/controllers/my-controller.js.hbs

@@ -3,7 +3,7 @@
 module.exports = {
   index(ctx) {
     ctx.body = strapi
-      .plugin('{{ id }}')
+      .plugin('{{ pluginName }}')
       .service('myService')
       .getWelcomeMessage();
   },

package/lib/plops/api.js

@@ -43,30 +43,9 @@ module.exports = plop => {
           return pluginsDirContent;
         },
       },
-      {
-        type: 'list',
-        name: 'kind',
-        message: 'Please choose the model type',
-        default: 'collectionType',
-        choices: [
-          { name: 'Collection Type', value: 'collectionType' },
-          { name: 'Singe Type', value: 'singleType' },
-        ],
-      },
-      {
-        type: 'confirm',
-        name: 'useDraftAndPublish',
-        default: false,
-        message: 'Use draft and publish?',
-      },
     ],
     actions(answers) {
-      let filePath;
-      if (answers.isPluginApi && answers.plugin) {
-        filePath = `plugins/{{plugin}}`;
-      } else {
-        filePath = `api/{{id}}`;
-      }
+      const filePath = answers.isPluginApi && answers.plugin ? 'plugins/{{plugin}}' : 'api/{{id}}';
 
       const baseActions = [
         {
@@ -74,11 +53,6 @@ module.exports = plop => {
           path: `${filePath}/controllers/{{id}}.js`,
           templateFile: 'templates/controller.js.hbs',
         },
-        {
-          type: 'add',
-          path: `${filePath}/content-types/{{id}}/schema.json`,
-          templateFile: 'templates/content-type.schema.json.hbs',
-        },
         {
           type: 'add',
           path: `${filePath}/services/{{id}}.js`,
@@ -90,16 +64,11 @@ module.exports = plop => {
         return baseActions;
       }
 
-      const routeType =
-        answers.kind === 'singleType'
-          ? 'single-type-routes.js.hbs'
-          : 'collection-type-routes.js.hbs';
-
       return [
         {
           type: 'add',
           path: `${filePath}/routes/{{id}}.js`,
-          templateFile: `templates/${routeType}`,
+          templateFile: `templates/single-route.js.hbs`,
         },
         ...baseActions,
       ];

package/lib/plops/content-type.js

@@ -1,168 +1,66 @@
 'use strict';
 
-const pluralize = require('pluralize');
+const { join } = require('path');
 const slugify = require('@sindresorhus/slugify');
+const fs = require('fs-extra');
 const { isKebabCase } = require('@strapi/utils');
 
-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');
-
-const DEFAULT_TYPES = [
-  // advanced types
-  'media',
-
-  // scalar types
-  'string',
-  'text',
-  'richtext',
-  'json',
-  'enumeration',
-  'password',
-  'email',
-  'integer',
-  'biginteger',
-  'float',
-  'decimal',
-  'date',
-  'time',
-  'datetime',
-  'timestamp',
-  'boolean',
-];
-
-const promptConfigQuestions = (plop, inquirer) => {
-  return inquirer.prompt([
-    {
-      type: 'input',
-      name: 'displayName',
-      message: 'Content type display name',
-      validate: input => !!input,
-    },
-    {
-      type: 'input',
-      name: 'singularName',
-      message: 'Content type singular name',
-      default: answers => slugify(answers.displayName),
-      validate(input) {
-        if (!isKebabCase(input)) {
-          return 'Value must be in kebab-case';
-        }
-
-        return true;
-      },
-    },
-    {
-      type: 'input',
-      name: 'pluralName',
-      message: 'Content type plural name',
-      default: answers => pluralize(answers.singularName),
-      validate(input, answers) {
-        if (answers.singularName === input) {
-          return 'Singular and plural names cannot be the same';
-        }
-
-        if (!isKebabCase(input)) {
-          return 'Value must be in kebab-case';
-        }
-
-        return true;
-      },
-    },
-    {
-      type: 'list',
-      name: 'kind',
-      message: 'Please choose the model type',
-      default: 'collectionType',
-      choices: [
-        { name: 'Collection Type', value: 'collectionType' },
-        { name: 'Singe Type', value: 'singleType' },
-      ],
-      validate: input => validateInput(input),
-    },
-    ...getDestinationPrompts('model', plop.getDestBasePath()),
-    {
-      type: 'confirm',
-      name: 'useDraftAndPublish',
-      default: false,
-      message: 'Use draft and publish?',
-    },
-    {
-      type: 'confirm',
-      name: 'addAttributes',
-      message: 'Do you want to add attributes?',
-    },
-  ]);
-};
-
-const promptAttributeQuestions = inquirer => {
-  return inquirer.prompt([
-    {
-      type: 'input',
-      name: 'attributeName',
-      message: 'Name of attribute',
-      validate: input => validateInput(input),
-    },
-    {
-      type: 'list',
-      name: 'attributeType',
-      message: 'What type of attribute',
-      pageSize: DEFAULT_TYPES.length,
-      choices: DEFAULT_TYPES.map(type => {
-        return { name: type, value: type };
-      }),
-    },
-    {
-      when: answers => answers.attributeType === 'enumeration',
-      type: 'input',
-      name: 'enum',
-      message: 'Add values separated by a comma',
-    },
-    {
-      when: answers => answers.attributeType === 'media',
-      type: 'list',
-      name: 'multiple',
-      message: 'Choose media type',
-      choices: [{ name: 'Multiple', value: true }, { name: 'Single', value: false }],
-    },
-    {
-      type: 'confirm',
-      name: 'addAttributes',
-      message: 'Do you want to add another attribute?',
-    },
-  ]);
-};
+const ctNamesPrompts = require('./prompts/ct-names-prompts');
+const kindPrompts = require('./prompts/kind-prompts');
+const draftAndPublishPrompts = require('./prompts/draft-and-publish-prompts');
+const getAttributesPrompts = require('./prompts/get-attributes-prompts');
+const bootstrapApiPrompts = require('./prompts/bootstrap-api-prompts');
 
 module.exports = plop => {
   // Model generator
   plop.setGenerator('content-type', {
     description: 'Generate a content type for an API',
     async prompts(inquirer) {
-      const config = await promptConfigQuestions(plop, inquirer);
-
-      if (!config.addAttributes) {
-        return {
-          ...config,
-          attributes: [],
-        };
-      }
-
-      const attributes = [];
-
-      const genAttribute = async () => {
-        const answers = await promptAttributeQuestions(inquirer);
-
-        attributes.push(answers);
-
-        if (answers.addAttributes) {
-          return genAttribute();
-        }
-      };
-
-      await genAttribute();
+      const config = await inquirer.prompt([
+        ...ctNamesPrompts,
+        ...kindPrompts,
+        ...draftAndPublishPrompts,
+      ]);
+      const attributes = await getAttributesPrompts(inquirer);
+
+      const api = await inquirer.prompt([
+        ...getDestinationPrompts('model', plop.getDestBasePath()),
+        {
+          when: answers => answers.destination === 'new',
+          type: 'input',
+          name: 'id',
+          default: config.singularName,
+          message: 'Name of the new API?',
+          async validate(input) {
+            if (!isKebabCase(input)) {
+              return 'Value must be in kebab-case';
+            }
+
+            const apiPath = join(plop.getDestBasePath(), 'api');
+            const exists = await fs.pathExists(apiPath);
+
+            if (!exists) {
+              return true;
+            }
+
+            const apiDir = await fs.readdir(apiPath, { withFileTypes: true });
+            const apiDirContent = apiDir.filter(fd => fd.isDirectory());
+
+            if (apiDirContent.findIndex(api => api.name === input) !== -1) {
+              throw new Error('This name is already taken.');
+            }
+
+            return true;
+          },
+        },
+        ...bootstrapApiPrompts,
+      ]);
 
       return {
         ...config,
+        ...api,
         attributes,
       };
     },
@@ -184,17 +82,19 @@ module.exports = plop => {
 
       const filePath = getFilePath(answers.destination);
 
-      return [
+      const baseActions = [
         {
           type: 'add',
           path: `${filePath}/content-types/{{ singularName }}/schema.json`,
           templateFile: 'templates/content-type.schema.json.hbs',
           data: {
-            id: answers.singularName,
             collectionName: slugify(answers.pluralName, { separator: '_' }),
           },
         },
-        {
+      ];
+
+      if (attributes.lenght > 0) {
+        baseActions.push({
           type: 'modify',
           path: `${filePath}/content-types/{{ singularName }}/schema.json`,
           transform(template) {
@@ -202,8 +102,44 @@ module.exports = plop => {
             parsedTemplate.attributes = attributes;
             return JSON.stringify(parsedTemplate, null, 2);
           },
-        },
-      ];
+        });
+      }
+
+      if (answers.bootstrapApi) {
+        const { singularName } = answers;
+
+        let uid;
+        if (answers.destination === 'new') {
+          uid = `api::${answers.id}.${singularName}`;
+        } else if (answers.api) {
+          uid = `api::${answers.api}.${singularName}`;
+        } else if (answers.plugin) {
+          uid = `plugin::${answers.plugin}.${singularName}`;
+        }
+
+        baseActions.push(
+          {
+            type: 'add',
+            path: `${filePath}/controllers/{{singularName}}.js`,
+            templateFile: 'templates/core-controller.js.hbs',
+            data: { uid },
+          },
+          {
+            type: 'add',
+            path: `${filePath}/services/{{singularName}}.js`,
+            templateFile: 'templates/core-service.js.hbs',
+            data: { uid },
+          },
+          {
+            type: 'add',
+            path: `${filePath}/routes/{{singularName}}.js`,
+            templateFile: `templates/core-router.js.hbs`,
+            data: { uid },
+          }
+        );
+      }
+
+      return baseActions;
     },
   });
 };

package/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');
 

package/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

package/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

package/lib/plops/prompts/bootstrap-api-prompts.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = [
+  {
+    type: 'confirm',
+    name: 'bootstrapApi',
+    default: true,
+    message: 'Bootstrap API related files?',
+  },
+];

package/lib/plops/prompts/ct-names-prompts.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const pluralize = require('pluralize');
+const slugify = require('@sindresorhus/slugify');
+const { isKebabCase } = require('@strapi/utils');
+
+module.exports = [
+  {
+    type: 'input',
+    name: 'displayName',
+    message: 'Content type display name',
+    validate: input => !!input,
+  },
+  {
+    type: 'input',
+    name: 'singularName',
+    message: 'Content type singular name',
+    default: answers => slugify(answers.displayName),
+    validate(input) {
+      if (!isKebabCase(input)) {
+        return 'Value must be in kebab-case';
+      }
+
+      return true;
+    },
+  },
+  {
+    type: 'input',
+    name: 'pluralName',
+    message: 'Content type plural name',
+    default: answers => pluralize(answers.singularName),
+    validate(input, answers) {
+      if (answers.singularName === input) {
+        return 'Singular and plural names cannot be the same';
+      }
+
+      if (!isKebabCase(input)) {
+        return 'Value must be in kebab-case';
+      }
+
+      return true;
+    },
+  },
+];

package/lib/plops/prompts/draft-and-publish-prompts.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = [
+  {
+    type: 'confirm',
+    name: 'useDraftAndPublish',
+    default: false,
+    message: 'Use draft and publish?',
+  },
+];

package/lib/plops/prompts/get-attributes-prompts.js

@@ -0,0 +1,102 @@
+'use strict';
+
+const validateInput = require('../utils/validate-input');
+
+const DEFAULT_TYPES = [
+  // advanced types
+  'media',
+
+  // scalar types
+  'string',
+  'text',
+  'richtext',
+  'json',
+  'enumeration',
+  'password',
+  'email',
+  'integer',
+  'biginteger',
+  'float',
+  'decimal',
+  'date',
+  'time',
+  'datetime',
+  'timestamp',
+  'boolean',
+];
+
+/**
+ * @param {import('inquirer').Inquirer} inquirer
+ * @returns {Promise<Record<string, string>[]>}
+ */
+module.exports = async inquirer => {
+  const { addAttributes } = await inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'addAttributes',
+      message: 'Do you want to add attributes?',
+    },
+  ]);
+
+  const attributes = [];
+
+  /**
+   * @param {import('inquirer').Inquirer} inquirer
+   * @returns {Promise<void>}
+   */
+  const createNewAttributes = async inquirer => {
+    const answers = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'attributeName',
+        message: 'Name of attribute',
+        validate: input => validateInput(input),
+      },
+      {
+        type: 'list',
+        name: 'attributeType',
+        message: 'What type of attribute',
+        pageSize: DEFAULT_TYPES.length,
+        choices: DEFAULT_TYPES.map(type => {
+          return { name: type, value: type };
+        }),
+      },
+      {
+        when: answers => answers.attributeType === 'enumeration',
+        type: 'input',
+        name: 'enum',
+        message: 'Add values separated by a comma',
+      },
+      {
+        when: answers => answers.attributeType === 'media',
+        type: 'list',
+        name: 'multiple',
+        message: 'Choose media type',
+        choices: [{ name: 'Multiple', value: true }, { name: 'Single', value: false }],
+      },
+      {
+        type: 'confirm',
+        name: 'addAttributes',
+        message: 'Do you want to add another attribute?',
+      },
+    ]);
+
+    attributes.push(answers);
+
+    if (!answers.addAttributes) {
+      return;
+    }
+
+    await createNewAttributes(inquirer);
+  };
+
+  if (addAttributes) {
+    await createNewAttributes(inquirer);
+  } else {
+    console.warn(
+      `You won't be able to manage entries from the admin, you can still add attributes later from the content type builder.`
+    );
+  }
+
+  return attributes;
+};

package/lib/plops/prompts/kind-prompts.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const validateInput = require('../utils/validate-input');
+
+module.exports = [
+  {
+    type: 'list',
+    name: 'kind',
+    message: 'Please choose the model type',
+    default: 'collectionType',
+    choices: [
+      { name: 'Collection Type', value: 'collectionType' },
+      { name: 'Single Type', value: 'singleType' },
+    ],
+    validate: input => validateInput(input),
+  },
+];

package/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 => {

package/lib/templates/collection-type-routes.js.hbs

@@ -6,6 +6,7 @@ module.exports = {
       handler: '{{id}}.find',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
     {
@@ -14,6 +15,7 @@ module.exports = {
       handler: '{{id}}.findOne',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
     {
@@ -22,6 +24,7 @@ module.exports = {
       handler: '{{id}}.create',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
     {
@@ -30,6 +33,7 @@ module.exports = {
       handler: '{{id}}.update',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
     {
@@ -38,6 +42,7 @@ module.exports = {
       handler: '{{id}}.delete',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
   ],

package/lib/templates/core-controller.js.hbs

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ *  {{ id }} controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('{{ uid }}');

package/lib/templates/core-router.js.hbs

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * {{ id }} router.
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('{{ uid }}');

package/lib/templates/core-service.js.hbs

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * {{ id }} service.
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('{{ uid }}');

package/lib/templates/single-route.js.hbs

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

package/lib/templates/single-type-routes.js.hbs

@@ -6,6 +6,7 @@ module.exports = {
       handler: '{{id}}.find',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
     {
@@ -14,6 +15,7 @@ module.exports = {
       handler: '{{id}}.update',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
     {
@@ -22,6 +24,7 @@ module.exports = {
       handler: '{{id}}.delete',
       config: {
         policies: [],
+        middlewares: [],
       },
     },
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "4.0.0-beta.12",
+  "version": "4.0.0-beta.16",
   "description": "Interactive API generator.",
   "keywords": [
     "strapi",
@@ -30,7 +30,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/utils": "4.0.0-beta.12",
+    "@strapi/utils": "4.0.0-beta.16",
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
     "node-plop": "0.26.3",
@@ -41,5 +41,5 @@
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "67fee6f3d59df974e8770bb123549f972edda905"
+  "gitHead": "71bdfa34637832e8e78a6cf1b57c8c6dbadf133d"
 }