sommark 2.1.1 → 2.2.0

package/mappers/languages/json.js

@@ -0,0 +1,172 @@
+import Mapper from "../mapper.js";
+import { TEXT } from "../../core/labels.js";
+import { transpilerError } from "../../core/errors.js";
+
+const Json = new Mapper();
+
+// ========================================================================== //
+//  Helpers                                                                   //
+// ========================================================================== //
+
+function escapeString(str) {
+	return JSON.stringify(str);
+}
+
+function processNode(node, parentType = null) {
+	if (!node) return "";
+
+	if (node.id === "Object" || node.id === "Array" || node.id === "Json") {
+		return renderBlock(node, parentType);
+	} else if (["string", "number", "bool", "null", "array", "none"].includes(node.id)) {
+		return renderInline(node, parentType);
+	} else if (node.type === TEXT) {
+		return "";
+	}
+	return "";
+}
+
+function renderBlock(node, parentType) {
+	let output = "";
+	let key = "";
+	let isRoot = node.id === "Json";
+	let type = node.id === "Array" || (isRoot && node.args.includes("array")) ? "array" : "object";
+
+	// ========================================================================== //
+	//  Key                                                                       //
+	// ========================================================================== //
+	if (!isRoot) {
+		if (parentType === "object") {
+			key = node.args && node.args[0] ? escapeString(node.args[0]) : null;
+			if (!key) {
+				key = '"unknown_key"';
+			}
+		}
+	}
+
+	// ========================================================================== //
+	//  Children                                                                  //
+	// ========================================================================== //
+	let children = [];
+	if (node.body && node.body.length > 0) {
+		for (const child of node.body) {
+			const childOutput = processNode(child, type);
+			if (childOutput) {
+				children.push(childOutput);
+			}
+		}
+	}
+
+	let content = children.join(",");
+	let wrapper = type === "array" ? `[${content}]` : `{${content}}`;
+
+	if (key) {
+		return `${key}:${wrapper}`;
+	} else {
+		if (parentType === "object") {
+			if (!node.args || !node.args[0]) {
+				transpilerError([`{line}<$red:JSON Error:$> <$yellow:Blocks inside an Object must have a key argument.$>{line}`]);
+			}
+		}
+		return wrapper;
+	}
+}
+
+function renderInline(node, parentType) {
+	let key = null;
+	let value = "";
+
+	// ========================================================================== //
+	//  Value                                                                     //
+	// ========================================================================== //
+	if (node.id === "string") {
+		if (!node.args || node.args.length === 0) {
+			transpilerError([`{line}<$red:JSON Error:$> <$yellow:String inline must have a value.$>{line}`]);
+		}
+		value = escapeString(node.args[0] || "");
+	} else if (node.id === "number") {
+		if (!node.args || node.args.length === 0 || isNaN(Number(node.args[0]))) {
+			transpilerError([`{line}<$red:JSON Error:$> <$yellow:Invalid or missing number value for inline.$>{line}`]);
+		}
+		value = node.args[0];
+	} else if (node.id === "bool") {
+		if (!node.args || (node.args[0] !== "true" && node.args[0] !== "false")) {
+			transpilerError([`{line}<$red:JSON Error:$> <$yellow:Bool inline must be 'true' or 'false'.$>{line}`]);
+		}
+		value = node.args[0] === "true" ? "true" : "false";
+	} else if (node.id === "null") {
+		value = "null";
+	} else if (node.id === "array") {
+		// ========================================================================== //
+		//  Inline array                                                              //
+		// ========================================================================== //
+		// (data)->(array: 1, 2, 3)
+		// args = ["1", " 2", " 3"]
+		const items = node.args.map(arg => {
+			const trimmed = arg.trim();
+			if (trimmed === "null") return "null";
+			if (trimmed === "true" || trimmed === "false") return trimmed;
+			if (!isNaN(parseFloat(trimmed)) && isFinite(trimmed)) return trimmed;
+			return escapeString(trimmed);
+		});
+		value = `[${items.join(",")}]`;
+	} else if (node.id === "none") {
+		// Special case: (-)->(none: val)
+		if (parentType === "object") {
+			transpilerError([
+				`{line}<$red:JSON Error:$> <$yellow:'none' inline is not allowed directly inside an Object. It must be inside an Array.$>{line}`
+			]);
+			return "";
+		}
+
+		// (-)->(none: 1, 2, null) -> [1, 2, null] -> args.length > 1
+		// (-)->(none: true) -> true -> args.length == 1
+
+		if (node.args.length > 1) {
+			const items = node.args.map(arg => {
+				const trimmed = arg.trim();
+				if (trimmed === "null") return "null";
+				if (trimmed === "true" || trimmed === "false") return trimmed;
+				if (!isNaN(parseFloat(trimmed)) && isFinite(trimmed)) return trimmed;
+				return escapeString(trimmed);
+			});
+			value = `[${items.join(",")}]`;
+		} else {
+			const arg = node.args[0] || "";
+			const trimmed = arg.trim();
+			if (trimmed === "null") value = "null";
+			else if (trimmed === "true" || trimmed === "false") value = trimmed;
+			else if (!isNaN(parseFloat(trimmed)) && isFinite(trimmed)) value = trimmed;
+			else value = escapeString(trimmed);
+		}
+	}
+
+	if (parentType === "object") {
+		if (node.id === "none") return "";
+
+		if (!node.value) {
+			transpilerError([
+				`{line}<$red:JSON Error:$> <$yellow:Inline elements inside an Object must have an identifier (key).$>{line}`
+			]);
+		}
+
+		key = escapeString(node.value);
+		return `${key}:${value}`;
+	} else {
+		return value;
+	}
+}
+
+// ========================================================================== //
+//  Main Registration                                                         //
+// ========================================================================== //
+
+const noop = () => "";
+Json.register(["Object", "Array"], noop);
+Json.register(["string", "number", "bool", "null", "array", "none"], noop);
+
+Json.register("Json", ({ args, content, ast }) => {
+	if (!ast) return "";
+	return processNode(ast, null);
+});
+
+export default Json;

package/mappers/languages/markdown.js

@@ -1,24 +1,38 @@
 import Mapper from "../mapper.js";
 const MARKDOWN = new Mapper();
-const { md } = MARKDOWN;
+const { md, safeArg } = MARKDOWN;
 // Block
-MARKDOWN.register("Block", ({ content }) => {
-	return content;
-});
-// Section
-MARKDOWN.register("Section", ({ content }) => {
+MARKDOWN.register(["Block", "block", "Section", "section"], ({ content }) => {
 	return content;
 });
 // Headings
-MARKDOWN.register("Heading", ({ args, content }) => {
-	return md.heading(args[1], args[0]) + content;
-});
+MARKDOWN.register(
+	["Heading", "heading"],
+	({ args, content }) => {
+		const level = safeArg(args, 0, "level", "number", Number, 1);
+		const title = safeArg(args, 1, "title", null, null, "");
+		return md.heading(title, level) + content;
+	},
+	{
+		rules: {
+			type: "Block"
+		}
+	}
+);
 // Inline Headings
-["h1", "h2", "h3", "h4", "h5", "h6"].forEach(heading => {
-	MARKDOWN.register(heading, ({ content }) => {
-		return md.heading(content, heading.replace("h", ""));
-	});
-});
+["h1", "h2", "h3", "h4", "h5", "h6"].forEach(
+	heading => {
+		MARKDOWN.register(heading, ({ content }) => {
+			const lvl = heading[1] && typeof Number(heading[1]) === "number" ? heading[1] : 1;
+			return md.heading(content, lvl);
+		});
+	},
+	{
+		rules: {
+			type: "Inline"
+		}
+	}
+);
 // Bold
 MARKDOWN.register(["bold", "b"], ({ content }) => {
 	return md.bold(content);
@@ -35,26 +49,59 @@ MARKDOWN.register(["emphasis", "e"], ({ content }) => {
 MARKDOWN.register(
 	["code", "Code", "codeBlock", "CodeBlock"],
 	({ args, content }) => {
-		return md.codeBlock(content, args[0]);
+		const lang = safeArg(args, 0, "lang", null, null, "text");
+		return md.codeBlock(content, lang);
 	},
-	{ escape: false }
+	{
+		escape: false,
+		rules: {
+			type: "AtBlock"
+		}
+	}
 );
 // Link
-MARKDOWN.register("link", ({ args, content }) => {
-	const title = args[1] ? `"${args[1].trim()}"` : "";
-	return md.url("link", content, args[0].trim(), title);
-});
+MARKDOWN.register(
+	["link", "Link"],
+	({ args, content }) => {
+		const url = safeArg(args, 0, "url", null, null, "");
+		const title = safeArg(args, 1, "title", null, null, "");
+		return md.url("link", content, url, title);
+	},
+	{
+		rules: {
+			type: "Inline"
+		}
+	}
+);
 // Image
-MARKDOWN.register("image", ({ args, content }) => {
-	const title = args[1] ? `"${args[1].trim()}"` : "";
-	return md.url("image", content, args[0].trim(), title);
-});
+MARKDOWN.register(
+	["image", "Image"],
+	({ args, content }) => {
+		const url = safeArg(args, 0, "url", null, null, "");
+		const title = safeArg(args, 1, "title", null, null, "");
+		return md.url("image", content, url, title);
+	},
+	{
+		rules: {
+			type: "Inline"
+		}
+	}
+);
 // Horizontal Rule
-MARKDOWN.register(["horizontal", "h"], ({ content }) => {
-	return md.horizontal(content);
-});
+MARKDOWN.register(
+	["horizontal", "hr", "h"],
+	({ args }) => {
+		const fmt = safeArg(args, 0, undefined, null, null, "*");
+		return md.horizontal(fmt);
+	},
+	{
+		rules: {
+			type: "Block"
+		}
+	}
+);
 // Escape Characters
-MARKDOWN.register(["escape", "s"], ({ content }) => {
+MARKDOWN.register(["escape", "Escape", "s"], ({ content }) => {
 	return md.escape(content);
 });
 // Table
@@ -70,7 +117,7 @@ MARKDOWN.register(
 				.map(line => line.trim())
 		);
 	},
-	{ escape: false }
+	{ escape: false, rules: { type: "AtBlock" } }
 );
 // List
 MARKDOWN.register(
@@ -78,11 +125,12 @@ MARKDOWN.register(
 	({ content }) => {
 		return content;
 	},
-	{ escape: false }
+	{ escape: false, rules: { type: "AtBlock" } }
 );
 // Todo
 MARKDOWN.register("todo", ({ args, content }) => {
 	const checked = content === "x" ? true : false;
-	return md.todo(checked, args && args[0] ? args[0].trim() : "");
+	const task = safeArg(args, 0, "task", null, null, "");
+	return md.todo(checked, task);
 });
 export default MARKDOWN;

package/mappers/mapper.js

@@ -1,9 +1,9 @@
 import TagBuilder from "../formatter/tag.js";
 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";
+import { sommarkError } from "../core/errors.js";
 
 class Mapper {
 	#customHeaderContent;
@@ -28,15 +28,16 @@ class Mapper {
 
 		this.#customHeaderContent = "";
 
-		this.highlightCode = highlightCode;
+		this.highlightCode = null;
 		this.escapeHTML = escapeHTML;
 		this.styles = [];
 		this.env = "node";
 		// Theme Registry
 		this.themes = {
+			"sommark-default": "pre{padding: 5px; background-color: #f6f8fa; font-family: monospace}",
 			"atom-one-dark": atomOneDark
 		};
-		this.currentTheme = "atom-one-dark";
+		this.currentTheme = this.highlightCode && typeof this.highlightCode === "function" ? "atom-one-dark" : "sommark-default";
 		this.enable_table_styles = true;
 	}
 
@@ -171,12 +172,15 @@ class Mapper {
 	//  Formatters                                                                //
 	// ========================================================================== //
 	code = (args, content) => {
-		const value = highlightCode(content, args && args[0] ? args[0].trim() : "text");
-		return this.tag("pre").body(
-			this.tag("code")
-				.attributes({ class: `hljs language-${args && args[0] ? args[0].trim() : "text"}` })
-				.body(value)
-		);
+		const lang = this.safeArg(args, 0, "lang", null, null, "text");
+		const code = content || "";
+		let value = content;
+		const code_element = this.tag("code");
+		if (this.highlightCode && typeof this.highlightCode === "function") {
+			code_element.attributes({ class: `hljs language-${lang}` });
+			value = this.highlightCode(code, lang);
+		}
+		return this.tag("pre").body(code_element.body(value));
 	};
 	htmlTable = (data, headers, defaultStyle = true) => {
 		const isAddedStyle = this.styles.some(s => s.includes(".sommark-table"));
@@ -312,5 +316,47 @@ class Mapper {
 	todo(checked = false) {
 		return checked.trim() === "x" || checked.trim().toLowerCase() === "done" ? true : false;
 	}
+	safeArg = (args, index, key, type = null, setType = null, fallBack = null) => {
+		if (!Array.isArray(args)) {
+			sommarkError([`{line}<$red:TypeError:$> <$yellow:args must be an array$>{line}`]);
+		}
+
+		if (index === undefined && key === undefined) {
+			sommarkError([`{line}<$red:ReferenceError:> <$yellow:At least one of 'index' or 'key' must be provided$>{line}`]);
+		}
+
+		if (index !== undefined && typeof index !== "number") {
+			sommarkError([`{line}<$red:TypeError:$> <$yellow:index must be a number$>{line}`]);
+		}
+
+		if (key !== undefined && typeof key !== "string") {
+			sommarkError([`{line}<$red:TypeError:$> <$yellow:key must be a string$>{line}`]);
+		}
+
+		if (type !== null && typeof type !== "string") {
+			sommarkError([`{line}<$red:TypeError:$> <$yellow:type must be a string$>{line}`]);
+		}
+
+		if (setType !== null && typeof setType !== "function") {
+			sommarkError([`{line}<$red:TypeError:$> <$yellow:setType must be a function$>{line}`]);
+		}
+
+		const validate = value => {
+			if (value === undefined) return false;
+			if (!type) return true;
+			const evaluated = setType ? setType(value) : value;
+			return typeof evaluated === type;
+		};
+
+		if (index !== undefined && validate(args[index])) {
+			return args[index];
+		}
+
+		if (key !== undefined && validate(args[key])) {
+			return args[key];
+		}
+
+		return fallBack;
+	};
 }
 export default Mapper;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sommark",
-	"version": "2.1.1",
+	"version": "2.2.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": {
@@ -42,10 +42,7 @@
 		"url": "https://github.com/Adam-Elmi/SomMark/issues"
 	},
 	"homepage": "https://github.com/Adam-Elmi/SomMark#readme",
-	"dependencies": {
-		"highlight.js": "^11.11.1"
-	},
 	"devDependencies": {
 		"vitest": "^4.0.16"
 	}
-}
+}

package/lib/highlight.js

@@ -1,11 +0,0 @@
-import hljs from "highlight.js";
-
-function highlightCode(code, language = "plaintext") {
-    if (!hljs.getLanguage(language)) {
-        language = "plaintext";
-    }
-    return hljs.highlight(code, { language }).value;
-}
-export {
-    highlightCode,
-};