new-s-block 1.0.0 → 1.0.5

package/bin/cli.js

@@ -29,6 +29,11 @@ function splitKeywords(blockName) {
   return blockName.split('-').filter(Boolean);
 }
 
+// "new-block" -> "st_new_block_inner"
+function toInnerClass(blockName) {
+  return 'st_' + blockName.replace(/-/g, '_') + '_inner';
+}
+
 function ensureDir(dirPath) {
   if (!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath, { recursive: true });
@@ -71,9 +76,9 @@ async function main() {
     }
   }
 
-  // 2. Block label
+  // 2. Block title
   const defaultLabel = toTitleCase(blockName);
-  const labelRaw     = await prompt(rl, 'Block label [' + defaultLabel + ']: ');
+  const labelRaw     = await prompt(rl, 'Block title [' + defaultLabel + ']: ');
   const blockLabel   = labelRaw.trim() || defaultLabel;
 
   // 3. Description
@@ -88,21 +93,25 @@ async function main() {
 
   // 5. Blocks folder
   const folderRaw = await prompt(rl, 'Blocks folder [blocks]: ');
-  const blocksDir = 'blocks/' + (folderRaw.trim() || '');
 
   rl.close();
 
   // ── Resolve paths ────────────────────────────────────────────────────────
 
-  // Normalise: strip any trailing slash and duplicate 'blocks/' the user may have typed
-  const subFolder  = folderRaw.trim().replace(/^blocks[\/\\]?/i, '').replace(/[\/\\]+$/, '');
-  const blockDir   = subFolder
+  // Strip any trailing slash and leading 'blocks/' the user may have typed
+  const subFolder = folderRaw.trim().replace(/^blocks[\/\\]?/i, '').replace(/[\/\\]+$/, '');
+  const blockDir  = subFolder
     ? path.join(cwd, 'blocks', subFolder, blockName)
     : path.join(cwd, 'blocks', blockName);
 
+  // Relative block path from 'blocks/' used in end messages e.g. "cards/new-block"
+  const blockRelPath = subFolder ? subFolder + '/' + blockName : blockName;
+
   const renderFile    = path.join(blockDir, blockName + '.php');
   const blockJsonFile = path.join(blockDir, 'block.json');
-  const scssFile      = path.join(cwd, 'assets', 'sass', 'blocks', blockName + '.scss');
+  const scssFile      = subFolder
+    ? path.join(cwd, 'assets', 'sass', 'blocks', subFolder, blockName + '.scss')
+    : path.join(cwd, 'assets', 'sass', 'blocks', blockName + '.scss');
 
   if (fs.existsSync(blockDir)) {
     console.error('\n\u274C  Block folder already exists: ' + path.relative(cwd, blockDir) + '\n');
@@ -119,12 +128,10 @@ async function main() {
   var autoKeywords = splitKeywords(blockName);
   autoKeywords.push('stier');
   var allKeywords = autoKeywords.concat(extraKeywords);
-  // Deduplicate
   allKeywords = allKeywords.filter(function (v, i, a) { return a.indexOf(v) === i; });
 
   var keywordsJson = '["' + allKeywords.join('", "') + '"]';
 
-  // Build block.json as a string to keep keywords on one line
   const blockJsonStr = '{\n' +
     '    "name": "acf/' + blockName + '",\n' +
     '    "title": "' + blockLabel + '",\n' +
@@ -147,12 +154,12 @@ async function main() {
 
   // ── render.php ───────────────────────────────────────────────────────────
 
-  const innerClass = 'st' + blockName.replace(/-/g, '') + '_inner';
+  const innerClass = toInnerClass(blockName);
 
   const renderPhp = '<?php\n' +
     "$padding = get_field('padding');\n" +
     '\n' +
-    "$class = 'st_block st_" + blockName + "';\n" +
+    "$class = 'st_block st_" + blockName.replace(/-/g, '_') + "';\n" +
     "if ( ! empty( $block['className'] ) ) {\n" +
     "    $class .= ' ' . $block['className'];\n" +
     '}\n' +
@@ -179,28 +186,29 @@ async function main() {
 
   // ── block-name.scss ──────────────────────────────────────────────────────
 
-  const scssContent = '.st_' + blockName + ' {\n\n}\n';
+  const scssContent = '.st_' + blockName.replace(/-/g, '_') + ' {\n\n}\n';
 
   writeFile(scssFile, scssContent);
 
   // ── Summary ──────────────────────────────────────────────────────────────
 
+  var cyan  = '\x1b[36m';
+  var reset = '\x1b[0m';
+
   console.log('\n\u2705  Block "' + blockLabel + '" created successfully!\n');
   console.log('   \uD83D\uDCC1 ' + path.relative(cwd, blockDir) + '/');
   console.log('      \u251C\u2500\u2500 block.json');
   console.log('      \u2514\u2500\u2500 ' + blockName + '.php');
-  console.log('   \uD83D\uDCC1 assets/sass/blocks/');
+  var sassDisplay = subFolder ? 'assets/sass/blocks/' + subFolder + '/' : 'assets/sass/blocks/';
+  console.log('   \uD83D\uDCC1 ' + sassDisplay);
   console.log('      \u2514\u2500\u2500 ' + blockName + '.scss');
   console.log('');
-  var cyan  = '\x1b[36m';
-  var reset = '\x1b[0m';
-  console.log('');
-  console.log("   Don't forget to add " + cyan + "@import 'blocks/" + blockName + "';" + reset + " in 'assets/sass/theme.scss'");
-  console.log("   Don't forget to add " + cyan + "register_block_type( __DIR__ . '/../blocks/" + blockName + "' );" + reset + " in 'includes/template-functions.php'");
+  console.log("   Don't forget to add " + cyan + "@import 'blocks/" + (subFolder ? subFolder + '/' : '') + blockName + "';" + reset + " in 'assets/sass/theme.scss'");
+  console.log("   Don't forget to add " + cyan + "register_block_type( __DIR__ . '/../blocks/" + blockRelPath + "' );" + reset + " in 'includes/template-functions.php'");
   console.log('');
 }
 
 main().catch(function (err) {
   console.error('\n\u274C  Error: ' + err.message);
   process.exit(1);
-});
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "new-s-block",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "description": "CLI tool to scaffold ACF Gutenberg blocks",
   "bin": {
     "new-s-block": "./bin/cli.js"