create-berna-stencil 1.0.51 → 1.0.53

package/.eleventy.js

@@ -4,7 +4,7 @@ const Image = require("@11ty/eleventy-img");
 const fs = require("fs");
 const path = require("path");
 
-const OUTPUT_DIR = "out";
+const OUTPUT_DIR = "c:/laragon/www/Berna-Stencil-out";
 
 module.exports = function (eleventyConfig) {
 

package/_tools/assistant.js

@@ -2,6 +2,8 @@ const readline = require('readline');
 const { addPage, removePage, renamePage } = require('./modules/updatePage');
 const { updateOutputPath, getCurrentOutputPath } = require('./modules/updateOutputPath');
 
+// --- Setup ---
+
 const readerInterface = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -10,86 +12,96 @@ const readerInterface = readline.createInterface({
 
 const PROTECTED_PAGES = ['homepage', '404'];
 
+// --- Utility ---
+
+// Converts any string to kebab-case
 function toKebabCase(str) {
     return str.trim().toLowerCase()
         .replace(/[\s_]+/g, '-')
         .replace(/-+/g, '-');
 }
 
-function handleCreateRequest() {
-    readerInterface.question('\n> Enter the name of the new page: ', (inputName) => {
-        const kebabName = toKebabCase(inputName);
-        if (!kebabName) {
-            console.log('(!) Invalid name.');
-        } else if (/^\d/.test(kebabName)) {
-            console.log('(!) Invalid name. Page name cannot start with a number.');
-        } else if (PROTECTED_PAGES.includes(kebabName)) {
-            console.log(`(!) "${kebabName}" is a protected page and cannot be created.`);
-        } else {
-            addPage(kebabName, null);
-        }
-        displayMainMenu();
-    });
+// Returns an error message if the name is invalid, null otherwise
+function validatePageName(name) {
+    if (!name)                      return 'Invalid name.';
+    if (/^\d/.test(name))           return 'Page name cannot start with a number.';
+    if (PROTECTED_PAGES.includes(name)) return `"${name}" is a protected page name.`;
+    return null;
+}
+
+// Wraps readerInterface.question in a Promise for use with async/await
+function ask(prompt) {
+    return new Promise(resolve =>
+        readerInterface.question(prompt, answer => resolve(answer))
+    );
+}
+
+// Asks for a page name, converts it to kebab-case, validates it,
+// logs the error and returns null if invalid
+async function askPageName(prompt) {
+    const raw = await ask(prompt);
+    const name = toKebabCase(raw);
+    const error = validatePageName(name);
+    if (error) {
+        console.log(`(!) ${error}`);
+        return null;
+    }
+    return name;
+}
+
+// --- Handlers ---
+
+async function handleCreateRequest() {
+    const name = await askPageName('\n> Enter the name of the new page: ');
+    if (name) addPage(name, null);
 }
 
-function handleRenameRequest() {
-    readerInterface.question('\n> Enter the name of the page to rename: ', (inputOld) => {
-        const oldName = toKebabCase(inputOld);
-        if (!oldName) {
-            console.log('(!) Invalid name.');
-            return displayMainMenu();
-        }
-        if (PROTECTED_PAGES.includes(oldName)) {
-            console.log(`(!) "${oldName}" is a protected page and cannot be renamed.`);
-            return displayMainMenu();
-        }
-        readerInterface.question('> enter the new name: ', (inputNew) => {
-            const newName = toKebabCase(inputNew);
-            if (!newName) {
-                console.log('(!) invalid name.');
-            } else if (/^\d/.test(newName)) {
-                console.log('(!) Invalid name. Page name cannot start with a number.');
-            } else if (PROTECTED_PAGES.includes(newName)) {
-                console.log(`(!) "${newName}" is a protected page name.`);
-            } else if (oldName === newName) {
-                console.log('(!) Old and new name are the same.');
-            } else {
-                renamePage(oldName, newName);
-            }
-            displayMainMenu();
-        });
-    });
+async function handleRemoveRequest() {
+    const name = await askPageName('\n> Enter the name of the page to remove: ');
+    if (name) removePage(name);
 }
 
-function handleRemoveRequest() {
-    readerInterface.question('\n> Enter the name of the page to remove: ', (inputName) => {
-        const kebabName = toKebabCase(inputName);
-        if (!kebabName) {
-            console.log('(!) Invalid name.');
-        } else if (PROTECTED_PAGES.includes(kebabName)) {
-            console.log(`(!) "${kebabName}" Is a protected page and cannot be removed.`);
-        } else {
-            removePage(kebabName);
-        }
-        displayMainMenu();
-    });
+async function handleRenameRequest() {
+    const oldName = await askPageName('\n> Enter the name of the page to rename: ');
+    if (!oldName) return;
+
+    const newName = await askPageName('> Enter the new name: ');
+    if (!newName) return;
+
+    // Extra check: old and new name must differ
+    if (oldName === newName) {
+        console.log('(!) Old and new name are the same.');
+        return;
+    }
+
+    renamePage(oldName, newName);
 }
 
-function handleOutputPathRequest() {
+async function handleOutputPathRequest() {
     const current = getCurrentOutputPath();
-    const currentLabel = current ? ` Current path: "${current}"` : '';
-
-    readerInterface.question(`${currentLabel}\n Enter the new output path: `, (inputPath) => {
-        if (!inputPath.trim()) {
-            console.log('(!) Invalid path.');
-        } else {
-            updateOutputPath(inputPath);
-        }
-        displayMainMenu();
-    });
+    const label = current ? ` Current path: "${current}"\n` : '';
+    const input = await ask(`${label} Enter the new output path: `);
+
+    if (!input.trim()) {
+        console.log('(!) Invalid path.');
+    } else {
+        updateOutputPath(input);
+    }
 }
 
-function displayMainMenu() {
+// --- Menu ---
+
+// Maps each menu choice to its handler function
+const MENU_ACTIONS = {
+    '1': handleCreateRequest,
+    '2': handleRemoveRequest,
+    '3': handleRenameRequest,
+    '4': handleOutputPathRequest,
+};
+
+// Displays the menu, waits for input, executes the chosen action,
+// then calls itself again to keep the CLI alive (async recursion, no stack buildup)
+async function displayMainMenu() {
     console.log('\n========================');
     console.log('  Berna-Stencil CLI      ');
     console.log('========================\n');
@@ -99,24 +111,23 @@ function displayMainMenu() {
     console.log('4. Configure output path');
     console.log('\nCTRL/CMD + C to exit');
 
-    readerInterface.question('\nChoose an option: ', (choice) => {
-        const cleanChoice = choice.trim();
-        if (cleanChoice === '1') {
-            handleCreateRequest();
-        } else if (cleanChoice === '2') {
-            handleRemoveRequest();
-        } else if (cleanChoice === '3') {
-            handleRenameRequest();
-        } else if (cleanChoice === '4') {
-            handleOutputPathRequest();
-        } else if (cleanChoice === '0') {
-            readerInterface.close();
-            process.exit(0);
-        } else {
-            console.log('(!) Invalid option.');
-            displayMainMenu();
-        }
-    });
+    const choice = (await ask('\nChoose an option: ')).trim();
+
+    if (choice === '0') {
+        readerInterface.close();
+        process.exit(0);
+    }
+
+    const action = MENU_ACTIONS[choice];
+    if (action) {
+        await action();
+    } else {
+        console.log('(!) Invalid option.');
+    }
+
+    // Recurse to redisplay the menu after each action.
+    // Safe because each iteration fully resolves before the next one starts.
+    displayMainMenu();
 }
 
 displayMainMenu();

package/_tools/modules/updateData.js

@@ -1,16 +1,46 @@
 const fileSystem = require('fs');
+
 const SITE_DATA_PATH = 'src/frontend/data/site.json';
 
+// --- Utility ---
+
+// Converts a kebab-case string to camelCase
+// slice(1) removes the delimiter character reliably, avoiding the regex flag bug
+// of a double replace('-', '') without the /g flag
 function toCamelCase(str) {
     return str.toLowerCase().replace(/[-_][a-z0-9]/g, (group) =>
-        group.toUpperCase().replace('-', '').replace('_', '')
+        group.slice(1).toUpperCase()
     );
 }
 
+// Converts a kebab-case page name to a human-readable title
+// e.g. "about-us" → "About Us"
+function toNiceTitle(pageName) {
+    return pageName
+        .split('-')
+        .map(w => w.charAt(0).toUpperCase() + w.slice(1))
+        .join(' ');
+}
+
+// Returns the parsed site.json content, or null if the file doesn't exist
+function readSiteData() {
+    if (!fileSystem.existsSync(SITE_DATA_PATH)) return null;
+    return JSON.parse(fileSystem.readFileSync(SITE_DATA_PATH, 'utf8'));
+}
+
+// Serializes and writes the data object back to site.json
+function writeSiteData(data) {
+    fileSystem.writeFileSync(SITE_DATA_PATH, JSON.stringify(data, null, 2));
+}
+
+// --- Public API ---
+
+// Adds a new page record to site.json
+// Skips silently if the file doesn't exist or the record is already present
 function addSiteData(pageName) {
-    if (!fileSystem.existsSync(SITE_DATA_PATH)) return;
+    const data = readSiteData();
+    if (!data) return;
 
-    const data = JSON.parse(fileSystem.readFileSync(SITE_DATA_PATH, 'utf8'));
     const camelName = toCamelCase(pageName);
 
     if (data.pages[camelName]) {
@@ -18,15 +48,11 @@ function addSiteData(pageName) {
         return;
     }
 
-    const niceTitle = pageName
-        .split('-')
-        .map(w => w.charAt(0).toUpperCase() + w.slice(1))
-        .join(' ');
-
+    // Build the default page record with SEO metadata and empty CDN arrays
     data.pages[camelName] = {
         seo: {
-            title: niceTitle,
-            description: "description",
+            title: toNiceTitle(pageName),
+            description: 'description',
         },
         cdn: {
             css: [],
@@ -34,14 +60,16 @@ function addSiteData(pageName) {
         }
     };
 
-    fileSystem.writeFileSync(SITE_DATA_PATH, JSON.stringify(data, null, 2));
+    writeSiteData(data);
     console.log(`[UPDATED] Record "${camelName}" added.`);
 }
 
+// Removes a page record from site.json
+// Skips silently if the file doesn't exist or the record is not found
 function removeSiteData(pageName) {
-    if (!fileSystem.existsSync(SITE_DATA_PATH)) return;
+    const data = readSiteData();
+    if (!data) return;
 
-    const data = JSON.parse(fileSystem.readFileSync(SITE_DATA_PATH, 'utf8'));
     const camelName = toCamelCase(pageName);
 
     if (!data.pages[camelName]) {
@@ -51,8 +79,44 @@ function removeSiteData(pageName) {
 
     delete data.pages[camelName];
 
-    fileSystem.writeFileSync(SITE_DATA_PATH, JSON.stringify(data, null, 2));
+    writeSiteData(data);
     console.log(`[CLEANED] Record "${camelName}" removed.`);
 }
 
-module.exports = { addSiteData, removeSiteData };
+// Renames a page record in site.json
+// Preserves all existing fields (cdn, etc.) and only updates the SEO title
+// Skips if the source record doesn't exist or the target name is already taken
+function renameSiteData(oldName, newName) {
+    const data = readSiteData();
+    if (!data) return;
+
+    const oldCamel = toCamelCase(oldName);
+    const newCamel = toCamelCase(newName);
+
+    if (!data.pages[oldCamel]) {
+        console.log(`[SKIP] Record "${oldCamel}" not found.`);
+        return;
+    }
+
+    if (data.pages[newCamel]) {
+        console.log(`[SKIP] Record "${newCamel}" already exists.`);
+        return;
+    }
+
+    // Spread the existing record to preserve cdn and any future fields,
+    // then override only the seo.title with the new page name
+    data.pages[newCamel] = {
+        ...data.pages[oldCamel],
+        seo: {
+            ...data.pages[oldCamel].seo,
+            title: toNiceTitle(newName),
+        }
+    };
+
+    delete data.pages[oldCamel];
+
+    writeSiteData(data);
+    console.log(`[UPDATED] Record "${oldCamel}" renamed to "${newCamel}".`);
+}
+
+module.exports = { addSiteData, removeSiteData, renameSiteData };

package/_tools/modules/updateIncludes.js

@@ -1,45 +1,78 @@
 const fileSystem = require('fs');
+const { toCamelCase } = require('./utils');
+
 const INCLUDES_PATH = 'src/frontend/components/layouts/includes.njk';
 
-function toCamelCase(str) {
-    return str.toLowerCase().replace(/[-_][a-z0-9]/g, (group) =>
-        group.toUpperCase().replace('-', '').replace('_', '')
+// --- Helpers ---
+
+// Returns the file content as a string, or null if the file doesn't exist
+function readIncludes() {
+    if (!fileSystem.existsSync(INCLUDES_PATH)) return null;
+    return fileSystem.readFileSync(INCLUDES_PATH, 'utf8');
+}
+
+// Writes updated content back to the includes file
+function writeIncludes(content) {
+    fileSystem.writeFileSync(INCLUDES_PATH, content);
+}
+
+// Builds the regex that matches the elif block for a given camelCase page name.
+// Defined once here to avoid duplication and the stateful /g flag bug:
+// using /g with .test() advances lastIndex, making a subsequent .replace() start
+// from the wrong position. A fresh non-/g regex avoids this entirely.
+function buildElifRegex(camelName) {
+    return new RegExp(
+        `[ \\t]*\\{%\\s*elif\\s+title\\s*==\\s*"${camelName}"\\s*%\\}[\\s\\S]*?(?=[ \\t]*\\{%\\s*(?:elif|else|endif))`,
     );
 }
 
+// --- Public API ---
+
+// Inserts a new elif block before {% else %} for the given page
 function addLayout(pageName) {
-    const camelName = toCamelCase(pageName);
-    if (!fileSystem.existsSync(INCLUDES_PATH)) return;
+    const content = readIncludes();
+    if (!content) return;
 
-    let content = fileSystem.readFileSync(INCLUDES_PATH, 'utf8');
+    const camelName = toCamelCase(pageName);
 
+    // Skip if the block already exists
     if (content.includes(`{% elif title == "${camelName}" %}`)) return;
 
-    const newElif = `{% elif title == "${camelName}" %}\n  {# Insert your includes under this page #}\n  {#{% include "component.njk" %}#}\n\n`;
-    const updatedContent = content.replace('{% else %}', `${newElif}{% else %}`);
+    const newElif =
+        `{% elif title == "${camelName}" %}\n` +
+        `  {# Insert your includes under this page #}\n` +
+        `  {#{% include "component.njk" %}#}\n\n`;
 
-    fileSystem.writeFileSync(INCLUDES_PATH, updatedContent);
+    writeIncludes(content.replace('{% else %}', `${newElif}{% else %}`));
     console.log(`[UPDATED] Layout block added for "${camelName}".`);
 }
 
+// Removes the elif block for the given page, then collapses extra blank lines
 function removeLayout(pageName) {
-    const camelName = toCamelCase(pageName);
-    if (!fileSystem.existsSync(INCLUDES_PATH)) return;
-
-    let content = fileSystem.readFileSync(INCLUDES_PATH, 'utf8');
+    const content = readIncludes();
+    if (!content) return;
 
-    const regex = new RegExp(`[ \\t]*\\{%\\s*elif\\s+title\\s*==\\s*"${camelName}"\\s*%\\}[\\s\\S]*?(?=[ \\t]*\\{%\\s*(?:elif|else|endif))`, 'g');
+    const camelName = toCamelCase(pageName);
+    const regex = buildElifRegex(camelName);
 
     if (!regex.test(content)) {
         console.log(`[DEBUG] Layout block for "${camelName}" not found. Skipped.`);
         return;
     }
 
-    let updatedContent = content.replace(regex, '');
-    updatedContent = updatedContent.replace(/\n\s*\n\s*\n/g, '\n\n');
+    // Build a fresh regex instance for replace to avoid stale lastIndex
+    const updated = content
+        .replace(buildElifRegex(camelName), '')
+        .replace(/\n\s*\n\s*\n/g, '\n\n');
 
-    fileSystem.writeFileSync(INCLUDES_PATH, updatedContent);
+    writeIncludes(updated);
     console.log(`[CLEANED] Layout block removed for "${camelName}".`);
 }
 
-module.exports = { addLayout, removeLayout };
+// Renames a layout block by removing the old one and inserting a new one
+function renameLayout(oldName, newName) {
+    removeLayout(oldName);
+    addLayout(newName);
+}
+
+module.exports = { addLayout, removeLayout, renameLayout };

package/_tools/modules/updateOutputPath.js

@@ -4,11 +4,25 @@ const path = require('path');
 const ELEVENTY_CONFIG = path.resolve(__dirname, '../../.eleventy.js');
 const PACKAGE_JSON = path.resolve(__dirname, '../../package.json');
 
+// Regex to locate the OUTPUT_DIR declaration in .eleventy.js.
+// Extracted as a constant to avoid writing it by hand in multiple places.
+const OUTPUT_DIR_REGEX = /const OUTPUT_DIR\s*=\s*['"`]([^'"`]*)['"`]/;
+
+// --- Helpers ---
+
+// Reads OUTPUT_DIR value from a given file content string, or returns null
+function parseOutputDir(content) {
+    const match = content.match(OUTPUT_DIR_REGEX);
+    return match ? match[1] : null;
+}
+
+// --- Updaters ---
+
 function updateEleventyConfig(newPath) {
-    let content = fs.readFileSync(ELEVENTY_CONFIG, 'utf-8');
+    const content = fs.readFileSync(ELEVENTY_CONFIG, 'utf-8');
 
     const updated = content.replace(
-        /const OUTPUT_DIR\s*=\s*['"`][^'"`]*['"`]/,
+        OUTPUT_DIR_REGEX,
         `const OUTPUT_DIR = "${newPath}"`
     );
 
@@ -23,34 +37,37 @@ function updateEleventyConfig(newPath) {
 }
 
 function updatePackageJson(newPath) {
-    const raw = fs.readFileSync(PACKAGE_JSON, 'utf-8');
-    const pkg = JSON.parse(raw);
+    const pkg = JSON.parse(fs.readFileSync(PACKAGE_JSON, 'utf-8'));
 
+    // Reconstruct all output-dependent scripts from scratch to avoid
+    // partial string replacement bugs on the outdir flag
     pkg.scripts['build:css'] = `sass src/frontend/scss:${newPath}/css --no-source-map --style=compressed --quiet`;
-    pkg.scripts['build:js'] = `esbuild "src/frontend/js/pages/*.js" --bundle --outdir=${newPath}/js/pages --minify`;
+    pkg.scripts['build:js']  = `esbuild "src/frontend/js/pages/*.js" --bundle --outdir=${newPath}/js/pages --minify`;
     pkg.scripts['serve:css'] = `sass --watch src/frontend/scss:${newPath}/css --no-source-map --quiet`;
-    pkg.scripts['serve:js'] = `esbuild "src/frontend/js/pages/*.js" --bundle --outdir=${newPath}/js/pages --watch`;
+    pkg.scripts['serve:js']  = `esbuild "src/frontend/js/pages/*.js" --bundle --outdir=${newPath}/js/pages --watch`;
 
     fs.writeFileSync(PACKAGE_JSON, JSON.stringify(pkg, null, 2), 'utf-8');
     console.log(`(✓) package.json updated → ${newPath}`);
     return true;
 }
 
+// --- Public API ---
+
 function updateOutputPath(newPath) {
     const trimmed = newPath.trim().replace(/\\/g, '/');
 
-    let normalizedPath;
-    if (trimmed === '.') {
-        normalizedPath = 'out';
-    } else {
-        const projectName = path.basename(process.cwd());
-        normalizedPath = trimmed.replace(/\/$/, '') + '/' + projectName + '-out';
-    }
+    // Normalize the path: bare "." becomes "out", everything else gets a
+    // project-scoped suffix to avoid collisions
+    const normalizedPath = trimmed === '.'
+        ? 'out'
+        : `${trimmed.replace(/\/$/, '')}/${path.basename(process.cwd())}-out`;
 
+    // Read the config once and reuse it to get the old path —
+    // avoids a second disk read inside updateEleventyConfig
     const eleventyContent = fs.readFileSync(ELEVENTY_CONFIG, 'utf-8');
-    const match = eleventyContent.match(/const OUTPUT_DIR\s*=\s*['"`]([^'"`]*)['"`]/);
-    const oldPath = match ? match[1] : null;
+    const oldPath = parseOutputDir(eleventyContent);
 
+    // Delete the old output folder if it exists
     if (oldPath) {
         const oldAbsPath = path.resolve(__dirname, '../../', oldPath);
         if (fs.existsSync(oldAbsPath)) {
@@ -67,19 +84,11 @@ function updateOutputPath(newPath) {
     updateEleventyConfig(normalizedPath);
 }
 
+// Returns the current OUTPUT_DIR value from .eleventy.js, or null on failure
 function getCurrentOutputPath() {
     try {
         const content = fs.readFileSync(ELEVENTY_CONFIG, 'utf-8');
-        const match = content.match(/const OUTPUT_DIR\s*=\s*['"`]([^'"`]*)['"`]/);
-        if (!match) return null;
-
-        const outputDir = match[1];
-
-        
-        const parent = path.dirname(outputDir);
-        const projectName = path.basename(outputDir);
-
-        return `${parent}/${projectName}`;
+        return parseOutputDir(content);
     } catch {
         return null;
     }