sommark 4.0.2 → 4.1.0

package/core/validator.js

@@ -18,18 +18,80 @@ import { transpilerError } from "./errors.js";
 const runValidations = (node, target, instance) => {
 	if (!target || !target.options) return;
 	const rules = target.options.rules || {};
-	const id = (target.id) ? (Array.isArray(target.id) ? target.id.join(" | ") : target.id) : "Unknown";
-	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
-		);
+	const id = (target.id) ? (Array.isArray(target.id) ? target.id.join(" | ") : target.id) : (node.id || "Unknown");
+	const errorRange = node.range ? {
+		start: node.range.start,
+		end: {
+			line: node.range.start.line,
+			character: node.range.start.character + (node.id || "").length + 2
+		}
+	} : null;
+	const context = instance ? { src: instance.src, range: errorRange, filename: instance.filename } : null;
+
+	// -- Structural Integrity (Empty Body / Self-Closing) ----------------- //
+	const isEmptyBodyTarget = rules.is_empty_body || rules.is_self_closing;
+
+	// -- Node Type Validation --------------------------------------------- //
+	if (target.options.type) {
+		const allowedTypes = Array.isArray(target.options.type) ? target.options.type : [target.options.type];
+		const hasAny = allowedTypes.includes("any");
+		if (!hasAny && !allowedTypes.includes(node.structure)) {
+			const isReserved = ["import", "$use-module", "slot", "for-each"].includes(id.toLowerCase());
+			const msg = isReserved
+				? `<$yellow:Reserved keyword$> <$blue:'${id}'$> <$yellow:is strictly defined as a [${allowedTypes.join(", ")}] structure node, but was used as a [${node.structure}] structure node.$>`
+				: `<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:is defined as type(s) [${allowedTypes.join(", ")}], but was used as a [${node.structure}] structure node.$>`;
+
+			transpilerError(
+				[
+					"{N}",
+					msg
+				],
+				context
+			);
+		}
+	}
+
+	if (isEmptyBodyTarget && node.type === "Block" && !node.isSelfClosing && 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(
+				[
+					"{N}",
+					"<$red:[Validation Error]:$>{N}",
+					`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:is defined as an empty-body component and cannot have children.$>`
+				],
+				context
+			);
+		}
+	}
+
+	// -- Arguments Validation (Required Args) ----------------------------- //
+	const isStructural = node.type === "Block" || node.type === "AtBlock";
+	if (isStructural && rules.required_args && Array.isArray(rules.required_args)) {
+		const missingArgs = rules.required_args.filter(arg => {
+			// Check if the argument exists in named args or as a positional arg (if arg is a number)
+			if (typeof arg === "number") {
+				return node.args[arg] === undefined;
+			}
+			return node.args[arg] === undefined;
+		});
+
+		if (missingArgs.length > 0) {
+			transpilerError(
+				[
+					"{N}",
+					`<$yellow:Identifier$> <$blue:'${id}'$> <$yellow:is missing required arguments:$> <$red:${missingArgs.join(", ")}$>{N}`,
+					`<$blue:Please ensure these arguments are provided in the template usage.$>`
+				],
+				context
+			);
+		}
 	}
 };
 
@@ -60,7 +122,17 @@ export function validateAST(ast, mapperFile, instance) {
 
 		// 1. Identify Target
 		if (node.id) {
-			const target = mapperFile.get(node.id) || (mapperFile.getUnknownTag ? mapperFile.getUnknownTag(node) : null);
+			let target = null;
+			const lowerId = node.id.toLowerCase();
+			if (["import", "$use-module", "slot", "for-each"].includes(lowerId)) {
+				target = {
+					id: lowerId,
+					options: { type: "Block" }
+				};
+			} else {
+				target = mapperFile.get(node.id) || (mapperFile.getUnknownTag ? mapperFile.getUnknownTag(node) : null);
+			}
+
 			if (target) {
 				runValidations(node, target, instance);
 			}

package/formatter/tag.js

@@ -69,6 +69,8 @@ class TagBuilder {
 		const id = this.tagName.toLowerCase();
 		const isCodeStyleOrScript = ["style", "script"].includes(id);
 		let inline_style = "";
+		const useClassFallback = options.fallbackTarget === "class";
+		const classSet = new Set();
 
 		// 1. Initial CSS Variable/Style processing
 		if (!isCodeStyleOrScript && args.style) {
@@ -83,12 +85,20 @@ class TagBuilder {
 			}
 		}
 
-		// 2. Attribute Dispatching
+		// 2. Pre-collect native classes if using class fallback
+		if (useClassFallback) {
+			if (args.class) {
+				String(args.class).split(/\s+/).filter(Boolean).forEach(c => classSet.add(c));
+			}
+		}
+
+		// 3. Attribute Dispatching
 		const keys = Object.keys(args).filter(arg => isNaN(parseInt(arg)));
 		keys.forEach(key => {
 			if (!isNaN(parseInt(key))) return; // Skip numeric positional arguments
 			if (key === "style") return;
 			if (isCodeStyleOrScript && key === "scoped") return;
+			if (useClassFallback && key === "class") return;
 
 			const isDimensionAttributeSupported = ["img", "video", "svg", "canvas", "iframe", "object", "embed"].includes(id);
 			const isWidthOrHeight = key === "width" || key === "height";
@@ -99,21 +109,35 @@ class TagBuilder {
 
 			const k = isEvent ? key.toLowerCase() : (isNative || isCustom) ? key : kebabize(key);
 
-			if (isCodeStyleOrScript) {
-				// Specialized tags: only render standard attributes, no styling fallback
-				this.#attr.push(`${k}="${escapeHTML(String(args[key]))}"`);
+			if (isCodeStyleOrScript || options.fallbackTarget === false) {
+				// Specialized tags or fallback disabled: render standard attributes, no styling fallback
+				const val = typeof args[key] === "object" ? JSON.stringify(args[key]) : args[key];
+				this.#attr.push(`${k}="${escapeHTML(String(val))}"`);
 			} else {
-				// Standard elements: process smart styling fallbacks for non-native props
+				// Standard elements: process smart fallbacks
 				if (isEvent || ((isNative || isCustom) && (!isWidthOrHeight || isDimensionAttributeSupported)) || isDataOrAria) {
 					const val = typeof args[key] === "object" ? JSON.stringify(args[key]) : args[key];
 					this.#attr.push(`${k}="${escapeHTML(String(val))}"`);
 				} else {
-					const val = typeof args[key] === "object" ? JSON.stringify(args[key]) : args[key];
-					inline_style += `${k}:${val};`;
+					if (useClassFallback) {
+						const val = args[key];
+						if (val === true || val === "true") {
+							classSet.add(k);
+						} else if (val !== false && val !== "false" && val !== null && val !== undefined) {
+							classSet.add(`${k}-${val}`);
+						}
+					} else {
+						const val = typeof args[key] === "object" ? JSON.stringify(args[key]) : args[key];
+						inline_style += `${k}:${val};`;
+					}
 				}
 			}
 		});
 
+		if (useClassFallback && classSet.size > 0) {
+			this.#attr.push(`class="${escapeHTML([...classSet].join(" "))}"`);
+		}
+
 		if (inline_style) {
 			// V4 DYNAMIC CSS: Automatically wrap CSS variables in var()
 			const processedStyle = inline_style.replace(/(^|[^\w\-_$])(--[\w\-_$]+)(?![\w\-_$]|:)/g, "$1var($2)");

package/grammar.ebnf

@@ -18,18 +18,28 @@ EscapeChar     = "\", ? any character except WhiteSpace ?;
 
 (* "Junk" refers to whitespace and comments which the parser skips in headers *)
 Comment        = "#", { ? any character except "\n" ? }, "\n";
-Junk           = { WhiteSpace | Comment };
+CommentBlock   = "###", { ? any character ? }, "###";
+Junk           = { WhiteSpace | Comment | CommentBlock };
 
 (* Prefix Layers for Dynamic Data *)
 PrefixJS       = "js{", { ? any character ? }, "}";
 PrefixP        = "p{", { ? any character ? }, "}";
-PrefixLayer    = PrefixJS | PrefixP;
+PrefixV        = "v{", { ? any character ? }, "}";
+PrefixLayer    = PrefixJS | PrefixP | PrefixV;
+
+(* Static / Runtime Logic Blocks *)
+LogicBlock     = ( "static" | "runtime" ), [ " " ], "${", { ? any character ? }, "}$";
 
 (* ========================================== *)
 (* Block Syntax (Containers)                  *)
 (* ========================================== *)
 
-Block          = BlockOpen, BlockBody, BlockEnd;
+Block          = StandardBlock | SelfClosingBlock;
+
+StandardBlock  = BlockOpen, BlockBody, BlockEnd;
+
+(* Self-Closing Blocks end with an exclamation mark (!) *)
+SelfClosingBlock = "[", Junk, BlockID, Junk, [ "=", Junk, BlockArgs, Junk ], "!", Junk, "]";
 
 (* Flexible Header with Junk-Skipping. Blocks allow colons in ID. *)
 BlockOpen      = "[", Junk, BlockID, Junk, [ "=", Junk, BlockArgs, Junk ], "]";
@@ -41,7 +51,7 @@ BlockArgs      = BlockArg, { Junk, ",", Junk, BlockArg };
 BlockArg       = [ BlockKey, Junk, ":", Junk ], Value;
 
 BlockKey       = BlockID | QuotedString;
-Value          = QuotedString | PrefixLayer | RawValue;
+Value          = QuotedString | PrefixLayer | LogicBlock | RawValue;
 
 QuotedString   = ("'" | '"'), { ? any character ? | EscapeChar }, ("'" | '"');
 RawValue       = { ? any char except ",", Junk, "]" ? | EscapeChar };
@@ -50,15 +60,16 @@ RawValue       = { ? any char except ",", Junk, "]" ? | EscapeChar };
 (* Inline Statement Syntax                    *)
 (* ========================================== *)
 
-(* Inlines use SimpleID (NO COLONS allowed in ID) *)
-InlineStatement = "(", InlineContent, ")", Junk, "->", Junk, "(", SimpleID, [ Junk, ":", Junk, InlineArgs ], ")";
+(* Inlines use SimpleID (NO COLONS allowed in ID unless key-value) *)
+InlineStatement = "(", InlineContent, ")", Junk, "->", Junk, "(", SimpleID, [ Junk, ( "=" | ":" ), Junk, InlineArgs ], ")";
 
 (* Content allows balanced parentheses and placeholders *)
-InlineContent   = { ? any char except ")" ? | BalancedParen | EscapeChar | PrefixP };
+InlineContent   = { ? any char except ")" ? | BalancedParen | EscapeChar | PrefixP | PrefixV };
 BalancedParen   = "(", InlineContent, ")";
 
-(* Inline Arguments: Positional Only *)
-InlineArgs      = Value, { Junk, ",", Junk, Value };
+(* Inline Arguments: Positional and Named support *)
+InlineArgs      = InlineArg, { Junk, ",", Junk, InlineArg };
+InlineArg       = [ SimpleID, Junk, ":", Junk ], Value;
 
 (* ========================================== *)
 (* At-Block Syntax (Raw Containers)           *)
@@ -83,4 +94,4 @@ AtBody         = { ? any character ? | EscapeChar };
 Document       = { Block | InlineStatement | AtBlock | TextContent | Comment | WhiteSpace };
 
 (* Text Content: Plain text with fallback behavior for symbols *)
-TextContent    = { ? any char except "[", "@_", "(", "#" ? | EscapeChar | PrefixP };
+TextContent    = { ? any char except "[", "@_", "(", "#" ? | EscapeChar | PrefixP | PrefixV | LogicBlock };

package/helpers/safeDataParser.js

@@ -28,7 +28,7 @@ export function safeDataParse(str) {
         if (char === '{') return parseObject();
         if (char === '[') return parseArray();
         if (char === '"' || char === "'") return parseString();
-        
+
         // Primitives or Unquoted identifiers
         return parsePrimitiveOrIdentifier();
     }
@@ -97,12 +97,12 @@ export function safeDataParse(str) {
             index++;
         }
         const token = s.slice(start, index);
-        
+
         if (token === "true") return true;
         if (token === "false") return false;
         if (token === "null") return null;
         if (!isNaN(Number(token))) return Number(token);
-        
+
         return token; // Fallback to string if it looks like an identifier
     }
 

package/helpers/spinner.js

@@ -0,0 +1,91 @@
+// Premium, dependency-free interactive terminal spinner for compilation feedback
+const spinnerFrames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+let spinnerIndex = 0;
+let activeSpinner = null;
+let spinnerDepth = 0;
+
+let originalStdoutWrite = null;
+let originalStderrWrite = null;
+let redrawTimeout = null;
+
+export function startSpinner() {
+	if (process.stdout.isTTY && !activeSpinner) {
+		// Hide terminal cursor for a clean premium visual feel
+		process.stdout.write("\x1b[?25l");
+
+		// Print the first frame immediately
+		const frame = spinnerFrames[spinnerIndex];
+		process.stdout.write(`\r\x1b[38;5;39m${frame}\x1b[0m \x1b[1mSomMark:\x1b[0m \x1b[38;5;208mCompiling template...\x1b[0m`);
+		spinnerIndex = (spinnerIndex + 1) % spinnerFrames.length;
+
+		// Intercept stdout and stderr writes to keep the spinner on the very bottom line
+		originalStdoutWrite = process.stdout.write;
+		process.stdout.write = function(chunk, encoding, callback) {
+			originalStdoutWrite.call(process.stdout, "\r\x1b[K");
+			const res = originalStdoutWrite.call(process.stdout, chunk, encoding, callback);
+			if (activeSpinner) {
+				if (redrawTimeout) clearTimeout(redrawTimeout);
+				redrawTimeout = setTimeout(() => {
+					if (activeSpinner && originalStdoutWrite) {
+						const f = spinnerFrames[spinnerIndex];
+						originalStdoutWrite.call(process.stdout, `\r\x1b[38;5;39m${f}\x1b[0m \x1b[1mSomMark:\x1b[0m \x1b[38;5;208mCompiling template...\x1b[0m`);
+					}
+				}, 0);
+			}
+			return res;
+		};
+
+		originalStderrWrite = process.stderr.write;
+		process.stderr.write = function(chunk, encoding, callback) {
+			if (originalStdoutWrite) {
+				originalStdoutWrite.call(process.stdout, "\r\x1b[K");
+			}
+			const res = originalStderrWrite.call(process.stderr, chunk, encoding, callback);
+			if (activeSpinner) {
+				if (redrawTimeout) clearTimeout(redrawTimeout);
+				redrawTimeout = setTimeout(() => {
+					if (activeSpinner && originalStdoutWrite) {
+						const f = spinnerFrames[spinnerIndex];
+						originalStdoutWrite.call(process.stdout, `\r\x1b[38;5;39m${f}\x1b[0m \x1b[1mSomMark:\x1b[0m \x1b[38;5;208mCompiling template...\x1b[0m`);
+					}
+				}, 0);
+			}
+			return res;
+		};
+
+		activeSpinner = setInterval(() => {
+			const frame = spinnerFrames[spinnerIndex];
+			if (originalStdoutWrite) {
+				originalStdoutWrite.call(process.stdout, `\r\x1b[38;5;39m${frame}\x1b[0m \x1b[1mSomMark:\x1b[0m \x1b[38;5;208mCompiling template...\x1b[0m`);
+			} else {
+				process.stdout.write(`\r\x1b[38;5;39m${frame}\x1b[0m \x1b[1mSomMark:\x1b[0m \x1b[38;5;208mCompiling template...\x1b[0m`);
+			}
+			spinnerIndex = (spinnerIndex + 1) % spinnerFrames.length;
+		}, 80);
+	}
+	spinnerDepth++;
+}
+
+export function stopSpinner() {
+	spinnerDepth--;
+	if (spinnerDepth <= 0) {
+		spinnerDepth = 0;
+		if (activeSpinner) {
+			clearInterval(activeSpinner);
+			activeSpinner = null;
+
+			// Restore original writes
+			if (originalStdoutWrite) {
+				process.stdout.write = originalStdoutWrite;
+				originalStdoutWrite = null;
+			}
+			if (originalStderrWrite) {
+				process.stderr.write = originalStderrWrite;
+				originalStderrWrite = null;
+			}
+
+			// Clear the spinner line and restore the terminal cursor
+			process.stdout.write("\r\x1b[K\x1b[?25h");
+		}
+	}
+}

package/helpers/utils.js

@@ -168,3 +168,49 @@ export function levenshtein(a, b) {
         }
         return matrix[b.length][a.length];
 }
+
+// -- Unresolved Placeholder Helpers ---------------------------------------- //
+
+export const UNRESOLVED_PREFIX = "SOMMARK_UNRESOLVED";
+export const UNRESOLVED_SUFFIX = "SOMMARK";
+
+/**
+ * Official method to get the unique envelope for an unresolved prefix value.
+ * @param {string} prefix - The layer ('p' or 'v').
+ * @param {string} expectedValue - The placeholder key.
+ * @returns {string} - The unique envelope string.
+ */
+export function getPrefixValue(prefix, expectedValue) {
+	if (!prefix || (prefix !== "p" && prefix !== "v")) {
+		sommarkError([
+			`<$red:getPrefixValue Error:$> {N}`,
+			`<$yellow:prefix must be 'p' or 'v'. Received:$> <$cyan:'${prefix}'$>`
+		]);
+	}
+
+	if (!expectedValue || typeof expectedValue !== "string" || expectedValue.trim() === "") {
+		sommarkError([
+			`<$red:getPrefixValue Error:$> {N}`,
+			`<$yellow:expectedValue must be a non-empty string. Received:$> <$cyan:'${expectedValue}'$>`
+		]);
+	}
+
+	return `${UNRESOLVED_PREFIX}_${prefix}_${expectedValue}_${UNRESOLVED_SUFFIX}`;
+}
+
+/**
+ * Performs a final pass on a string to clean up any remaining unresolved envelopes.
+ * @param {string} content - The content to clean.
+ * @param {string|null} [fallback] - The format to use for missing keys (e.g., "$layer{$key}" or "").
+ * @returns {string} - The cleaned content.
+ */
+export function cleanUnresolved(content, fallback = null) {
+	const pattern = new RegExp(`${UNRESOLVED_PREFIX}_(p|v)_(.+?)_${UNRESOLVED_SUFFIX}`, "g");
+	return content.replace(pattern, (match, layer, key) => {
+		if (fallback !== null) {
+			return fallback.replace("$layer", layer).replace("$key", key);
+		}
+		// Default: Keep as is or restore classic
+		return `${layer}{${key}}`;
+	});
+}