@mocoto/mahoraga 0.14.0 → 0.14.1

package/dist/shared/formatters/formatters/sql.js

@@ -1,11 +1,15 @@
+// SPDX-License-Identifier: MIT
 import { corrigirPontuacaoECodigo, normalizarFimDeLinha, normalizarNewlinesFinais, removerBom } from './commons.js';
+/* ────────────────────────── Keywords ────────────────────────── */
 const SQL_KEYWORDS = new Set(['select', 'from', 'where', 'insert', 'into', 'values', 'update', 'set', 'delete', 'create', 'table', 'drop', 'alter', 'add', 'column', 'index', 'join', 'left', 'right', 'inner', 'outer', 'on', 'and', 'or', 'not', 'in', 'is', 'null', 'as', 'order', 'by', 'group', 'having', 'limit', 'offset', 'union', 'all', 'distinct', 'case', 'when', 'then', 'else', 'end', 'exists', 'between', 'like', 'asc', 'desc', 'primary', 'key', 'foreign', 'references', 'constraint', 'default', 'check', 'unique', 'if', 'begin', 'commit', 'rollback', 'transaction', 'grant', 'revoke', 'with', 'recursive', 'over', 'partition', 'window', 'returning', 'cascade', 'restrict', 'no', 'action', 'using', 'cross', 'natural', 'full', 'replace', 'view', 'trigger', 'function', 'procedure', 'declare', 'fetch', 'cursor', 'open', 'close', 'deallocate']);
 const MAJOR_CLAUSE_KEYWORDS = new Set(['SELECT', 'FROM', 'WHERE', 'INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'ALTER', 'ORDER BY', 'GROUP BY', 'HAVING', 'LIMIT', 'OFFSET', 'UNION', 'SET', 'VALUES', 'INTO', 'BEGIN', 'COMMIT', 'ROLLBACK', 'WITH', 'RETURNING']);
 const JOIN_KEYWORDS = new Set(['JOIN', 'LEFT', 'RIGHT', 'INNER', 'OUTER', 'CROSS', 'NATURAL', 'FULL']);
+/* ────────────────────────── Tokenizer ────────────────────────── */
 function tokenizeSql(src) {
     const tokens = [];
     let indice = 0;
     while (indice < src.length) {
+        // -- line comments
         if (src[indice] === '-' && src[indice + 1] === '-') {
             const end = src.indexOf('\n', indice);
             tokens.push({
@@ -15,6 +19,7 @@ function tokenizeSql(src) {
             indice = end === -1 ? src.length : end;
             continue;
         }
+        // /* block comments */
         if (src[indice] === '/' && src[indice + 1] === '*') {
             const end = src.indexOf('*/', indice + 2);
             tokens.push({
@@ -24,12 +29,14 @@ function tokenizeSql(src) {
             indice = end === -1 ? src.length : end + 2;
             continue;
         }
+        // strings
         if (src[indice] === "'" || src[indice] === '"') {
             const delimitadorString = src[indice];
             let posAtual = indice + 1;
             while (posAtual < src.length && src[posAtual] !== delimitadorString) {
-                if (src[posAtual] === '\\')
+                if (src[posAtual] === '\\') {
                     posAtual++;
+                }
                 posAtual++;
             }
             tokens.push({
@@ -39,10 +46,12 @@ function tokenizeSql(src) {
             indice = posAtual + 1;
             continue;
         }
+        // numbers
         if (/\d/.test(src[indice] ?? '') && (indice === 0 || !/\w/.test(src[indice - 1] ?? ''))) {
             let posAtual = indice;
-            while (posAtual < src.length && /[\d.]/.test(src[posAtual] ?? ''))
+            while (posAtual < src.length && /[\d.]/.test(src[posAtual] ?? '')) {
                 posAtual++;
+            }
             tokens.push({
                 type: 'number',
                 value: src.slice(indice, posAtual)
@@ -50,10 +59,12 @@ function tokenizeSql(src) {
             indice = posAtual;
             continue;
         }
+        // identifiers / keywords
         if (/[a-zA-Z_]/.test(src[indice] ?? '')) {
             let posAtual = indice;
-            while (posAtual < src.length && /[\w]/.test(src[posAtual] ?? ''))
+            while (posAtual < src.length && /[\w]/.test(src[posAtual] ?? '')) {
                 posAtual++;
+            }
             const word = src.slice(indice, posAtual);
             tokens.push({
                 type: SQL_KEYWORDS.has(word.toLowerCase()) ? 'keyword' : 'ident',
@@ -62,10 +73,12 @@ function tokenizeSql(src) {
             indice = posAtual;
             continue;
         }
+        // operators
         if (/[=<>!+\-*/%&|^~]/.test(src[indice] ?? '')) {
             let posAtual = indice;
-            while (posAtual < src.length && /[=<>!+\-*/%&|^~]/.test(src[posAtual] ?? ''))
+            while (posAtual < src.length && /[=<>!+\-*/%&|^~]/.test(src[posAtual] ?? '')) {
                 posAtual++;
+            }
             tokens.push({
                 type: 'op',
                 value: src.slice(indice, posAtual)
@@ -73,6 +86,7 @@ function tokenizeSql(src) {
             indice = posAtual;
             continue;
         }
+        // punctuation
         if (/[(),.;:]/.test(src[indice] ?? '')) {
             tokens.push({
                 type: 'punct',
@@ -81,10 +95,12 @@ function tokenizeSql(src) {
             indice++;
             continue;
         }
+        // whitespace
         if (/\s/.test(src[indice] ?? '')) {
             let posAtual = indice;
-            while (posAtual < src.length && /\s/.test(src[posAtual] ?? ''))
+            while (posAtual < src.length && /\s/.test(src[posAtual] ?? '')) {
                 posAtual++;
+            }
             tokens.push({
                 type: 'ws',
                 value: src.slice(indice, posAtual)
@@ -92,10 +108,15 @@ function tokenizeSql(src) {
             indice = posAtual;
             continue;
         }
+        // fallback
         indice++;
     }
     return tokens;
 }
+/* ────────────────────────── Formatter ────────────────────────── */
+/**
+ * Minimal SQL formatter.
+ */
 export function formatarSqlMinimo(code) {
     const normalized = normalizarFimDeLinha(removerBom(code));
     const tokens = tokenizeSql(normalized);
@@ -106,44 +127,55 @@ export function formatarSqlMinimo(code) {
     const pushIndent = () => '  '.repeat(indent);
     const peekKeyword = (from) => {
         for (let chave = from + 1; chave < tokens.length; chave++) {
-            if (tokens[chave]?.type === 'ws')
+            if (tokens[chave]?.type === 'ws') {
                 continue;
+            }
             const tk = tokens[chave];
-            if (tk?.type === 'keyword')
-                return String(tk.value).toUpperCase();
+            if (tk.type === 'keyword') {
+                return tk.value.toUpperCase();
+            }
             return null;
         }
         return null;
     };
     for (let textoTitulo = 0; textoTitulo < tokens.length; textoTitulo++) {
         const tok = tokens[textoTitulo];
-        if (!tok)
+        if (!tok) {
             continue;
+        }
+        // comments always on their own line
         if (tok.type === 'comment') {
-            if (!lineStart)
+            if (!lineStart) {
                 out.push('\n');
+            }
             out.push(`${pushIndent()}${tok.value.trim()}`);
             out.push('\n');
             lineStart = true;
             continue;
         }
-        if (tok.type === 'ws')
+        // skip whitespace (we control spacing)
+        if (tok.type === 'ws') {
             continue;
+        }
         if (tok.type === 'keyword') {
             const upper = tok.value.toUpperCase();
+            // ORDER BY / GROUP BY compound keyword
             if (upper === 'ORDER' || upper === 'GROUP') {
                 const next = peekKeyword(textoTitulo);
                 if (next === 'BY') {
                     inSelectClause = false;
-                    if (!lineStart)
+                    if (!lineStart) {
                         out.push('\n');
+                    }
                     out.push(`${pushIndent()}${upper} BY`);
                     lineStart = false;
+                    // skip the BY token
                     for (let chave = textoTitulo + 1; chave < tokens.length; chave++) {
-                        if (tokens[chave]?.type === 'ws')
+                        if (tokens[chave]?.type === 'ws') {
                             continue;
+                        }
                         const tk = tokens[chave];
-                        if (tk?.type === 'keyword' && String(tk.value).toUpperCase() === 'BY') {
+                        if (tk.type === 'keyword' && tk.value.toUpperCase() === 'BY') {
                             textoTitulo = chave;
                             break;
                         }
@@ -152,37 +184,45 @@ export function formatarSqlMinimo(code) {
                     continue;
                 }
             }
+            // Major clause keywords - new line
             if (MAJOR_CLAUSE_KEYWORDS.has(upper)) {
                 if (upper === 'FROM' || upper === 'WHERE' || upper === 'HAVING' || upper === 'LIMIT' || upper === 'OFFSET' || upper === 'SET' || upper === 'RETURNING') {
                     inSelectClause = false;
                 }
-                if (!lineStart)
+                if (!lineStart) {
                     out.push('\n');
+                }
                 out.push(`${pushIndent()}${upper}`);
                 lineStart = false;
-                if (upper === 'SELECT')
+                if (upper === 'SELECT') {
                     inSelectClause = true;
+                }
                 continue;
             }
+            // JOIN keywords - new line
             if (JOIN_KEYWORDS.has(upper)) {
                 inSelectClause = false;
-                if (!lineStart)
+                if (!lineStart) {
                     out.push('\n');
+                }
                 out.push(`${pushIndent()}${upper}`);
                 lineStart = false;
                 continue;
             }
+            // AND / OR - new line with extra indent
             if (upper === 'AND' || upper === 'OR') {
                 out.push('\n');
                 out.push(`${pushIndent()}  ${upper}`);
                 lineStart = false;
                 continue;
             }
+            // ON - same line
             if (upper === 'ON') {
                 out.push(` ${upper}`);
                 lineStart = false;
                 continue;
             }
+            // Other keywords - inline
             if (lineStart) {
                 out.push(`${pushIndent()}${upper}`);
             }
@@ -192,6 +232,7 @@ export function formatarSqlMinimo(code) {
             lineStart = false;
             continue;
         }
+        // punctuation
         if (tok.type === 'punct') {
             if (tok.value === '(') {
                 out.push(' (');
@@ -231,6 +272,7 @@ export function formatarSqlMinimo(code) {
             lineStart = false;
             continue;
         }
+        // everything else (identifiers, strings, numbers, operators)
         if (lineStart) {
             out.push(`${pushIndent()}  ${tok.value}`);
         }
@@ -252,4 +294,3 @@ export function formatarSqlMinimo(code) {
         reason: anyChanged ? `estilo-mahoraga-sql(punct:${stats.pontuacaoRepetida},space:${stats.espacamentoIncorreto},ops:${stats.operadoresRelacionais})` : 'normalizacao-basica'
     };
 }
-//# sourceMappingURL=sql.js.map

package/dist/shared/formatters/formatters/svg.js

@@ -1,5 +1,10 @@
+// SPDX-License-Identifier: MIT
 import { otimizarSvgLikeSvgo } from '../engines/svgs.js';
 import { corrigirPontuacaoECodigo, normalizarNewlinesFinais } from './commons.js';
+/**
+ * Minimal SVG formatter with error handling.
+ * Em caso de erro de parsing, retorna aviso recomendando o otimizador SVG.
+ */
 export function formatarSvgMinimo(code) {
     try {
         if (!/<svg\b/i.test(code)) {
@@ -37,4 +42,3 @@ export function formatarSvgMinimo(code) {
         };
     }
 }
-//# sourceMappingURL=svg.js.map

package/dist/shared/formatters/formatters/toml.js

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 import { corrigirPontuacaoECodigo, normalizarFimDeLinha, normalizarNewlinesFinais, removerBom } from './commons.js';
 function parseTomlLines(code) {
     const lines = normalizarFimDeLinha(code).split('\n');
@@ -45,6 +46,7 @@ function parseTomlLines(code) {
             });
             continue;
         }
+        // Array of tables: [[name]]
         if (/^\[\[.+\]\]$/.test(trimmed)) {
             result.push({
                 raw,
@@ -53,6 +55,7 @@ function parseTomlLines(code) {
             });
             continue;
         }
+        // Section: [name]
         if (/^\[.+\]$/.test(trimmed)) {
             result.push({
                 raw,
@@ -61,6 +64,7 @@ function parseTomlLines(code) {
             });
             continue;
         }
+        // Multiline string start
         if (/=\s*"""/.test(trimmed) || /=\s*'''/.test(trimmed)) {
             if (!trimmed.endsWith('"""') && !trimmed.endsWith("'''")) {
                 inMultilineString = true;
@@ -72,6 +76,7 @@ function parseTomlLines(code) {
             });
             continue;
         }
+        // Array value start
         if (/=\s*\[/.test(trimmed) && !trimmed.includes(']')) {
             inArrayValue = true;
             result.push({
@@ -81,6 +86,7 @@ function parseTomlLines(code) {
             });
             continue;
         }
+        // Inline table
         if (/=\s*\{/.test(trimmed)) {
             result.push({
                 raw,
@@ -89,6 +95,7 @@ function parseTomlLines(code) {
             });
             continue;
         }
+        // Key-value
         result.push({
             raw,
             kind: 'key-value',
@@ -105,7 +112,10 @@ function corrigirEspacamentoToml(entries) {
             continue;
         }
         let fixed = entry.raw;
+        // Key-value: key = value (espaços em torno de =)
         if (entry.kind === 'key-value' || entry.kind === 'multiline-string') {
+            // key=value → key = value
+            // Mas não dentro de strings
             const eqIdx = fixed.indexOf('=');
             if (eqIdx > 0) {
                 const before = fixed.slice(0, eqIdx);
@@ -121,10 +131,12 @@ function corrigirEspacamentoToml(entries) {
                 }
             }
         }
+        // Sections: [section] (sem espaços extras)
         if (entry.kind === 'section') {
             const inner = fixed.replace(/^\[/, '').replace(/\]$/, '').trim();
             fixed = `[${inner}]`;
         }
+        // Array of tables: [[section]] (sem espaços extras)
         if (entry.kind === 'array-of-tables') {
             const inner = fixed.replace(/^\[\[/, '').replace(/\]\]$/, '').trim();
             fixed = `[[${inner}]]`;
@@ -141,11 +153,19 @@ function corrigirEspacamentoToml(entries) {
     }
     return out;
 }
+/* ────────────────────────── TOML Public API ────────────────────────── */
+/**
+ * TOML formatter com detecção de contexto para strings multiline e arrays.
+ */
 export function formatarTomlMinimo(code) {
     const normalized = normalizarFimDeLinha(removerBom(code));
+    // Parse com contexto
     const entries = parseTomlLines(normalized);
+    // Correção de espaçamento
     const corrigidos = corrigirEspacamentoToml(entries);
+    // Reconstruir
     const rebuilt = corrigidos.map(erro => erro.raw).join('\n');
+    // Alinhar chaves por seção
     const lines = rebuilt.split('\n');
     const out = [];
     let currentSection = [];
@@ -232,6 +252,10 @@ export function formatarTomlMinimo(code) {
         reason: anyChanged ? `estilo-mahoraga-toml(punct:${stats.pontuacaoRepetida},space:${stats.espacamentoIncorreto},ops:${stats.operadoresRelacionais})` : 'normalizacao-basica'
     };
 }
+/* ────────────────────────── INI Public API ────────────────────────── */
+/**
+ * INI formatter com detecção de contexto.
+ */
 export function formatarIniMinimo(code) {
     const normalized = normalizarFimDeLinha(removerBom(code));
     const lines = normalized.split('\n');
@@ -311,4 +335,3 @@ export function formatarIniMinimo(code) {
         reason: anyChanged ? `estilo-mahoraga-ini(punct:${stats.pontuacaoRepetida},space:${stats.espacamentoIncorreto},ops:${stats.operadoresRelacionais})` : 'normalizacao-basica'
     };
 }
-//# sourceMappingURL=toml.js.map

package/dist/shared/formatters/formatters/xml.js

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 import { XMLValidator } from 'fast-xml-parser';
 import { corrigirPontuacaoECodigo, normalizarFimDeLinha, normalizarNewlinesFinais, removerBom, removerEspacosFinaisPorLinha } from './commons.js';
 function tokenizeXml(src) {
@@ -6,42 +7,48 @@ function tokenizeXml(src) {
     let last = 0;
     for (const metrica of src.matchAll(re)) {
         const start = metrica.index ?? -1;
-        if (start < 0)
+        if (start < 0) {
             continue;
-        if (start > last)
+        }
+        if (start > last) {
             out.push({
                 kind: 'text',
                 value: src.slice(last, start)
             });
+        }
         out.push({
             kind: 'tag',
             value: metrica[0] ?? ''
         });
-        last = start + (metrica[0]?.length ?? 0);
+        last = start + (metrica[0].length ?? 0);
     }
-    if (last < src.length)
+    if (last < src.length) {
         out.push({
             kind: 'text',
             value: src.slice(last)
         });
+    }
     return out;
 }
 function normalizeXmlTagToken(tag) {
-    if (tag.startsWith('<!--') || tag.startsWith('<![CDATA['))
+    if (tag.startsWith('<!--') || tag.startsWith('<![CDATA[')) {
         return {
             tag,
             changed: false
         };
-    if (tag.startsWith('<?'))
+    }
+    if (tag.startsWith('<?')) {
         return {
             tag,
             changed: false
         };
-    if (tag.startsWith('<!'))
+    }
+    if (tag.startsWith('<!')) {
         return {
             tag,
             changed: false
         };
+    }
     let out = tag;
     const original = tag;
     out = out.replace(/^<\s+/, '<');
@@ -55,8 +62,9 @@ function normalizeXmlTagToken(tag) {
         const ch = out[indice] ?? '';
         if (inQuote) {
             buf += ch;
-            if (ch === inQuote)
+            if (ch === inQuote) {
                 inQuote = null;
+            }
             continue;
         }
         if (ch === '"' || ch === "'") {
@@ -87,27 +95,31 @@ function normalizeXmlTagToken(tag) {
 }
 function hasXmlMixedContent(tokens) {
     for (const textoTitulo of tokens) {
-        if (textoTitulo.kind !== 'text')
+        if (textoTitulo.kind !== 'text') {
             continue;
-        if (/[\S]/.test(textoTitulo.value))
+        }
+        if (/[\S]/.test(textoTitulo.value)) {
             return true;
+        }
     }
     return false;
 }
 function prettyPrintXmlIfSafe(xml) {
     const tokens = tokenizeXml(xml);
-    if (hasXmlMixedContent(tokens))
+    if (hasXmlMixedContent(tokens)) {
         return {
             xml,
             changed: false
         };
+    }
     let changed = false;
     let indent = 0;
     const indentStr = (node) => '  '.repeat(Math.max(0, node));
     const outLines = [];
     const pushLine = (line) => {
-        if (!line)
+        if (!line) {
             return;
+        }
         outLines.push(line);
     };
     for (const tok of tokens) {
@@ -115,16 +127,18 @@ function prettyPrintXmlIfSafe(xml) {
             continue;
         }
         const raw = tok.value.trim();
-        if (!raw)
+        if (!raw) {
             continue;
+        }
         const isClosing = /^<\//.test(raw);
         const isSelfClosing = /\/>$/.test(raw);
         const isDecl = /^<\?xml\b/i.test(raw) || /^<\?/.test(raw);
         const isDoctype = /^<!DOCTYPE\b/i.test(raw);
         const isComment = /^<!--/.test(raw);
         const isCdata = /^<!\[CDATA\[/.test(raw);
-        if (isClosing)
+        if (isClosing) {
             indent = Math.max(0, indent - 1);
+        }
         const line = `${indentStr(indent)}${raw}`;
         pushLine(line);
         if (!isClosing && !isSelfClosing && !isDecl && !isDoctype && !isComment && !isCdata) {
@@ -132,13 +146,17 @@ function prettyPrintXmlIfSafe(xml) {
         }
     }
     const out = `${outLines.join('\n').trimEnd()}\n`;
-    if (out !== xml)
+    if (out !== xml) {
         changed = true;
+    }
     return {
         xml: out,
         changed
     };
 }
+/**
+ * Minimal XML formatter.
+ */
 export function formatarXmlMinimo(code) {
     const normalized = normalizarFimDeLinha(removerBom(code));
     const semEspacosFinais = removerEspacosFinaisPorLinha(normalized);
@@ -146,11 +164,13 @@ export function formatarXmlMinimo(code) {
     const tokens = tokenizeXml(comPontuacao);
     let _changedTokens = false;
     const rebuilt = tokens.map(textoTitulo => {
-        if (textoTitulo.kind === 'text')
+        if (textoTitulo.kind === 'text') {
             return textoTitulo.value;
+        }
         const raiz = normalizeXmlTagToken(textoTitulo.value);
-        if (raiz.changed)
+        if (raiz.changed) {
             _changedTokens = true;
+        }
         return raiz.tag;
     }).join('');
     let pretty = rebuilt;
@@ -173,4 +193,3 @@ export function formatarXmlMinimo(code) {
         reason: anyChanged ? `estilo-mahoraga-xml(punct:${stats.pontuacaoRepetida},space:${stats.espacamentoIncorreto},ops:${stats.operadoresRelacionais})` : 'normalizacao-basica'
     };
 }
-//# sourceMappingURL=xml.js.map