Fix author archive parity and pagination #738
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| #!/usr/bin/env node | ||
| import fs from 'node:fs/promises'; | ||
| import path from 'node:path'; | ||
| import process from 'node:process'; | ||
| import matter from 'gray-matter'; | ||
|
|
||
| const args = parseArgs(process.argv.slice(2)); | ||
| const outPath = path.resolve(args.out ?? 'src/data/author-post-paths.json'); | ||
| const postsDir = path.resolve(args.postsDir ?? 'src/content/posts'); | ||
| const wxrDir = path.resolve(args.wxrDir ?? 'data/raw'); | ||
| const routeAliasesPath = new URL('../src/data/route-aliases.json', import.meta.url); | ||
| const routeAliases = JSON.parse(await fs.readFile(routeAliasesPath, 'utf8')); | ||
|
|
||
| const AUTHOR_ALIASES = { | ||
| Tiffany: 'tiffany', | ||
| 'alan@rentmoreweeks.com': 'alan', | ||
| 'Our Discount Desk': 'our-discount-desk', | ||
| 'Our Travel Reporter': 'our-travel-reporter', | ||
| }; | ||
|
|
||
| const ROUTE_ALIASES = new Map(Object.entries(routeAliases)); | ||
|
|
||
| const localPosts = await loadLocalPosts(postsDir); | ||
| const authorPathMap = await buildAuthorPathMap(wxrDir, localPosts); | ||
|
|
||
| await fs.mkdir(path.dirname(outPath), { recursive: true }); | ||
| await fs.writeFile(outPath, `${JSON.stringify(authorPathMap, null, 2)}\n`); | ||
|
|
||
| console.log(`Author post paths written: ${outPath}`); | ||
| for (const [slug, routes] of Object.entries(authorPathMap)) { | ||
| console.log(`- ${slug}: ${routes.length}`); | ||
| } | ||
|
|
||
| function parseArgs(argv) { | ||
| const out = {}; | ||
| for (let i = 0; i < argv.length; i += 1) { | ||
| const arg = argv[i]; | ||
| if (!arg.startsWith('--')) continue; | ||
| const [key, inlineValue] = arg.split('='); | ||
| const name = key.slice(2); | ||
| if (inlineValue !== undefined) { | ||
| out[name] = inlineValue; | ||
| continue; | ||
| } | ||
| const next = argv[i + 1]; | ||
| if (!next || next.startsWith('--')) { | ||
| out[name] = true; | ||
| } else { | ||
| out[name] = next; | ||
| i += 1; | ||
| } | ||
| } | ||
| return out; | ||
| } | ||
|
|
||
| async function loadLocalPosts(rootDir) { | ||
| const files = (await fs.readdir(rootDir)) | ||
| .filter((entry) => entry.endsWith('.md')) | ||
| .map((entry) => path.join(rootDir, entry)); | ||
|
|
||
| const byWordpressId = new Map(); | ||
| const byRoute = new Map(); | ||
|
|
||
| for (const filePath of files) { | ||
| const raw = await fs.readFile(filePath, 'utf8'); | ||
| const { data } = matter(raw); | ||
| if (data.status !== 'publish' || data.draft === true) continue; | ||
|
|
||
| const wordpressId = String(data.wordpressId ?? '').trim(); | ||
| const route = normalizeRoutePath(data.path); | ||
| const dateValue = toTimestamp(data.date); | ||
| if (!route || !dateValue) continue; | ||
|
|
||
| const record = { | ||
| wordpressId, | ||
| route, | ||
| date: dateValue, | ||
| }; | ||
|
|
||
| if (wordpressId) byWordpressId.set(wordpressId, record); | ||
| byRoute.set(route, record); | ||
| } | ||
|
|
||
| return { byWordpressId, byRoute }; | ||
| } | ||
|
|
||
| async function buildAuthorPathMap(wxrDir, localPosts) { | ||
| const files = (await fs.readdir(wxrDir)) | ||
| .filter((entry) => /^wordpress-export-posts-\d{4}\.xml$/.test(entry)) | ||
| .map((entry) => path.join(wxrDir, entry)) | ||
| .sort(); | ||
|
|
||
| const pathsBySlug = new Map(Object.values(AUTHOR_ALIASES).map((slug) => [slug, new Map()])); | ||
|
|
||
| for (const filePath of files) { | ||
| const raw = await fs.readFile(filePath, 'utf8'); | ||
| for (const item of iterateItems(raw)) { | ||
| const slug = AUTHOR_ALIASES[item.creator]; | ||
| if (!slug) continue; | ||
| if (item.postType !== 'post' || item.status !== 'publish') continue; | ||
|
|
||
| const sourceRoute = normalizeRoutePath(item.link); | ||
| const preferred = localPosts.byWordpressId.get(item.wordpressId); | ||
| const fallback = localPosts.byRoute.get(sourceRoute); | ||
| const aliasTarget = ROUTE_ALIASES.get(sourceRoute) ?? ''; | ||
| const aliasResolved = aliasTarget ? localPosts.byRoute.get(aliasTarget) : null; | ||
| const resolved = preferred ?? fallback ?? aliasResolved; | ||
| if (!resolved) continue; | ||
|
|
||
| // Preserve the exported alias path when the WXR item only resolves via ROUTE_ALIASES | ||
| // so author archive pagination can match WordPress while reusing the canonical local post. | ||
| const recordedRoute = | ||
| preferred || fallback || !aliasResolved ? resolved.route : sourceRoute; | ||
|
|
||
| pathsBySlug.get(slug).set(recordedRoute, resolved.date); | ||
| } | ||
| } | ||
|
|
||
| return Object.fromEntries( | ||
| [...pathsBySlug.entries()].map(([slug, routes]) => { | ||
| const orderedRoutes = [...routes.entries()] | ||
| .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])) | ||
| .map(([route]) => route); | ||
| return [slug, orderedRoutes]; | ||
| }) | ||
| ); | ||
| } | ||
|
|
||
| function *iterateItems(xml) { | ||
| const itemRegex = /<item>([\s\S]*?)<\/item>/g; | ||
| for (const match of xml.matchAll(itemRegex)) { | ||
| const item = match[1]; | ||
| yield { | ||
| creator: decodeXml(extractCdata(item, 'dc:creator')), | ||
| status: extractCdata(item, 'wp:status'), | ||
| postType: extractCdata(item, 'wp:post_type'), | ||
| wordpressId: extractTag(item, 'wp:post_id'), | ||
| link: decodeXml(extractTag(item, 'link')), | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| function extractCdata(source, tagName) { | ||
| const match = source.match(new RegExp(`<${escapeRegExp(tagName)}><!\\[CDATA\\[([\\s\\S]*?)\\]\\]><\\/${escapeRegExp(tagName)}>`, 'i')); | ||
| if (match) return match[1].trim(); | ||
| return extractTag(source, tagName); | ||
| } | ||
|
|
||
| function extractTag(source, tagName) { | ||
| const match = source.match(new RegExp(`<${escapeRegExp(tagName)}>([\\s\\S]*?)<\\/${escapeRegExp(tagName)}>`, 'i')); | ||
| return match ? match[1].trim() : ''; | ||
| } | ||
|
|
||
| function escapeRegExp(value) { | ||
| return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); | ||
| } | ||
|
|
||
| function decodeXml(value) { | ||
| return String(value || '') | ||
| .replace(/&/g, '&') | ||
| .replace(/–/g, '–') | ||
| .replace(/’/g, '’') | ||
| .replace(/“/g, '“') | ||
| .replace(/”/g, '”') | ||
| .replace(/&/g, '&') | ||
| .replace(/"/g, '"') | ||
| .replace(/'/g, "'") | ||
| .replace(/</g, '<') | ||
| .replace(/>/g, '>'); | ||
| } | ||
|
|
||
| function normalizeRoutePath(value) { | ||
| const raw = String(value || '') | ||
| .replace(/https?:\/\/blog\.hichee\.com/i, '') | ||
| .replace(/%ef%bf%bc/gi, '') | ||
| .replace(/\uFFFC/g, '') | ||
| .trim(); | ||
|
|
||
| if (!raw) return ''; | ||
|
|
||
| const withLeadingSlash = raw.startsWith('/') ? raw : `/${raw}`; | ||
| return withLeadingSlash.endsWith('/') ? withLeadingSlash : `${withLeadingSlash}/`; | ||
| } | ||
|
|
||
| function toTimestamp(value) { | ||
| if (value instanceof Date) return value.getTime(); | ||
| const parsed = Date.parse(String(value || '')); | ||
| return Number.isFinite(parsed) ? parsed : 0; | ||
|
Comment on lines
+176
to
+188
There was a problem hiding this comment.
.replace(/&|&/g, '&') |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| --- | ||
| interface Props { | ||
| basePath: string; | ||
| currentPage: number; | ||
| totalPages: number; | ||
| ariaLabel?: string; | ||
| } | ||
|
|
||
| const { basePath, currentPage, totalPages, ariaLabel = 'Pagination' } = Astro.props; | ||
| const items = totalPages > 1 ? buildItems(currentPage, totalPages) : []; | ||
| const previousHref = totalPages > 1 && currentPage > 1 ? pageHref(basePath, currentPage - 1) : null; | ||
| const nextHref = totalPages > 1 && currentPage < totalPages ? pageHref(basePath, currentPage + 1) : null; | ||
| const previousPage = currentPage - 1; | ||
| const nextPage = currentPage + 1; | ||
|
|
||
| function buildItems(current: number, total: number) { | ||
| const pages = new Set([1, total, current - 1, current, current + 1]); | ||
| if (current <= 3) { | ||
| pages.add(2); | ||
| pages.add(3); | ||
| } | ||
| if (current >= total - 2) { | ||
| pages.add(total - 1); | ||
| pages.add(total - 2); | ||
| } | ||
|
|
||
| const ordered = [...pages] | ||
| .filter((page) => page >= 1 && page <= total) | ||
| .sort((a, b) => a - b); | ||
|
|
||
| const items = []; | ||
| let previous = 0; | ||
| for (const page of ordered) { | ||
| if (previous && page - previous > 1) { | ||
| items.push({ type: 'ellipsis', key: `ellipsis-${previous}-${page}` }); | ||
| } | ||
| items.push({ type: 'page', key: `page-${page}`, page }); | ||
| previous = page; | ||
| } | ||
| return items; | ||
| } | ||
|
|
||
| function pageHref(rootPath: string, page: number) { | ||
| if (page <= 1) return rootPath; | ||
| return `${rootPath}page/${page}/`; | ||
| } | ||
| --- | ||
|
|
||
| { | ||
| totalPages > 1 && ( | ||
| <nav class="pagination-nav" aria-label={ariaLabel}> | ||
| <div class="pagination-nav__list"> | ||
| { | ||
| previousHref && ( | ||
| <a | ||
| class="page-numbers page-numbers--nav" | ||
| href={previousHref} | ||
| rel="prev" | ||
| aria-label={`Previous page, page ${previousPage}`} | ||
| > | ||
| Previous | ||
| </a> | ||
| ) | ||
| } | ||
|
|
||
| { | ||
| items.map((item) => | ||
| item.type === 'ellipsis' ? ( | ||
| <span class="page-numbers page-numbers--ellipsis" aria-hidden="true"> | ||
| … | ||
| </span> | ||
| ) : item.page === currentPage ? ( | ||
| <span class="page-numbers current" aria-current="page"> | ||
| {item.page} | ||
| </span> | ||
| ) : ( | ||
| <a class="page-numbers" href={pageHref(basePath, item.page)}> | ||
| {item.page} | ||
| </a> | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| { | ||
| nextHref && ( | ||
| <a | ||
| class="page-numbers page-numbers--nav" | ||
| href={nextHref} | ||
| rel="next" | ||
| aria-label={`Next page, page ${nextPage}`} | ||
| > | ||
| Next | ||
| </a> | ||
| ) | ||
| } | ||
| </div> | ||
| </nav> | ||
| ) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.