From 5631be8ac1d77aab9a63dd4e5e72f668dddf0de6 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 30 Jan 2023 20:32:23 -0400 Subject: remaining CLI help messages & tweaks --- src/write/build-modes/live-dev-server.js | 11 +++++++++-- src/write/build-modes/static-build.js | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'src/write/build-modes') diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js index 81ae5b8e..39229a9a 100644 --- a/src/write/build-modes/live-dev-server.js +++ b/src/write/build-modes/live-dev-server.js @@ -25,13 +25,20 @@ import { generateRedirectHTML, } from '../page-template.js'; +const defaultHost = '0.0.0.0'; +const defaultPort = 8002; + +export const description = `Hosts a local HTTP server which generates page content as it is requested, instead of all at once; reacts to changes in data files, so new reloads will be up-to-date with on-disk YAML data (<- not implemented yet, check back soon!)\n\nIntended for local development ONLY; this custom HTTP server is NOT rigorously tested and almost certainly has security flaws`; + export function getCLIOptions() { return { host: { + help: `Hostname to which HTTP server is bound\nDefaults to ${defaultHost}`, type: 'value', }, port: { + help: `Port to which HTTP server is bound\nDefaults to ${defaultPort}`, type: 'value', validate(size) { if (parseInt(size) !== parseFloat(size)) return 'an integer'; @@ -57,8 +64,8 @@ export async function go({ developersComment, getSizeOfAdditionalFile, }) { - const host = cliOptions['host'] ?? '0.0.0.0'; - const port = parseInt(cliOptions['port'] ?? 8002); + const host = cliOptions['host'] ?? defaultHost; + const port = parseInt(cliOptions['port'] ?? defaultPort); let targetSpecPairs = getPageSpecsWithTargets({wikiData}); const pages = progressCallAll(`Computing page data & paths for ${targetSpecPairs.length} targets.`, diff --git a/src/write/build-modes/static-build.js b/src/write/build-modes/static-build.js index 220e51f4..fa724536 100644 --- a/src/write/build-modes/static-build.js +++ b/src/write/build-modes/static-build.js @@ -15,7 +15,7 @@ import {serializeThings} from '../../data/serialize.js'; import * as pageSpecs from '../../page/index.js'; import link from '../../util/link.js'; -import {empty, queue} from '../../util/sugar.js'; +import {empty, queue, withEntries} from '../../util/sugar.js'; import { logError, @@ -34,6 +34,8 @@ import { const pageFlags = Object.keys(pageSpecs); +export const description = `Generates all page content in one build (according to the contents of data files at build time) and writes them to disk, preparing the output folder for upload and serving by any static web host\n\nIntended for any production or public-facing release of a wiki; serviceable for local development, but can be a bit unwieldy and time/CPU-expensive`; + export function getCLIOptions() { return { // This is the output directory. It's the one you'll upload online with @@ -43,6 +45,7 @@ export function getCLIOptions() { // couple symlinked directories, so if you're uploading, you're pro8a8ly // gonna want to resolve those yourself. 'out-path': { + help: `Specify path to output directory, into which HTML page files and other output are written and other directories are linked\n\nAlways required alongside --static-build mode, but may be provided via the HSMUSIC_OUT environment variable instead`, type: 'value', }, @@ -51,12 +54,14 @@ export function getCLIOptions() { // the site. Not recommended for production, since it isn't guaranteed // 100% error-free (and index.html-style links are less pretty anyway). 'append-index-html': { + help: `Apply "index.html" to the end of page links, instead of just linking to the directory (ex. "/track/ng2yu/"); useful when no local server hosting option is available and browsing build output directly off the disk drive\n\nDefinitely not intended for production: this option isn't extensively tested and may include conspicuous oddities`, type: 'flag', }, // Only want to 8uild one language during testing? This can chop down // 8uild times a pretty 8ig chunk! Just pass a single language code. 'lang': { + help: `Skip rest and build only pages for this locale language (specify a language code)`, type: 'value', }, @@ -65,7 +70,12 @@ export function getCLIOptions() { // They're here to make development quicker when you're only working // on some particular area(s) of the site rather than making changes // across all of them. - ...Object.fromEntries(pageFlags.map((key) => [key, {type: 'flag'}])), + ...withEntries(pageSpecs, entries => entries.map( + ([key, spec]) => [key, { + help: spec.description && + `Skip rest and build only:\n${spec.description}`, + type: 'flag', + }])), }; } -- cgit 1.3.0-6-gf8a5