nibula 1.6.0 → 1.6.1

package/tools/lib/outputPath.js

@@ -1,141 +1,141 @@
-const path = require('path');
-const settings = require('../config/settings.json');
-const { PATHS } = require('./paths');
-const { readText, writeText, readJson, writeJson, removeDirectory } = require('./files');
-const { log } = require('./logger');
-const { formatText } = require('./text');
-const { isTypeScriptProject, scriptEntries } = require('./project');
-
-const OUTPUT_VARIABLE = settings.eleventy.outputVariable;
-const TYPESCRIPT_OUTPUT_KEY = settings.typescript.outputKey;
-const OUTPUT_VARIABLE_PATTERN = new RegExp(`const ${OUTPUT_VARIABLE}\\s*=\\s*['"\`]([^'"\`]*)['"\`]`);
-const TYPESCRIPT_OUTPUT_PATTERN = new RegExp(`"${TYPESCRIPT_OUTPUT_KEY}"\\s*:\\s*"[^"]*"`);
-const WINDOWS_DRIVE_PATTERN = /^[a-zA-Z]:/;
-const BACKSLASH_PATTERN = /\\/g;
-const TRAILING_SLASH_PATTERN = /\/$/;
-const FORWARD_SLASH = '/';
-const RELATIVE_PREFIX = './';
-const EMPTY = '';
-
-function parseOutputDirectory(content) {
-    const match = content.match(OUTPUT_VARIABLE_PATTERN);
-    return match ? match[1] : null;
-}
-
-function isAbsolutePath(target) {
-    return path.isAbsolute(target) || WINDOWS_DRIVE_PATTERN.test(target);
-}
-
-function updateEleventyConfig(newPath) {
-    const content = readText(PATHS.eleventyConfig);
-    const updated = content.replace(OUTPUT_VARIABLE_PATTERN, `const ${OUTPUT_VARIABLE} = "${newPath}"`);
-
-    if (content === updated) {
-        log('output.variableMissing', { variable: OUTPUT_VARIABLE, file: settings.paths.eleventyConfig });
-        return;
-    }
-    writeText(PATHS.eleventyConfig, updated);
-    log('output.fileUpdated', { file: settings.paths.eleventyConfig, path: newPath });
-}
-
-function updatePackageJson(newPath, oldPath) {
-    const packageJson = readJson(PATHS.packageJson);
-    const entries = scriptEntries();
-
-    packageJson[settings.packageJson.outputKey] = newPath;
-    packageJson[settings.packageJson.scriptsKey] = packageJson[settings.packageJson.scriptsKey] || {};
-
-    const scripts = packageJson[settings.packageJson.scriptsKey];
-
-    for (const { name, marker, template } of settings.outputScripts) {
-        const current = scripts[name];
-        const token = oldPath ? `${oldPath}${marker}` : null;
-
-        if (current && token && current.includes(token)) {
-            scripts[name] = current.split(token).join(`${newPath}${marker}`);
-        } else {
-            scripts[name] = formatText(template, { output: newPath, entries });
-        }
-    }
-
-    writeJson(PATHS.packageJson, packageJson);
-    log('output.fileUpdated', { file: settings.paths.packageJson, path: newPath });
-}
-
-function updateTypeScriptConfig(newPath) {
-    if (!isTypeScriptProject()) return;
-
-    const prefix = isAbsolutePath(newPath) ? EMPTY : RELATIVE_PREFIX;
-    const outputDirectory = `${prefix}${newPath}${FORWARD_SLASH}${settings.typescript.outputSubdirectory}`;
-    const content = readText(PATHS.typescriptConfig);
-    const updated = content.replace(TYPESCRIPT_OUTPUT_PATTERN, `"${TYPESCRIPT_OUTPUT_KEY}": "${outputDirectory}"`);
-
-    if (content === updated) {
-        log('output.keyMissing', { key: TYPESCRIPT_OUTPUT_KEY, file: settings.paths.typescriptConfig });
-        return;
-    }
-    writeText(PATHS.typescriptConfig, updated);
-    log('output.fileUpdated', { file: settings.paths.typescriptConfig, path: outputDirectory });
-}
-
-function deleteOldOutput(oldPath) {
-    if (!oldPath) return;
-
-    const target = path.resolve(PATHS.root, oldPath);
-    const insideProject = target.startsWith(PATHS.root + path.sep);
-
-    if (!insideProject || target === PATHS.root) {
-        log('output.refuseDelete', { path: target });
-        return;
-    }
-    if (removeDirectory(target)) {
-        log('output.directoryDeleted', { path: target });
-    }
-}
-
-function normalizeOutputPath(rawPath) {
-    const trimmed = (rawPath ?? '').trim().replace(BACKSLASH_PATTERN, FORWARD_SLASH);
-    if (!trimmed) return null;
-
-    if (trimmed === settings.project.currentDirectory) return settings.project.defaultOutputDirectory;
-
-    const parent = trimmed.replace(TRAILING_SLASH_PATTERN, EMPTY);
-    return `${parent}${FORWARD_SLASH}${path.basename(PATHS.root)}${settings.project.outputSuffix}`;
-}
-
-function updateOutputPath(rawPath) {
-    const normalizedPath = normalizeOutputPath(rawPath);
-    if (!normalizedPath) {
-        log('output.emptyPath');
-        return;
-    }
-
-    let oldPath = null;
-    try {
-        oldPath = parseOutputDirectory(readText(PATHS.eleventyConfig));
-    } catch (error) {
-        log('output.readFailed', { file: settings.paths.eleventyConfig, error: error.message });
-        return;
-    }
-
-    deleteOldOutput(oldPath);
-    log('output.updating', { path: normalizedPath });
-
-    try {
-        updatePackageJson(normalizedPath, oldPath);
-        updateEleventyConfig(normalizedPath);
-        updateTypeScriptConfig(normalizedPath);
-    } catch (error) {
-        log('output.updateFailed', { error: error.message });
-    }
-}
-
-function getCurrentOutputPath() {
-    try {
-        return parseOutputDirectory(readText(PATHS.eleventyConfig));
-    } catch {
-        return null;
-    }
-}
-
-module.exports = { updateOutputPath, getCurrentOutputPath };
+const path = require('path');
+const settings = require('../config/settings.json');
+const { PATHS } = require('./paths');
+const { readText, writeText, readJson, writeJson, removeDirectory } = require('./files');
+const { log } = require('./logger');
+const { formatText } = require('./text');
+const { isTypeScriptProject, scriptEntries } = require('./project');
+
+const OUTPUT_VARIABLE = settings.eleventy.outputVariable;
+const TYPESCRIPT_OUTPUT_KEY = settings.typescript.outputKey;
+const OUTPUT_VARIABLE_PATTERN = new RegExp(`const ${OUTPUT_VARIABLE}\\s*=\\s*['"\`]([^'"\`]*)['"\`]`);
+const TYPESCRIPT_OUTPUT_PATTERN = new RegExp(`"${TYPESCRIPT_OUTPUT_KEY}"\\s*:\\s*"[^"]*"`);
+const WINDOWS_DRIVE_PATTERN = /^[a-zA-Z]:/;
+const BACKSLASH_PATTERN = /\\/g;
+const TRAILING_SLASH_PATTERN = /\/$/;
+const FORWARD_SLASH = '/';
+const RELATIVE_PREFIX = './';
+const EMPTY = '';
+
+function parseOutputDirectory(content) {
+    const match = content.match(OUTPUT_VARIABLE_PATTERN);
+    return match ? match[1] : null;
+}
+
+function isAbsolutePath(target) {
+    return path.isAbsolute(target) || WINDOWS_DRIVE_PATTERN.test(target);
+}
+
+function updateEleventyConfig(newPath) {
+    const content = readText(PATHS.eleventyConfig);
+    const updated = content.replace(OUTPUT_VARIABLE_PATTERN, `const ${OUTPUT_VARIABLE} = "${newPath}"`);
+
+    if (content === updated) {
+        log('output.variableMissing', { variable: OUTPUT_VARIABLE, file: settings.paths.eleventyConfig });
+        return;
+    }
+    writeText(PATHS.eleventyConfig, updated);
+    log('output.fileUpdated', { file: settings.paths.eleventyConfig, path: newPath });
+}
+
+function updatePackageJson(newPath, oldPath) {
+    const packageJson = readJson(PATHS.packageJson);
+    const entries = scriptEntries();
+
+    packageJson[settings.packageJson.outputKey] = newPath;
+    packageJson[settings.packageJson.scriptsKey] = packageJson[settings.packageJson.scriptsKey] || {};
+
+    const scripts = packageJson[settings.packageJson.scriptsKey];
+
+    for (const { name, marker, template } of settings.outputScripts) {
+        const current = scripts[name];
+        const token = oldPath ? `${oldPath}${marker}` : null;
+
+        if (current && token && current.includes(token)) {
+            scripts[name] = current.split(token).join(`${newPath}${marker}`);
+        } else {
+            scripts[name] = formatText(template, { output: newPath, entries });
+        }
+    }
+
+    writeJson(PATHS.packageJson, packageJson);
+    log('output.fileUpdated', { file: settings.paths.packageJson, path: newPath });
+}
+
+function updateTypeScriptConfig(newPath) {
+    if (!isTypeScriptProject()) return;
+
+    const prefix = isAbsolutePath(newPath) ? EMPTY : RELATIVE_PREFIX;
+    const outputDirectory = `${prefix}${newPath}${FORWARD_SLASH}${settings.typescript.outputSubdirectory}`;
+    const content = readText(PATHS.typescriptConfig);
+    const updated = content.replace(TYPESCRIPT_OUTPUT_PATTERN, `"${TYPESCRIPT_OUTPUT_KEY}": "${outputDirectory}"`);
+
+    if (content === updated) {
+        log('output.keyMissing', { key: TYPESCRIPT_OUTPUT_KEY, file: settings.paths.typescriptConfig });
+        return;
+    }
+    writeText(PATHS.typescriptConfig, updated);
+    log('output.fileUpdated', { file: settings.paths.typescriptConfig, path: outputDirectory });
+}
+
+function deleteOldOutput(oldPath) {
+    if (!oldPath) return;
+
+    const target = path.resolve(PATHS.root, oldPath);
+    const insideProject = target.startsWith(PATHS.root + path.sep);
+
+    if (!insideProject || target === PATHS.root) {
+        log('output.refuseDelete', { path: target });
+        return;
+    }
+    if (removeDirectory(target)) {
+        log('output.directoryDeleted', { path: target });
+    }
+}
+
+function normalizeOutputPath(rawPath) {
+    const trimmed = (rawPath ?? '').trim().replace(BACKSLASH_PATTERN, FORWARD_SLASH);
+    if (!trimmed) return null;
+
+    if (trimmed === settings.project.currentDirectory) return settings.project.defaultOutputDirectory;
+
+    const parent = trimmed.replace(TRAILING_SLASH_PATTERN, EMPTY);
+    return `${parent}${FORWARD_SLASH}${path.basename(PATHS.root)}${settings.project.outputSuffix}`;
+}
+
+function updateOutputPath(rawPath) {
+    const normalizedPath = normalizeOutputPath(rawPath);
+    if (!normalizedPath) {
+        log('output.emptyPath');
+        return;
+    }
+
+    let oldPath = null;
+    try {
+        oldPath = parseOutputDirectory(readText(PATHS.eleventyConfig));
+    } catch (error) {
+        log('output.readFailed', { file: settings.paths.eleventyConfig, error: error.message });
+        return;
+    }
+
+    deleteOldOutput(oldPath);
+    log('output.updating', { path: normalizedPath });
+
+    try {
+        updatePackageJson(normalizedPath, oldPath);
+        updateEleventyConfig(normalizedPath);
+        updateTypeScriptConfig(normalizedPath);
+    } catch (error) {
+        log('output.updateFailed', { error: error.message });
+    }
+}
+
+function getCurrentOutputPath() {
+    try {
+        return parseOutputDirectory(readText(PATHS.eleventyConfig));
+    } catch {
+        return null;
+    }
+}
+
+module.exports = { updateOutputPath, getCurrentOutputPath };

package/tools/lib/pageActions.js

@@ -1,147 +1,147 @@
-const path = require('path');
-const settings = require('../config/settings.json');
-const { PATHS } = require('./paths');
-const { exists, readText, writeText, copyFile, moveFile, removeFile, removeDirectory, removeDirectoryIfEmpty } = require('./files');
-const { log } = require('./logger');
-const { formatText } = require('./text');
-const { languageSettings } = require('./project');
-const { getPageArtifacts, pageExists } = require('./pageArtifacts');
-const { readPagesData, addPageData, removePageData, renamePageData } = require('./pagesData');
-const { addPageBlock, removePageBlock, renamePageBlock } = require('./pageComponents');
-
-const FRONT_MATTER_PATTERNS = Object.freeze({
-    title:     /^title:.*$/m,
-    permalink: /^permalink:.*$/m,
-});
-
-function templatePath(name) {
-    return path.join(PATHS.templates, name);
-}
-
-function applyFrontMatter(filePath, values, keys = Object.keys(FRONT_MATTER_PATTERNS)) {
-    let content = readText(filePath);
-
-    for (const key of keys) {
-        content = content.replace(FRONT_MATTER_PATTERNS[key], formatText(settings.frontMatter[key], values));
-    }
-
-    writeText(filePath, content);
-}
-
-function addPage(pageName) {
-    if (pageExists(pageName)) {
-        log('page.alreadyExists', { name: pageName });
-        return;
-    }
-
-    const { camelName, source } = getPageArtifacts(pageName);
-    const values = { camelName, pageName };
-
-    const creations = [
-        { destination: source.style,  template: settings.page.styleTemplate,  isRoute: false },
-        { destination: source.script, template: languageSettings().template,  isRoute: false },
-        { destination: source.route,  template: settings.page.routeTemplate,  isRoute: true  },
-    ];
-
-    try {
-        for (const { destination, template, isRoute } of creations) {
-            const templateFile = templatePath(template);
-
-            if (!exists(templateFile)) {
-                log('page.templateMissing', { path: templateFile });
-                continue;
-            }
-
-            copyFile(templateFile, destination);
-            if (isRoute) applyFrontMatter(destination, values);
-
-            log('page.fileCreated', { path: destination });
-        }
-    } catch (error) {
-        log('page.createFailed', { error: error.message });
-        return;
-    }
-
-    addPageBlock(pageName);
-    addPageData(pageName);
-}
-
-function renamePage(oldName, newName) {
-    if (!pageExists(oldName)) {
-        log('page.doesNotExist', { name: oldName });
-        return;
-    }
-    if (pageExists(newName)) {
-        log('page.targetExists', { name: newName });
-        return;
-    }
-    if (!readPagesData()) return;
-
-    const current = getPageArtifacts(oldName);
-    const next = getPageArtifacts(newName);
-    const values = { camelName: next.camelName, pageName: newName };
-
-    const moves = [
-        { source: current.source.style,  destination: next.source.style,  isRoute: false },
-        { source: current.source.script, destination: next.source.script, isRoute: false },
-        { source: current.source.route,  destination: next.source.route,  isRoute: true  },
-    ];
-
-    try {
-        for (const { source, destination, isRoute } of moves) {
-            if (!exists(source)) {
-                log('page.fileMissing', { path: source });
-                continue;
-            }
-
-            moveFile(source, destination);
-            log('page.fileRenamed', { source, destination });
-
-            if (isRoute) applyFrontMatter(destination, values, ['permalink']);
-        }
-    } catch (error) {
-        log('page.renameFailed', { error: error.message });
-        return;
-    }
-
-    renamePageBlock(oldName, newName);
-    renamePageData(oldName, newName);
-}
-
-function removePage(pageName) {
-    if (!pageExists(pageName)) {
-        log('page.doesNotExist', { name: pageName });
-        return;
-    }
-    if (!readPagesData()) return;
-
-    const { source, output } = getPageArtifacts(pageName);
-    const files = [source.style, source.script, source.route, ...output.files];
-
-    for (const file of files) {
-        try {
-            if (removeFile(file)) log('page.fileDeleted', { path: file });
-        } catch (error) {
-            log('page.deleteFailed', { path: file, error: error.message });
-        }
-    }
-
-    for (const directory of output.directories) {
-        try {
-            if (removeDirectory(directory)) log('page.fileDeleted', { path: directory });
-        } catch (error) {
-            log('page.deleteFailed', { path: directory, error: error.message });
-        }
-    }
-
-    removePageBlock(pageName);
-    removePageData(pageName);
-
-    const sourceDirectories = [source.style, source.script, source.route].map(file => path.dirname(file));
-
-    for (const directory of sourceDirectories) {
-        if (removeDirectoryIfEmpty(directory)) log('page.fileDeleted', { path: directory });
-    }
-}
-
+const path = require('path');
+const settings = require('../config/settings.json');
+const { PATHS } = require('./paths');
+const { exists, readText, writeText, copyFile, moveFile, removeFile, removeDirectory, removeDirectoryIfEmpty } = require('./files');
+const { log } = require('./logger');
+const { formatText } = require('./text');
+const { languageSettings } = require('./project');
+const { getPageArtifacts, pageExists } = require('./pageArtifacts');
+const { readPagesData, addPageData, removePageData, renamePageData } = require('./pagesData');
+const { addPageBlock, removePageBlock, renamePageBlock } = require('./pageComponents');
+
+const FRONT_MATTER_PATTERNS = Object.freeze({
+    title:     /^title:.*$/m,
+    permalink: /^permalink:.*$/m,
+});
+
+function templatePath(name) {
+    return path.join(PATHS.templates, name);
+}
+
+function applyFrontMatter(filePath, values, keys = Object.keys(FRONT_MATTER_PATTERNS)) {
+    let content = readText(filePath);
+
+    for (const key of keys) {
+        content = content.replace(FRONT_MATTER_PATTERNS[key], formatText(settings.frontMatter[key], values));
+    }
+
+    writeText(filePath, content);
+}
+
+function addPage(pageName) {
+    if (pageExists(pageName)) {
+        log('page.alreadyExists', { name: pageName });
+        return;
+    }
+
+    const { camelName, source } = getPageArtifacts(pageName);
+    const values = { camelName, pageName };
+
+    const creations = [
+        { destination: source.style,  template: settings.page.styleTemplate,  isRoute: false },
+        { destination: source.script, template: languageSettings().template,  isRoute: false },
+        { destination: source.route,  template: settings.page.routeTemplate,  isRoute: true  },
+    ];
+
+    try {
+        for (const { destination, template, isRoute } of creations) {
+            const templateFile = templatePath(template);
+
+            if (!exists(templateFile)) {
+                log('page.templateMissing', { path: templateFile });
+                continue;
+            }
+
+            copyFile(templateFile, destination);
+            if (isRoute) applyFrontMatter(destination, values);
+
+            log('page.fileCreated', { path: destination });
+        }
+    } catch (error) {
+        log('page.createFailed', { error: error.message });
+        return;
+    }
+
+    addPageBlock(pageName);
+    addPageData(pageName);
+}
+
+function renamePage(oldName, newName) {
+    if (!pageExists(oldName)) {
+        log('page.doesNotExist', { name: oldName });
+        return;
+    }
+    if (pageExists(newName)) {
+        log('page.targetExists', { name: newName });
+        return;
+    }
+    if (!readPagesData()) return;
+
+    const current = getPageArtifacts(oldName);
+    const next = getPageArtifacts(newName);
+    const values = { camelName: next.camelName, pageName: newName };
+
+    const moves = [
+        { source: current.source.style,  destination: next.source.style,  isRoute: false },
+        { source: current.source.script, destination: next.source.script, isRoute: false },
+        { source: current.source.route,  destination: next.source.route,  isRoute: true  },
+    ];
+
+    try {
+        for (const { source, destination, isRoute } of moves) {
+            if (!exists(source)) {
+                log('page.fileMissing', { path: source });
+                continue;
+            }
+
+            moveFile(source, destination);
+            log('page.fileRenamed', { source, destination });
+
+            if (isRoute) applyFrontMatter(destination, values, ['permalink']);
+        }
+    } catch (error) {
+        log('page.renameFailed', { error: error.message });
+        return;
+    }
+
+    renamePageBlock(oldName, newName);
+    renamePageData(oldName, newName);
+}
+
+function removePage(pageName) {
+    if (!pageExists(pageName)) {
+        log('page.doesNotExist', { name: pageName });
+        return;
+    }
+    if (!readPagesData()) return;
+
+    const { source, output } = getPageArtifacts(pageName);
+    const files = [source.style, source.script, source.route, ...output.files];
+
+    for (const file of files) {
+        try {
+            if (removeFile(file)) log('page.fileDeleted', { path: file });
+        } catch (error) {
+            log('page.deleteFailed', { path: file, error: error.message });
+        }
+    }
+
+    for (const directory of output.directories) {
+        try {
+            if (removeDirectory(directory)) log('page.fileDeleted', { path: directory });
+        } catch (error) {
+            log('page.deleteFailed', { path: directory, error: error.message });
+        }
+    }
+
+    removePageBlock(pageName);
+    removePageData(pageName);
+
+    const sourceDirectories = [source.style, source.script, source.route].map(file => path.dirname(file));
+
+    for (const directory of sourceDirectories) {
+        if (removeDirectoryIfEmpty(directory)) log('page.fileDeleted', { path: directory });
+    }
+}
+
 module.exports = { addPage, removePage, renamePage };

package/tools/lib/pageArtifacts.js

@@ -1,46 +1,46 @@
-const path = require('path');
-const settings = require('../config/settings.json');
-const { PATHS } = require('./paths');
-const { exists } = require('./files');
-const { languageSettings, scriptPagesDirectory } = require('./project');
-const { getCurrentOutputPath } = require('./outputPath');
-const { toCamelCase, formatText } = require('./text');
-
-const PATH_SEPARATOR = '/';
-
-function outputRoot() {
-    return path.join(PATHS.root, getCurrentOutputPath() || settings.project.defaultOutputDirectory);
-}
-
-function resolveOutput(root, template, values) {
-    return path.join(root, ...formatText(template, values).split(PATH_SEPARATOR));
-}
-
-function routeFile(pageName) {
-    return path.join(PATHS.routes, `${pageName}.${settings.page.routeExtension}`);
-}
-
-function pageExists(pageName) {
-    return exists(routeFile(pageName));
-}
-
-function getPageArtifacts(pageName) {
-    const camelName = toCamelCase(pageName);
-    const values = { camelName, pageName };
-    const root = outputRoot();
-
-    return {
-        camelName,
-        source: {
-            style:  path.join(PATHS.stylePages, `${camelName}.${settings.page.styleExtension}`),
-            script: path.join(scriptPagesDirectory(), `${camelName}.${languageSettings().extension}`),
-            route:  routeFile(pageName),
-        },
-        output: {
-            files:       settings.page.outputFiles.map((template) => resolveOutput(root, template, values)),
-            directories: settings.page.outputDirectories.map((template) => resolveOutput(root, template, values)),
-        },
-    };
-}
-
-module.exports = { getPageArtifacts, pageExists };
+const path = require('path');
+const settings = require('../config/settings.json');
+const { PATHS } = require('./paths');
+const { exists } = require('./files');
+const { languageSettings, scriptPagesDirectory } = require('./project');
+const { getCurrentOutputPath } = require('./outputPath');
+const { toCamelCase, formatText } = require('./text');
+
+const PATH_SEPARATOR = '/';
+
+function outputRoot() {
+    return path.join(PATHS.root, getCurrentOutputPath() || settings.project.defaultOutputDirectory);
+}
+
+function resolveOutput(root, template, values) {
+    return path.join(root, ...formatText(template, values).split(PATH_SEPARATOR));
+}
+
+function routeFile(pageName) {
+    return path.join(PATHS.routes, `${pageName}.${settings.page.routeExtension}`);
+}
+
+function pageExists(pageName) {
+    return exists(routeFile(pageName));
+}
+
+function getPageArtifacts(pageName) {
+    const camelName = toCamelCase(pageName);
+    const values = { camelName, pageName };
+    const root = outputRoot();
+
+    return {
+        camelName,
+        source: {
+            style:  path.join(PATHS.stylePages, `${camelName}.${settings.page.styleExtension}`),
+            script: path.join(scriptPagesDirectory(), `${camelName}.${languageSettings().extension}`),
+            route:  routeFile(pageName),
+        },
+        output: {
+            files:       settings.page.outputFiles.map((template) => resolveOutput(root, template, values)),
+            directories: settings.page.outputDirectories.map((template) => resolveOutput(root, template, values)),
+        },
+    };
+}
+
+module.exports = { getPageArtifacts, pageExists };