markdown2typst 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown2typst",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "A comprehensive JavaScript library for converting Markdown to Typst code",
   "type": "module",
   "main": "./dist/markdown2typst.js",

package/src/block-renderer.ts

@@ -97,8 +97,22 @@ export function renderBlock(
  * @returns Rendered Typst math block
  */
 function renderMathBlock(node: MathNode, indentLevel: number, context: RenderContext): string {
+	// Reconstruct the full LaTeX string.
+	// If a LaTeX environment is adjacent to $$, remark-math treats the adjacent text as `meta`,
+	// and may absorb the trailing $$ into `value` if it's on the same line as the environment closure.
+	let rawLatex = node.value || '';
+	const meta = (node as any).meta;
+	if (meta) {
+		rawLatex = meta + (rawLatex ? '\n' + rawLatex : '');
+	}
+
+	// Check if the closing $$ was absorbed into the value
+	if (rawLatex.endsWith('$$')) {
+		rawLatex = rawLatex.slice(0, -2);
+	}
+
 	// Convert LaTeX to Typst math syntax
-	const value = node.value.trim();
+	const value = rawLatex.trim();
 	try {
 		const typstMath = tex2typst(value);
 		return indentLines(`$ ${typstMath} $`, indentLevel);

package/src/external-modules.d.ts

@@ -0,0 +1,36 @@
+// Ambient declarations for external modules that are provided as runtime dependencies
+// These are intentionally minimal so consumers don't need the dev-only @types packages.
+
+declare module 'country-list' {
+    export function getCode(name: string): string | undefined;
+    export function getCodes(): string[];
+}
+
+declare module 'langs' {
+    export interface Lang {
+        name?: string;
+        local?: string;
+        '1'?: string;
+        '2'?: string;
+        '2B'?: string;
+        '3'?: string;
+        [key: string]: any;
+    }
+
+    export function codes(type: string): string[];
+    export function all(): Lang[];
+    export function where(codeType: string, value: string): Lang | undefined;
+    const langs: {
+        codes: typeof codes;
+        all: typeof all;
+        where: typeof where;
+    };
+    export default langs;
+}
+
+declare module 'js-yaml' {
+    export function load(s: string): any;
+    export function dump(o: any): string;
+}
+
+export {};

package/src/inline-renderer.ts

@@ -83,12 +83,11 @@ function renderInline(
 			}
 			// Render footnote content inline
 			try {
+				if (!context.renderBlock) {
+					throw new Error('renderBlock not available in context');
+				}
 				const content = def.children
-					.map((child) => {
-						// Import renderBlock only when needed to avoid circular dependencies
-						const { renderBlock } = require('./block-renderer.js');
-						return renderBlock(child, 0, context);
-					})
+					.map((child) => context.renderBlock!(child, 0, context))
 					.filter(isNonEmpty)
 					.join(' '); // Join blocks with space for inline footnote
 				return `#footnote[${content.trim()}]`;

package/src/markdown2typst.ts

@@ -1,99 +1,101 @@
-/**
- * markdown2typst - Convert Markdown to Typst
- * 
- * A comprehensive library for converting Markdown documents to Typst markup language.
- * Supports GitHub Flavored Markdown, math equations, tables, footnotes, and more
- * 
- * This code is inspired by the original work of zhaoyiqun (Creator of MDXport; 'cosformula' on GitHub).
- * Refactored, documented, modified and extended by Mapaor.
- * 
- * @module markdown2typst
- * @license MIT
- */
-
-import { ErrorSeverity, type Markdown2TypstOptions } from './types.js';
-import { parseMarkdown } from './parser.js';
-import { collectDefinitions, collectFootnotes, findLeadingH1 } from './collectors.js';
-import { parseFrontmatter, mergeMetadata } from './frontmatter.js';
-import { buildOutput } from './output-builder.js';
-
-// Re-export types for public API
-export type { Markdown2TypstOptions, ConversionError, ErrorCallback } from './types.js';
-export { ErrorSeverity } from './types.js';
-
-/**
- * Convert Markdown text to Typst markup.
- * 
- * This is the main entry point for the library. It parses the Markdown using remark,
- * processes frontmatter and metadata, and converts the AST to Typst syntax.
- * 
- * The conversion pipeline consists of several stages:
- * 1. Parse Markdown into an AST (Abstract Syntax Tree)
- * 2. Collect link/image definitions and footnotes
- * 3. Parse YAML frontmatter and merge with options
- * 4. Render AST nodes to Typst markup
- * 5. Build final output with metadata and body
- * 
- * @param markdown - The Markdown text to convert
- * @param options - Optional configuration for the conversion
- * @returns The converted Typst markup as a string
- * 
- * @example
- * ```typescript
- * const typst = markdown2typst('# Hello\n\nThis is **bold**.');
- * console.log(typst);
- * ```
- * 
- * @example
- * ```typescript
- * const typst = markdown2typst(markdown, {
- *   title: 'My Document',
- *   authors: ['John Doe'],
- *   lang: 'en'
- * });
- * ```
- */
-export function markdown2typst(markdown: string, options: Markdown2TypstOptions = {}): string {
-	try {
-		// Stage 1: Parse Markdown into AST
-		const tree = parseMarkdown(markdown, options.onError);
-
-		// Stage 2: Collect definitions and footnotes from the AST
-		const definitions = collectDefinitions(tree, options.onError);
-		const footnoteDefinitions = collectFootnotes(tree, options.onError);
-
-		// Stage 3: Parse frontmatter and extract leading title (if enabled)
-		const frontmatter = parseFrontmatter(tree, options.onError);
-		const leadingH1 = options.useH1AsTitle
-			? findLeadingH1(tree, definitions, options.onError)
-			: null;
-
-		// Stage 4: Merge metadata from options, frontmatter, and leading H1
-		const metadata = mergeMetadata(options, frontmatter, leadingH1?.title ?? null);
-
-		// Stage 5: Build final Typst output
-		const context = {
-			definitions,
-			footnoteDefinitions,
-			onError: options.onError,
-			warnings: { externalImages: false }
-		};
-		return buildOutput(tree, metadata, leadingH1?.index ?? null, context);
-	} catch (error) {
-		// Handle unexpected fatal errors
-		const errorMessage = error instanceof Error ? error.message : String(error);
-		if (options.onError) {
-			options.onError({
-				severity: ErrorSeverity.ERROR,
-				message: `Fatal error during conversion: ${errorMessage}`,
-				context: 'markdown2typst',
-				originalError: error
-			});
-		}
-		// Rethrow fatal errors after logging
-		throw error;
-	}
-}
-
-// Export as default for convenience (allows: import markdown2typst from 'markdown2typst')
-export default markdown2typst;
+/**
+ * markdown2typst - Convert Markdown to Typst
+ * 
+ * A comprehensive library for converting Markdown documents to Typst markup language.
+ * Supports GitHub Flavored Markdown, math equations, tables, footnotes, and more
+ * 
+ * This code is inspired by the original work of zhaoyiqun (Creator of MDXport; 'cosformula' on GitHub).
+ * Refactored, documented, modified and extended by Mapaor.
+ * 
+ * @module markdown2typst
+ * @license MIT
+ */
+
+import { ErrorSeverity, type Markdown2TypstOptions } from './types.js';
+import { parseMarkdown } from './parser.js';
+import { collectDefinitions, collectFootnotes, findLeadingH1 } from './collectors.js';
+import { parseFrontmatter, mergeMetadata } from './frontmatter.js';
+import { buildOutput } from './output-builder.js';
+import { renderBlock } from './block-renderer.js';
+
+// Re-export types for public API
+export type { Markdown2TypstOptions, ConversionError, ErrorCallback } from './types.js';
+export { ErrorSeverity } from './types.js';
+
+/**
+ * Convert Markdown text to Typst markup.
+ * 
+ * This is the main entry point for the library. It parses the Markdown using remark,
+ * processes frontmatter and metadata, and converts the AST to Typst syntax.
+ * 
+ * The conversion pipeline consists of several stages:
+ * 1. Parse Markdown into an AST (Abstract Syntax Tree)
+ * 2. Collect link/image definitions and footnotes
+ * 3. Parse YAML frontmatter and merge with options
+ * 4. Render AST nodes to Typst markup
+ * 5. Build final output with metadata and body
+ * 
+ * @param markdown - The Markdown text to convert
+ * @param options - Optional configuration for the conversion
+ * @returns The converted Typst markup as a string
+ * 
+ * @example
+ * ```typescript
+ * const typst = markdown2typst('# Hello\n\nThis is **bold**.');
+ * console.log(typst);
+ * ```
+ * 
+ * @example
+ * ```typescript
+ * const typst = markdown2typst(markdown, {
+ *   title: 'My Document',
+ *   authors: ['John Doe'],
+ *   lang: 'en'
+ * });
+ * ```
+ */
+export function markdown2typst(markdown: string, options: Markdown2TypstOptions = {}): string {
+	try {
+		// Stage 1: Parse Markdown into AST
+		const tree = parseMarkdown(markdown, options.onError);
+
+		// Stage 2: Collect definitions and footnotes from the AST
+		const definitions = collectDefinitions(tree, options.onError);
+		const footnoteDefinitions = collectFootnotes(tree, options.onError);
+
+		// Stage 3: Parse frontmatter and extract leading title (if enabled)
+		const frontmatter = parseFrontmatter(tree, options.onError);
+		const leadingH1 = options.useH1AsTitle
+			? findLeadingH1(tree, definitions, options.onError)
+			: null;
+
+		// Stage 4: Merge metadata from options, frontmatter, and leading H1
+		const metadata = mergeMetadata(options, frontmatter, leadingH1?.title ?? null);
+
+		// Stage 5: Build final Typst output
+		const context = {
+			definitions,
+			footnoteDefinitions,
+			onError: options.onError,
+			warnings: { externalImages: false },
+			renderBlock
+		};
+		return buildOutput(tree, metadata, leadingH1?.index ?? null, context);
+	} catch (error) {
+		// Handle unexpected fatal errors
+		const errorMessage = error instanceof Error ? error.message : String(error);
+		if (options.onError) {
+			options.onError({
+				severity: ErrorSeverity.ERROR,
+				message: `Fatal error during conversion: ${errorMessage}`,
+				context: 'markdown2typst',
+				originalError: error
+			});
+		}
+		// Rethrow fatal errors after logging
+		throw error;
+	}
+}
+
+// Export as default for convenience (allows: import markdown2typst from 'markdown2typst')
+export default markdown2typst;

package/src/types.ts

@@ -144,6 +144,15 @@ export type ConversionWarnings = {
 	externalImages: boolean;
 };
 
+/**
+ * Block renderer function type for dependency injection
+ */
+export type BlockRenderer = (
+	node: import('mdast').Content,
+	indentLevel: number,
+	context: RenderContext
+) => string | null;
+
 /**
  * Context for rendering nodes
  */
@@ -153,4 +162,6 @@ export type RenderContext = {
 	onError?: ErrorCallback;
 	/** Track conversion warnings for generating helper functions */
 	warnings: ConversionWarnings;
+	/** Block renderer function (injected to avoid circular imports) */
+	renderBlock?: BlockRenderer;
 };