sommark 3.3.2 → 3.3.4

package/cli/cli.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { enableColor } from "../helpers/colorize.js";
+
 import { getHelp } from "./commands/help.js";
 import { printVersion, printHeader } from "./commands/version.js";
 import { runBuild } from "./commands/build.js";
@@ -48,10 +49,11 @@ async function main() {
 
 	// 4. Init
 	if (command === "init") {
-		await runInit();
+		await runInit(args[1] === "--local" || args[1] === "-l");
 		return;
 	}
 
+
 	// 5. Show
 	if (command === "show") {
 		await runShow(args[1]);

package/cli/commands/init.js

@@ -18,42 +18,29 @@ export function getConfigDir() {
     }
 }
 
-export async function runInit() {
+export async function runInit(isLocal = false) {
     try {
-        const configDir = getConfigDir();
+        const configDir = isLocal ? process.cwd() : getConfigDir();
         const configFilePath = path.join(configDir, "smark.config.js");
 
-        // ======================================================
-        // Create configuration directory
-        // ======================================================
-
-        await fs.mkdir(configDir, { recursive: true });
-
-        // ======================================================
-        // Default configuration content
-        // ======================================================
+        if (!isLocal) {
+            await fs.mkdir(configDir, { recursive: true });
+        }
 
         const defaultConfigContent = `export default {
-    outputDir: "",
+    outputDir: "./",
     outputFile: "output",
-    mappingFile: "",
+    mappingFile: null,
     plugins: [],
     priority: [],
+    excludePlugins: [],
 };
 `;
 
-        // ======================================================
-        // Check if config file already exists
-        // ======================================================
-
         try {
             await fs.access(configFilePath);
             console.log(formatMessage(`<$yellow:Configuration already exists at:$> <$cyan:${configFilePath}$>`));
         } catch {
-            // ======================================================
-            // Create default config file if it doesn't exist
-            // ======================================================
-
             await fs.writeFile(configFilePath, defaultConfigContent, "utf-8");
             console.log(formatMessage(`<$green:Initialized SomMark configuration at:$> <$cyan:${configFilePath}$>`));
         }
@@ -63,3 +50,4 @@ export async function runInit() {
         ]);
     }
 }
+

package/cli/commands/print.js

@@ -41,9 +41,12 @@ export async function printLex(filePath) {
       format: "text",
       filename: absolutePath,
       plugins: config.plugins,
-      priority: config.priority
+      priority: config.priority,
+      excludePlugins: config.excludePlugins,
+      includeDocument: config.includeDocument ?? true
     });
 
+
     const tokens = await smark.lex();
     console.log(JSON.stringify(tokens, null, 2));
   } else {
@@ -67,9 +70,12 @@ export async function printParse(filePath) {
       format: "text",
       filename: absolutePath,
       plugins: config.plugins,
-      priority: config.priority
+      priority: config.priority,
+      excludePlugins: config.excludePlugins,
+      includeDocument: config.includeDocument ?? true
     });
 
+
     const ast = await smark.parse();
     console.log(JSON.stringify(ast, null, 2));
   } else {

package/cli/helpers/transpile.js

@@ -19,6 +19,8 @@ export async function transpile({ src, format, filename = null, mappingFile = ""
     const config = await loadConfig(filename);
     let finalMapper = mappingFile;
 
+
+
     // 1. Resolve Mapping File
     if (typeof mappingFile !== "object" || mappingFile === null) {
         if (config.mappingFile) {
@@ -42,7 +44,9 @@ export async function transpile({ src, format, filename = null, mappingFile = ""
         filename,
         mapperFile: finalMapper,
         plugins: config.plugins,
-        priority: config.priority
+        priority: config.priority,
+        excludePlugins: config.excludePlugins,
+        includeDocument: config.includeDocument ?? true
     });
 
     return await smark.transpile();

package/core/helpers/config-loader.js

@@ -23,13 +23,16 @@ export function getConfigDir() {
  * Recursively searches for smark.config.js up the directory tree starting from startDir.
  */
 async function findConfig(startDir) {
-	let currentDir = startDir;
-	while (currentDir !== path.parse(currentDir).root) {
+	let currentDir = path.resolve(startDir);
+	const root = path.parse(currentDir).root;
+
+	while (true) {
 		const configPath = path.join(currentDir, CONFIG_FILE_NAME);
 		try {
 			await fs.access(configPath);
 			return configPath;
 		} catch {
+			if (currentDir === root) break;
 			currentDir = path.dirname(currentDir);
 		}
 	}
@@ -56,7 +59,17 @@ async function loadConfigFile(configPath) {
  * Checks local directory, parent directories, and finally the global config directory.
  */
 export async function findAndLoadConfig(targetPath) {
-	const startDir = targetPath ? (await fs.stat(targetPath)).isDirectory() ? targetPath : path.dirname(targetPath) : process.cwd();
+	let startDir;
+	if (targetPath) {
+		try {
+			const stats = await fs.stat(targetPath);
+			startDir = stats.isDirectory() ? targetPath : path.dirname(targetPath);
+		} catch {
+			startDir = process.cwd();
+		}
+	} else {
+		startDir = process.cwd();
+	}
 	
 	let configPath = await findConfig(startDir);
 	
@@ -87,15 +100,28 @@ export async function findAndLoadConfig(targetPath) {
 		outputDir: startDir,
 		mappingFile: null,
 		plugins: [],
-		priority: []
+		priority: [],
+		excludePlugins: [],
+		includeDocument: true
 	};
 
 	if (configPath) {
 		const loadedConfig = await loadConfigFile(configPath);
 		if (loadedConfig) {
-			return { ...defaultConfig, ...loadedConfig, resolvedConfigPath: configPath };
+			const finalConfig = { ...defaultConfig, ...loadedConfig, resolvedConfigPath: configPath };
+			
+			// Ensure outputDir is resolved if it's relative in the config
+			if (loadedConfig.outputDir) {
+				const configDir = path.dirname(configPath);
+				finalConfig.outputDir = path.resolve(configDir, loadedConfig.outputDir);
+			}
+
+			return finalConfig;
 		}
 	}
 
 	return { ...defaultConfig, resolvedConfigPath: null };
 }
+
+
+

package/core/transpiler.js

@@ -56,11 +56,12 @@ async function generateOutput(ast, i, format, mapper_file) {
 		// ========================================================================== //
 		//  Always use placeholders for blocks to support wrapping                      //
 		// ========================================================================== //
-		const placeholder = format === mdxFormat && node.body.length > 0 ? `\n${BODY_PLACEHOLDER}\n` : BODY_PLACEHOLDER;
+		const isParentBlock = format === mdxFormat && node.body.length > 1;
+		const placeholder = isParentBlock ? `\n${BODY_PLACEHOLDER}\n` : BODY_PLACEHOLDER;
 		const textContent = getNodeText(node);
 
 		result += target.render.call(mapper_file, { args: node.args, content: placeholder, textContent, ast: node });
-		if (format === mdxFormat) result = "\n" + result + "\n";
+		if (isParentBlock) result = "\n" + result + "\n";
 
 		// ========================================================================== //
 		//  Process body nodes recursively                                           //
@@ -70,7 +71,7 @@ async function generateOutput(ast, i, format, mapper_file) {
 			switch (body_node.type) {
 				case TEXT:
 					const shouldEscapeText = target.options?.escape !== false;
-					context += (format === htmlFormat || format === mdxFormat) && shouldEscapeText ? escapeHTML(body_node.text) : body_node.text;
+					context += (format === htmlFormat) && shouldEscapeText ? escapeHTML(body_node.text) : body_node.text;
 					break;
 
 				case INLINE:
@@ -84,7 +85,7 @@ async function generateOutput(ast, i, format, mapper_file) {
 						context +=
 							inlineTarget.render.call(mapper_file, {
 								args: body_node.args.length > 0 ? body_node.args : [],
-								content: (format === htmlFormat || format === mdxFormat) && shouldEscapeInline ? escapeHTML(body_node.value) : body_node.value,
+								content: (format === htmlFormat) && shouldEscapeInline ? escapeHTML(body_node.value) : body_node.value,
 								ast: body_node
 							}) + (format === mdxFormat ? "\n" : "");
 					}
@@ -98,11 +99,12 @@ async function generateOutput(ast, i, format, mapper_file) {
 					if (atTarget) {
 						const shouldEscapeAt = atTarget.options?.escape !== false;
 						let content = body_node.content;
-						if (shouldEscapeAt && (format === htmlFormat || format === mdxFormat)) {
+						if (shouldEscapeAt && (format === htmlFormat)) {
 							content = escapeHTML(content);
 						}
-						const rendered = atTarget.render.call(mapper_file, { args: body_node.args, content, ast: body_node }).trimEnd() + "\n";
-						context = context.trim() ? context.trimEnd() + "\n" + rendered : context + rendered;
+						const rendered = atTarget.render.call(mapper_file, { args: body_node.args, content, ast: body_node });
+						const finalAtRendered = (format === mdxFormat) ? rendered : rendered.trimEnd() + "\n";
+						context = context.trim() ? context.trimEnd() + "\n" + finalAtRendered : context + finalAtRendered;
 					}
 					break;
 
@@ -112,7 +114,12 @@ async function generateOutput(ast, i, format, mapper_file) {
 
 				case BLOCK:
 					const blockOutput = await generateOutput(body_node, i, format, mapper_file);
-					context = context.trim() ? context.trimEnd() + "\n" + blockOutput : context + blockOutput;
+					const blockIsParent = format === mdxFormat && body_node.body.length > 1;
+					if (format === mdxFormat && !blockIsParent) {
+						context += blockOutput;
+					} else {
+						context = context.trim() ? context.trimEnd() + "\n" + blockOutput : context + blockOutput;
+					}
 					break;
 			}
 		}
@@ -138,7 +145,9 @@ async function generateOutput(ast, i, format, mapper_file) {
 			`<$yellow:Identifier$> <$blue:'${node.id}'$> <$yellow: is not found in mapping outputs$>{line}`
 		]);
 	}
-	return result.trimEnd() + "\n";
+	const newline = (format === mdxFormat && node.body.length <= 1) ? "" : "\n";
+	const finalResult = (format === mdxFormat) ? result : result.trimEnd();
+	return finalResult + newline;
 }
 
 // ========================================================================== //
@@ -157,7 +166,7 @@ async function transpiler({ ast, format, mapperFile, includeDocument = true }) {
 				output += mapperFile.comment(node.text);
 				break;
 			case TEXT:
-				const shouldEscapeText = (format === htmlFormat || format === mdxFormat);
+				const shouldEscapeText = (format === htmlFormat);
 				output += shouldEscapeText ? escapeHTML(node.text) : node.text;
 				break;
 			case INLINE:
@@ -167,7 +176,7 @@ async function transpiler({ ast, format, mapperFile, includeDocument = true }) {
 					const shouldEscapeInline = inlineTarget.options?.escape !== false;
 					output += inlineTarget.render.call(mapperFile, {
 						args: node.args.length > 0 ? node.args : [],
-						content: (format === htmlFormat || format === mdxFormat) && shouldEscapeInline ? escapeHTML(node.value) : node.value,
+						content: (format === htmlFormat) && shouldEscapeInline ? escapeHTML(node.value) : node.value,
 						ast: node
 					}) + (format === mdxFormat ? "\n" : "");
 				}
@@ -178,11 +187,12 @@ async function transpiler({ ast, format, mapperFile, includeDocument = true }) {
 				if (atTarget) {
 					const shouldEscapeAt = atTarget.options?.escape !== false;
 					let content = node.content;
-					if (shouldEscapeAt && (format === htmlFormat || format === mdxFormat)) {
+					if (shouldEscapeAt && (format === htmlFormat)) {
 						content = escapeHTML(content);
 					}
-					const rendered = atTarget.render.call(mapperFile, { args: node.args, content, ast: node }).trimEnd() + "\n";
-					output = output.trim() ? output.trimEnd() + "\n" + rendered : output + rendered;
+					const rendered = atTarget.render.call(mapperFile, { args: node.args, content, ast: node });
+					const finalAtRendered = (format === mdxFormat) ? rendered : rendered.trimEnd() + "\n";
+					output = output.trim() ? output.trimEnd() + "\n" + finalAtRendered : output + finalAtRendered;
 				}
 				break;
 		}

package/mappers/languages/html.js

@@ -147,7 +147,7 @@ HTML.register(
 
 		return this.tag("pre").body(code_element.body(code));
 	},
-	{ escape: false, type: "AtBlock" }
+	{ escape: false, type: ["AtBlock", "Block"] }
 );
 // List
 HTML.register(

package/mappers/languages/markdown.js

@@ -74,7 +74,7 @@ MARKDOWN.register(
 	},
 	{
 		escape: false,
-		type: "AtBlock"
+		type: ["AtBlock", "Block"]
 	}
 );
 // Link

package/mappers/languages/mdx.js

@@ -1,9 +1,7 @@
 import Mapper from "../mapper.js";
 import MARKDOWN from "./markdown.js";
 import { HTML_TAGS } from "../../constants/html_tags.js";
-import { HTML_PROPS } from "../../constants/html_props.js";
 import { VOID_ELEMENTS } from "../../constants/void_elements.js";
-import kebabize from "../../helpers/kebabize.js";
 
 class MdxMapper extends Mapper {
 	constructor() {
@@ -90,7 +88,14 @@ const { tag } = MDX;
 MDX.inherit(MARKDOWN);
 
 // Block for raw MDX content (ESM, etc.)
-MDX.register("mdx", ({ content }) => content, { escape: false, type: "Block" });
+MDX.register("mdx", ({ content }) => {
+	// Clean up hidden characters
+	let clean = content.replace(/\u200B/g, "").trim();
+	// Remove leading semicolon to avoid MDX errors
+	if (clean.startsWith(";")) clean = clean.substring(1).trim();
+	// Add spacing around ESM blocks
+	return "\n" + clean + "\n\n";
+}, { escape: false, type: ["AtBlock", "Block"] });
 
 // Re-register HTML tags to use jsxProps
 HTML_TAGS.forEach(tagName => {
@@ -122,6 +127,7 @@ HTML_TAGS.forEach(tagName => {
 			return element.body(content);
 		},
 		{
+			escape: false,
 			type: VOID_ELEMENTS.has(tagName) ? "Block" : ["Block", "Inline"],
 			rules: {
 				is_self_closing: VOID_ELEMENTS.has(tagName)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sommark",
-	"version": "3.3.2",
+	"version": "3.3.4",
 	"description": "SomMark is a declarative, extensible markup language for structured content that can be converted to HTML, Markdown, MDX, JSON, and more.",
 	"main": "index.js",
 	"directories": {