nibula 1.6.0 → 1.6.2

package/tools/config/messages.json

@@ -1,80 +1,80 @@
-{
-  "project": {
-    "notInside": "Not inside a Nibula project.",
-    "alreadyInside": "You are already inside a Nibula project.",
-    "alreadyInsideHint": "Run \"nib new\" from outside a project."
-  },
-  "validation": {
-    "invalidName": "Invalid name.",
-    "invalidNameCharacters": "Page name can only contain lowercase letters, numbers, and hyphens.",
-    "nameStartsWithNumber": "Page name cannot start with a number.",
-    "protectedName": "\"{name}\" is a protected page name.",
-    "invalidPath": "Invalid path.",
-    "invalidPathCharacters": "Path contains invalid characters.",
-    "templatesLabel": "CLI page templates"
-  },
-  "page": {
-    "alreadyExists": "[skip] page \"{name}\" already exists",
-    "doesNotExist": "[skip] page \"{name}\" does not exist",
-    "targetExists": "[skip] target page \"{name}\" already exists",
-    "templateMissing": "[skip] template not found: {path}",
-    "fileMissing": "[skip] not found: {path}",
-    "fileCreated": "[created] {path}",
-    "fileRenamed": "[renamed] {source} \u2192 {destination}",
-    "fileDeleted": "[deleted] {path}",
-    "createFailed": "[error] could not create page files: {error}",
-    "renameFailed": "[error] could not rename page files: {error}",
-    "deleteFailed": "[error] {path}: {error}"
-  },
-  "components": {
-    "fileMissing": "[skip] not found: {path}",
-    "anchorMissing": "[skip] no {anchor} anchor in {file}",
-    "blockAdded": "[updated] page block added for \"{name}\"",
-    "blockMissing": "[skip] page block for \"{name}\" not found",
-    "blockRemoved": "[cleaned] page block removed for \"{name}\"",
-    "blockRenamed": "[renamed] page block \"{source}\" \u2192 \"{destination}\""
-  },
-  "pagesData": {
-      "fileMissing": "[skip] not found: {path}",
-      "invalidStructure": "[error] {file} must contain an object of pages",
-      "parseFailed": "[error] cannot parse {file}: {error}",
-      "recordExists": "[skip] record \"{name}\" already exists",
-      "recordMissing": "[skip] record \"{name}\" not found",
-      "recordAdded": "[updated] record \"{name}\" added",
-      "recordRemoved": "[cleaned] record \"{name}\" removed",
-      "recordRenamed": "[updated] record \"{source}\" renamed to \"{destination}\""
-  },
-  "output": {
-    "emptyPath": "[skip] empty output path",
-    "readFailed": "[error] cannot read {file}: {error}",
-    "updateFailed": "[error] could not update output path: {error}",
-    "updating": "\nupdating output path \u2192 \"{path}\"",
-    "variableMissing": "[skip] {variable} not found in {file}",
-    "keyMissing": "[skip] {key} not found in {file}",
-    "fileUpdated": "[updated] {file} \u2192 {path}",
-    "directoryDeleted": "[deleted] {path}",
-    "refuseDelete": "[skip] refusing to delete \"{path}\" (outside project)",
-    "missingConfiguration": "(!) {key} not found in {file}",
-    "cleaned": "(\u2713) cleaned \u2192 {path}",
-    "nothingToClean": "(i) nothing to clean \u2192 {path}"
-  },
-  "cli": {
-    "usingLocalVersion": "Nibula cli local version ({local})",
-    "createPrompt": "Name of the new page: ",
-    "removePrompt": "Name of the page to remove: ",
-    "renameFromPrompt": "Page to rename: ",
-    "renameToPrompt": "New name: ",
-    "outputPathPrompt": "New output path: ",
-    "menuPrompt": "Choose an option: ",
-    "currentOutputPath": "Current path: \"{path}\"",
-    "confirmRemove": "This permanently deletes all files for \"{name}\".",
-    "cancelled": "Cancelled.",
-    "pageNotFound": "Page \"{name}\" does not exist.",
-    "sameName": "Old and new name are the same.",
-    "invalidOption": "Invalid option.",
-    "unexpectedError": "Unexpected error: {error}",
-    "missingFiles": "This project is missing required files:",
-    "incompleteProject": "The project may be incomplete or created with a different Nibula version.",
-    "exitHint": "CTRL + C to exit"
-  }
-}
+{
+  "project": {
+    "notInside": "Not inside a Nibula project.",
+    "alreadyInside": "You are already inside a Nibula project.",
+    "alreadyInsideHint": "Run \"nib new\" from outside a project."
+  },
+  "validation": {
+    "invalidName": "Invalid name.",
+    "invalidNameCharacters": "Page name can only contain lowercase letters, numbers, and hyphens.",
+    "nameStartsWithNumber": "Page name cannot start with a number.",
+    "protectedName": "\"{name}\" is a protected page name.",
+    "invalidPath": "Invalid path.",
+    "invalidPathCharacters": "Path contains invalid characters.",
+    "templatesLabel": "CLI page templates"
+  },
+  "page": {
+    "alreadyExists": "[skip] page \"{name}\" already exists",
+    "doesNotExist": "[skip] page \"{name}\" does not exist",
+    "targetExists": "[skip] target page \"{name}\" already exists",
+    "templateMissing": "[skip] template not found: {path}",
+    "fileMissing": "[skip] not found: {path}",
+    "fileCreated": "[created] {path}",
+    "fileRenamed": "[renamed] {source} \u2192 {destination}",
+    "fileDeleted": "[deleted] {path}",
+    "createFailed": "[error] could not create page files: {error}",
+    "renameFailed": "[error] could not rename page files: {error}",
+    "deleteFailed": "[error] {path}: {error}"
+  },
+  "components": {
+    "fileMissing": "[skip] not found: {path}",
+    "anchorMissing": "[skip] no {anchor} anchor in {file}",
+    "blockAdded": "[updated] page block added for \"{name}\"",
+    "blockMissing": "[skip] page block for \"{name}\" not found",
+    "blockRemoved": "[cleaned] page block removed for \"{name}\"",
+    "blockRenamed": "[renamed] page block \"{source}\" \u2192 \"{destination}\""
+  },
+  "pagesData": {
+      "fileMissing": "[skip] not found: {path}",
+      "invalidStructure": "[error] {file} must contain an object of pages",
+      "parseFailed": "[error] cannot parse {file}: {error}",
+      "recordExists": "[skip] record \"{name}\" already exists",
+      "recordMissing": "[skip] record \"{name}\" not found",
+      "recordAdded": "[updated] record \"{name}\" added",
+      "recordRemoved": "[cleaned] record \"{name}\" removed",
+      "recordRenamed": "[updated] record \"{source}\" renamed to \"{destination}\""
+  },
+  "output": {
+    "emptyPath": "[skip] empty output path",
+    "readFailed": "[error] cannot read {file}: {error}",
+    "updateFailed": "[error] could not update output path: {error}",
+    "updating": "\nupdating output path \u2192 \"{path}\"",
+    "variableMissing": "[skip] {variable} not found in {file}",
+    "keyMissing": "[skip] {key} not found in {file}",
+    "fileUpdated": "[updated] {file} \u2192 {path}",
+    "directoryDeleted": "[deleted] {path}",
+    "refuseDelete": "[skip] refusing to delete \"{path}\" (outside project)",
+    "missingConfiguration": "(!) {key} not found in {file}",
+    "cleaned": "(\u2713) cleaned \u2192 {path}",
+    "nothingToClean": "(i) nothing to clean \u2192 {path}"
+  },
+  "cli": {
+    "usingLocalVersion": "Nibula cli local version ({local})",
+    "createPrompt": "Name of the new page: ",
+    "removePrompt": "Name of the page to remove: ",
+    "renameFromPrompt": "Page to rename: ",
+    "renameToPrompt": "New name: ",
+    "outputPathPrompt": "New output path: ",
+    "menuPrompt": "Choose an option: ",
+    "currentOutputPath": "Current path: \"{path}\"",
+    "confirmRemove": "This permanently deletes all files for \"{name}\".",
+    "cancelled": "Cancelled.",
+    "pageNotFound": "Page \"{name}\" does not exist.",
+    "sameName": "Old and new name are the same.",
+    "invalidOption": "Invalid option.",
+    "unexpectedError": "Unexpected error: {error}",
+    "missingFiles": "This project is missing required files:",
+    "incompleteProject": "The project may be incomplete or created with a different Nibula version.",
+    "exitHint": "CTRL + C to exit"
+  }
+}

package/tools/config/settings.json

@@ -1,131 +1,131 @@
-{
-  "project": {
-    "marker": ".eleventy.js",
-    "defaultOutputDirectory": "out",
-    "currentDirectory": ".",
-    "outputSuffix": "-out"
-  },
-  "paths": {
-    "eleventyConfig": ".eleventy.js",
-    "packageJson": "package.json",
-    "typescriptConfig": "tsconfig.json",
-    "routes": "src/frontend/routes",
-    "stylePages": "src/frontend/scss/pages",
-    "pagesData": "src/frontend/data/pages.json",
-    "siteData": "src/frontend/data/site.json",
-    "pageComponents": "src/frontend/layouts/page-components.njk",
-    "templates": "tools/res/templates"
-  },
-  "languages": {
-    "javascript": {
-      "pages": "src/frontend/js/pages",
-      "extension": "js",
-      "template": "template.js"
-    },
-    "typescript": {
-      "pages": "src/frontend/ts/pages",
-      "extension": "ts",
-      "template": "template.ts"
-    }
-  },
-  "packageJson": {
-    "outputKey": "outputDir",
-    "scriptsKey": "scripts"
-  },
-  "eleventy": {
-    "outputVariable": "OUTPUT_DIR"
-  },
-  "typescript": {
-    "outputKey": "outDir",
-    "outputSubdirectory": "ts"
-  },
-  "build": {
-    "scriptOutput": "js/pages"
-  },
-  "outputScripts": [
-    {
-      "name": "build:css",
-      "marker": "/css",
-      "template": "sass src/frontend/scss:{output}/css --no-source-map --style=compressed --quiet --load-path=node_modules"
-    },
-    {
-      "name": "serve:css",
-      "marker": "/css",
-      "template": "sass --watch src/frontend/scss:{output}/css --no-source-map --quiet --load-path=node_modules"
-    },
-    {
-      "name": "build:js",
-      "marker": "/js/pages",
-      "template": "esbuild \"{entries}\" --bundle --outdir={output}/js/pages --minify"
-    },
-    {
-      "name": "serve:js",
-      "marker": "/js/pages",
-      "template": "esbuild \"{entries}\" --bundle --outdir={output}/js/pages --watch"
-    }
-  ],
-  "page": {
-    "protected": ["homepage", "404"],
-    "styleExtension": "scss",
-    "routeExtension": "njk",
-    "styleTemplate": "template.scss",
-    "routeTemplate": "template.njk",
-    "outputFiles": [
-      "js/pages/{camelName}.js",
-      "css/pages/{camelName}.css",
-      "{pageName}.html",
-      "pages/{pageName}.html"
-    ],
-    "outputDirectories": [
-      "{pageName}",
-      "pages/{pageName}"
-    ],
-    "defaultData": {
-      "seo": {
-        "title": "{title}",
-        "description": "description",
-        "keywords": "",
-        "noindex": false,
-        "canonical": ""
-      },
-      "cdn": {
-        "css": [],
-        "js": []
-      }
-    }
-  },
-  "pageComponents": {
-    "anchor": "{% else %}",
-    "condition": "{% elif title == \"{camelName}\" %}",
-    "include": "{% include \"component-name.njk\" ignore missing %}"
-  },
-  "frontMatter": {
-    "title": "title: \"{camelName}\"",
-    "permalink": "permalink: \"/{pageName}/\""
-  },
-  "cli": {
-    "title": "Nibula CLI",
-    "boxWidth": 17,
-    "confirmHint": "[y/N]",
-    "symbols": {
-      "prompt": "\u276f",
-      "error": "\u2716",
-      "warning": "\u26a0",
-      "bullet": "-"
-    },
-    "colors": {
-      "box": "cyan",
-      "menuKey": "dim",
-      "prompt": "cyan",
-      "error": "red",
-      "warning": "yellow",
-      "notice": "dim"
-    },
-    "menu": [
-      { "key": "1", "action": "createPage", "label": "Create page" },
-      { "key": "2", "action": "removePage", "label": "Remove page" },
-      { "key": "3", "action": "renamePage", "label": "Rename page" },
-      { "key": "4", "action": "outputPath", "label": "Configure output path" }
-    ]
-  }
+{
+  "project": {
+    "marker": ".eleventy.js",
+    "defaultOutputDirectory": "out",
+    "currentDirectory": ".",
+    "outputSuffix": "-out"
+  },
+  "paths": {
+    "eleventyConfig": ".eleventy.js",
+    "packageJson": "package.json",
+    "typescriptConfig": "tsconfig.json",
+    "routes": "src/frontend/routes",
+    "stylePages": "src/frontend/scss/pages",
+    "pagesData": "src/frontend/data/pages.json",
+    "siteData": "src/frontend/data/site.json",
+    "pageComponents": "src/frontend/layouts/page-components.njk",
+    "templates": "tools/res/templates"
+  },
+  "languages": {
+    "javascript": {
+      "pages": "src/frontend/js/pages",
+      "extension": "js",
+      "template": "template.js"
+    },
+    "typescript": {
+      "pages": "src/frontend/ts/pages",
+      "extension": "ts",
+      "template": "template.ts"
+    }
+  },
+  "packageJson": {
+    "outputKey": "outputDir",
+    "scriptsKey": "scripts"
+  },
+  "eleventy": {
+    "outputVariable": "OUTPUT_DIR"
+  },
+  "typescript": {
+    "outputKey": "outDir",
+    "outputSubdirectory": "ts"
+  },
+  "build": {
+    "scriptOutput": "js/pages"
+  },
+  "outputScripts": [
+    {
+      "name": "build:css",
+      "marker": "/css",
+      "template": "sass src/frontend/scss:{output}/css --no-source-map --style=compressed --quiet --load-path=node_modules"
+    },
+    {
+      "name": "serve:css",
+      "marker": "/css",
+      "template": "sass --watch src/frontend/scss:{output}/css --no-source-map --quiet --load-path=node_modules"
+    },
+    {
+      "name": "build:js",
+      "marker": "/js/pages",
+      "template": "esbuild \"{entries}\" --bundle --outdir={output}/js/pages --minify"
+    },
+    {
+      "name": "serve:js",
+      "marker": "/js/pages",
+      "template": "esbuild \"{entries}\" --bundle --outdir={output}/js/pages --watch"
+    }
+  ],
+  "page": {
+    "protected": ["homepage", "404"],
+    "styleExtension": "scss",
+    "routeExtension": "njk",
+    "styleTemplate": "template.scss",
+    "routeTemplate": "template.njk",
+    "outputFiles": [
+      "js/pages/{camelName}.js",
+      "css/pages/{camelName}.css",
+      "{pageName}.html",
+      "pages/{pageName}.html"
+    ],
+    "outputDirectories": [
+      "{pageName}",
+      "pages/{pageName}"
+    ],
+    "defaultData": {
+      "seo": {
+        "title": "{title}",
+        "description": "description",
+        "keywords": "",
+        "noindex": false,
+        "canonical": ""
+      },
+      "cdn": {
+        "css": [],
+        "js": []
+      }
+    }
+  },
+  "pageComponents": {
+    "anchor": "{% else %}",
+    "condition": "{% elif title == \"{camelName}\" %}",
+    "include": "{% include \"component-name.njk\" ignore missing %}"
+  },
+  "frontMatter": {
+    "title": "title: \"{camelName}\"",
+    "permalink": "permalink: \"/{pageName}/\""
+  },
+  "cli": {
+    "title": "Nibula CLI",
+    "boxWidth": 17,
+    "confirmHint": "[y/N]",
+    "symbols": {
+      "prompt": "\u276f",
+      "error": "\u2716",
+      "warning": "\u26a0",
+      "bullet": "-"
+    },
+    "colors": {
+      "box": "cyan",
+      "menuKey": "dim",
+      "prompt": "cyan",
+      "error": "red",
+      "warning": "yellow",
+      "notice": "dim"
+    },
+    "menu": [
+      { "key": "1", "action": "createPage", "label": "Create page" },
+      { "key": "2", "action": "removePage", "label": "Remove page" },
+      { "key": "3", "action": "renamePage", "label": "Rename page" },
+      { "key": "4", "action": "outputPath", "label": "Configure output path" }
+    ]
+  }
 } 

package/tools/lib/colors.js

@@ -1,17 +1,17 @@
-const color = Object.freeze({
-    reset:   '\x1b[0m',
-    bold:    '\x1b[1m',
-    dim:     '\x1b[2m',
-    red:     '\x1b[31m',
-    green:   '\x1b[32m',
-    yellow:  '\x1b[33m',
-    blue:    '\x1b[34m',
-    magenta: '\x1b[35m',
-    cyan:    '\x1b[36m',
-});
-
-function paint(name, text) {
-    return `${color[name] ?? ''}${text}${color.reset}`;
-}
-
-module.exports = { color, paint };
+const color = Object.freeze({
+    reset:   '\x1b[0m',
+    bold:    '\x1b[1m',
+    dim:     '\x1b[2m',
+    red:     '\x1b[31m',
+    green:   '\x1b[32m',
+    yellow:  '\x1b[33m',
+    blue:    '\x1b[34m',
+    magenta: '\x1b[35m',
+    cyan:    '\x1b[36m',
+});
+
+function paint(name, text) {
+    return `${color[name] ?? ''}${text}${color.reset}`;
+}
+
+module.exports = { color, paint };

package/tools/lib/files.js

@@ -1,76 +1,76 @@
-const fs = require('fs');
-const path = require('path');
-
-const ENCODING = 'utf8';
-const INDENTATION = 2;
-const NEW_LINE = '\n';
-
-function exists(target) {
-    return fs.existsSync(target);
-}
-
-function ensureDirectory(target) {
-    fs.mkdirSync(path.dirname(target), { recursive: true });
-}
-
-function readText(target) {
-    return fs.readFileSync(target, ENCODING);
-}
-
-function writeText(target, content) {
-    ensureDirectory(target);
-    fs.writeFileSync(target, content);
-}
-
-function readJson(target) {
-    return JSON.parse(readText(target));
-}
-
-function writeJson(target, data) {
-    writeText(target, `${JSON.stringify(data, null, INDENTATION)}${NEW_LINE}`);
-}
-
-function copyFile(source, destination) {
-    ensureDirectory(destination);
-    fs.copyFileSync(source, destination);
-}
-
-function moveFile(source, destination) {
-    ensureDirectory(destination);
-    fs.renameSync(source, destination);
-}
-
-function removeFile(target) {
-    if (!exists(target)) return false;
-    fs.unlinkSync(target);
-    return true;
-}
-
-function removeDirectory(target) {
-    if (!exists(target)) return false;
-    fs.rmSync(target, { recursive: true, force: true });
-    return true;
-}
-
-function removeDirectoryIfEmpty(target) {
-    try {
-        if (fs.readdirSync(target).length > 0) return false;
-        fs.rmdirSync(target);
-        return true;
-    } catch (error) {
-        return false;
-    }
-}
-
-module.exports = {
-    exists,
-    readText,
-    writeText,
-    readJson,
-    writeJson,
-    copyFile,
-    moveFile,
-    removeFile,
-    removeDirectory,
-    removeDirectoryIfEmpty,
+const fs = require('fs');
+const path = require('path');
+
+const ENCODING = 'utf8';
+const INDENTATION = 2;
+const NEW_LINE = '\n';
+
+function exists(target) {
+    return fs.existsSync(target);
+}
+
+function ensureDirectory(target) {
+    fs.mkdirSync(path.dirname(target), { recursive: true });
+}
+
+function readText(target) {
+    return fs.readFileSync(target, ENCODING);
+}
+
+function writeText(target, content) {
+    ensureDirectory(target);
+    fs.writeFileSync(target, content);
+}
+
+function readJson(target) {
+    return JSON.parse(readText(target));
+}
+
+function writeJson(target, data) {
+    writeText(target, `${JSON.stringify(data, null, INDENTATION)}${NEW_LINE}`);
+}
+
+function copyFile(source, destination) {
+    ensureDirectory(destination);
+    fs.copyFileSync(source, destination);
+}
+
+function moveFile(source, destination) {
+    ensureDirectory(destination);
+    fs.renameSync(source, destination);
+}
+
+function removeFile(target) {
+    if (!exists(target)) return false;
+    fs.unlinkSync(target);
+    return true;
+}
+
+function removeDirectory(target) {
+    if (!exists(target)) return false;
+    fs.rmSync(target, { recursive: true, force: true });
+    return true;
+}
+
+function removeDirectoryIfEmpty(target) {
+    try {
+        if (fs.readdirSync(target).length > 0) return false;
+        fs.rmdirSync(target);
+        return true;
+    } catch (error) {
+        return false;
+    }
+}
+
+module.exports = {
+    exists,
+    readText,
+    writeText,
+    readJson,
+    writeJson,
+    copyFile,
+    moveFile,
+    removeFile,
+    removeDirectory,
+    removeDirectoryIfEmpty,
 };

package/tools/lib/logger.js

@@ -1,22 +1,22 @@
-const messages = require('../config/messages.json');
-const { formatText } = require('./text');
-
-const KEY_SEPARATOR = '.';
-
-function resolveTemplate(key) {
-    return key.split(KEY_SEPARATOR).reduce(
-        (current, part) => (current !== null && typeof current === 'object' ? current[part] : undefined),
-        messages
-    );
-}
-
-function message(key, values) {
-    const template = resolveTemplate(key);
-    return typeof template === 'string' ? formatText(template, values) : key;
-}
-
-function log(key, values) {
-    console.log(message(key, values));
-}
-
-module.exports = { message, log };
+const messages = require('../config/messages.json');
+const { formatText } = require('./text');
+
+const KEY_SEPARATOR = '.';
+
+function resolveTemplate(key) {
+    return key.split(KEY_SEPARATOR).reduce(
+        (current, part) => (current !== null && typeof current === 'object' ? current[part] : undefined),
+        messages
+    );
+}
+
+function message(key, values) {
+    const template = resolveTemplate(key);
+    return typeof template === 'string' ? formatText(template, values) : key;
+}
+
+function log(key, values) {
+    console.log(message(key, values));
+}
+
+module.exports = { message, log };