@strapi/generators 4.0.0-beta.13 → 4.0.0-beta.17

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/content-type.js

@@ -3,6 +3,7 @@
 const { join } = require('path');
 const slugify = require('@sindresorhus/slugify');
 const fs = require('fs-extra');
+const { isKebabCase } = require('@strapi/utils');
 
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
@@ -33,6 +34,10 @@ module.exports = plop => {
           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);
 
@@ -101,21 +106,35 @@ module.exports = plop => {
       }
 
       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/controller.js.hbs',
+            templateFile: 'templates/core-controller.js.hbs',
+            data: { uid },
           },
           {
             type: 'add',
             path: `${filePath}/services/{{singularName}}.js`,
-            templateFile: 'templates/service.js.hbs',
+            templateFile: 'templates/core-service.js.hbs',
+            data: { uid },
           },
           {
             type: 'add',
             path: `${filePath}/routes/{{singularName}}.js`,
-            templateFile: `templates/${slugify(answers.kind)}-routes.js.hbs`,
+            templateFile: `templates/core-router.js.hbs`,
+            data: { uid },
           }
         );
       }

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

@@ -92,6 +92,10 @@ module.exports = async 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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.17",
   "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.13",
+    "@strapi/utils": "4.0.0-beta.17",
     "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": "3a31a96067aa0a74cabf51282215820ba46dd447"
+  "gitHead": "8f9cf3803464d3dbfc8c1090c16bb5f53a60c6c3"
 }