sommark 4.0.1 → 4.0.3

package/cli/cli.mjs

@@ -61,7 +61,7 @@ async function main() {
 
 	// 5. Show
 	if (command === "show") {
-		await runShow(args[1]);
+		await runShow(args[1], args[2]);
 		return;
 	}
 

package/cli/commands/help.js

@@ -19,7 +19,8 @@ export function getHelp(unknown_option = true) {
 		"{N}  <$green:-h, --help$>     <$cyan: Show help message$>",
 		"{N}  <$green:-v, --version$>  <$cyan: Show version information$>",
 		"{N}  <$green:init$>           <$cyan: Initialize local SomMark configuration file (smark.config.js)$>",
-		"{N}  <$green:show config$>    <$cyan: Display the absolute paths to the active SomMark configuration files$>",
+		"{N}  <$green:show config [file]$>    <$cyan: Display the configuration data (for a specific file or CWD)$>",
+		"{N}  <$green:show --path-config [file]$>    <$cyan: Display the absolute path to the active config file$>",
 		"{N}  <$green:color on|off$>   <$cyan: Help on enabling colors via Environment Variables$>",
 
 		"{N}{N}<$yellow:Transpilation Options:$>",

package/cli/commands/show.js

@@ -8,30 +8,40 @@ import { loadConfig, getResolvedConfigPath } from "../helpers/config.js";
 /**
  * Shows the configuration data or where the settings file is located.
  * @param {string} target - The target to show ('config' or '--path-config').
+ * @param {string|null} [filePath=null] - Optional file path to show config for.
  */
-export async function runShow(target) {
-    const config = await loadConfig();
+export async function runShow(target, filePath = null) {
+    const config = await loadConfig(filePath);
     const resolvedPath = getResolvedConfigPath();
+    const contextText = filePath ? ` for <$blue:'${filePath}'$>` : "";
 
     if (target === "config") {
         try {
-            console.log(formatMessage(`{N}<$yellow:SomMark Configuration Data:$>{N}`));
+            console.log(formatMessage(`{N}<$yellow:SomMark Configuration Data$>${contextText}<$yellow::$>{N}`));
             
-            // Format config for display (hide large objects)
+            // Format config for display (hide large objects and internal metadata)
             const displayConfig = { ...config };
-            if (displayConfig.mappingFile && typeof displayConfig.mappingFile === "object") {
-                displayConfig.mappingFile = "[Mapper Object]";
+            const configPath = displayConfig.resolvedConfigPath;
+            delete displayConfig.resolvedConfigPath;
+            
+            if (displayConfig.mapperFile && typeof displayConfig.mapperFile === "object") {
+                displayConfig.mapperFile = "[Mapper Object]";
             }
             
             console.log(JSON.stringify(displayConfig, null, 4));
-            console.log("");
+            
+            if (configPath) {
+                console.log(formatMessage(`{N}<$yellow:Active Config Path:$> <$green:${configPath}$>{N}`));
+            } else {
+                console.log(formatMessage(`{N}<$yellow:Active Config Path:$> <$red:None (Using Defaults)$>{N}`));
+            }
         } catch (error) {
             cliError([
                 `{line}<$red:Failed to retrieve configuration data:$> <$magenta:${error.message}$>{line}`
             ]);
         }
     } else if (target === "--path-config") {
-        console.log(formatMessage(`{N}<$yellow:SomMark Configuration Path:$>{N}`));
+        console.log(formatMessage(`{N}<$yellow:SomMark Configuration Path$>${contextText}<$yellow::$>{N}`));
         if (resolvedPath) {
             console.log(formatMessage(`  <$green:${resolvedPath}$>{N}`));
         } else {
@@ -40,8 +50,8 @@ export async function runShow(target) {
     } else {
         cliError([
             `{line}<$red:Invalid target for 'show' command:$> <$blue:'${target || ""}'$> `,
-            `{N}<$yellow:Usage:$> {N} <$cyan:sommark show config$>        - Displays configuration data`,
-            ` <$cyan:sommark show --path-config$> - Displays configuration file path{line}`
+            `{N}<$yellow:Usage:$> {N} <$cyan:sommark show config [file]$>        - Displays configuration data`,
+            ` <$cyan:sommark show --path-config [file]$> - Displays configuration file path{line}`
         ]);
     }
 }

package/cli/helpers/transpile.js

@@ -31,10 +31,15 @@ export async function transpile({ src, format, filename = null, mapperFile = "",
         }
 
         // Custom Mapper (String Path)
-        if (typeof finalMapper === "string" && finalMapper !== "" && (await isExist(finalMapper))) {
-            const mapperFileURL = pathToFileURL(path.resolve(process.cwd(), finalMapper)).href;
-            const loadedMapper = await import(mapperFileURL);
-            finalMapper = loadedMapper.default;
+        if (typeof finalMapper === "string" && finalMapper !== "") {
+            const baseDir = finalConfig.resolvedConfigPath ? path.dirname(finalConfig.resolvedConfigPath) : process.cwd();
+            const absoluteMapperPath = path.resolve(baseDir, finalMapper);
+            
+            if (await isExist(absoluteMapperPath)) {
+                const mapperFileURL = `${pathToFileURL(absoluteMapperPath).href}?t=${Date.now()}`;
+                const loadedMapper = await import(mapperFileURL);
+                finalMapper = loadedMapper.default;
+            }
         }
     }
 

package/core/helpers/config-loader.js

@@ -31,31 +31,47 @@ async function loadConfigFile(configPath) {
  * @returns {Promise<Object>} - The final configuration merged with defaults.
  */
 export async function findAndLoadConfig(targetPath) {
-	let startDir = process.cwd();
+	const cwd = process.cwd();
 	let configPath = null;
+	let startDir = cwd;
 
-	// 1. Check if targetPath is an explicit config file path
+	// 1. Resolve Target Directory
 	if (targetPath) {
 		try {
-			const stats = await fs.stat(targetPath);
-			if (stats.isFile() && targetPath.endsWith(".js")) {
-				configPath = path.resolve(targetPath);
+			const absoluteTarget = path.resolve(cwd, targetPath);
+			const stats = await fs.stat(absoluteTarget);
+			
+			// If target is a .js file, it might be an explicit config (legacy/internal support)
+			if (stats.isFile() && absoluteTarget.endsWith(".js") && !absoluteTarget.endsWith("smark.config.js")) {
+				configPath = absoluteTarget;
 			} else {
-				startDir = stats.isDirectory() ? targetPath : path.dirname(targetPath);
+				startDir = stats.isDirectory() ? absoluteTarget : path.dirname(absoluteTarget);
 			}
 		} catch {
-			// Path doesn't exist
+			// Path doesn't exist, fallback to CWD
 		}
 	}
 
-	// 2. Check the current folder
+	// 2. Check the Target Directory (Highest Priority)
 	if (!configPath) {
-		const localConfig = path.join(startDir, CONFIG_FILE_NAME);
+		const targetConfig = path.join(startDir, CONFIG_FILE_NAME);
+		try {
+			await fs.access(targetConfig);
+			configPath = targetConfig;
+		} catch {
+			// No config found in target dir
+		}
+	}
+
+	// 3. Check the Current Working Directory (Fallback)
+	// We only check CWD if it's different from the Target Directory
+	if (!configPath && startDir !== cwd) {
+		const cwdConfig = path.join(cwd, CONFIG_FILE_NAME);
 		try {
-			await fs.access(localConfig);
-			configPath = localConfig;
+			await fs.access(cwdConfig);
+			configPath = cwdConfig;
 		} catch {
-			// No local config found
+			// No config found in CWD
 		}
 	}
 	

package/core/validator.js

@@ -22,14 +22,23 @@ const runValidations = (node, target, instance) => {
 	const context = instance ? { src: instance.src, range: node.range, filename: instance.filename } : null;
 
 	// -- Structural Integrity (Self-Closing) ------------------------------ //
-	if (rules.is_self_closing && (node.type === "Block" && (node.body && node.body.length > 0))) {
-		transpilerError(
-			[
-				"<$red:Validation Error:$> ",
-				`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:is self-closing and cannot have children (body).$>`
-			],
-			context
-		);
+	if (rules.is_self_closing && node.type === "Block" && node.body) {
+		const hasContent = node.body.some(child => {
+			if (child.type === "Text") {
+				return (child.text || "").trim().length > 0;
+			}
+			return true; // Any other node type (Block, Inline, etc.) counts as content
+		});
+
+		if (hasContent) {
+			transpilerError(
+				[
+					"<$red:Validation Error:$> ",
+					`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:is self-closing and cannot have children (body).$>`
+				],
+				context
+			);
+		}
 	}
 };
 

package/package.json

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