@strapi/generators 4.2.0-beta.1 → 4.2.0-beta.4

package/lib/plops/middleware.js

@@ -3,6 +3,7 @@
 const tsUtils = require('@strapi/typescript-utils');
 
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
+const validateInput = require('./utils/validate-input');
 const getFilePath = require('./utils/get-file-path');
 
 module.exports = plop => {
@@ -14,6 +15,7 @@ module.exports = plop => {
         type: 'input',
         name: 'name',
         message: 'Middleware name',
+        validate: input => validateInput(input),
       },
       ...getDestinationPrompts('middleware', plop.getDestBasePath(), { rootFolder: true }),
     ],

package/lib/plops/plugin.js

@@ -1,7 +1,10 @@
 'use strict';
 
 const chalk = require('chalk');
-const tsUtils = require('@strapi/typescript-utils');
+const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
+const { isKebabCase, toKebabCase } = require('@strapi/utils');
+
+const validateInput = require('./utils/validate-input');
 
 const logInstructions = (pluginName, { language }) => {
   const maxLength = `    resolve: './src/plugins/${pluginName}'`.length;
@@ -37,13 +40,29 @@ module.exports = plop => {
         type: 'input',
         name: 'pluginName',
         message: 'Plugin name',
+        validate: input => validateInput(input),
+      },
+      {
+        type: 'list',
+        name: 'language',
+        message: 'Choose your preferred language',
+        choices: ['Javascript', 'Typescript'],
+        default: 'Javascript',
       },
     ],
     actions(answers) {
-      const currentDir = process.cwd();
-      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
+      const isTypescript = answers.language === 'Typescript';
+      const language = isTypescript ? 'ts' : 'js';
+      const projectLanguage = isUsingTypeScriptSync(process.cwd()) ? 'ts' : 'js';
 
-      // TODO: Adds tsconfig & build command for TS plugins?
+      if (!isKebabCase(answers.pluginName)) {
+        answers.pluginName = toKebabCase(answers.pluginName);
+        console.log(
+          chalk.yellow(
+            `Strapi only supports kebab-cased names for plugins.\nYour plugin has been automatically renamed to "${answers.pluginName}".`
+          )
+        );
+      }
 
       return [
         {
@@ -62,7 +81,7 @@ module.exports = plop => {
           path: 'plugins/{{ pluginName }}/package.json',
           templateFile: `templates/${language}/plugin-package.json.hbs`,
         },
-        () => plop.renderString(logInstructions(answers.pluginName, { language })),
+        () => plop.renderString(logInstructions(answers.pluginName, { language: projectLanguage })),
       ];
     },
   });

package/lib/plops/policy.js

@@ -3,6 +3,7 @@
 const tsUtils = require('@strapi/typescript-utils');
 
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
+const validateInput = require('./utils/validate-input');
 const getFilePath = require('./utils/get-file-path');
 
 module.exports = plop => {
@@ -14,6 +15,7 @@ module.exports = plop => {
         type: 'input',
         name: 'id',
         message: 'Policy name',
+        validate: input => validateInput(input),
       },
       ...getDestinationPrompts('policy', plop.getDestBasePath(), { rootFolder: true }),
     ],

package/lib/plops/utils/__tests__/get-file-path.test.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const getFilePath = require('../get-file-path');
+
+describe('Get-File-Path util', () => {
+  test('with destination set as api', () => {
+    const filePath = getFilePath('api');
+    expect(filePath).toBe(`api/{{ api }}`);
+  });
+
+  test('with destination set as plugin', () => {
+    const filePath = getFilePath('plugin');
+    expect(filePath).toBe(`plugins/{{ plugin }}/server`);
+  });
+
+  test('with destination set as root', () => {
+    const filePath = getFilePath('root');
+    expect(filePath).toBe(`./`);
+  });
+
+  test('with empty destination string', () => {
+    const filePath = getFilePath('');
+    expect(filePath).toBe(`api/{{ id }}`);
+  });
+});

package/lib/templates/js/plugin-package.json.hbs

@@ -4,8 +4,9 @@
   "description": "This is the description of the plugin.",
   "strapi": {
     "name": "{{ pluginName }}",
-    "description": "Description of {{ pluginName }} plugin",
-    "kind": "plugin"
+    "description": "Description of {{titleCase pluginName }} plugin",
+    "kind": "plugin",
+    "displayName": "{{titleCase pluginName }}"
   },
   "dependencies": {},
   "author": {
@@ -17,7 +18,7 @@
     }
   ],
   "engines": {
-    "node": ">=12.x.x <=16.x.x",
+    "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
   "license": "MIT"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "4.2.0-beta.1",
+  "version": "4.2.0-beta.4",
   "description": "Interactive API generator.",
   "keywords": [
     "strapi",
@@ -30,8 +30,8 @@
   "main": "lib/index.js",
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/typescript-utils": "4.2.0-beta.1",
-    "@strapi/utils": "4.2.0-beta.1",
+    "@strapi/typescript-utils": "4.2.0-beta.4",
+    "@strapi/utils": "4.2.0-beta.4",
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
     "node-plop": "0.26.3",
@@ -39,8 +39,8 @@
     "pluralize": "8.0.0"
   },
   "engines": {
-    "node": ">=12.22.0 <=16.x.x",
+    "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "4fa2804f35e15ed72dfd309fb5bb1c4dba18932f"
+  "gitHead": "5caff35a30e33b7a660eb946299f9e3d2d35b2b8"
 }