sommark 3.2.0 → 3.3.1

package/README.md

@@ -109,3 +109,10 @@ Read our detailed guides in the `docs/` folder:
 - **[Mapper API](docs/13.mapper.md)**: How to create new output formats.
 - **[CLI Reference](docs/11.cli.md)**: Terminal commands and flags.
 - **[API Quick Reference](docs/api)**: Fast lookup for all functions.
+
+# Editor Support
+
+### Editor Support
+High-quality syntax highlighting and diagnostics are provided via **LSP Semantic Tokens**. This ensures perfect coloring in any editor that supports the Language Server Protocol (e.g., VS Code, Neovim, CoC).
+
+Information for integration can be found in the [SomMark-LSP](https://github.com/Adam-Elmi/SomMark-LSP) project.

package/cli/commands/build.js

@@ -16,7 +16,8 @@ import { transpile } from "../helpers/transpile.js";
 async function generateOutput(outputDir, outputFile, format, sourcePath, mappingFile) {
     let source_code = await readContent(sourcePath);
     source_code = source_code.toString();
-    const output = await transpile({ src: source_code, format, mappingFile });
+    const absolutePath = path.resolve(process.cwd(), sourcePath);
+    const output = await transpile({ src: source_code, format, filename: absolutePath, mappingFile });
     const finalPath = path.join(outputDir, `${outputFile}.${extensions[format]}`);
     await createFile(outputDir, `${outputFile}.${extensions[format]}`, output);
     return finalPath;

package/cli/commands/init.js

@@ -20,15 +20,11 @@ export function getConfigDir() {
 
 export async function runInit() {
     try {
-        const configDir = getConfigDir();
-        const pluginsDir = path.join(configDir, "plugins");
-        const configFilePath = path.join(configDir, "smark.config.js");
-
         // ======================================================
-        // Create directories
+        // Create configuration directory
         // ======================================================
 
-        await fs.mkdir(pluginsDir, { recursive: true });
+        await fs.mkdir(configDir, { recursive: true });
 
         // ======================================================
         // Default configuration content

package/cli/commands/list.js

@@ -10,7 +10,16 @@ import { formatMessage } from "../../core/errors.js";
  */
 export async function runListPlugins(args) {
     const config = await loadConfig();
-    const enabledPlugins = config.plugins || [];
+
+    const sm = new SomMark({
+        src: "",
+        format: "html",
+        plugins: config.plugins,
+        excludePlugins: config.excludePlugins,
+        priority: config.priority
+    });
+
+    const enabledPlugins = sm.plugins;
 
     // Filter flags
     const showInternal = args.includes("--internal") || args.includes("-i");
@@ -24,16 +33,14 @@ export async function runListPlugins(args) {
     // 1. Internal Plugins
     if (showInternal || showAll) {
         const internal = enabledPlugins.filter(p => {
-             const name = typeof p === "string" ? p : p.name;
-             return BUILT_IN_PLUGINS.some(bp => bp.name === name);
+            return BUILT_IN_PLUGINS.some(bp => bp.name === p.name);
         });
 
         if (internal.length > 0) {
             console.log(formatMessage(`  <$magenta:Internal Plugins (Built-in):$>{N}`));
             internal.forEach(p => {
-                const name = typeof p === "string" ? p : p.name;
-                const pluginObj = BUILT_IN_PLUGINS.find(bp => bp.name === name);
-                printPluginInfo(name, pluginObj);
+                const pluginObj = BUILT_IN_PLUGINS.find(bp => bp.name === p.name);
+                printPluginInfo(p.name, pluginObj);
             });
             found = true;
         }
@@ -42,15 +49,13 @@ export async function runListPlugins(args) {
     // 2. External Plugins
     if (showExternal || showAll) {
         const external = enabledPlugins.filter(p => {
-            const name = typeof p === "string" ? p : p.name;
-            return !BUILT_IN_PLUGINS.some(bp => bp.name === name);
+            return !BUILT_IN_PLUGINS.some(bp => bp.name === p.name);
         });
 
         if (external.length > 0) {
             console.log(formatMessage(`${found ? "{N}" : ""}  <$magenta:External Plugins (User-defined):$>{N}`));
             external.forEach(p => {
-                const name = typeof p === "string" ? p : (p.name || "Unknown");
-                printPluginInfo(name, typeof p === "object" ? p : null);
+                printPluginInfo(p.name || "Unknown", p);
             });
             found = true;
         }
@@ -101,7 +106,7 @@ export async function runListPipeline() {
         console.log(formatMessage(`  <$magenta:${phase.name}$>`));
         if (matched.length > 0) {
             matched.forEach(p => {
-                console.log(formatMessage(`    <$green:• ${p.name}$> <$cyan:[${Array.isArray(p.type) ? p.type.join(", ") : p.type}]$>`));
+                console.log(formatMessage(`    <$green:└── ${p.name}$> <$cyan:[${Array.isArray(p.type) ? p.type.join(", ") : p.type}]$>`));
             });
         } else {
             console.log(formatMessage(`    <$yellow: (None registered)$>`));
@@ -114,6 +119,6 @@ export async function runListPipeline() {
 function printPluginInfo(name, pluginObj) {
     const author = pluginObj?.author || "Unknown";
     const desc = pluginObj?.description || "No description provided.";
-    console.log(formatMessage(`    <$green:• ${name}$> <$cyan:by ${author}$>`));
+    console.log(formatMessage(`    <$green:└── ${name}$> - <$cyan:by ${author}$>`));
     console.log(formatMessage(`      <$yellow:${desc}$>`));
 }

package/cli/commands/print.js

@@ -13,11 +13,12 @@ export async function printOutput(format, filePath) {
     const fileName = path.basename(filePath);
     console.log(formatMessage(`{line}<$blue: Printing output for$> <$yellow:'${fileName}'$>{line}`));
     let source_code = await readContent(filePath);
+    const absolutePath = path.resolve(process.cwd(), filePath);
     if (format === "json") {
-      const output = await transpile({ src: source_code.toString(), format });
+      const output = await transpile({ src: source_code.toString(), format, filename: absolutePath });
       console.log(JSON.stringify(JSON.parse(output, null, 2), null, 2));
     } else {
-      console.log(await transpile({ src: source_code.toString(), format }));
+      console.log(await transpile({ src: source_code.toString(), format, filename: absolutePath }));
     }
   } else {
     cliError([`{line}<$red:File$> <$blue:'${filePath}'$> <$red: is not found$>{line}`]);
@@ -34,9 +35,11 @@ export async function printLex(filePath) {
     const source_code = await readContent(filePath);
     const config = await loadConfig();
 
+    const absolutePath = path.resolve(process.cwd(), filePath);
     const smark = new SomMark({
       src: source_code.toString(),
       format: "text",
+      filename: absolutePath,
       plugins: config.plugins,
       priority: config.priority
     });
@@ -58,9 +61,11 @@ export async function printParse(filePath) {
     const source_code = await readContent(filePath);
     const config = await loadConfig();
 
+    const absolutePath = path.resolve(process.cwd(), filePath);
     const smark = new SomMark({
       src: source_code.toString(),
       format: "text",
+      filename: absolutePath,
       plugins: config.plugins,
       priority: config.priority
     });

package/cli/helpers/transpile.js

@@ -15,7 +15,7 @@ const default_mapperFiles = { [htmlFormat]: HTML, [markdownFormat]: MARKDOWN, [m
 // ========================================================================== //
 //  Transpile Function                                                        //
 // ========================================================================== //
-export async function transpile({ src, format, mappingFile = "" }) {
+export async function transpile({ src, format, filename = null, mappingFile = "" }) {
     const config = await loadConfig();
     let finalMapper = mappingFile;
 
@@ -39,6 +39,7 @@ export async function transpile({ src, format, mappingFile = "" }) {
     const smark = new SomMark({
         src,
         format,
+        filename,
         mapperFile: finalMapper,
         plugins: config.plugins,
         priority: config.priority

package/core/errors.js

@@ -1,18 +1,23 @@
 import colorize from "../helpers/colorize.js";
 
+/**
+ * SomMark Errors
+ * Handles formatting and throwing errors with beautiful CLI coloring and pointers.
+ */
+
+// ========================================================================== //
+//  Message Formatting                                                       //
+// ========================================================================== //
+
 function formatMessage(text) {
 	/*
-	Format:
-	{line} = Horizontal line
-	{N} = Newline
-  <color: Text> = Colored Text
-
-  [No Nest]
-  -----------------------------
-	Example: <$red: Expected token$> <$magenta: ']'$> {N} at line <$red: 1$> {N} column <$green: 2$> {line}
+	Format System:
+	{line} = Draws a horizontal line
+	{N}    = Inserts a newline
+	<$color: Text$> = Colors the text (supports red, yellow, green, blue, magenta, cyan)
 	*/
 	const horizontal_rule = "\n----------------------------------------------------------------------------------------------\n";
-	const pattern = /<\$([^:]+):([^$]+)\$>/g;
+	const pattern = /<\$([^:]+):([\s\S]*?)\$>/g;
 
 	if (Array.isArray(text)) {
 		text = text.join("");
@@ -33,6 +38,10 @@ function formatMessage(text) {
 	return text;
 }
 
+// ========================================================================== //
+//  Error Classes                                                            //
+// ========================================================================== //
+
 class CustomError extends Error {
 	constructor(message, name) {
 		super(message);
@@ -80,6 +89,10 @@ class SommarkError extends CustomError {
 	}
 }
 
+// ========================================================================== //
+//  Error Dispatcher (Helper)                                               //
+// ========================================================================== //
+
 function getError(type) {
 	const validate_msg = msg => Array.isArray(msg) && msg.length > 0;
 	switch (type) {

package/core/labels.js

@@ -3,6 +3,8 @@ export const BLOCK = "Block",
 	INLINE = "Inline",
 	ATBLOCK = "AtBlock",
 	COMMENT = "Comment",
+	IMPORT = "Import",
+	USE_MODULE = "$use-module",
 	SEMICOLON = "Semicolon",
 	BLOCKCOMMA = "Block-comma",
 	ATBLOCKCOMMA = "Atblock-comma",
@@ -21,4 +23,5 @@ export const BLOCK = "Block",
 	at_value = "At Value",
 	at_id_2 = "At Identifier 2",
 	at_end = "Atblock End",
+	block_end_2 = "Block End 2",
 	end_keyword = "end";