@anthusai/papyrus 5.18.0 → 5.19.0

package/amplify/publication/redirect-and-index.js

@@ -91,6 +91,22 @@ function markdownTwin(uri) {
   return uri.substring(0, uri.length - 5) + ".md";
 }
 
+// Directory-style sites keep a page's twin at /x/index.md, so a bare /x.md is rewritten there. The edge cannot test for
+// existence, hence the rule: a last segment <name>.md with a name other than index. A path prefix (a base path) is just
+// part of <path>. The flag is spliced in by redirect-rules.ts at deploy time from urls.style.
+const directoryTwins = /*PAPYRUS_DIRECTORY_TWINS*/false/*END_PAPYRUS_DIRECTORY_TWINS*/;
+
+function directoryTwin(uri) {
+  if (uri.length < 5 || uri.substring(uri.length - 3) !== ".md") {
+    return null;
+  }
+  const lastSegment = uri.substring(uri.lastIndexOf("/") + 1);
+  if (lastSegment === "index.md" || lastSegment === ".md") {
+    return null;
+  }
+  return uri.substring(0, uri.length - 3) + "/index.md";
+}
+
 async function handler(event) {
   const request = event.request;
   const redirectTarget = await lookUpRedirectTarget(request.uri);
@@ -110,6 +126,12 @@ async function handler(event) {
     };
   }
   request.uri = rewriteToIndexDocument(request.uri);
+  if (directoryTwins) {
+    const bareTwin = directoryTwin(request.uri);
+    if (bareTwin !== null) {
+      request.uri = bareTwin;
+    }
+  }
   if (negotiateMarkdown && prefersMarkdown(request)) {
     const twin = markdownTwin(request.uri);
     if (twin !== null) {

package/amplify/publication/redirect-rules.js

@@ -27,20 +27,34 @@ export function edgeRulesFromSettings(settings) {
 export function negotiatesMarkdown(settings) {
     return settings.site !== undefined && settings.agents?.markdown !== false;
 }
+/** A directory-style site keeps a page's Markdown twin at `/x/index.md`; the edge then serves a bare `/x.md` from there. */
+export function usesDirectoryTwins(settings) {
+    return negotiatesMarkdown(settings) && settings.urls?.style === "directory";
+}
 export function readEdgeConfig(staticDir, baseDirectory = process.cwd()) {
     if (staticDir === undefined)
-        return { rules: [], negotiateMarkdown: false };
+        return { rules: [], negotiateMarkdown: false, directoryTwins: false };
     const settingsPath = resolve(baseDirectory, staticDir, "projection.json");
     if (!existsSync(settingsPath))
-        return { rules: [], negotiateMarkdown: false };
+        return { rules: [], negotiateMarkdown: false, directoryTwins: false };
     const settings = JSON.parse(readFileSync(settingsPath, "utf8"));
-    return { rules: edgeRulesFromSettings(settings), negotiateMarkdown: negotiatesMarkdown(settings) };
+    return { rules: edgeRulesFromSettings(settings), negotiateMarkdown: negotiatesMarkdown(settings), directoryTwins: usesDirectoryTwins(settings) };
 }
 export function readEdgeRules(staticDir, baseDirectory = process.cwd()) {
     return readEdgeConfig(staticDir, baseDirectory).rules;
 }
 const NEGOTIATE_START = "/*PAPYRUS_NEGOTIATE_MARKDOWN*/";
 const NEGOTIATE_END = "/*END_PAPYRUS_NEGOTIATE_MARKDOWN*/";
+const TWINS_START = "/*PAPYRUS_DIRECTORY_TWINS*/";
+const TWINS_END = "/*END_PAPYRUS_DIRECTORY_TWINS*/";
+function spliceFlag(source, start, end, label) {
+    const from = source.indexOf(start);
+    const to = source.indexOf(end);
+    if (from === -1 || to === -1 || to < from) {
+        throw new Error(`redirect function source has no ${label} markers`);
+    }
+    return source.slice(0, from + start.length) + "true" + source.slice(to);
+}
 /** The CloudFront Function source with the site's pattern rules and Markdown negotiation flag spliced in. */
 export function compileRedirectFunctionSource(source, rules, options = {}) {
     const start = source.indexOf(START_MARKER);
@@ -50,12 +64,10 @@ export function compileRedirectFunctionSource(source, rules, options = {}) {
     }
     let compiled = rules.length === 0 ? source : source.slice(0, start + START_MARKER.length) + JSON.stringify(rules) + source.slice(end);
     if (options.negotiateMarkdown === true) {
-        const from = compiled.indexOf(NEGOTIATE_START);
-        const to = compiled.indexOf(NEGOTIATE_END);
-        if (from === -1 || to === -1 || to < from) {
-            throw new Error("redirect function source has no markdown negotiation markers");
-        }
-        compiled = compiled.slice(0, from + NEGOTIATE_START.length) + "true" + compiled.slice(to);
+        compiled = spliceFlag(compiled, NEGOTIATE_START, NEGOTIATE_END, "markdown negotiation");
+    }
+    if (options.directoryTwins === true) {
+        compiled = spliceFlag(compiled, TWINS_START, TWINS_END, "directory twin");
     }
     return compiled;
 }

package/amplify/publication/redirect-rules.ts

@@ -38,14 +38,19 @@ export function negotiatesMarkdown(settings: ProjectionSettings): boolean {
   return settings.site !== undefined && settings.agents?.markdown !== false;
 }
 
-export type EdgeConfig = { rules: EdgeRedirectRule[]; negotiateMarkdown: boolean };
+/** A directory-style site keeps a page's Markdown twin at `/x/index.md`; the edge then serves a bare `/x.md` from there. */
+export function usesDirectoryTwins(settings: ProjectionSettings): boolean {
+  return negotiatesMarkdown(settings) && settings.urls?.style === "directory";
+}
+
+export type EdgeConfig = { rules: EdgeRedirectRule[]; negotiateMarkdown: boolean; directoryTwins: boolean };
 
 export function readEdgeConfig(staticDir: string | undefined, baseDirectory: string = process.cwd()): EdgeConfig {
-  if (staticDir === undefined) return { rules: [], negotiateMarkdown: false };
+  if (staticDir === undefined) return { rules: [], negotiateMarkdown: false, directoryTwins: false };
   const settingsPath = resolve(baseDirectory, staticDir, "projection.json");
-  if (!existsSync(settingsPath)) return { rules: [], negotiateMarkdown: false };
+  if (!existsSync(settingsPath)) return { rules: [], negotiateMarkdown: false, directoryTwins: false };
   const settings = JSON.parse(readFileSync(settingsPath, "utf8")) as ProjectionSettings;
-  return { rules: edgeRulesFromSettings(settings), negotiateMarkdown: negotiatesMarkdown(settings) };
+  return { rules: edgeRulesFromSettings(settings), negotiateMarkdown: negotiatesMarkdown(settings), directoryTwins: usesDirectoryTwins(settings) };
 }
 
 export function readEdgeRules(staticDir: string | undefined, baseDirectory: string = process.cwd()): EdgeRedirectRule[] {
@@ -54,12 +59,23 @@ export function readEdgeRules(staticDir: string | undefined, baseDirectory: stri
 
 const NEGOTIATE_START = "/*PAPYRUS_NEGOTIATE_MARKDOWN*/";
 const NEGOTIATE_END = "/*END_PAPYRUS_NEGOTIATE_MARKDOWN*/";
+const TWINS_START = "/*PAPYRUS_DIRECTORY_TWINS*/";
+const TWINS_END = "/*END_PAPYRUS_DIRECTORY_TWINS*/";
+
+function spliceFlag(source: string, start: string, end: string, label: string): string {
+  const from = source.indexOf(start);
+  const to = source.indexOf(end);
+  if (from === -1 || to === -1 || to < from) {
+    throw new Error(`redirect function source has no ${label} markers`);
+  }
+  return source.slice(0, from + start.length) + "true" + source.slice(to);
+}
 
 /** The CloudFront Function source with the site's pattern rules and Markdown negotiation flag spliced in. */
 export function compileRedirectFunctionSource(
   source: string,
   rules: EdgeRedirectRule[],
-  options: { negotiateMarkdown?: boolean } = {},
+  options: { negotiateMarkdown?: boolean; directoryTwins?: boolean } = {},
 ): string {
   const start = source.indexOf(START_MARKER);
   const end = source.indexOf(END_MARKER);
@@ -68,12 +84,10 @@ export function compileRedirectFunctionSource(
   }
   let compiled = rules.length === 0 ? source : source.slice(0, start + START_MARKER.length) + JSON.stringify(rules) + source.slice(end);
   if (options.negotiateMarkdown === true) {
-    const from = compiled.indexOf(NEGOTIATE_START);
-    const to = compiled.indexOf(NEGOTIATE_END);
-    if (from === -1 || to === -1 || to < from) {
-      throw new Error("redirect function source has no markdown negotiation markers");
-    }
-    compiled = compiled.slice(0, from + NEGOTIATE_START.length) + "true" + compiled.slice(to);
+    compiled = spliceFlag(compiled, NEGOTIATE_START, NEGOTIATE_END, "markdown negotiation");
+  }
+  if (options.directoryTwins === true) {
+    compiled = spliceFlag(compiled, TWINS_START, TWINS_END, "directory twin");
   }
   return compiled;
 }

package/amplify/publication/s3-projection.js

@@ -70,10 +70,12 @@ export function addS3ProjectionPublication(scope, props, media) {
     assertValidPublicationConfig({ kind: "s3-projection", ...props });
     const bucket = createSiteBucket(scope, props.retainBucketOnDelete !== false);
     const keyValueStore = new cloudfront.KeyValueStore(scope, "RedirectsKeyValueStore");
+    const edgeConfig = readEdgeConfig(props.staticDir);
     const redirectFunction = new cloudfront.Function(scope, "RedirectAndIndexFunction", {
         runtime: cloudfront.FunctionRuntime.JS_2_0,
-        code: cloudfront.FunctionCode.fromInline(compileRedirectFunctionSource(readFileSync(redirectFunctionSourcePath, "utf8"), readEdgeConfig(props.staticDir).rules, {
-            negotiateMarkdown: readEdgeConfig(props.staticDir).negotiateMarkdown,
+        code: cloudfront.FunctionCode.fromInline(compileRedirectFunctionSource(readFileSync(redirectFunctionSourcePath, "utf8"), edgeConfig.rules, {
+            negotiateMarkdown: edgeConfig.negotiateMarkdown,
+            directoryTwins: edgeConfig.directoryTwins,
         })),
         keyValueStore,
     });

package/amplify/publication/s3-projection.ts

@@ -112,11 +112,13 @@ export function addS3ProjectionPublication(
   const bucket = createSiteBucket(scope, props.retainBucketOnDelete !== false);
 
   const keyValueStore = new cloudfront.KeyValueStore(scope, "RedirectsKeyValueStore");
+  const edgeConfig = readEdgeConfig(props.staticDir);
   const redirectFunction = new cloudfront.Function(scope, "RedirectAndIndexFunction", {
     runtime: cloudfront.FunctionRuntime.JS_2_0,
     code: cloudfront.FunctionCode.fromInline(
-      compileRedirectFunctionSource(readFileSync(redirectFunctionSourcePath, "utf8"), readEdgeConfig(props.staticDir).rules, {
-        negotiateMarkdown: readEdgeConfig(props.staticDir).negotiateMarkdown,
+      compileRedirectFunctionSource(readFileSync(redirectFunctionSourcePath, "utf8"), edgeConfig.rules, {
+        negotiateMarkdown: edgeConfig.negotiateMarkdown,
+        directoryTwins: edgeConfig.directoryTwins,
       }),
     ),
     keyValueStore,

package/bin/papyrus-infra.mjs

@@ -53,7 +53,7 @@ if (command === "compile-edge-function") {
   const { compileRedirectFunctionSource, readEdgeConfig } = await import("../amplify/publication/redirect-rules.js");
   const functionSource = fs.readFileSync(new URL("../amplify/publication/redirect-and-index.js", import.meta.url), "utf8");
   const config = readEdgeConfig(staticDir);
-  const compiled = compileRedirectFunctionSource(functionSource, config.rules, { negotiateMarkdown: config.negotiateMarkdown });
+  const compiled = compileRedirectFunctionSource(functionSource, config.rules, { negotiateMarkdown: config.negotiateMarkdown, directoryTwins: config.directoryTwins });
   const out = opt("out");
   if (out) fs.writeFileSync(path.resolve(out), compiled);
   else process.stdout.write(compiled);

package/package.json

@@ -407,7 +407,7 @@
       "optional": true
     }
   },
-  "version": "5.18.0",
+  "version": "5.19.0",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-crypto/sha256-js": "5.2.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.18.0",
+  "version": "5.19.0",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",