fumadocs-typescript 5.1.5 → 5.2.1

package/dist/{get-simple-form-B8HWDNe0.js → get-simple-form-Bya17G4R.js}

@@ -1,31 +1,46 @@
 import { TypeFormatFlags } from "ts-morph";
-
 //#region src/lib/get-simple-form.ts
-function getSimpleForm(type, checker, noUndefined = false, location) {
+function getSimpleForm(type, checker, location, options = {}) {
+	const { override, shouldSimplify, noUndefined = false } = options;
 	if (type.isUndefined() && noUndefined) return "";
+	const overridden = override?.({
+		checker,
+		type,
+		location
+	});
+	if (overridden) return overridden;
+	if (shouldSimplify && !shouldSimplify({
+		checker,
+		type,
+		location
+	})) return type.getText(location, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope);
 	const alias = type.getAliasSymbol();
 	if (alias) {
 		const args = type.getAliasTypeArguments();
 		if (args.length === 0) return alias.getName();
-		return `${alias.getName()}<${args.map((arg) => getSimpleForm(arg, checker)).join(", ")}>`;
+		const nextOptions = {
+			...options,
+			noUndefined: false
+		};
+		return `${alias.getName()}<${args.map((arg) => getSimpleForm(arg, checker, location, nextOptions)).join(", ")}>`;
 	}
 	if (type.isUnion()) {
-		const types = [];
-		for (const t of type.getUnionTypes()) {
-			const str = getSimpleForm(t, checker, noUndefined);
-			if (str.length > 0 && str !== "never") types.unshift(str);
+		if (noUndefined) {
+			const members = type.getUnionTypes().filter((t) => !t.isUndefined());
+			if (members.length === 0) return "undefined";
+			if (members.length === 1) return getSimpleForm(members[0], checker, location, options);
 		}
-		return types.length > 0 ? dedupe(types).join(" | ").replace("true | false", "boolean") : "never";
+		return "union";
 	}
 	if (type.isIntersection()) {
 		const types = [];
 		for (const t of type.getIntersectionTypes()) {
-			const str = getSimpleForm(t, checker, noUndefined);
+			const str = getSimpleForm(t, checker, location, options);
 			if (str.length > 0 && str !== "never") types.unshift(str);
 		}
 		return dedupe(types).join(" & ");
 	}
-	if (type.isTuple()) return `[${type.getTupleElements().map((t) => getSimpleForm(t, checker)).join(", ")}]`;
+	if (type.isTuple()) return "tuple";
 	if (type.isArray() || type.isReadonlyArray()) return "array";
 	if (type.getCallSignatures().length > 0) return "function";
 	if (type.isClassOrInterface() || type.isObject()) return "object";
@@ -40,6 +55,5 @@ function dedupe(arr) {
 	}
 	return out;
 }
-
 //#endregion
-export { getSimpleForm };
+export { getSimpleForm };

package/dist/index.d.ts

@@ -1,15 +1,7 @@
-import { a as GeneratorOptions, c as createGenerator, d as generateHash, f as BaseTypeTableProps, i as Generator, l as createProject, n as GenerateOptions, o as RawTag, p as GenerateTypeTableOptions, r as GeneratedDoc, s as TypescriptConfig, t as DocEntry, u as Cache } from "./base-CLqyTLv7.js";
-import { ResolvedShikiConfig } from "fumadocs-core/highlight/config";
-import { Nodes } from "hast";
+import { a as GeneratedDoc, c as RawTag, d as createProject, f as Cache, h as GenerateTypeTableOptions, i as GenerateOptions, l as TypescriptConfig, m as BaseTypeTableProps, n as ShikiOptions, o as Generator, p as generateHash, r as DocEntry, s as GeneratorOptions, t as MarkdownRenderer, u as createGenerator } from "./markdown-cnIFnWzR.js";
 import { Root } from "mdast";
 import { Transformer } from "unified";
 
-//#region src/markdown.d.ts
-interface MarkdownRenderer {
-  renderTypeToHast: (type: string) => Nodes | Promise<Nodes>;
-  renderMarkdownToHast: (md: string) => Nodes | Promise<Nodes>;
-}
-//#endregion
 //#region src/lib/remark-auto-type-table.d.ts
 interface RemarkAutoTypeTableOptions {
   /**
@@ -23,7 +15,7 @@ interface RemarkAutoTypeTableOptions {
   /**
    * config for Shiki when using default `renderMarkdown` & `renderType`.
    */
-  shiki?: ResolvedShikiConfig;
+  shiki?: ShikiOptions;
   renderMarkdown?: MarkdownRenderer['renderMarkdownToHast'];
   renderType?: MarkdownRenderer['renderTypeToHast'];
   /**

package/dist/index.js

@@ -1,11 +1,10 @@
-import { n as markdownRenderer, t as parseTags } from "./parse-tags-DMoo_pSD.js";
+import { n as markdownRenderer, t as parseTags } from "./parse-tags-CaW74X-R.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { createHash } from "node:crypto";
 import { valueToEstree } from "estree-util-value-to-estree";
 import { visit } from "unist-util-visit";
 import { toEstree } from "hast-util-to-estree";
-
 //#region src/lib/type-table.ts
 async function getTypeTableOutput(gen, { name, type, ...props }, options) {
 	const file = props.path && options?.basePath ? path.join(options.basePath, props.path) : props.path;
@@ -24,17 +23,14 @@ async function getTypeTableOutput(gen, { name, type, ...props }, options) {
 	if (name && output.length === 0) throw new Error(`${name} in ${file ?? "empty file"} doesn't exist`);
 	return output;
 }
-
 //#endregion
 //#region src/cache/index.ts
 function generateHash(str) {
 	return createHash("SHA256").update(str).digest("hex").slice(0, 12);
 }
-
 //#endregion
 //#region package.json
-var version = "5.1.5";
-
+var version = "5.2.1";
 //#endregion
 //#region src/lib/base.ts
 async function createProject(options = {}) {
@@ -114,7 +110,7 @@ async function generate(id, name, entryContext) {
 }
 async function getDocEntry(prop, context) {
 	const { ts } = await import("ts-morph");
-	const { getSimpleForm } = await import("./get-simple-form-B8HWDNe0.js");
+	const { getSimpleForm } = await import("./get-simple-form-Bya17G4R.js");
 	const { transform, allowInternal = false, program } = context;
 	if (context.type.isClass() && prop.getName().startsWith("#")) return;
 	const subType = prop.getTypeAtLocation(context.declaration);
@@ -132,7 +128,10 @@ async function getDocEntry(prop, context) {
 		description: ts.displayPartsToString(prop.compilerSymbol.getDocumentationComment(program.getTypeChecker().compilerObject)),
 		tags,
 		type: subType.getText(context.declaration, ts.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope | ts.TypeFormatFlags.NoTruncation),
-		simplifiedType: getSimpleForm(subType, program.getTypeChecker(), isOptional, context.declaration),
+		simplifiedType: getSimpleForm(subType, program.getTypeChecker(), context.declaration, {
+			...context.typeSimplifier,
+			noUndefined: isOptional
+		}),
 		required: !isOptional,
 		deprecated: false
 	};
@@ -159,7 +158,6 @@ async function getDocEntry(prop, context) {
 	transform?.call(context, entry, subType, prop);
 	return entry;
 }
-
 //#endregion
 //#region src/lib/remark-auto-type-table.ts
 function objectBuilder() {
@@ -319,7 +317,6 @@ function remarkAutoTypeTable(config = {}) {
 		await Promise.all(queue);
 	};
 }
-
 //#endregion
 //#region src/cache/fs-cache.ts
 function createFileSystemGeneratorCache(dir) {
@@ -339,6 +336,5 @@ function createFileSystemGeneratorCache(dir) {
 		}
 	};
 }
-
 //#endregion
-export { createFileSystemGeneratorCache, createGenerator, createProject, generateHash, remarkAutoTypeTable };
+export { createFileSystemGeneratorCache, createGenerator, createProject, generateHash, remarkAutoTypeTable };

package/dist/{base-CLqyTLv7.d.ts → markdown-cnIFnWzR.d.ts}

@@ -1,4 +1,6 @@
-import { ExportedDeclarations, Project, Symbol, Type } from "ts-morph";
+import { ExportedDeclarations, Node, Project, Symbol, Type, TypeChecker } from "ts-morph";
+import { Nodes } from "hast";
+import { BundledTheme, CodeOptionsThemes, CodeToHastOptionsCommon } from "shiki";
 
 //#region src/lib/type-table.d.ts
 interface BaseTypeTableProps {
@@ -47,6 +49,23 @@ interface Cache {
 }
 declare function generateHash(str: string): string;
 //#endregion
+//#region src/lib/get-simple-form.d.ts
+interface TypeSimplifierContext {
+  type: Type;
+  checker: TypeChecker;
+  location?: Node;
+}
+interface TypeSimplifierOptions {
+  /**
+   * whether the simplified names should be preferred over the type names.
+   *
+   * Default: always prefer simplified ones.
+   */
+  shouldSimplify?: (ctx: TypeSimplifierContext) => boolean;
+  override?: (ctx: TypeSimplifierContext) => string | undefined;
+  noUndefined?: boolean;
+}
+//#endregion
 //#region src/lib/base.d.ts
 interface GeneratedDoc {
   /**
@@ -88,6 +107,7 @@ interface GenerateOptions {
    * Modify output property entry
    */
   transform?: Transformer;
+  typeSimplifier?: TypeSimplifierOptions;
 }
 type Generator = ReturnType<typeof createGenerator>;
 interface GeneratorOptions extends TypescriptConfig {
@@ -111,4 +131,11 @@ declare function createGenerator(options?: GeneratorOptions): {
   generateTypeTable(props: BaseTypeTableProps, options?: GenerateTypeTableOptions): Promise<GeneratedDoc[]>;
 };
 //#endregion
-export { GeneratorOptions as a, createGenerator as c, generateHash as d, BaseTypeTableProps as f, Generator as i, createProject as l, GenerateOptions as n, RawTag as o, GenerateTypeTableOptions as p, GeneratedDoc as r, TypescriptConfig as s, DocEntry as t, Cache as u };
+//#region src/markdown.d.ts
+interface MarkdownRenderer {
+  renderTypeToHast: (type: string) => Nodes | Promise<Nodes>;
+  renderMarkdownToHast: (md: string) => Nodes | Promise<Nodes>;
+}
+type ShikiOptions = Omit<CodeToHastOptionsCommon, 'lang'> & CodeOptionsThemes<BundledTheme>;
+//#endregion
+export { GeneratedDoc as a, RawTag as c, createProject as d, Cache as f, GenerateTypeTableOptions as h, GenerateOptions as i, TypescriptConfig as l, BaseTypeTableProps as m, ShikiOptions as n, Generator as o, generateHash as p, DocEntry as r, GeneratorOptions as s, MarkdownRenderer as t, createGenerator as u };

package/dist/{parse-tags-DMoo_pSD.js → parse-tags-CaW74X-R.js}

@@ -1,17 +1,15 @@
 import { remark } from "remark";
 import { remarkGfm } from "fumadocs-core/mdx-plugins/remark-gfm";
-import { createRehypeCode } from "fumadocs-core/mdx-plugins/rehype-code.core";
+import { rehypeCode } from "fumadocs-core/mdx-plugins/rehype-code";
 import remarkRehype from "remark-rehype";
-import { highlightHast } from "fumadocs-core/highlight/core";
-import { configDefault } from "fumadocs-core/highlight";
-
+import { highlightHast } from "fumadocs-core/highlight";
 //#region src/markdown.ts
-function markdownRenderer(shiki = configDefault) {
-	const processor = remark().use(remarkGfm).use(remarkRehype).use(createRehypeCode(shiki), {
-		lazy: true,
+function markdownRenderer(options) {
+	const processor = remark().use(remarkGfm).use(remarkRehype).use(rehypeCode, {
 		langs: ["ts", "tsx"],
 		transformers: [],
-		parseMetaString: void 0
+		parseMetaString: void 0,
+		...options
 	});
 	return {
 		async renderTypeToHast(type) {
@@ -24,9 +22,10 @@ function markdownRenderer(shiki = configDefault) {
 					tagName: "code",
 					properties: {},
 					children: (await highlightHast(type, {
-						config: shiki,
 						lang: "ts",
-						structure: "inline"
+						structure: "inline",
+						defaultColor: false,
+						...options
 					})).children
 				}]
 			};
@@ -37,7 +36,6 @@ function markdownRenderer(shiki = configDefault) {
 		}
 	};
 }
-
 //#endregion
 //#region src/lib/parse-tags.ts
 /**
@@ -65,6 +63,5 @@ function parseTags(tags) {
 	}
 	return typed;
 }
-
 //#endregion
-export { markdownRenderer as n, parseTags as t };
+export { markdownRenderer as n, parseTags as t };

package/dist/ui/index.d.ts

@@ -1,14 +1,12 @@
-import { f as BaseTypeTableProps, i as Generator, p as GenerateTypeTableOptions } from "../base-CLqyTLv7.js";
-import * as runtime from "react/jsx-runtime";
-import "server-only";
-import { ResolvedShikiConfig } from "fumadocs-core/highlight/config";
+import { h as GenerateTypeTableOptions, m as BaseTypeTableProps, n as ShikiOptions, o as Generator } from "../markdown-cnIFnWzR.js";
+import * as JsxRuntime from "react/jsx-runtime";
 import { ComponentProps, ReactNode } from "react";
 
 //#region src/ui/auto-type-table.d.ts
 interface AutoTypeTableProps extends BaseTypeTableProps, ComponentProps<'div'> {
   generator: Generator;
   /** Shiki configuration when using default `renderMarkdown` & `renderType` */
-  shiki?: ResolvedShikiConfig;
+  shiki?: ShikiOptions;
   options?: GenerateTypeTableOptions;
   renderMarkdown?: (md: string) => Promise<ReactNode>;
   renderType?: (type: string) => Promise<ReactNode>;
@@ -23,6 +21,6 @@ declare function AutoTypeTable({
   path,
   type,
   ...props
-}: AutoTypeTableProps): Promise<Promise<runtime.JSX.Element>[]>;
+}: AutoTypeTableProps): Promise<Promise<JsxRuntime.JSX.Element>[]>;
 //#endregion
 export { AutoTypeTable, AutoTypeTableProps };

package/dist/ui/index.js

@@ -1,11 +1,9 @@
-import { n as markdownRenderer, t as parseTags } from "../parse-tags-DMoo_pSD.js";
+import { n as markdownRenderer, t as parseTags } from "../parse-tags-CaW74X-R.js";
 import { TypeTable } from "fumadocs-ui/components/type-table";
 import { toJsxRuntime } from "hast-util-to-jsx-runtime";
-import * as runtime from "react/jsx-runtime";
+import * as JsxRuntime from "react/jsx-runtime";
 import { jsx } from "react/jsx-runtime";
 import defaultMdxComponents from "fumadocs-ui/mdx";
-import "server-only";
-
 //#region src/ui/auto-type-table.tsx
 async function AutoTypeTable({ generator, options, renderType, renderMarkdown, shiki, name, path, type, ...props }) {
 	if (!renderType || !renderMarkdown) {
@@ -46,15 +44,12 @@ async function AutoTypeTable({ generator, options, renderType, renderMarkdown, s
 }
 function toJsx(hast) {
 	return toJsxRuntime(hast, {
-		Fragment: runtime.Fragment,
-		jsx: runtime.jsx,
-		jsxs: runtime.jsxs,
+		...JsxRuntime,
 		components: {
 			...defaultMdxComponents,
 			img: void 0
 		}
 	});
 }
-
 //#endregion
-export { AutoTypeTable };
+export { AutoTypeTable };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-typescript",
-  "version": "5.1.5",
+  "version": "5.2.1",
   "description": "Typescript Integration for Fumadocs",
   "keywords": [
     "Docs",
@@ -45,16 +45,16 @@
     "@types/estree": "^1.0.8",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
-    "@types/node": "25.3.3",
+    "@types/node": "25.5.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "mdast-util-mdx": "^3.0.0",
-    "tsdown": "0.20.3",
-    "typescript": "^5.9.3",
+    "shiki": "^4.0.2",
+    "tsdown": "0.21.6",
+    "typescript": "^6.0.2",
     "vfile": "^6.0.3",
-    "eslint-config-custom": "0.0.0",
-    "fumadocs-core": "16.6.8",
-    "fumadocs-ui": "16.6.8",
+    "fumadocs-core": "16.7.8",
+    "fumadocs-ui": "16.7.8",
     "tsconfig": "0.0.0"
   },
   "peerDependencies": {
@@ -62,12 +62,16 @@
     "@types/hast": "*",
     "@types/mdast": "*",
     "@types/react": "*",
-    "fumadocs-core": "^16.5.0",
-    "fumadocs-ui": "^16.5.0",
+    "fumadocs-core": "^16.7.0",
+    "fumadocs-ui": "^16.7.0",
     "react": "*",
+    "shiki": "*",
     "typescript": "*"
   },
   "peerDependenciesMeta": {
+    "shiki": {
+      "optional": true
+    },
     "@types/estree": {
       "optional": true
     },
@@ -88,7 +92,7 @@
     "build": "tsdown",
     "clean": "rimraf dist",
     "dev": "tsdown --watch",
-    "lint": "eslint .",
+    "lint": "oxlint .",
     "types:check": "tsc --noEmit"
   }
 }