@abreen/tada 1.5.4 → 1.5.6

package/build/apply-base-path-plugin.ts

@@ -11,6 +11,7 @@ const log = makeLogger(import.meta.url);
 interface ApplyBasePathOptions {
   literateJavaOutputPaths?: Set<string>;
   sourceUrlPath?: string;
+  validTargets?: Set<string>;
 }
 
 export default function applyBasePathPlugin(
@@ -22,6 +23,7 @@ export default function applyBasePathPlugin(
   const rewriteCodeLinks = isFeatureEnabled(siteVariables, 'code');
   const literateJavaOutputPaths = pluginOptions.literateJavaOutputPaths;
   const sourceUrlPath = pluginOptions.sourceUrlPath;
+  const validTargets = pluginOptions.validTargets;
 
   function rewriteInternalHref(href: string): string {
     const match = href.match(/^([^?#]*)(.*)$/);
@@ -43,6 +45,19 @@ export default function applyBasePathPlugin(
               break;
             }
           }
+          // Only rewrite if the .html version exists. Public files with
+          // code extensions are copied as-is and have no .html page.
+          if (validTargets && sourceUrlPath) {
+            const resolved = modifiedPath.startsWith('/')
+              ? modifiedPath
+              : path.posix.join(
+                  path.posix.dirname(sourceUrlPath),
+                  modifiedPath,
+                );
+            if (!validTargets.has(`${resolved}.html`)) {
+              break;
+            }
+          }
           modifiedPath += '.html';
           break;
         }

package/build/utils/markdown.ts

@@ -25,6 +25,7 @@ interface CreateMarkdownOptions {
   validatorOptions?: Record<string, unknown>;
   literateJavaOutputPaths?: Set<string>;
   sourceUrlPath?: string;
+  validTargets?: Set<string>;
 }
 
 function capitalize(str: string): string {
@@ -43,6 +44,7 @@ export function createMarkdown(
     validatorOptions = {},
     literateJavaOutputPaths,
     sourceUrlPath,
+    validTargets,
   } = options;
   const markdown = new MarkdownIt({ html: true, typographer: true })
     .use(headingSubtitlePlugin)
@@ -55,6 +57,7 @@ export function createMarkdown(
     .use(applyBasePathPlugin, siteVariables, {
       literateJavaOutputPaths,
       sourceUrlPath,
+      validTargets,
     })
     .use(tocPlugin)
     .use(columnsPlugin)
@@ -125,7 +128,7 @@ export function createMarkdown(
   markdown.use(markdownItContainer, 'alert', {
     marker: '!',
     validate: function (params: string) {
-      return !!params.trim().match(/^(note|warning)\s*"?(.+)?"?$/);
+      return !!params.trim().match(/^(note|warning)(?:\s+"(.+)"|\s+(.+))?$/);
     },
     render: function (
       tokens: Token[],
@@ -135,7 +138,7 @@ export function createMarkdown(
     ) {
       const matches = tokens[idx].info
         .trim()
-        .match(/^(note|warning)\s*"?(.+)?"?$/);
+        .match(/^(note|warning)(?:\s+"(.+)"|\s+(.+))?$/);
 
       if (tokens[idx].nesting === 1) {
         const classNames = ['alert'];
@@ -144,7 +147,7 @@ export function createMarkdown(
           classNames.push(type);
         }
 
-        const title = matches && matches[2]?.trim();
+        const title = matches && (matches[2] || matches[3])?.trim();
         const displayTitle = title
           ? markdown.utils.escapeHtml(curlyQuote(title))
           : capitalize(type || '');

package/build/utils/render.ts

@@ -377,6 +377,7 @@ function renderPlainTextContent(
     },
     literateJavaOutputPaths,
     sourceUrlPath,
+    validTargets: validInternalTargets,
   });
 
   const ext = path.extname(filePath);
@@ -559,6 +560,7 @@ export function renderLiterateJavaPageAsset({
     },
     literateJavaOutputPaths,
     sourceUrlPath,
+    validTargets: validInternalTargets,
   });
   let fenceIndex = 0;
   const defaultFence = md.renderer.rules.fence!;

package/build/validate-internal-links-plugin.ts

@@ -150,6 +150,15 @@ export default function validateInternalLinks(
     }
 
     if (!validTargets!.has(resolvedPath)) {
+      // If code extension rewriting changed the path, check the original
+      // path too. Public files with code extensions are copied as-is and
+      // do not produce .html versions.
+      if (codeExtPattern) {
+        const unrewritten = resolveLinkPath(sourceUrlPath!, href, null);
+        if (unrewritten && validTargets!.has(unrewritten)) {
+          return;
+        }
+      }
       reportBrokenLink(rawHref, resolvedPath);
     }
   }

package/init/public/Test.java

@@ -0,0 +1,9 @@
+/// A source code file which is simply copied into the built site.
+/// Tada will not process this file: it won't create an HTML file for it
+/// (even if `features.code` is `true`) and it won't appear in search results
+/// (even if `features.search` is `true`).
+public class Test {
+  public static void main(String[] args) {
+    System.out.println("hello");
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abreen/tada",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "type": "module",
   "description": "A static site generator",
   "license": "MIT",