sommark 4.5.3 → 5.0.0

package/cli/commands/color.js

@@ -1,31 +1,53 @@
 import { formatMessage } from "../../core/errors.js";
+import fs from "node:fs/promises";
+import path from "node:path";
+import os from "node:os";
+
+const SOMMARK_CONFIG_DIR = path.join(os.homedir(), ".sommark");
+const SOMMARK_CONFIG_FILE = path.join(SOMMARK_CONFIG_DIR, "config.json");
+
+/**
+ * Reads the user-level SomMark config from ~/.sommark/config.json.
+ * @returns {Promise<Object>}
+ */
+async function readUserConfig() {
+    try {
+        const raw = await fs.readFile(SOMMARK_CONFIG_FILE, "utf-8");
+        return JSON.parse(raw);
+    } catch {
+        return {};
+    }
+}
+
+/**
+ * Writes a key/value pair to ~/.sommark/config.json.
+ */
+async function writeUserConfig(data) {
+    await fs.mkdir(SOMMARK_CONFIG_DIR, { recursive: true });
+    const existing = await readUserConfig();
+    await fs.writeFile(SOMMARK_CONFIG_FILE, JSON.stringify({ ...existing, ...data }, null, 2));
+}
 
 /**
- * Checks if colors are turned on in your settings.
+ * Checks if colors are enabled — reads from user config or SOMMARK_COLOR env var.
  * @returns {Promise<boolean>}
  */
 export async function isColorEnabled() {
-    return process.env.SOMMARK_COLOR === "true";
+    if (process.env.SOMMARK_COLOR === "true") return true;
+    if (process.env.SOMMARK_COLOR === "false") return false;
+    const config = await readUserConfig();
+    return config.color === true;
 }
 
 /**
- * Shows the user how to turn colors on or off.
+ * Instructs the user how to enable or disable color output via the environment variable.
  * @param {string} action - 'on' or 'off'.
  */
 export function runColor(action) {
     if (action === "on") {
-        console.log(formatMessage([
-            `{line}<$yellow:SomMark uses Environment Variables for colors:$>{line}`,
-            `<$blue:Set this in your current shell:$>`,
-            `  <$cyan:export SOMMARK_COLOR=true$>{line}`,
-            `<$blue:Add it to your .bashrc or .zshrc for permanent effect.$>{line}`
-        ].join("")));
+        console.log(formatMessage(`Set <$cyan:SOMMARK_COLOR=true$> in your shell environment to enable colors.`));
     } else if (action === "off") {
-        console.log(formatMessage([
-            `{line}<$yellow:To disable colors, run:$>{line}`,
-            `  <$cyan:export SOMMARK_COLOR=false$>{line}`,
-            `<$blue:(Or remove the SOMMARK_COLOR variable from your shell config)$>{line}`
-        ].join("")));
+        console.log(formatMessage(`Set <$cyan:SOMMARK_COLOR=false$> in your shell environment to disable colors.`));
     } else {
         console.log(formatMessage(`Usage: <$blue:sommark color on|off$>`));
     }

package/cli/commands/help.js

@@ -36,6 +36,9 @@ export function getHelp(unknown_option = true) {
 		"{N}  <$green:--json$>         <$cyan: Transpile to JSON$>",
 		"{N}  <$green:--jsonc$>        <$cyan: Transpile to JSON with Comments (JSONC)$>",
 		"{N}  <$green:--text$>         <$cyan: Transpile to plain text$>",
+		"{N}  <$green:--csv$>          <$cyan: Transpile to CSV$>",
+		"{N}  <$green:--toml$>         <$cyan: Transpile to TOML$>",
+		"{N}  <$green:--yaml$>         <$cyan: Transpile to YAML$>",
 		"{N}  <$green:--lex$>          <$cyan: Print lexer tokens to console$>",
 		"{N}  <$green:--parse$>        <$cyan: Print parser AST to console$>",
 

package/cli/commands/init.js

@@ -21,8 +21,6 @@ export async function runInit() {
 export default {
     format: "html",              // Target output format (html, markdown, mdx, json, xml, jsonc, text)
     removeComments: true,       // Strip SomMark comments from the final output
-    generateRuntimeOutput: false, // Generate only VM script bundles, ignoring markup layouts
-    hideRuntimeOutput: false,     // Strip all <script> tags from final compiled HTML outputs
     customProps: [],            // Whitelisted HTML attributes
     placeholders: {},           // Global p{key} placeholders for content injection
     importAliases: {            // Custom path aliases for modules (e.g. { "@": "./src/components" })

package/cli/constants.js

@@ -4,7 +4,7 @@
  */
 
 /** @type {Array<string>} List of recognized CLI flags and commands. */
-export const options = ["-v", "--version", "-h", "--help", "--html", "--markdown", "--mdx", "--json", "--jsonc", "--text", "--xml", "--print", "-p", "--lex", "--parse", "list", "bundle"];
+export const options = ["-v", "--version", "-h", "--help", "--html", "--markdown", "--mdx", "--json", "--jsonc", "--text", "--xml", "--csv", "--toml", "--yaml", "--print", "-p", "--lex", "--parse", "list", "bundle"];
 
 /** @type {Object<string, string>} Map of output formats to their respective file extensions. */
 export const extensions = {
@@ -14,5 +14,8 @@ export const extensions = {
 	mdx: "mdx",
 	json: "json",
 	jsonc: "jsonc",
-	xml: "xml"
+	xml: "xml",
+	csv: "csv",
+	toml: "toml",
+	yaml: "yaml"
 };

package/core/errors.js

@@ -20,17 +20,18 @@ import colorize from "../helpers/colorize.js";
  * @returns {string} - The final formatted and colored string.
  */
 function formatMessage(text) {
-	const horizontal_rule = "\n----------------------------------------------------------------------------------------------\n";
+	const horizontal_rule = "\n" + colorize("blue", "-".repeat(90)) + "\n";
 	const pattern = /<\$([^:]+):([\s\S]*?)\$>/g;
 
 	if (Array.isArray(text)) {
 		text = text.join("");
 	}
 
+	// Apply {line} before color tags so the rule is never nested inside a color wrapper.
+	text = text.replaceAll("{line}", horizontal_rule);
 	text = text.replace(pattern, (match, color, content) => {
 		return colorize(color, content.trim());
 	});
-	text = text.replaceAll("{line}", horizontal_rule);
 	text = text.replaceAll("{N}", "\n");
 
 	text = text
@@ -68,11 +69,11 @@ function formatErrorWithContext(src, range, filename, message, typeName) {
 			: `from line <$yellow:${range.start.line + 1}$>, column <$yellow:${range.start.character}$> to line <$yellow:${range.end.line + 1}$>, column <$yellow:${range.end.character}$>`;
 
 	const formattedMessage = [
-		`<$blue:{line}$><$red:Here where error occurred${sourceLabel}:$>{N}${lineContent}{N}${pointerPadding}<$yellow:^$>{N}{N}`,
+		`{line}<$red:Here where error occurred${sourceLabel}:$>{N}${lineContent}{N}${pointerPadding}<$yellow:^$>{N}`,
 		`<$red:${typeName} Error:$> `,
 		...(Array.isArray(message) ? message : [message]),
 		`{N}at line <$yellow:${range.start.line + 1}$>, ${rangeInfo}{N}`,
-		"<$blue:{line}$>"
+		`{line}`
 	];
 
 	return formattedMessage;

package/core/evaluator.js

@@ -644,10 +644,9 @@ class EvaluatorState {
                 const tag = SomMark.__dynamicTags.get(${JSON.stringify(id)});
                 if (!tag) throw new Error("Tag not found inside VM: " + ${JSON.stringify(id)});
                 const res = tag.render({
-                    args: payload.args,
+                    props: payload.props,
                     content: payload.content,
                     textContent: payload.textContent,
-                    nodeType: payload.nodeType,
                     isSelfClosing: payload.isSelfClosing
                 });
                 return res;

package/core/formats.js

@@ -8,6 +8,9 @@ export const mdxFormat = "mdx";
 export const jsonFormat = "json";
 export const jsoncFormat = "jsonc";
 export const xmlFormat = "xml";
+export const csvFormat = "csv";
+export const tomlFormat = "toml";
+export const yamlFormat = "yaml";
 
 const formats = {
 	textFormat,
@@ -16,7 +19,10 @@ const formats = {
 	mdxFormat,
 	jsonFormat,
 	jsoncFormat,
-	xmlFormat
+	xmlFormat,
+	csvFormat,
+	tomlFormat,
+	yamlFormat
 };
 
 export default formats;

package/core/helpers/config-loader.js

@@ -86,9 +86,7 @@ export async function findAndLoadConfig(targetPath) {
 		fallbackTarget: "style",
 		outputValidator: null,
 		baseDir: null,
-		showSpinner: false,
-		generateRuntimeOutput: false,
-		hideRuntimeOutput: false,
+		showSpinner: true,
 		security: {},
 	};
 

package/core/helpers/lib.js

@@ -18,7 +18,7 @@ export function registerHostSettings(settings) {
     hostSettings = settings || {};
 }
 
-const version = "4.5.3";
+const version = "5.0.0";
 
 const SomMark = {
     version,

package/core/labels.js

@@ -4,8 +4,6 @@
  */
 export const BLOCK = "Block",
 	TEXT = "Text",
-	INLINE = "Inline",
-	ATBLOCK = "AtBlock",
 	COMMENT = "Comment",
 	COMMENT_BLOCK = "CommentBlock",
 	IMPORT = "Import",
@@ -18,13 +16,8 @@ export const BLOCK = "Block",
 /**
  * Names for symbols used to separate parts of the code (like commas and colons).
  */
-export const SEMICOLON = "Semicolon",
-	BLOCKCOMMA = "Block-comma",
-	ATBLOCKCOMMA = "Atblock-comma",
-	INLINECOMMA = "Inline-comma",
-	BLOCKCOLON = "Block-colon",
-	ATBLOCKCOLON = "Atblock-colon",
-	INLINECOLON = "Inline-colon";
+export const BLOCKCOMMA = "Block-comma",
+	BLOCKCOLON = "Block-colon";
 
 /**
  * These names are used in error messages to tell you exactly which part 
@@ -34,12 +27,6 @@ export const block_id = "Block Identifier",
 	block_value = "Block Value",
 	block_key = "Block Key",
 	block_end = "Block end",
-	inline_id = "Inline Identifier",
-	inline_text = "Inline Text",
-	at_id = "At Identifier",
-	at_value = "At Value",
-	atblock_key = "AtBlock Key",
-	at_end = "Atblock End",
 	/** Reserved keyword for closing blocks */
 	end_keyword = "end",
 	slot_keyword = "slot",