@nuxtjs/mdc 0.16.1 → 0.17.0

package/dist/runtime/parser/handlers/utils.js

@@ -9,13 +9,17 @@ export function parseThematicBlock(lang) {
   }
   const languageMatches = lang.replace(/[{|[](.+)/, "").match(/^[^ \t]+(?=[ \t]|$)/);
   const highlightTokensMatches = lang.match(/\{([^}]*)\}/);
-  const filenameMatches = lang.match(/\[((\\\]|[^\]])*)\]/);
+  const filenameMatches = lang.match(/\[(.*)\]/);
   const meta = lang.replace(languageMatches?.[0] ?? "", "").replace(highlightTokensMatches?.[0] ?? "", "").replace(filenameMatches?.[0] ?? "", "").trim();
+  let filename = void 0;
+  if (filenameMatches?.[1]) {
+    filename = filenameMatches[1].replace(/\\([[\]{}().*+?^$|])/g, "$1");
+  }
   return {
     language: languageMatches?.[0] || void 0,
     highlights: parseHighlightedLines(highlightTokensMatches?.[1] || void 0),
     // https://github.com/nuxt/content/pull/2169
-    filename: filenameMatches?.[1].replace(/\\\]/g, "]") || void 0,
+    filename,
     meta
   };
 }

package/dist/runtime/parser/index.js

@@ -44,10 +44,14 @@ export const createParseProcessor = async (inlineOptions = {}) => {
     highlight: moduleOptions?.highlight
   }, defaults);
   if (options.rehype?.plugins?.highlight) {
-    options.rehype.plugins.highlight.options = {
-      ...options.rehype.plugins.highlight.options || {},
-      ...options.highlight || {}
-    };
+    if (inlineOptions.highlight === false) {
+      delete options.rehype.plugins.highlight;
+    } else {
+      options.rehype.plugins.highlight.options = {
+        ...options.rehype.plugins.highlight.options || {},
+        ...options.highlight || {}
+      };
+    }
   }
   let processor = unified();
   for (const config of mdcConfigs) {
@@ -103,7 +107,7 @@ export const createMarkdownParser = async (inlineOptions = {}) => {
 };
 export const parseMarkdown = async (md, markdownParserOptions = {}, parseOptions = {}) => {
   const parser = await createMarkdownParser(markdownParserOptions);
-  return parser(md, parseOptions);
+  return parser(md.replace(/\r\n/g, "\n"), parseOptions);
 };
 export function contentHeading(body) {
   let title = "";

package/dist/runtime/stringify/mdc-remark.js

@@ -6,6 +6,8 @@ import { visit } from "unist-util-visit";
 import { format } from "hast-util-format";
 import { computeHighlightRanges, refineCodeLanguage } from "./utils.js";
 const mdcRemarkElementType = "mdc-element";
+const mdastTextComponentType = "textDirective";
+const mdcTextComponentType = "textComponent";
 const own = {}.hasOwnProperty;
 export function mdcRemark(options) {
   return function(node, _file) {
@@ -27,6 +29,26 @@ export function mdcRemark(options) {
         ...options?.nodeHandlers
       }
     });
+    visit(mdast, (node2) => node2.type === mdastTextComponentType, (node2, index, parent) => {
+      node2.type = mdcTextComponentType;
+      if (node2.name === "binding") {
+        return;
+      }
+      if (index && parent && parent.children) {
+        if (index > 0 && parent.children[index - 1].type === "text") {
+          const text = parent.children[index - 1];
+          if (!["\n", " ", "	"].includes(text.value.slice(-1))) {
+            text.value += " ";
+          }
+        }
+        if (index && index < parent.children.length - 1 && parent.children[index + 1].type === "text") {
+          const text = parent.children[index + 1];
+          if (!["\n", " ", "	", ",", "."].includes(text.value.slice(0, 1))) {
+            text.value = " " + text.value;
+          }
+        }
+      }
+    });
     return mdast;
   };
 }
@@ -64,6 +86,13 @@ const mdcRemarkNodeHandlers = {
     if (node.properties && node.properties.dataMdast === "ignore") {
       return;
     }
+    if (node.properties && (node.properties.className || node.properties["class-name"])) {
+      const pascal = Array.isArray(node.properties.className || "") ? node.properties.className : String(node.properties.className || "").split(" ");
+      const kebab = Array.isArray(node.properties["class-name"] || "") ? node.properties["class-name"] : String(node.properties["class-name"] || "").split(" ");
+      node.properties.class = [node.properties.class || "", ...pascal, ...kebab].filter(Boolean).join(" ");
+      Reflect.deleteProperty(node.properties, "className");
+      Reflect.deleteProperty(node.properties, "class-name");
+    }
     if (own.call(state.handlers, node.tagName)) {
       return state.handlers[node.tagName](state, node, parent) || void 0;
     }
@@ -72,10 +101,10 @@ const mdcRemarkNodeHandlers = {
       state.patch(node, result);
       return result;
     }
-    const isInlineElement = (parent?.children || []).some((child) => child.type === "text") || ["p", "li"].includes(parent?.tagName);
+    const isInlineElement = (parent?.children || []).some((child) => child.type === "text") || ["p", "li", "strong", "em", "span"].includes(parent?.tagName);
     if (isInlineElement) {
       return {
-        type: "textComponent",
+        type: mdastTextComponentType,
         name: node.tagName,
         attributes: node.properties,
         children: state.all(node)
@@ -145,16 +174,21 @@ const mdcRemarkHandlers = {
       meta
     };
   },
-  span: (state, node) => {
-    const result = {
-      type: "textComponent",
-      name: "span",
-      attributes: node.properties,
-      children: state.all(node)
-    };
-    state.patch(node, result);
-    return result;
+  button: (state, node) => {
+    if (
+      // @ts-expect-error: custom type
+      node.children?.find((child) => child.type === mdcRemarkElementType) || node.children?.find((child) => child.type === "text" && child.value.includes("\n"))
+    ) {
+      return {
+        type: "containerComponent",
+        name: "button",
+        children: state.all(node),
+        attributes: node.properties
+      };
+    }
+    return createTextComponent("button")(state, node);
   },
+  span: createTextComponent("span"),
   binding: createTextComponent("binding"),
   iframe: createTextComponent("iframe"),
   video: createTextComponent("video"),
@@ -221,11 +255,13 @@ const mdcRemarkHandlers = {
 };
 function createTextComponent(name) {
   return (state, node) => {
-    return {
-      type: "textComponent",
+    const result = {
+      type: mdastTextComponentType,
       name,
       attributes: node.properties,
-      children: node.children ? state.toFlow(state.all(node)) : void 0
+      children: state.all(node)
     };
+    state.patch(node, result);
+    return result;
   };
 }

package/dist/runtime/utils/slot.d.ts

@@ -1,3 +1,3 @@
-export declare const renderSlot: (slots: Record<string, any>, name: string, props: any, ...rest: any[]) => import("@vue/runtime-core").VNode<import("@vue/runtime-core").RendererNode, import("@vue/runtime-core").RendererElement, {
+export declare const renderSlot: (slots: Record<string, any>, name: string, props: any, ...rest: any[]) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }>;

package/dist/shared/{mdc.86c0ccda.d.ts → mdc.BkZUOs7X.d.mts}

@@ -1,9 +1,6 @@
-import type { BuiltinTheme, Highlighter as Highlighter$1, HighlighterCore, ShikiTransformer } from 'shiki';
-import type { Processor } from 'unified';
-import type { ElementContent } from 'hast';
-
-
-
+import { BuiltinTheme, Highlighter as Highlighter$1, ShikiTransformer, HighlighterCore } from 'shiki';
+import { Processor } from 'unified';
+import { ElementContent } from 'hast';
 
 type MdcThemeOptions = BuiltinTheme | string | Record<string, BuiltinTheme | string>;
 interface HighlighterOptions {
@@ -22,16 +19,6 @@ interface RehypeHighlightOption {
     highlighter?: Highlighter;
 }
 
-
-
-
-
-
-
-
-
-
-
 type Awaitable<T> = T | Promise<T>;
 interface MdcConfig {
     /**
@@ -74,8 +61,6 @@ interface MdcConfig {
     };
 }
 
-
-
 declare function defineConfig(config: MdcConfig): MdcConfig;
 
 export { defineConfig as d };

package/dist/types.d.mts

@@ -1,7 +1,5 @@
-import type { NuxtModule } from '@nuxt/schema'
+export { type Awaitable, type HighlightResult, type Highlighter, type HighlighterOptions, type defineConfig } from './shared/mdc.BkZUOs7X.mjs'
 
-import type { default as Module } from './module.js'
+export { type DefaultHighlightLangs, type MdcConfig, type MdcThemeOptions, type RehypeHighlightOption, default } from './module.mjs'
 
-export type ModuleOptions = typeof Module extends NuxtModule<infer O> ? Partial<O> : Record<string, any>
-
-export { type Awaitable, type HighlightResult, type Highlighter, type HighlighterOptions, type defineConfig } from './module.js'
+export { type Comment, type CommentData, type Content, type Data, type Doctype, type DoctypeData, type Element, type ElementContent, type ElementContentMap, type ElementData, type Literal, type Literals, type MDCComment, type MDCData, type MDCElement, type MDCNode, type MDCParseOptions, type MDCParserResult, type MDCRenderOptions, type MDCRoot, type MDCStringifyOptions, type MDCText, type ModuleOptions, type Node, type NodePosition, type Nodes, type Parent, type Parents, type Properties, type RehypePlugin, type RemarkPlugin, type Root, type RootContent, type RootContentMap, type RootData, type Text, type TextData, type Toc, type TocLink, type UnistPlugin } from './module.mjs'

package/package.json

@@ -1,18 +1,14 @@
 {
   "name": "@nuxtjs/mdc",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "Nuxt MDC module",
   "repository": "nuxt-modules/mdc",
   "license": "MIT",
   "type": "module",
   "exports": {
-    ".": {
-      "types": "./dist/module.d.ts",
-      "import": "./dist/module.mjs",
-      "require": "./dist/module.cjs"
-    },
+    ".": "./dist/module.mjs",
     "./config": {
-      "types": "./dist/config.d.ts",
+      "types": "./dist/config.d.mts",
       "import": "./dist/config.mjs",
       "require": "./dist/config.cjs"
     },
@@ -41,19 +37,19 @@
       "import": "./dist/runtime/*.js"
     }
   },
-  "main": "./dist/module.cjs",
-  "types": "./dist/types.d.ts",
+  "main": "./dist/module.mjs",
+  "types": "./dist/types.d.mts",
   "files": [
     "dist"
   ],
   "typesVersions": {
     "*": {
       "*": [
-        "./dist/* ",
-        "./dist/index.d.ts"
+        "./dist/*",
+        "./dist/index.d.mts"
       ],
       "config": [
-        "./dist/config.d.ts"
+        "./dist/config.d.mts"
       ]
     }
   },
@@ -72,15 +68,17 @@
     "verify": "npm run dev:prepare && npm run lint && npm run test && npm run typecheck"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.16.1",
-    "@shikijs/transformers": "^3.2.1",
+    "@nuxt/kit": "^3.16.2",
+    "@shikijs/langs": "^3.3.0",
+    "@shikijs/themes": "^3.3.0",
+    "@shikijs/transformers": "^3.3.0",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "@vue/compiler-core": "^3.5.13",
     "consola": "^3.4.2",
     "debug": "4.4.0",
     "defu": "^6.1.4",
-    "destr": "^2.0.3",
+    "destr": "^2.0.5",
     "detab": "^3.0.2",
     "github-slugger": "^2.0.0",
     "hast-util-format": "^1.1.0",
@@ -88,25 +86,25 @@
     "hast-util-to-string": "^3.0.1",
     "mdast-util-to-hast": "^13.2.0",
     "micromark-util-sanitize-uri": "^2.0.1",
-    "parse5": "^7.2.1",
+    "parse5": "^7.3.0",
     "pathe": "^2.0.3",
     "property-information": "^7.0.0",
     "rehype-external-links": "^3.0.0",
     "rehype-minify-whitespace": "^6.0.2",
     "rehype-raw": "^7.0.0",
-    "rehype-remark": "^10.0.0",
+    "rehype-remark": "^10.0.1",
     "rehype-slug": "^6.0.0",
     "rehype-sort-attribute-values": "^5.0.1",
     "rehype-sort-attributes": "^5.0.1",
     "remark-emoji": "^5.0.1",
     "remark-gfm": "^4.0.1",
-    "remark-mdc": "^3.5.3",
+    "remark-mdc": "v3.6.0",
     "remark-parse": "^11.0.0",
-    "remark-rehype": "^11.1.1",
+    "remark-rehype": "^11.1.2",
     "remark-stringify": "^11.0.0",
     "scule": "^1.3.0",
-    "shiki": "^3.2.1",
-    "ufo": "^1.5.4",
+    "shiki": "^3.3.0",
+    "ufo": "^1.6.1",
     "unified": "^11.0.5",
     "unist-builder": "^4.0.0",
     "unist-util-visit": "^5.0.0",
@@ -114,26 +112,26 @@
     "vfile": "^6.0.3"
   },
   "devDependencies": {
-    "@nuxt/devtools": "^2.3.1",
-    "@nuxt/eslint-config": "^1.2.0",
-    "@nuxt/module-builder": "^0.8.4",
-    "@nuxt/schema": "^3.16.1",
+    "@nuxt/devtools": "^2.4.0",
+    "@nuxt/eslint-config": "^1.3.0",
+    "@nuxt/module-builder": "^1.0.1",
+    "@nuxt/schema": "^3.16.2",
     "@nuxt/test-utils": "^3.17.2",
-    "@nuxt/ui": "^3.0.0",
+    "@nuxt/ui": "^3.0.2",
     "@nuxtjs/mdc": "link:.",
-    "@types/node": "^22.13.10",
-    "eslint": "^9.22.0",
-    "nuxt": "^3.16.1",
+    "@types/node": "^22.14.1",
+    "eslint": "^9.25.1",
+    "nuxt": "^3.16.2",
     "rehype": "^13.0.2",
-    "release-it": "^18.1.2",
-    "typescript": "5.8.2",
-    "vitest": "^3.0.9",
-    "vue-tsc": "^2.2.8"
+    "release-it": "^19.0.1",
+    "typescript": "5.8.3",
+    "vitest": "^3.1.2",
+    "vue-tsc": "^2.2.10"
   },
   "resolutions": {
     "@nuxtjs/mdc": "workspace:*"
   },
-  "packageManager": "pnpm@10.6.5",
+  "packageManager": "pnpm@10.9.0",
   "release-it": {
     "git": {
       "commitMessage": "chore(release): release v${version}"

package/dist/config.d.ts

@@ -1,4 +0,0 @@
-export { d as defineConfig } from './shared/mdc.86c0ccda.js';
-import 'shiki';
-import 'unified';
-import 'hast';

package/dist/module.cjs

@@ -1,5 +0,0 @@
-module.exports = function(...args) {
-  return import('./module.mjs').then(m => m.default.call(this, ...args))
-}
-const _meta = module.exports.meta = require('./module.json')
-module.exports.getMeta = () => Promise.resolve(_meta)