Merge branch 'main' of github.com:quarto-dev/quarto-cli into main

Author: jjallaire

src/command/render/filters.ts

@@ -53,10 +53,6 @@ import { mergeConfigs } from "../../core/config.ts";
 import { projectType } from "../../project/types/project-types.ts";
 import { readCodePage } from "../../core/windows.ts";
 import { authorsFilter, authorsFilterActive } from "./authors.ts";
-import {
-  Extension,
-  extensionIdString,
-} from "../../extension/extension-shared.ts";
 
 const kQuartoParams = "quarto-params";
 
@@ -565,48 +561,23 @@ function citeMethod(options: PandocOptions): CiteMethod | null {
 
 function resolveFilterExtension(options: PandocOptions, filters: string[]) {
   // Resolve any filters that are provided by an extension
-  const extensions = filterExtensions(options);
-  return filters.flatMap((filter) => {
+  const results = filters.flatMap((filter) => {
     if (filter !== kQuartoFilterMarker && !existsSync(filter)) {
-      // Try to resolve this path to an extension
-      const exactMatch = extensions.find((ext) => {
-        const idStr = extensionIdString(ext.id);
-        if (filter === idStr) {
-          return true;
-        }
-      });
-      if (exactMatch) {
-        return exactMatch.contributes.filters || [];
+      const extension = options.extension?.find(
+        filter,
+        options.source,
+        "filters",
+        options.project,
+      );
+      const filters = extension?.contributes.filters;
+      if (filters) {
+        return filters;
       } else {
-        const nameMatch = extensions.find((ext) => {
-          if (filter === ext.id.name) {
-            return true;
-          }
-        });
-        if (nameMatch) {
-          return nameMatch.contributes.filters || [];
-        } else {
-          return filter;
-        }
+        return filter;
       }
     } else {
       return filter;
     }
   });
-}
-
-function filterExtensions(options: PandocOptions) {
-  const filterExts: Extension[] = [];
-  if (options.extension) {
-    const allExtensions = options.extension?.extensions(
-      options.source,
-      options.project,
-    );
-    Object.values(allExtensions).forEach((extension) => {
-      if (extension.contributes.filters) {
-        filterExts.push(extension);
-      }
-    });
-  }
-  return filterExts;
+  return results;
 }

src/extension/extension-shared.ts

@@ -8,21 +8,21 @@ import SemVer from "semver/mod.ts";
 import { Metadata } from "../config/types.ts";
 import { ProjectContext } from "../project/types.ts";
 
-export const kContributes = "contributes";
 export const kCommon = "common";
 export const kExtensionDir = "_extensions";
 
 export const kTitle = "title";
 export const kAuthor = "author";
 export const kVersion = "version";
 
+// TODO: rename format => formats
 export interface Extension extends Record<string, unknown> {
   id: ExtensionId;
   title: string;
   author: string;
   version?: SemVer;
   path: string;
-  [kContributes]: {
+  contributes: {
     shortcodes?: string[];
     filters?: string[];
     format?: Record<string, unknown>;
@@ -39,6 +39,12 @@ export interface ExtensionContext {
     input: string,
     project?: ProjectContext,
   ): Extension | undefined;
+  find(
+    name: string,
+    input: string,
+    contributes: "shortcodes" | "filters" | "format",
+    project?: ProjectContext,
+  ): Extension | undefined;
 }
 
 export interface ExtensionId {

src/extension/extension.ts

@@ -26,7 +26,6 @@ import {
   extensionIdString,
   kAuthor,
   kCommon,
-  kContributes,
   kExtensionDir,
   kTitle,
   kVersion,
@@ -61,9 +60,56 @@ export function createExtensionContext(): ExtensionContext {
     return resolveExtensionPaths(unresolved, input, project);
   };
 
+  const find = (
+    name: string,
+    input: string,
+    contributes: "shortcodes" | "filters" | "format",
+    project?: ProjectContext,
+  ): Extension | undefined => {
+    // Filter the extension based upon what they contribute
+    const exts = extensions(input, project).filter((ext) => {
+      if (contributes === "shortcodes" && ext.contributes.shortcodes) {
+        return true;
+      } else if (contributes === "filters" && ext.contributes.filters) {
+        return true;
+      } else if (contributes === "format" && ext.contributes.format) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+
+    // Try to resolve using an exact match of the extension
+    const exactMatch = exts.find((ext) => {
+      const idStr = extensionIdString(ext.id);
+      if (name === idStr) {
+        return true;
+      } else {
+        return undefined;
+      }
+    });
+
+    // If there wasn't an exact match, try just using the name
+    if (exactMatch) {
+      return exactMatch;
+    } else {
+      const nameMatch = exts.find((ext) => {
+        if (name === ext.id.name) {
+          return true;
+        }
+      });
+      if (nameMatch) {
+        return nameMatch;
+      } else {
+        return undefined;
+      }
+    }
+  };
+
   return {
     extension,
     extensions,
+    find,
   };
 }
 
@@ -270,9 +316,9 @@ export function discoverExtensionPath(
 function validateExtension(extension: Extension) {
   let contribCount = 0;
   const contribs = [
-    extension[kContributes].filters,
-    extension[kContributes].shortcodes,
-    extension[kContributes].format,
+    extension.contributes.filters,
+    extension.contributes.shortcodes,
+    extension.contributes.format,
   ];
   contribs.forEach((contrib) => {
     if (contrib) {
@@ -299,7 +345,7 @@ function readExtension(
   extensionFile: string,
 ): Extension {
   const yaml = readYaml(extensionFile) as Metadata;
-  const contributes = yaml[kContributes] as Metadata | undefined;
+  const contributes = yaml.contributes as Metadata | undefined;
 
   const title = yaml[kTitle] as string;
   const author = yaml[kAuthor] as string;
@@ -335,7 +381,7 @@ function readExtension(
     version,
     id: extensionId,
     path: extensionDir,
-    [kContributes]: {
+    contributes: {
       shortcodes: shortcodes.map((code) => join(extensionDir, code)),
       filters,
       format,

src/project/types/book/book-config.ts

@@ -357,6 +357,7 @@ export async function bookRenderItems(
         kBookItemChapter,
         bookChaptersToSidebarItems(bookInputs)
           .map((item) => normalizeSidebarItem(projectDir, item, context)),
+        key === "chapters" ? 0 : 1, // next chapters under appendices, so start depth at level 1 (under appendix)
       );
     }
   };

src/project/types/website/listing/website-listing-read.ts

@@ -541,13 +541,16 @@ async function readContents(
               );
             }
           } else {
-            const item = await listItemFromFile(file, project);
-            if (item) {
-              validateItem(listing, item, (field: string) => {
-                return `The file ${file} is missing the required field '${field}'.`;
-              });
-              listingItemSources.add(item.source);
-              listingItems.push(item.item);
+            const isFile = Deno.statSync(file).isFile;
+            if (isFile) {
+              const item = await listItemFromFile(file, project);
+              if (item) {
+                validateItem(listing, item, (field: string) => {
+                  return `The file ${file} is missing the required field '${field}'.`;
+                });
+                listingItemSources.add(item.source);
+                listingItems.push(item.item);
+              }
             }
           }
         }