@nuxtjs/mdc 0.16.0 → 0.17.0

package/dist/runtime/components/prose/ProseImg.vue

@@ -8,38 +8,35 @@
   />
 </template>
 
-<script setup lang="ts">
-import { withTrailingSlash, withLeadingSlash, joinURL } from 'ufo'
-import { useRuntimeConfig, computed } from '#imports'
-
-import ImageComponent from '#build/mdc-image-component.mjs'
-
+<script setup>
+import { withTrailingSlash, withLeadingSlash, joinURL } from "ufo";
+import { useRuntimeConfig, computed } from "#imports";
+import ImageComponent from "#build/mdc-image-component.mjs";
 const props = defineProps({
   src: {
     type: String,
-    default: ''
+    default: ""
   },
   alt: {
     type: String,
-    default: ''
+    default: ""
   },
   width: {
     type: [String, Number],
-    default: undefined
+    default: void 0
   },
   height: {
     type: [String, Number],
-    default: undefined
+    default: void 0
   }
-})
-
+});
 const refinedSrc = computed(() => {
-  if (props.src?.startsWith('/') && !props.src.startsWith('//')) {
-    const _base = withLeadingSlash(withTrailingSlash(useRuntimeConfig().app.baseURL))
-    if (_base !== '/' && !props.src.startsWith(_base)) {
-      return joinURL(_base, props.src)
+  if (props.src?.startsWith("/") && !props.src.startsWith("//")) {
+    const _base = withLeadingSlash(withTrailingSlash(useRuntimeConfig().app.baseURL));
+    if (_base !== "/" && !props.src.startsWith(_base)) {
+      return joinURL(_base, props.src);
     }
   }
-  return props.src
-})
+  return props.src;
+});
 </script>

package/dist/runtime/components/prose/ProseImg.vue.d.ts

@@ -0,0 +1,41 @@
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    src: {
+        type: StringConstructor;
+        default: string;
+    };
+    alt: {
+        type: StringConstructor;
+        default: string;
+    };
+    width: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: undefined;
+    };
+    height: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: undefined;
+    };
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    src: {
+        type: StringConstructor;
+        default: string;
+    };
+    alt: {
+        type: StringConstructor;
+        default: string;
+    };
+    width: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: undefined;
+    };
+    height: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: undefined;
+    };
+}>> & Readonly<{}>, {
+    src: string;
+    alt: string;
+    width: string | number;
+    height: string | number;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;

package/dist/runtime/components/prose/ProseLi.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseOl.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseP.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProsePre.vue

@@ -2,11 +2,11 @@
   <pre :class="$props.class"><slot /></pre>
 </template>
 
-<script setup lang="ts">
+<script setup>
 defineProps({
   code: {
     type: String,
-    default: ''
+    default: ""
   },
   language: {
     type: String,
@@ -17,7 +17,7 @@ defineProps({
     default: null
   },
   highlights: {
-    type: Array as () => number[],
+    type: Array,
     default: () => []
   },
   meta: {
@@ -28,7 +28,7 @@ defineProps({
     type: String,
     default: null
   }
-})
+});
 </script>
 
 <style>

package/dist/runtime/components/prose/ProsePre.vue.d.ts

@@ -0,0 +1,69 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    code: {
+        type: StringConstructor;
+        default: string;
+    };
+    language: {
+        type: StringConstructor;
+        default: null;
+    };
+    filename: {
+        type: StringConstructor;
+        default: null;
+    };
+    highlights: {
+        type: () => number[];
+        default: () => never[];
+    };
+    meta: {
+        type: StringConstructor;
+        default: null;
+    };
+    class: {
+        type: StringConstructor;
+        default: null;
+    };
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    code: {
+        type: StringConstructor;
+        default: string;
+    };
+    language: {
+        type: StringConstructor;
+        default: null;
+    };
+    filename: {
+        type: StringConstructor;
+        default: null;
+    };
+    highlights: {
+        type: () => number[];
+        default: () => never[];
+    };
+    meta: {
+        type: StringConstructor;
+        default: null;
+    };
+    class: {
+        type: StringConstructor;
+        default: null;
+    };
+}>> & Readonly<{}>, {
+    class: string;
+    code: string;
+    meta: string;
+    language: string;
+    highlights: number[];
+    filename: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseScript.vue

@@ -4,12 +4,12 @@
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
 defineProps({
   src: {
     type: String,
-    default: ''
+    default: ""
   }
-})
-const isDev = import.meta.dev
+});
+const isDev = import.meta.dev;
 </script>

package/dist/runtime/components/prose/ProseScript.vue.d.ts

@@ -0,0 +1,14 @@
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    src: {
+        type: StringConstructor;
+        default: string;
+    };
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    src: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & Readonly<{}>, {
+    src: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;

package/dist/runtime/components/prose/ProseStrong.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseTable.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseTbody.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseTd.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseTh.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseThead.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseTr.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/prose/ProseUl.vue.d.ts

@@ -0,0 +1,12 @@
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/highlighter/shiki.d.ts

@@ -1,4 +1,4 @@
-import { type LanguageInput, type ThemeInput, type RegexEngine } from 'shiki';
+import type { LanguageInput, ThemeInput, RegexEngine } from '@shikijs/types';
 import type { MdcConfig, Highlighter } from '@nuxtjs/mdc';
 export interface CreateShikiHighlighterOptions {
     themes?: ThemeInput[];

package/dist/runtime/highlighter/shiki.js

@@ -1,4 +1,4 @@
-import { createJavaScriptRegexEngine } from "shiki";
+import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
 export function createShikiHighlighter({
   langs = [],
   themes = [],
@@ -92,19 +92,22 @@ export function createShikiHighlighter({
         }
       }
     }
-    const transformers = [
-      ...baseTransformers
-    ];
+    const transformersMap = /* @__PURE__ */ new Map();
+    for (const transformer of baseTransformers) {
+      transformersMap.set(transformer.name || `transformer:${Math.random()}-${transformer.constructor.name}`, transformer);
+    }
     for (const config of await getConfigs()) {
       const newTransformers = typeof config.shiki?.transformers === "function" ? await config.shiki?.transformers(code, lang, theme, options) : config.shiki?.transformers || [];
-      transformers.push(...newTransformers);
+      for (const transformer of newTransformers) {
+        transformersMap.set(transformer.name || `transformer:${Math.random()}-${transformer.constructor.name}`, transformer);
+      }
     }
     const root = shiki2.codeToHast(code.trimEnd(), {
       lang,
       ...codeToHastOptions,
       themes: themesObject,
       transformers: [
-        ...transformers,
+        ...transformersMap.values(),
         {
           name: "mdc:highlight",
           line(node, line) {

package/dist/runtime/index.d.ts

@@ -2,4 +2,5 @@ export { parseMarkdown, createMarkdownParser, createParseProcessor } from './par
 export { stringifyMarkdown, createMarkdownStringifier, createStringifyProcessor } from './stringify/index.js';
 export { rehypeHighlight } from './highlighter/rehype.js';
 export { createShikiHighlighter } from './highlighter/shiki.js';
+export { createCachedParser } from './parser/cached.js';
 export * from './utils/node.js';

package/dist/runtime/index.js

@@ -2,4 +2,5 @@ export { parseMarkdown, createMarkdownParser, createParseProcessor } from "./par
 export { stringifyMarkdown, createMarkdownStringifier, createStringifyProcessor } from "./stringify/index.js";
 export { rehypeHighlight } from "./highlighter/rehype.js";
 export { createShikiHighlighter } from "./highlighter/shiki.js";
+export { createCachedParser } from "./parser/cached.js";
 export * from "./utils/node.js";

package/dist/runtime/parser/cached.d.ts

@@ -0,0 +1,2 @@
+import type { MDCParseOptions } from '@nuxtjs/mdc';
+export declare function createCachedParser(parserOptions: MDCParseOptions): (value: string) => Promise<any>;

package/dist/runtime/parser/cached.js

@@ -0,0 +1,44 @@
+export function createCachedParser(parserOptions) {
+  let processor;
+  let lastValue = "";
+  let lastParse;
+  return async function parse(value) {
+    if (!processor) {
+      processor = await import("@nuxtjs/mdc/runtime").then((m) => m.createParseProcessor({
+        ...parserOptions,
+        keepPosition: true
+      }));
+    }
+    if (!value.startsWith(lastValue)) {
+      lastValue = "";
+      lastParse = void 0;
+    }
+    let startOffset = 0;
+    if (lastParse?.body?.children.length && lastParse.body.children.length > 1) {
+      const lastCompleteNode = lastParse.body.children[lastParse.body.children.length - 2];
+      if (lastCompleteNode?.position?.end) {
+        startOffset = lastCompleteNode.position.end;
+      }
+    }
+    const processorResult = await processor.process({ value: value.slice(startOffset) });
+    const result = processorResult?.result;
+    if (result) {
+      const body = {
+        type: "root",
+        children: [
+          ...startOffset > 0 ? lastParse?.body?.children.slice(0, -1) || [] : [],
+          ...result.body.children.map((child) => ({
+            ...child,
+            position: child.position && {
+              start: child.position.start + startOffset,
+              end: child.position.end + startOffset
+            }
+          }))
+        ]
+      };
+      lastParse = { ...result, body };
+      lastValue = value;
+      return lastParse;
+    }
+  };
+}

package/dist/runtime/parser/compiler.js

@@ -10,6 +10,10 @@ export function compileHast(options = {}) {
         children: node.children.map((child) => compileToJSON(child, node)).filter(Boolean)
       };
     }
+    const position = node.position?.start?.offset && node.position?.end?.offset ? {
+      start: node.position.start.offset,
+      end: node.position.end.offset
+    } : void 0;
     if (node.type === "element") {
       if (node.tagName === "p" && node.children.every((child) => child.type === "text" && /^\s*$/.test(child.value))) {
         return null;
@@ -40,26 +44,24 @@ export function compileHast(options = {}) {
         node.tagName = "template";
       }
       const children = (node.tagName === "template" && node.content?.children.length ? node.content.children : node.children).map((child) => compileToJSON(child, node)).filter(Boolean);
-      return {
+      const result = {
         type: "element",
         tag: node.tagName,
         props: validateProps(node.tagName, node.properties),
         children
       };
+      if (options.keepPosition) {
+        result.position = position;
+      }
+      return result;
     }
     if (node.type === "text") {
       if (!/^\n+$/.test(node.value || "") || parent?.properties?.emptyLinePlaceholder) {
-        return {
-          type: "text",
-          value: node.value
-        };
+        return options.keepPosition ? { type: "text", value: node.value, position } : { type: "text", value: node.value };
       }
     }
     if (options.keepComments && node.type === "comment") {
-      return {
-        type: "comment",
-        value: node.value
-      };
+      return options.keepPosition ? { type: "comment", value: node.value, position } : { type: "comment", value: node.value };
     }
     return null;
   }

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 = "";