compute all urls before the permalink generation

site/generations/page.ts

@@ -9,7 +9,6 @@ import {type MenubarData, MenubarDatum} from "../internal/menubar.tsx"
 import {type PageData, PageDatum} from "../internal/page.tsx"
 import {type PartData, PartDatum} from "../internal/part.tsx"
 import {type ServiceData, ServiceDatum} from "../internal/service.tsx"
-import {writeUrl} from "../internal/url.ts"
 
 declare module "@onlyoffice/eleventy-types" {
   interface Data {
@@ -59,10 +58,6 @@ declare module "@onlyoffice/eleventy-types" {
 
 export function data(): Data {
   return {
-    permalink(d) {
-      return writeUrl(d)
-    },
-
     layout: "article",
 
     eleventyComputed: {

site/internal/url.ts

@@ -7,6 +7,7 @@ import {slug} from "github-slugger"
 
 declare module "@onlyoffice/eleventy-types" {
   interface Data {
+    isWritten?: boolean
     doWrite?(this: void, data: Data): boolean | undefined
   }
 }
@@ -16,6 +17,8 @@ declare module "@onlyoffice/eleventy-types" {
     canonicalUrl?: string
     sitemapUrl?: string
     virtualUrl?: string
+    specificUrl?: string
+    writeUrl?: string
   }
 }
 
@@ -31,26 +34,41 @@ export function eleventyUrl(uc: UserConfig): void {
     await rmTempDir(c.dir.output)
   })
 
-  uc.addGlobalData("eleventyComputed", {
-    canonicalUrl,
-    sitemapUrl,
-    virtualUrl,
+  uc.addGlobalData("permalink", () => {
+    return permalink
   })
 }
 
-export function isWritten(d: Data): boolean {
-  const p = d.page
-  if (!p) {
-    throw new Error("The page data is missing")
+function permalink(d: Data): string {
+  if (d.writeUrl) {
+    return d.writeUrl
   }
-  return !isTempPath(p.outputPath)
-}
 
-export function writeUrl(d: Data): string {
-  if (doWrite(d)) {
-    return specificUrl(d)
+  const sp = computePath(d, d.specificPath)
+  const su = slugify(sp)
+
+  const vp = computePath(d, d.virtualPath)
+  const vu = slugify(vp)
+
+  const [mu] = cutSuffix(vu, "index.html")
+  const [cu] = cutSuffix(su, "index.html")
+
+  d.isWritten = doWrite(d)
+
+  if (d.isWritten) {
+    d.writeUrl = su
+  } else {
+    const tp = computePath(d, tempPath)
+    const tu = slugify(tp)
+    d.writeUrl = tu
   }
-  return tempUrl()
+
+  d.specificUrl = su
+  d.virtualUrl = vu
+  d.sitemapUrl = mu
+  d.canonicalUrl = cu
+
+  return d.writeUrl
 }
 
 function doWrite(d: Data): boolean {
@@ -63,11 +81,6 @@ function doWrite(d: Data): boolean {
   return true
 }
 
-function tempUrl(): string {
-  const p = tempPath()
-  return slugify(p)
-}
-
 async function rmTempDir(r: string): Promise<void> {
   const d = both.join(r, "temp")
   await rm(d, {recursive: true})
@@ -78,33 +91,7 @@ let tempCount = 0
 function tempPath(): string {
   const i = tempCount
   tempCount += 1
-  return `temp/${i}.txt`
-}
-
-function isTempPath(u: string): boolean {
-  return /temp\/\d+\.txt$/.test(u)
-}
-
-function canonicalUrl(d: Data): string {
-  let u = specificUrl(d)
-  ;[u] = cutSuffix(u, "index.html")
-  return u
-}
-
-function sitemapUrl(d: Data): string {
-  let u = virtualUrl(d)
-  ;[u] = cutSuffix(u, "index.html")
-  return u
-}
-
-function virtualUrl(d: Data): string {
-  const p = computePath(d, d.virtualPath)
-  return slugify(p)
-}
-
-function specificUrl(d: Data): string {
-  const p = computePath(d, d.specificPath)
-  return slugify(p)
+  return `/temp/${i}.txt`
 }
 
 function slugify(s: string): string {

site/layouts/article.tsx

@@ -1,7 +1,6 @@
 import {type Context, type Data} from "@onlyoffice/eleventy-types"
 import {type JSX, h} from "preact"
 import {Article} from "../internal/article.tsx"
-import {isWritten} from "../internal/url.ts"
 
 export function data(): Data {
   return {
@@ -10,7 +9,7 @@ export function data(): Data {
 }
 
 export function render(c: Context): JSX.Element {
-  if (!isWritten(c)) {
+  if (!c.isWritten) {
     return <div>This page should not be rendered</div>
   }
 

site/layouts/chapter.tsx

@@ -1,7 +1,6 @@
 import {type Context, type Data} from "@onlyoffice/eleventy-types"
 import {type JSX, h} from "preact"
 import {Chapter} from "../internal/chapter.tsx"
-import {isWritten} from "../internal/url.ts"
 
 export function data(): Data {
   return {
@@ -13,7 +12,7 @@ export function data(): Data {
 }
 
 export function render(c: Context): JSX.Element {
-  if (!isWritten(c)) {
+  if (!c.isWritten) {
     return <div>This page should not be rendered</div>
   }
 

site/layouts/html.tsx

@@ -2,10 +2,9 @@ import {type Context} from "@onlyoffice/eleventy-types"
 import {h} from "preact"
 import {Html} from "../internal/html.tsx"
 import {renderToString} from "../internal/preact.ts"
-import {isWritten} from "../internal/url.ts"
 
 export async function render(c: Context): Promise<string> {
-  if (!isWritten(c)) {
+  if (!c.isWritten) {
     return "This page should not be rendered"
   }
   const e = <Html

site/layouts/library.tsx

@@ -1,7 +1,6 @@
 import {type Context, type Data} from "@onlyoffice/eleventy-types"
 import {type JSX, h} from "preact"
 import {Library} from "@/internal/library.tsx"
-import {isWritten} from "../internal/url.ts"
 
 export function data(): Data {
   return {
@@ -10,7 +9,7 @@ export function data(): Data {
 }
 
 export function render(c: Context): JSX.Element {
-  if (!isWritten(c)) {
+  if (!c.isWritten) {
     return <div>This page should not be rendered</div>
   }
 

site/layouts/page.tsx

@@ -1,7 +1,6 @@
 import {type Context, type Data} from "@onlyoffice/eleventy-types"
 import {type JSX, h} from "preact"
 import {Page} from "../internal/page.tsx"
-import {isWritten} from "../internal/url.ts"
 
 export function data(): Data {
   return {
@@ -10,7 +9,7 @@ export function data(): Data {
 }
 
 export function render(c: Context): JSX.Element {
-  if (!isWritten(c)) {
+  if (!c.isWritten) {
     return <div>This page should not be rendered</div>
   }