Merge branch 'quarto-dev:main' into main

Author: mihaprajs

CITATION.cff

@@ -16,8 +16,11 @@ authors:
 - family-names: "Dervieux"
   given-names: "Christophe"
   orcid: "https://orcid.org/0000-0003-4474-2498"
+- family-names: "Woodhull"
+  given-names: "Gordon"
+  orcid: "https://orcid.org/0009-0005-1809-8936"
 title: "Quarto"
-version: 1.4
+version: 1.6
 doi: 10.5281/zenodo.5960048
-date-released: 2024-02-15
+date-released: 2024-11-27
 url: "https://github.com/quarto-dev/quarto-cli"

dev-docs/checklist-make-a-new-quarto-release.md

@@ -45,6 +45,7 @@
   - [ ] publish the release blog post that should exist in https://github.com/quarto-dev/quarto-web/tree/main/docs/blog/posts
         by removing the `draft: true` line in the metadata and changing the date to match the release date. Do this on a branch off of `main` to trigger our PR automation to make the corresponding change to `prerelease`.
 
+- [ ] Update https://github.com/quarto-dev/quarto-cli/blob/main/CITATION.cff
 - [ ] Packaging and package managers, etc
   - TBD winget, etc?
   - [ ] chocolatey

news/changelog-1.7.md

@@ -25,9 +25,18 @@ All changes included in 1.7:
 
 - ([#11608](https://github.com/quarto-dev/quarto-cli/pull/11608)): Do not issue error message when calling `quarto check info`.
 
-## `typst` Format
+## `html` format
+
+- ([#11860])(https://github.com/quarto-dev/quarto-cli/issues/11860)): ES6 modules that import other local JS modules in documents with `embed-resources: true` are now correctly embedded.
+
+## `pdf` format
+
+- ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
+
+## `typst` format
 
 - ([#11578](https://github.com/quarto-dev/quarto-cli/issues/11578)): Typst column layout widths use fractional `fr` units instead of percent `%` units for unitless and default widths in order to fill the enclosing block and not spill outside it.
+- ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
 
 ## Lua Filters and extensions
 

package/src/common/prepare-dist.ts

@@ -238,6 +238,7 @@ function inlineFilters(config: Configuration) {
     { name: "crossref" },
     { name: "customwriter" },
     { name: "qmd-reader", dir: "." },
+    { name: "leveloneanalysis", dir: "quarto-internals"}
   ];
 
   filtersToInline.forEach((filter) => {

src/core/config.ts

@@ -5,18 +5,22 @@
  */
 
 import * as ld from "./lodash.ts";
+import { makeTimedFunction } from "./performance/function-times.ts";
 
-export function mergeConfigs<T>(config: T, ...configs: Array<unknown>): T {
-  // copy all configs so we don't mutate them
-  config = ld.cloneDeep(config);
-  configs = ld.cloneDeep(configs);
+export const mergeConfigs = makeTimedFunction(
+  "mergeConfigs",
+  function mergeConfigs<T>(config: T, ...configs: Array<unknown>): T {
+    // copy all configs so we don't mutate them
+    config = ld.cloneDeep(config);
+    configs = ld.cloneDeep(configs);
 
-  return ld.mergeWith(
-    config,
-    ...configs,
-    mergeArrayCustomizer,
-  );
-}
+    return ld.mergeWith(
+      config,
+      ...configs,
+      mergeArrayCustomizer,
+    );
+  },
+);
 
 export function mergeArrayCustomizer(objValue: unknown, srcValue: unknown) {
   if (ld.isArray(objValue) || ld.isArray(srcValue)) {

src/core/data-url.ts

@@ -1,4 +1,4 @@
-import { encode as base64Encode } from "encoding/base64";
+import { encodeBase64 as base64Encode } from "encoding/base64";
 
 export function asDataUrl(
   content: string | ArrayBuffer,

src/core/deno-dom.ts

@@ -9,20 +9,24 @@ import { debug } from "../deno_ral/log.ts";
 import { HTMLDocument, initParser } from "deno_dom/deno-dom-wasm-noinit.ts";
 import { register } from "deno_dom/src/parser.ts";
 import { DOMParser } from "deno_dom/src/dom/dom-parser.ts";
+import { makeTimedFunctionAsync } from "./performance/function-times.ts";
 
 export async function getDomParser() {
   await initDenoDom();
   return new DOMParser();
 }
 
-export async function parseHtml(src: string): Promise<HTMLDocument> {
-  await initDenoDom();
-  const result = (new DOMParser()).parseFromString(src, "text/html");
-  if (!result) {
-    throw new Error("Couldn't parse string into HTML");
-  }
-  return result;
-}
+export const parseHtml = makeTimedFunctionAsync(
+  "parseHtml",
+  async function parseHtml(src: string): Promise<HTMLDocument> {
+    await initDenoDom();
+    const result = (new DOMParser()).parseFromString(src, "text/html");
+    if (!result) {
+      throw new Error("Couldn't parse string into HTML");
+    }
+    return result;
+  },
+);
 
 export async function writeDomToHtmlFile(
   doc: HTMLDocument,

src/core/esbuild.ts

@@ -106,6 +106,8 @@ export async function esbuildCommand(
   if (result.success) {
     return result.stdout;
   } else {
+    console.error(result.stderr);
+
     throw new Error("esbuild command failed");
   }
 }

src/core/lib/break-quarto-md.ts

@@ -7,7 +7,7 @@
  * Copyright (C) 2021-2022 Posit Software, PBC
  */
 
-import { lineOffsets, lines } from "./text.ts";
+import { lineOffsets } from "./text.ts";
 import { Range, rangedLines, RangedSubstring } from "./ranged-text.ts";
 import {
   asMappedString,

src/core/lib/is-circular.ts

@@ -0,0 +1,27 @@
+/*
+ * is-circular.ts
+ *
+ * Copyright (C) 2025 Posit Software, PBC
+ */
+
+// deno-lint-ignore no-explicit-any
+export const isCircular = (obj: any): unknown => {
+  const objectSet = new WeakSet();
+  // deno-lint-ignore no-explicit-any
+  const detect = (obj: any): boolean => {
+    if (obj && typeof obj === "object") {
+      if (objectSet.has(obj)) {
+        return true;
+      }
+      objectSet.add(obj);
+      for (const key in obj) {
+        if (Object.hasOwn(obj, key) && detect(obj[key])) {
+          return true;
+        }
+      }
+      objectSet.delete(obj);
+    }
+    return false;
+  };
+  return detect(obj);
+};