nibula 1.6.0 → 1.6.2

package/tools/lib/pageComponents.js

@@ -1,88 +1,88 @@
-const path = require('path');
-const settings = require('../config/settings.json');
-const { PATHS } = require('./paths');
-const { exists, readText, writeText } = require('./files');
-const { log } = require('./logger');
-const { toCamelCase, formatText } = require('./text');
-
-const EXTRA_BLANK_LINES_PATTERN = /\n\s*\n\s*\n/g;
-const BLANK_LINES = '\n\n';
-const ANCHOR = settings.pageComponents.anchor;
-
-function blockPattern(camelName) {
-    return new RegExp(
-        `[ \\t]*\\{%\\s*elif\\s+title\\s*==\\s*"${camelName}"\\s*%\\}[\\s\\S]*?(?=[ \\t]*\\{%\\s*(?:elif|else|endif))`
-    );
-}
-
-function conditionFor(camelName) {
-    return formatText(settings.pageComponents.condition, { camelName });
-}
-
-function readPageComponents() {
-    if (!exists(PATHS.pageComponents)) {
-        log('components.fileMissing', { path: PATHS.pageComponents });
-        return null;
-    }
-    return readText(PATHS.pageComponents);
-}
-
-function writePageComponents(content) {
-    writeText(PATHS.pageComponents, content);
-}
-
-function addPageBlock(pageName) {
-    const content = readPageComponents();
-    if (content === null) return;
-
-    const camelName = toCamelCase(pageName);
-    const condition = conditionFor(camelName);
-    if (content.includes(condition)) return;
-
-    if (!content.includes(ANCHOR)) {
-        log('components.anchorMissing', { anchor: ANCHOR, file: path.basename(PATHS.pageComponents) });
-        return;
-    }
-
-    const block = `${condition}\n${settings.pageComponents.include}\n\n`;
-
-    writePageComponents(content.replace(ANCHOR, `${block}${ANCHOR}`));
-    log('components.blockAdded', { name: camelName });
-}
-
-function removePageBlock(pageName) {
-    const content = readPageComponents();
-    if (content === null) return;
-
-    const camelName = toCamelCase(pageName);
-    if (!blockPattern(camelName).test(content)) {
-        log('components.blockMissing', { name: camelName });
-        return;
-    }
-
-    const updated = content
-        .replace(blockPattern(camelName), '')
-        .replace(EXTRA_BLANK_LINES_PATTERN, BLANK_LINES);
-
-    writePageComponents(updated);
-    log('components.blockRemoved', { name: camelName });
-}
-
-function renamePageBlock(oldName, newName) {
-    const content = readPageComponents();
-    if (content === null) return;
-
-    const oldCamelName = toCamelCase(oldName);
-    const newCamelName = toCamelCase(newName);
-    const oldCondition = conditionFor(oldCamelName);
-
-    if (!content.includes(oldCondition)) {
-        log('components.blockMissing', { name: oldCamelName });
-        return;
-    }
-
-    writePageComponents(content.replace(oldCondition, conditionFor(newCamelName)));
-    log('components.blockRenamed', { source: oldCamelName, destination: newCamelName });
-}
-
-module.exports = { addPageBlock, removePageBlock, renamePageBlock };
+const path = require('path');
+const settings = require('../config/settings.json');
+const { PATHS } = require('./paths');
+const { exists, readText, writeText } = require('./files');
+const { log } = require('./logger');
+const { toCamelCase, formatText } = require('./text');
+
+const EXTRA_BLANK_LINES_PATTERN = /\n\s*\n\s*\n/g;
+const BLANK_LINES = '\n\n';
+const ANCHOR = settings.pageComponents.anchor;
+
+function blockPattern(camelName) {
+    return new RegExp(
+        `[ \\t]*\\{%\\s*elif\\s+title\\s*==\\s*"${camelName}"\\s*%\\}[\\s\\S]*?(?=[ \\t]*\\{%\\s*(?:elif|else|endif))`
+    );
+}
+
+function conditionFor(camelName) {
+    return formatText(settings.pageComponents.condition, { camelName });
+}
+
+function readPageComponents() {
+    if (!exists(PATHS.pageComponents)) {
+        log('components.fileMissing', { path: PATHS.pageComponents });
+        return null;
+    }
+    return readText(PATHS.pageComponents);
+}
+
+function writePageComponents(content) {
+    writeText(PATHS.pageComponents, content);
+}
+
+function addPageBlock(pageName) {
+    const content = readPageComponents();
+    if (content === null) return;
+
+    const camelName = toCamelCase(pageName);
+    const condition = conditionFor(camelName);
+    if (content.includes(condition)) return;
+
+    if (!content.includes(ANCHOR)) {
+        log('components.anchorMissing', { anchor: ANCHOR, file: path.basename(PATHS.pageComponents) });
+        return;
+    }
+
+    const block = `${condition}\n${settings.pageComponents.include}\n\n`;
+
+    writePageComponents(content.replace(ANCHOR, `${block}${ANCHOR}`));
+    log('components.blockAdded', { name: camelName });
+}
+
+function removePageBlock(pageName) {
+    const content = readPageComponents();
+    if (content === null) return;
+
+    const camelName = toCamelCase(pageName);
+    if (!blockPattern(camelName).test(content)) {
+        log('components.blockMissing', { name: camelName });
+        return;
+    }
+
+    const updated = content
+        .replace(blockPattern(camelName), '')
+        .replace(EXTRA_BLANK_LINES_PATTERN, BLANK_LINES);
+
+    writePageComponents(updated);
+    log('components.blockRemoved', { name: camelName });
+}
+
+function renamePageBlock(oldName, newName) {
+    const content = readPageComponents();
+    if (content === null) return;
+
+    const oldCamelName = toCamelCase(oldName);
+    const newCamelName = toCamelCase(newName);
+    const oldCondition = conditionFor(oldCamelName);
+
+    if (!content.includes(oldCondition)) {
+        log('components.blockMissing', { name: oldCamelName });
+        return;
+    }
+
+    writePageComponents(content.replace(oldCondition, conditionFor(newCamelName)));
+    log('components.blockRenamed', { source: oldCamelName, destination: newCamelName });
+}
+
+module.exports = { addPageBlock, removePageBlock, renamePageBlock };

package/tools/lib/pagesData.js

@@ -1,88 +1,88 @@
-const path = require('path');
-const settings = require('../config/settings.json');
-const { PATHS } = require('./paths');
-const { exists, readText, writeJson } = require('./files');
-const { log } = require('./logger');
-const { toCamelCase, toTitleCase, formatValue } = require('./text');
-
-function readPagesData() {
-    if (!exists(PATHS.pagesData)) {
-        log('pagesData.fileMissing', { path: PATHS.pagesData });
-        return null;
-    }
-    try {
-        const data = JSON.parse(readText(PATHS.pagesData));
-        if (!data || typeof data !== 'object' || Array.isArray(data)) {
-            log('pagesData.invalidStructure', { file: path.basename(PATHS.pagesData) });
-            return null;
-        }
-        return data;
-    } catch (error) {
-        log('pagesData.parseFailed', { file: path.basename(PATHS.pagesData), error: error.message });
-        return null;
-    }
-}
-
-function writePagesData(data) {
-    writeJson(PATHS.pagesData, data);
-}
-
-function createRecord(pageName) {
-    return formatValue(settings.page.defaultData, { title: toTitleCase(pageName) });
-}
-
-function addPageData(pageName) {
-    const data = readPagesData();
-    if (!data) return;
-
-    const camelName = toCamelCase(pageName);
-    if (data[camelName]) {
-        log('pagesData.recordExists', { name: camelName });
-        return;
-    }
-
-    data[camelName] = createRecord(pageName);
-
-    writePagesData(data);
-    log('pagesData.recordAdded', { name: camelName });
-}
-
-function removePageData(pageName) {
-    const data = readPagesData();
-    if (!data) return;
-
-    const camelName = toCamelCase(pageName);
-    if (!data[camelName]) {
-        log('pagesData.recordMissing', { name: camelName });
-        return;
-    }
-
-    delete data[camelName];
-    writePagesData(data);
-    log('pagesData.recordRemoved', { name: camelName });
-}
-
-function renamePageData(oldName, newName) {
-    const data = readPagesData();
-    if (!data) return;
-
-    const oldCamelName = toCamelCase(oldName);
-    const newCamelName = toCamelCase(newName);
-
-    if (!data[oldCamelName]) {
-        log('pagesData.recordMissing', { name: oldCamelName });
-        return;
-    }
-    if (data[newCamelName]) {
-        log('pagesData.recordExists', { name: newCamelName });
-        return;
-    }
-
-    data[newCamelName] = data[oldCamelName];
-    delete data[oldCamelName];
-
-    writePagesData(data);
-    log('pagesData.recordRenamed', { source: oldCamelName, destination: newCamelName });
-}
-
+const path = require('path');
+const settings = require('../config/settings.json');
+const { PATHS } = require('./paths');
+const { exists, readText, writeJson } = require('./files');
+const { log } = require('./logger');
+const { toCamelCase, toTitleCase, formatValue } = require('./text');
+
+function readPagesData() {
+    if (!exists(PATHS.pagesData)) {
+        log('pagesData.fileMissing', { path: PATHS.pagesData });
+        return null;
+    }
+    try {
+        const data = JSON.parse(readText(PATHS.pagesData));
+        if (!data || typeof data !== 'object' || Array.isArray(data)) {
+            log('pagesData.invalidStructure', { file: path.basename(PATHS.pagesData) });
+            return null;
+        }
+        return data;
+    } catch (error) {
+        log('pagesData.parseFailed', { file: path.basename(PATHS.pagesData), error: error.message });
+        return null;
+    }
+}
+
+function writePagesData(data) {
+    writeJson(PATHS.pagesData, data);
+}
+
+function createRecord(pageName) {
+    return formatValue(settings.page.defaultData, { title: toTitleCase(pageName) });
+}
+
+function addPageData(pageName) {
+    const data = readPagesData();
+    if (!data) return;
+
+    const camelName = toCamelCase(pageName);
+    if (data[camelName]) {
+        log('pagesData.recordExists', { name: camelName });
+        return;
+    }
+
+    data[camelName] = createRecord(pageName);
+
+    writePagesData(data);
+    log('pagesData.recordAdded', { name: camelName });
+}
+
+function removePageData(pageName) {
+    const data = readPagesData();
+    if (!data) return;
+
+    const camelName = toCamelCase(pageName);
+    if (!data[camelName]) {
+        log('pagesData.recordMissing', { name: camelName });
+        return;
+    }
+
+    delete data[camelName];
+    writePagesData(data);
+    log('pagesData.recordRemoved', { name: camelName });
+}
+
+function renamePageData(oldName, newName) {
+    const data = readPagesData();
+    if (!data) return;
+
+    const oldCamelName = toCamelCase(oldName);
+    const newCamelName = toCamelCase(newName);
+
+    if (!data[oldCamelName]) {
+        log('pagesData.recordMissing', { name: oldCamelName });
+        return;
+    }
+    if (data[newCamelName]) {
+        log('pagesData.recordExists', { name: newCamelName });
+        return;
+    }
+
+    data[newCamelName] = data[oldCamelName];
+    delete data[oldCamelName];
+
+    writePagesData(data);
+    log('pagesData.recordRenamed', { source: oldCamelName, destination: newCamelName });
+}
+
 module.exports = { readPagesData, addPageData, removePageData, renamePageData };

package/tools/lib/paths.js

@@ -1,64 +1,64 @@
-const fs = require('fs');
-const path = require('path');
-const settings = require('../config/settings.json');
-const { paint } = require('./colors');
-
-const PACKAGE_ROOT = path.resolve(__dirname, '..', '..');
-const PATH_SEPARATOR = '/';
-
-let cachedProjectRoot = null;
-
-function findProjectRoot(start) {
-    let directory = path.resolve(start ?? process.cwd());
-    while (true) {
-        if (fs.existsSync(path.join(directory, settings.project.marker))) return directory;
-        const parent = path.dirname(directory);
-        if (parent === directory) return null;
-        directory = parent;
-    }
-}
-
-function projectRoot() {
-    if (cachedProjectRoot) return cachedProjectRoot;
-    const root = findProjectRoot();
-    if (!root) {
-        console.error(paint('red', require('./logger').message('project.notInside')));
-        process.exit(1);
-    }
-    cachedProjectRoot = root;
-    return root;
-}
-
-function resolveFromProject(relativePath) {
-    return path.join(projectRoot(), ...relativePath.split(PATH_SEPARATOR));
-}
-
-function resolveFromPackage(relativePath) {
-    return path.join(PACKAGE_ROOT, ...relativePath.split(PATH_SEPARATOR));
-}
-
-const PATHS = Object.freeze({
-    get root()             { return projectRoot(); },
-    get eleventyConfig()   { return resolveFromProject(settings.paths.eleventyConfig); },
-    get packageJson()      { return resolveFromProject(settings.paths.packageJson); },
-    get typescriptConfig() { return resolveFromProject(settings.paths.typescriptConfig); },
-    get routes()           { return resolveFromProject(settings.paths.routes); },
-    get stylePages()       { return resolveFromProject(settings.paths.stylePages); },
-    get siteData()         { return resolveFromProject(settings.paths.siteData); },
-    get pagesData()        { return resolveFromProject(settings.paths.pagesData); },
-    get pageComponents()   { return resolveFromProject(settings.paths.pageComponents); },
-    get templates()        { return resolveFromPackage(settings.paths.templates); },
-});
-
-function getNotInsideProjectMessage() {
-    return paint('red', require('./logger').message('project.notInside'));
-}
-
-module.exports = {
-    PATHS,
-    PACKAGE_ROOT,
-    getNotInsideProjectMessage,
-    findProjectRoot,
-    resolveFromProject,
-    resolveFromPackage,
+const fs = require('fs');
+const path = require('path');
+const settings = require('../config/settings.json');
+const { paint } = require('./colors');
+
+const PACKAGE_ROOT = path.resolve(__dirname, '..', '..');
+const PATH_SEPARATOR = '/';
+
+let cachedProjectRoot = null;
+
+function findProjectRoot(start) {
+    let directory = path.resolve(start ?? process.cwd());
+    while (true) {
+        if (fs.existsSync(path.join(directory, settings.project.marker))) return directory;
+        const parent = path.dirname(directory);
+        if (parent === directory) return null;
+        directory = parent;
+    }
+}
+
+function projectRoot() {
+    if (cachedProjectRoot) return cachedProjectRoot;
+    const root = findProjectRoot();
+    if (!root) {
+        console.error(paint('red', require('./logger').message('project.notInside')));
+        process.exit(1);
+    }
+    cachedProjectRoot = root;
+    return root;
+}
+
+function resolveFromProject(relativePath) {
+    return path.join(projectRoot(), ...relativePath.split(PATH_SEPARATOR));
+}
+
+function resolveFromPackage(relativePath) {
+    return path.join(PACKAGE_ROOT, ...relativePath.split(PATH_SEPARATOR));
+}
+
+const PATHS = Object.freeze({
+    get root()             { return projectRoot(); },
+    get eleventyConfig()   { return resolveFromProject(settings.paths.eleventyConfig); },
+    get packageJson()      { return resolveFromProject(settings.paths.packageJson); },
+    get typescriptConfig() { return resolveFromProject(settings.paths.typescriptConfig); },
+    get routes()           { return resolveFromProject(settings.paths.routes); },
+    get stylePages()       { return resolveFromProject(settings.paths.stylePages); },
+    get siteData()         { return resolveFromProject(settings.paths.siteData); },
+    get pagesData()        { return resolveFromProject(settings.paths.pagesData); },
+    get pageComponents()   { return resolveFromProject(settings.paths.pageComponents); },
+    get templates()        { return resolveFromPackage(settings.paths.templates); },
+});
+
+function getNotInsideProjectMessage() {
+    return paint('red', require('./logger').message('project.notInside'));
+}
+
+module.exports = {
+    PATHS,
+    PACKAGE_ROOT,
+    getNotInsideProjectMessage,
+    findProjectRoot,
+    resolveFromProject,
+    resolveFromPackage,
 };

package/tools/lib/project.js

@@ -1,54 +1,54 @@
-const fs = require('fs');
-const settings = require('../config/settings.json');
-const { PATHS, resolveFromProject } = require('./paths');
-const { readJson, writeJson } = require('./files');
-
-const JAVASCRIPT = 'javascript';
-const TYPESCRIPT = 'typescript';
-const ENTRY_WILDCARD = '*';
-
-function isTypeScriptProject() {
-    return fs.existsSync(PATHS.typescriptConfig);
-}
-
-function currentLanguage() {
-    return isTypeScriptProject() ? TYPESCRIPT : JAVASCRIPT;
-}
-
-function languageSettings(language) {
-    return settings.languages[language ?? currentLanguage()];
-}
-
-function scriptPagesDirectory(language) {
-    return resolveFromProject(languageSettings(language).pages);
-}
-
-function scriptEntries(language) {
-    const { pages, extension } = languageSettings(language);
-    return `${pages}/${ENTRY_WILDCARD}.${extension}`;
-}
-
-function allScriptEntries() {
-    return Object.keys(settings.languages).map((language) => scriptEntries(language));
-}
-
-function readPackageJson() {
-    return readJson(PATHS.packageJson);
-}
-
-function writePackageJson(content) {
-    writeJson(PATHS.packageJson, content);
-}
-
-module.exports = {
-    JAVASCRIPT,
-    TYPESCRIPT,
-    isTypeScriptProject,
-    currentLanguage,
-    languageSettings,
-    scriptPagesDirectory,
-    scriptEntries,
-    allScriptEntries,
-    readPackageJson,
-    writePackageJson,
-};
+const fs = require('fs');
+const settings = require('../config/settings.json');
+const { PATHS, resolveFromProject } = require('./paths');
+const { readJson, writeJson } = require('./files');
+
+const JAVASCRIPT = 'javascript';
+const TYPESCRIPT = 'typescript';
+const ENTRY_WILDCARD = '*';
+
+function isTypeScriptProject() {
+    return fs.existsSync(PATHS.typescriptConfig);
+}
+
+function currentLanguage() {
+    return isTypeScriptProject() ? TYPESCRIPT : JAVASCRIPT;
+}
+
+function languageSettings(language) {
+    return settings.languages[language ?? currentLanguage()];
+}
+
+function scriptPagesDirectory(language) {
+    return resolveFromProject(languageSettings(language).pages);
+}
+
+function scriptEntries(language) {
+    const { pages, extension } = languageSettings(language);
+    return `${pages}/${ENTRY_WILDCARD}.${extension}`;
+}
+
+function allScriptEntries() {
+    return Object.keys(settings.languages).map((language) => scriptEntries(language));
+}
+
+function readPackageJson() {
+    return readJson(PATHS.packageJson);
+}
+
+function writePackageJson(content) {
+    writeJson(PATHS.packageJson, content);
+}
+
+module.exports = {
+    JAVASCRIPT,
+    TYPESCRIPT,
+    isTypeScriptProject,
+    currentLanguage,
+    languageSettings,
+    scriptPagesDirectory,
+    scriptEntries,
+    allScriptEntries,
+    readPackageJson,
+    writePackageJson,
+};