From e06292fe8e7d789d38ac43fd9eee6816e39e18fe Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 10 Jan 2023 19:45:13 -0400 Subject: extract fn for localizedPathnames --- src/write/build-modes/live-dev-server.js | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'src/write/build-modes/live-dev-server.js') diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js index b6bf662b..a5d9da97 100644 --- a/src/write/build-modes/live-dev-server.js +++ b/src/write/build-modes/live-dev-server.js @@ -11,10 +11,10 @@ import {serializeThings} from '../../data/serialize.js'; import * as pageSpecs from '../../page/index.js'; import {logInfo, logWarn, progressCallAll} from '../../util/cli.js'; -import {withEntries} from '../../util/sugar.js'; import { getPagePathname, + getPagePathnameAcrossLanguages, getPageSubdirectoryPrefix, getURLsFrom, getURLsFromRoot, @@ -280,20 +280,13 @@ export async function go({ response.writeHead(200, contentTypeHTML); - const localizedPathnames = withEntries(languages, entries => entries - .filter(([key, language]) => key !== 'default' && !language.hidden) - .map(([_key, language]) => [ - language.code, - getPagePathname({ - baseDirectory: - (language === defaultLanguage - ? '' - : language.code), - fullKey: 'localized.' + pageSubKey, - urlArgs, - urls, - }), - ])); + const localizedPathnames = getPagePathnameAcrossLanguages({ + defaultLanguage, + languages, + pageSubKey, + urlArgs, + urls, + }); const bound = bindUtilities({ absoluteTo, -- cgit 1.3.0-6-gf8a5 From fd59ddd05bdfebf2f9a55a0fa5915485929e7de6 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 10 Jan 2023 19:54:10 -0400 Subject: don't pass around fullKey where unneeded --- src/write/build-modes/live-dev-server.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/write/build-modes/live-dev-server.js') diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js index a5d9da97..bdd4561e 100644 --- a/src/write/build-modes/live-dev-server.js +++ b/src/write/build-modes/live-dev-server.js @@ -83,17 +83,14 @@ export async function go({ else if (page.type === 'redirect') servePath = page.fromPath; - const fullKey = 'localized.' + servePath[0]; - const urlArgs = servePath.slice(1); - return Object.values(languages).map(language => { const baseDirectory = language === defaultLanguage ? '' : language.code; const pathname = getPagePathname({ baseDirectory, - fullKey, - urlArgs, + pageSubKey: servePath[0], + urlArgs: servePath.slice(1), urls, }); -- cgit 1.3.0-6-gf8a5 From 54ad9946e3fa32ae8388d54ec8b3baad78a29417 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 10 Jan 2023 20:20:18 -0400 Subject: prefer passing around pagePath --- src/write/build-modes/live-dev-server.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/write/build-modes/live-dev-server.js') diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js index bdd4561e..ec9689bd 100644 --- a/src/write/build-modes/live-dev-server.js +++ b/src/write/build-modes/live-dev-server.js @@ -89,8 +89,7 @@ export async function go({ const pathname = getPagePathname({ baseDirectory, - pageSubKey: servePath[0], - urlArgs: servePath.slice(1), + pagePath: servePath, urls, }); @@ -248,9 +247,9 @@ export async function go({ const to = getURLsFrom({ urls, baseDirectory, - pageSubKey: servePath[0], + pagePath: servePath, subdirectoryPrefix: getPageSubdirectoryPrefix({ - urlArgs: servePath.slice(1), + pagePath: servePath, }), }); @@ -260,9 +259,6 @@ export async function go({ }); try { - const pageSubKey = servePath[0]; - const urlArgs = servePath.slice(1); - if (page.type === 'redirect') { response.writeHead(301, contentTypeHTML); @@ -280,8 +276,7 @@ export async function go({ const localizedPathnames = getPagePathnameAcrossLanguages({ defaultLanguage, languages, - pageSubKey, - urlArgs, + pagePath: servePath, urls, }); @@ -305,9 +300,8 @@ export async function go({ languages, localizedPathnames, oEmbedJSONHref: null, // No oEmbed support for live dev server - pageSubKey, + pagePath: servePath, pathname, - urlArgs, to, transformMultiline: bound.transformMultiline, wikiData, -- cgit 1.3.0-6-gf8a5 From ba8a441f95481e294d414a0c89e2513f82f45a7a Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 10 Jan 2023 20:28:22 -0400 Subject: compute subdirectoryPrefix internally --- src/write/build-modes/live-dev-server.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/write/build-modes/live-dev-server.js') diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js index ec9689bd..a4c4c871 100644 --- a/src/write/build-modes/live-dev-server.js +++ b/src/write/build-modes/live-dev-server.js @@ -15,7 +15,6 @@ import {logInfo, logWarn, progressCallAll} from '../../util/cli.js'; import { getPagePathname, getPagePathnameAcrossLanguages, - getPageSubdirectoryPrefix, getURLsFrom, getURLsFromRoot, } from '../../util/urls.js'; @@ -245,12 +244,9 @@ export async function go({ } = urlToPageMap[pathnameKey]; const to = getURLsFrom({ - urls, baseDirectory, pagePath: servePath, - subdirectoryPrefix: getPageSubdirectoryPrefix({ - pagePath: servePath, - }), + urls, }); const absoluteTo = getURLsFromRoot({ -- cgit 1.3.0-6-gf8a5 From 7f6d21d480e22765f438d5a80227f89c416b770b Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 10 Jan 2023 20:47:38 -0400 Subject: bind more language vars, pass to generateDocumentHTML --- src/write/build-modes/live-dev-server.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/write/build-modes/live-dev-server.js') diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js index a4c4c871..0e2b6160 100644 --- a/src/write/build-modes/live-dev-server.js +++ b/src/write/build-modes/live-dev-server.js @@ -278,8 +278,10 @@ export async function go({ const bound = bindUtilities({ absoluteTo, + defaultLanguage, getSizeOfAdditionalFile, language, + languages, to, urls, wikiData, @@ -288,19 +290,13 @@ export async function go({ const pageInfo = page.page(bound); const pageHTML = generateDocumentHTML(pageInfo, { + ...bound, cachebust, - defaultLanguage, developersComment, - getThemeString: bound.getThemeString, - language, - languages, localizedPathnames, oEmbedJSONHref: null, // No oEmbed support for live dev server pagePath: servePath, pathname, - to, - transformMultiline: bound.transformMultiline, - wikiData, }); console.log(`${requestHead} [200] ${pathname}`); -- cgit 1.3.0-6-gf8a5