sommark 2.0.2 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## v2.1.0 (2026-02-08)
+
+### Fixes
+-  Fixed styles property to include css styles
+
+### Removed
+- Removed `getStyle` method
+
+### Features
+- Added new rule that handles self-closing tags
+
+### Improvements
+- Improved documentation
+- Added missing property `enable_table_styles` from `/mappers/mapper.js`
+
+
 ## v2.0.2 (2026-02-03)
 
 ### Features

package/README.md

@@ -16,7 +16,7 @@
 # SomMark v2
 
 > [!WARNING]
-> Old version is no longer supported.
+> Old version(v1) is no longer supported.
 
 SomMark provides a way to write structured content that can be converted into other formats like HTML or Markdown. It is different from standard Markdown because it uses explicit syntax for blocks and elements, which makes it easier to process and customize.
 
@@ -93,6 +93,36 @@ Raw content here.
 ```
 
 ## General Rules
+* SomMark Top-Level Rules:
+  - Only Blocks and comments are allowed at the top level.
+  - Inline Statements, Atblocks, and text cannot appear at the top level. They must be inside a Block, or it is invalid.
+  **Invalid Top-Level:**
+  ```ini
+  Hello world             ❌  (Text cannot be at top level)
+  
+  Welcome to (SomMark)->(Bold)         ❌  (Inline statement cannot be at top level)
+  
+  @_Code_@: js;
+  function add(a, b) {
+    return a + b;
+  }
+  @_end_@                 ❌  (Atblock cannot be at top level)
+  ```
+  
+  **Valid Top-Level:**
+  ```ini
+  [Block]
+    Hello world 
+    Welcome to (SomMark)->(Bold)          # Inline statement inside block is valid
+  
+    @_Code_@: js;
+    function add(a, b) {
+      return a + b;                        # Treated as plain text
+    }       
+    @_end_@
+  
+  [end]
+```
 
 *   **Identifiers**: Names can only contain letters and numbers.
 *   **Escape Character**: Use the backslash `\` to escape special characters (like colons or commas) inside arguments.
@@ -254,23 +284,65 @@ export default myMapper;
 
 You can force strict rules on your content. If a rule is broken, SomMark will stop and show an error.
 
-```javascript
-import { Mapper } from "sommark";
-const myMapper = new Mapper();
-const { tag } = myMapper;
+### Argument Validation (`args`)
+
+Validates the arguments passed to the tag.
 
+```javascript
 myMapper.register("User", ({ args }) => {
     return tag("div").body(`User: ${args[0]}`);
 }, {
     rules: {
         args: {
             min: 1,           // Must have at least 1 argument
-            required: ["id"]  // The "id" key is required
+            max: 3,           // Cannot have more than 3 arguments
+            required: ["id"], // The "id" named key is required
+            includes: ["id", "role", "age"] // Only these keys are allowed
+        }
+    }
+});
+```
+
+- **`min`**: Minimum number of arguments required.
+- **`max`**: Maximum number of arguments allowed.
+- **`required`**: Array of keys that MUST be present in the arguments.
+- **`includes`**: Whitelist of allowed argument keys. Any key not in this list will trigger an error.
+
+### Content Validation (`content`)
+
+Validates the inner content (body) of the block.
+
+```javascript
+myMapper.register("Summary", ({ content }) => {
+    return tag("p").body(content);
+}, {
+    rules: {
+        content: {
+            maxLength: 100 // Content must be 100 characters or less
         }
     }
 });
 ```
-*Example input that passes:* `[User = Adam, id:123] ... [end]`
+
+- **`maxLength`**: Maximum length of the content string.
+
+### Self-Closing Tags
+
+Ensures a tag is used without content or children.
+
+```javascript
+myMapper.register("Separator", () => {
+    return tag("hr").selfClose();
+}, {
+    rules: {
+        is_Self_closing: true
+    }
+});
+```
+
+- **`is_Self_closing`**: If `true`, SomMark will throw an error if the tag contains any content.
+
+*Example input that passes:* `[Image = src: image.png, alt: Image][end]`
 
 ## Using Options
 
@@ -293,6 +365,7 @@ myMapper.register("Code", ({ content }) => {
     }
     }); // options
 ```
+--- 
 
 # License
 

package/core/transpiler.js

@@ -44,14 +44,14 @@ function validateRules(target, args, content) {
 		if (min && argCount < min) {
 			transpilerError([
 				"{line}<$red:Validation Error:$> ",
-				`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:requires at least$> <$green:${min}$> <$yellow:argument(s). Found$> <$red:${argCount}$>{line}`
+				`<$yellow:Identifier$> <$blue:'${Array.isArray(id) ? id.join(" | ") : id}'$> <$yellow:requires at least$> <$green:${min}$> <$yellow:argument(s). Found$> <$red:${argCount}$>{line}`
 			]);
 		}
 		// Max Check
 		if (max && argCount > max) {
 			transpilerError([
 				"{line}<$red:Validation Error:$> ",
-				`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:accepts at most$> <$green:${max}$> <$yellow:argument(s). Found$> <$red:${argCount}$>{line}`
+				`<$yellow:Identifier$> <$blue:'${Array.isArray(id) ? id.join(" | ") : id}'$> <$yellow:accepts at most$> <$green:${max}$> <$yellow:argument(s). Found$> <$red:${argCount}$>{line}`
 			]);
 		}
 		// Required Keys Check
@@ -60,7 +60,7 @@ function validateRules(target, args, content) {
 			if (missingKeys.length > 0) {
 				transpilerError([
 					"{line}<$red:Validation Error:$> ",
-					`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:is missing required argument(s):$> <$red:${missingKeys.join(", ")}$>{line}`
+					`<$yellow:Identifier$> <$blue:'${Array.isArray(id) ? id.join(" | ") : id}'$> <$yellow:is missing required argument(s):$> <$red:${missingKeys.join(", ")}$>{line}`
 				]);
 			}
 		}
@@ -70,7 +70,7 @@ function validateRules(target, args, content) {
 			if (invalidKeys.length > 0) {
 				transpilerError([
 					"{line}<$red:Validation Error:$> ",
-					`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:contains invalid argument key(s):$> <$red:${invalidKeys.join(", ")}$>`,
+					`<$yellow:Identifier$> <$blue:'${Array.isArray(id) ? id.join(" | ") : id}'$> <$yellow:contains invalid argument key(s):$> <$red:${invalidKeys.join(", ")}$>`,
 					`{N}<$yellow:Allowed keys are:$> <$green:${includes.join(", ")}$>{line}`
 				]);
 			}
@@ -83,7 +83,16 @@ function validateRules(target, args, content) {
 		if (maxLength && content.length > maxLength) {
 			transpilerError([
 				"{line}<$red:Validation Error:$> ",
-				`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:content exceeds maximum length of$> <$green:${maxLength}$> <$yellow:characters. Found$> <$red:${content.length}$>{line}`
+				`<$yellow:Identifier$> <$blue:'${Array.isArray(id) ? id.join(" | ") : id}'$> <$yellow:content exceeds maximum length of$> <$green:${maxLength}$> <$yellow:characters. Found$> <$red:${content.length}$>{line}`
+			]);
+		}
+	}
+	// Validate is_Self_closing
+	if (rules.is_Self_closing) {
+		if (content) {
+			transpilerError([
+				"{line}<$red:Validation Error:$> ",
+				`<$yellow:Identifier$> <$blue:'${Array.isArray(id) ? id.join(" | ") : id}'$> <$yellow:is self-closing tag and is not allowed to have a content | children$>{line}`
 			]);
 		}
 	}
@@ -108,6 +117,7 @@ async function generateOutput(ast, i, format, mapper_file) {
 				//  Text                                                                      //
 				// ========================================================================== //
 				case TEXT:
+					validateRules(target, body_node.args, body_node.text);
 					const shouldEscape = target && target.options && target.options.escape === false ? false : true;
 					context +=
 						(format === htmlFormat || format === mdxFormat) && shouldEscape ? escapeHTML(body_node.text) : body_node.text;
@@ -212,16 +222,24 @@ async function transpiler({ ast, format, mapperFile, includeDocument = true }) {
 	}
 	if (includeDocument && format === htmlFormat) {
 		let finalHeader = mapperFile.header;
-
-		// Inject Style Tag if code blocks exist
-		if (mapperFile.enable_highlightTheme && (output.includes("<pre") || output.includes("<code")) && mapperFile.getStyle) {
-			const styleContent = mapperFile.getStyle();
-			if (styleContent) {
-				const styleTag = `<style>\n${styleContent}\n</style>`;
+		let styleContent = "";
+		const updateStyleTag = style => {
+			if (style) {
+				const styleTag = `<style>\n${style}\n</style>`;
 				if (!finalHeader.includes(styleTag)) {
 					finalHeader += styleTag + "\n";
 				}
 			}
+		};
+
+		// Inject Style Tag if code blocks exist
+		if (mapperFile.enable_highlightTheme && (output.includes("<pre") || output.includes("<code"))) {
+			mapperFile.addStyle(mapperFile.themes[mapperFile.currentTheme]);
+			styleContent = mapperFile.styles.join("\n");
+			updateStyleTag(styleContent);
+		} else {
+			styleContent = mapperFile.styles.join("\n");
+			updateStyleTag(styleContent);
 		}
 
 		const document = `<!DOCTYPE html>\n<html>\n${finalHeader}\n<body>\n${output}\n</body>\n</html>\n`;

package/helpers/loadCss.js

@@ -1,4 +1,4 @@
-export async function loadCss(env, filePath) {
+async function loadCss(env, filePath) {
     if (!env) {
         env = typeof window !== "undefined" && typeof window.document !== "undefined" ? "browser" : "node";
     }

package/mappers/languages/html.js

@@ -36,13 +36,29 @@ HTML.register("color", ({ args, content }) => {
 });
 // Link
 HTML.register("link", ({ args, content }) => {
-	console.log(args);
-	return tag("a").attributes({ href: args[0].trim(), title: args[1] ? args[1].trim() : "" }).body(content);
+	return tag("a")
+		.attributes({ href: args[0].trim(), title: args[1] ? args[1].trim() : "" })
+		.body(content);
 });
 // Image
-HTML.register("image", ({ args, content }) => {
-	return tag("img").attributes({ src: args[0].trim(), alt: content }).selfClose();
-});
+HTML.register(
+	["image", "Image"],
+	({ args }) => {
+		const src = args && args["src"] ? args["src"] : "";
+		const alt = args && args["alt"] ? args["alt"] : "";
+		const width = args && args["width"] ? args["width"] : "",
+			height = args && args["height"] ? args["height"] : "";
+		return tag("img").attributes({ src, alt, width, height }).selfClose();
+	},
+	{
+		rules: {
+			is_Self_closing: true,
+			args: {
+			required: ["src"]
+			}
+		}
+	}
+);
 // Code
 HTML.register(
 	["code", "Code"],
@@ -68,13 +84,23 @@ HTML.register(
 	{ escape: false }
 );
 // Horizontal Rule
-HTML.register("hr", () => {
-	return tag("hr").selfClose();
-});
+HTML.register(
+	"hr",
+	() => {
+		return tag("hr").selfClose();
+	},
+	{
+		rules: {
+			is_Self_closing: true
+		}
+	}
+);
 // Todo
 HTML.register("todo", ({ args, content }) => {
 	const checked = HTML.todo(content);
-	return tag("div").body(tag("input").attributes({ type: "checkbox", disabled: true, checked }).selfClose() + (args[0] ? args[0] : ""));
+	return tag("div").body(
+		tag("input").attributes({ type: "checkbox", disabled: true, checked }).selfClose() + (args[0] ? args[0] : "")
+	);
 });
 
 export default HTML;

package/mappers/mapper.js

@@ -3,6 +3,7 @@ import MarkdownBuilder from "../formatter/mark.js";
 import { highlightCode } from "../lib/highlight.js";
 import escapeHTML from "../helpers/escapeHTML.js";
 import atomOneDark from "../helpers/defaultTheme.js";
+import loadCss from "../helpers/loadCss.js";
 
 class Mapper {
 	#customHeaderContent;
@@ -31,12 +32,12 @@ class Mapper {
 		this.escapeHTML = escapeHTML;
 		this.styles = [];
 		this.env = "node";
-
 		// Theme Registry
 		this.themes = {
 			"atom-one-dark": atomOneDark
 		};
 		this.currentTheme = "atom-one-dark";
+		this.enable_table_styles = true;
 	}
 
 	registerHighlightTheme(themes) {
@@ -51,17 +52,10 @@ class Mapper {
 		}
 	}
 
-	getStyle() {
-		const themeCss = this.themes[this.currentTheme] || "";
-		const customCss = this.styles.join("\n");
-		return (themeCss + "\n" + customCss).trim();
-	}
-
 	// ========================================================================== //
 	//  Style Management                                                          //
 	// ========================================================================== //
 
-
 	addStyle(css) {
 		if (typeof css === "object" && css !== null) {
 			let styleString = "";
@@ -80,6 +74,11 @@ class Mapper {
 		}
 	}
 
+	loadCss = async (env = this.env, filePath) => {
+		const css = await loadCss(env, filePath);
+		this.addStyle(css);
+	};
+
 	// ========================================================================== //
 	//  Header Generation                                                         //
 	// ========================================================================== //
@@ -311,7 +310,7 @@ class Mapper {
 		}
 	};
 	todo(checked = false) {
-		return checked.trim() === "x" ? true : false;
+		return checked.trim() === "x" || checked.trim().toLowerCase() === "done" ? true : false;
 	}
 }
 export default Mapper;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sommark",
-	"version": "2.0.2",
+	"version": "2.1.0",
 	"description": "SomMark is a structural markup language for writing structured documents and converting them into HTML or Markdown or MDX(only ready components).",
 	"main": "index.js",
 	"directories": {