@astrojs/markdoc 0.12.11 → 0.13.0

package/dist/content-entry-type.js

@@ -36,7 +36,11 @@ async function getContentEntryType({
       const userMarkdocConfig = markdocConfigResult?.config ?? {};
       const markdocConfigUrl = markdocConfigResult?.fileUrl;
       const pluginContext = this;
-      const markdocConfig = await setupConfig(userMarkdocConfig, options);
+      const markdocConfig = await setupConfig(
+        userMarkdocConfig,
+        options,
+        astroConfig.experimental.headingIdCompat
+      );
       const filePath = fileURLToPath(fileUrl);
       raiseValidationErrors({
         ast,
@@ -93,6 +97,7 @@ markdocConfig.nodes = { ...assetsConfig.nodes, ...markdocConfig.nodes };
 
 ${getStringifiedImports(componentConfigByTagMap, "Tag", astroConfig.root)}
 ${getStringifiedImports(componentConfigByNodeMap, "Node", astroConfig.root)}
+const experimentalHeadingIdCompat = ${JSON.stringify(astroConfig.experimental.headingIdCompat || false)}
 
 const tagComponentMap = ${getStringifiedMap(componentConfigByTagMap, "Tag")};
 const nodeComponentMap = ${getStringifiedMap(componentConfigByNodeMap, "Node")};
@@ -104,7 +109,7 @@ const stringifiedAst = ${JSON.stringify(
         JSON.stringify(ast)
       )};
 
-export const getHeadings = createGetHeadings(stringifiedAst, markdocConfig, options);
+export const getHeadings = createGetHeadings(stringifiedAst, markdocConfig, options, experimentalHeadingIdCompat);
 export const Content = createContentComponent(
 	Renderer,
 	stringifiedAst,
@@ -112,6 +117,7 @@ export const Content = createContentComponent(
   options,
 	tagComponentMap,
 	nodeComponentMap,
+	experimentalHeadingIdCompat,
 )`;
       return { code: res };
     },

package/dist/heading-ids.d.ts

@@ -3,8 +3,9 @@ import Slugger from 'github-slugger';
 type HeadingIdConfig = MarkdocConfig & {
     ctx: {
         headingSlugger: Slugger;
+        experimentalHeadingIdCompat: boolean;
     };
 };
 export declare const heading: Schema;
-export declare function setupHeadingConfig(): HeadingIdConfig;
+export declare function setupHeadingConfig(experimentalHeadingIdCompat: boolean): HeadingIdConfig;
 export {};

package/dist/heading-ids.js

@@ -3,13 +3,15 @@ import Markdoc, {
 import Slugger from "github-slugger";
 import { getTextContent } from "./runtime.js";
 import { MarkdocError } from "./utils.js";
-function getSlug(attributes, children, headingSlugger) {
+function getSlug(attributes, children, headingSlugger, experimentalHeadingIdCompat) {
   if (attributes.id && typeof attributes.id === "string") {
     return attributes.id;
   }
   const textContent = attributes.content ?? getTextContent(children);
   let slug = headingSlugger.slug(textContent);
-  if (slug.endsWith("-")) slug = slug.slice(0, -1);
+  if (!experimentalHeadingIdCompat) {
+    if (slug.endsWith("-")) slug = slug.slice(0, -1);
+  }
   return slug;
 }
 const heading = {
@@ -26,7 +28,12 @@ const heading = {
         message: "Unexpected problem adding heading IDs to Markdoc file. Did you modify the `ctx.headingSlugger` property in your Markdoc config?"
       });
     }
-    const slug = getSlug(attributes, children, config.ctx.headingSlugger);
+    const slug = getSlug(
+      attributes,
+      children,
+      config.ctx.headingSlugger,
+      config.ctx.experimentalHeadingIdCompat
+    );
     const render = config.nodes?.heading?.render ?? `h${level}`;
     const tagProps = (
       // For components, pass down `level` as a prop,
@@ -37,11 +44,12 @@ const heading = {
     return new Markdoc.Tag(render, tagProps, children);
   }
 };
-function setupHeadingConfig() {
+function setupHeadingConfig(experimentalHeadingIdCompat) {
   const headingSlugger = new Slugger();
   return {
     ctx: {
-      headingSlugger
+      headingSlugger,
+      experimentalHeadingIdCompat
     },
     nodes: {
       heading

package/dist/runtime.d.ts

@@ -8,9 +8,9 @@ import type { MarkdocIntegrationOptions } from './options.js';
  * Called on each file's individual transform.
  * TODO: virtual module to merge configs per-build instead of per-file?
  */
-export declare function setupConfig(userConfig: AstroMarkdocConfig | undefined, options: MarkdocIntegrationOptions | undefined): Promise<MergedConfig>;
+export declare function setupConfig(userConfig: AstroMarkdocConfig | undefined, options: MarkdocIntegrationOptions | undefined, experimentalHeadingIdCompat: boolean): Promise<MergedConfig>;
 /** Used for synchronous `getHeadings()` function */
-export declare function setupConfigSync(userConfig: AstroMarkdocConfig | undefined, options: MarkdocIntegrationOptions | undefined): MergedConfig;
+export declare function setupConfigSync(userConfig: AstroMarkdocConfig | undefined, options: MarkdocIntegrationOptions | undefined, experimentalHeadingIdCompat: boolean): MergedConfig;
 type MergedConfig = Required<Omit<AstroMarkdocConfig, 'extends'>>;
 /** Merge function from `@markdoc/markdoc` internals */
 export declare function mergeConfig(configA: AstroMarkdocConfig, configB: AstroMarkdocConfig): MergedConfig;
@@ -24,6 +24,6 @@ export declare function getTextContent(childNodes: RenderableTreeNode[]): string
  * for `headings` result on `render()` return value
  */
 export declare function collectHeadings(children: RenderableTreeNode[], collectedHeadings: MarkdownHeading[]): void;
-export declare function createGetHeadings(stringifiedAst: string, userConfig: AstroMarkdocConfig, options: MarkdocIntegrationOptions | undefined): () => MarkdownHeading[];
-export declare function createContentComponent(Renderer: AstroInstance['default'], stringifiedAst: string, userConfig: AstroMarkdocConfig, options: MarkdocIntegrationOptions | undefined, tagComponentMap: Record<string, AstroInstance['default']>, nodeComponentMap: Record<NodeType, AstroInstance['default']>): import("astro/runtime/server/index.js").AstroComponentFactory;
+export declare function createGetHeadings(stringifiedAst: string, userConfig: AstroMarkdocConfig, options: MarkdocIntegrationOptions | undefined, experimentalHeadingIdCompat: boolean): () => MarkdownHeading[];
+export declare function createContentComponent(Renderer: AstroInstance['default'], stringifiedAst: string, userConfig: AstroMarkdocConfig, options: MarkdocIntegrationOptions | undefined, tagComponentMap: Record<string, AstroInstance['default']>, nodeComponentMap: Record<NodeType, AstroInstance['default']>, experimentalHeadingIdCompat: boolean): import("astro/runtime/server/index.js").AstroComponentFactory;
 export {};

package/dist/runtime.js

@@ -3,8 +3,8 @@ import Markdoc, {
 import { createComponent, renderComponent } from "astro/runtime/server/index.js";
 import { setupHeadingConfig } from "./heading-ids.js";
 import { htmlTag } from "./html/tagdefs/html.tag.js";
-async function setupConfig(userConfig = {}, options) {
-  let defaultConfig = setupHeadingConfig();
+async function setupConfig(userConfig = {}, options, experimentalHeadingIdCompat) {
+  let defaultConfig = setupHeadingConfig(experimentalHeadingIdCompat);
   if (userConfig.extends) {
     for (let extension of userConfig.extends) {
       if (extension instanceof Promise) {
@@ -19,8 +19,8 @@ async function setupConfig(userConfig = {}, options) {
   }
   return merged;
 }
-function setupConfigSync(userConfig = {}, options) {
-  const defaultConfig = setupHeadingConfig();
+function setupConfigSync(userConfig = {}, options, experimentalHeadingIdCompat) {
+  const defaultConfig = setupHeadingConfig(experimentalHeadingIdCompat);
   let merged = mergeConfig(defaultConfig, userConfig);
   if (options?.allowHTML) {
     merged = mergeConfig(merged, HTML_CONFIG);
@@ -107,9 +107,9 @@ function collectHeadings(children, collectedHeadings) {
     collectHeadings(node.children, collectedHeadings);
   }
 }
-function createGetHeadings(stringifiedAst, userConfig, options) {
+function createGetHeadings(stringifiedAst, userConfig, options, experimentalHeadingIdCompat) {
   return function getHeadings() {
-    const config = setupConfigSync(userConfig, options);
+    const config = setupConfigSync(userConfig, options, experimentalHeadingIdCompat);
     const ast = Markdoc.Ast.fromJSON(stringifiedAst);
     const content = Markdoc.transform(ast, config);
     let collectedHeadings = [];
@@ -117,12 +117,12 @@ function createGetHeadings(stringifiedAst, userConfig, options) {
     return collectedHeadings;
   };
 }
-function createContentComponent(Renderer, stringifiedAst, userConfig, options, tagComponentMap, nodeComponentMap) {
+function createContentComponent(Renderer, stringifiedAst, userConfig, options, tagComponentMap, nodeComponentMap, experimentalHeadingIdCompat) {
   return createComponent({
     async factory(result, props) {
       const withVariables = mergeConfig(userConfig, { variables: props });
       const config = resolveComponentImports(
-        await setupConfig(withVariables, options),
+        await setupConfig(withVariables, options, experimentalHeadingIdCompat),
         tagComponentMap,
         nodeComponentMap
       );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "0.12.11",
+  "version": "0.13.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -60,8 +60,8 @@
     "esbuild": "^0.25.0",
     "github-slugger": "^2.0.0",
     "htmlparser2": "^10.0.0",
+    "@astrojs/markdown-remark": "6.3.0",
     "@astrojs/internal-helpers": "0.6.1",
-    "@astrojs/markdown-remark": "6.2.1",
     "@astrojs/prism": "3.2.0"
   },
   "peerDependencies": {
@@ -71,8 +71,8 @@
     "@types/markdown-it": "^14.1.2",
     "devalue": "^5.1.1",
     "linkedom": "^0.18.9",
-    "vite": "^6.2.0",
-    "astro": "5.4.3",
+    "vite": "^6.2.1",
+    "astro": "5.5.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {