@trebired/code-discipline 4.2.0 → 4.2.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `@trebired/code-discipline` will be documented here.
 
+## 4.2.1
+
+- Made `maxCharactersPerLine` ignore SVG files and inline JSX `<svg>...</svg>` regions while still reporting ordinary long lines.
+
 ## 4.2.0
 
 - Changed the configured `minFileLines` default from `5` to `1`.

package/dist/checks/rules/max/characters-per-line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characters-per-line.d.ts","sourceRoot":"","sources":["../../../../src/checks/rules/max/characters-per-line.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAOnF,iBAAe,2BAA2B,CACxC,WAAW,EAAE,iBAAiB,EAAE,EAChC,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAoCpC;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAC"}
+{"version":3,"file":"characters-per-line.d.ts","sourceRoot":"","sources":["../../../../src/checks/rules/max/characters-per-line.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AA8CnF,iBAAe,2BAA2B,CACxC,WAAW,EAAE,iBAAiB,EAAE,EAChC,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAqDpC;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAC"}

package/dist/checks/rules/max/characters-per-line.js

@@ -3,6 +3,39 @@ import { createRuleProgress, emitRuleChunk, emitRuleCompleted } from "../../prog
 function countCharacters(line) {
     return Array.from(line).length;
 }
+function isSvgFile(file) {
+    return file.extension.toLowerCase() === ".svg";
+}
+function canContainJsxSvg(file) {
+    return [".js", ".jsx", ".mjs", ".mts", ".ts", ".tsx"].includes(file.extension.toLowerCase());
+}
+function isLikelyJsxSvgStart(line, matchIndex) {
+    const before = line.slice(0, matchIndex).trimEnd();
+    const trimmed = line.trimStart();
+    if (trimmed.startsWith("//") || trimmed.startsWith("*"))
+        return false;
+    if (!before)
+        return true;
+    return /(?:return|[({\[<>=?:,])$/.test(before);
+}
+function countInlineSvgOpenTags(line) {
+    let count = 0;
+    const matcher = /<svg\b/gi;
+    let match;
+    while ((match = matcher.exec(line))) {
+        if (!isLikelyJsxSvgStart(line, match.index))
+            continue;
+        const tagEnd = line.indexOf(">", match.index);
+        const tagText = tagEnd === -1 ? line.slice(match.index) : line.slice(match.index, tagEnd + 1);
+        if (/\/\s*>$/.test(tagText))
+            continue;
+        count += 1;
+    }
+    return count;
+}
+function countInlineSvgCloseTags(line) {
+    return Array.from(line.matchAll(/<\/svg\s*>/gi)).length;
+}
 async function runMaxCharactersPerLineRule(sourceFiles, options) {
     if (!options.rules.maxCharactersPerLine)
         return [];
@@ -14,9 +47,24 @@ async function runMaxCharactersPerLineRule(sourceFiles, options) {
     const violations = [];
     for (let index = 0; index < sourceFiles.length; index += 1) {
         const file = sourceFiles[index];
+        if (isSvgFile(file)) {
+            emitRuleChunk(progress, index + 1, violations.length);
+            continue;
+        }
         const lines = (await fs.readFile(file.absolutePath, "utf8")).split(/\r?\n/);
+        const trackInlineSvg = canContainJsxSvg(file);
+        let inlineSvgDepth = 0;
         for (let lineIndex = 0; lineIndex < lines.length; lineIndex += 1) {
-            const characterCount = countCharacters(lines[lineIndex] ?? "");
+            const line = lines[lineIndex] ?? "";
+            if (trackInlineSvg) {
+                const openTags = countInlineSvgOpenTags(line);
+                const closeTags = countInlineSvgCloseTags(line);
+                const isInlineSvgLine = inlineSvgDepth > 0 || openTags > 0;
+                inlineSvgDepth = Math.max(0, inlineSvgDepth + openTags - closeTags);
+                if (isInlineSvgLine)
+                    continue;
+            }
+            const characterCount = countCharacters(line);
             if (characterCount <= options.rules.maxCharactersPerLine.max)
                 continue;
             violations.push({

package/dist/checks/rules/max/characters-per-line.js.map

@@ -1 +1 @@
-{"version":3,"file":"characters-per-line.js","sourceRoot":"","sources":["../../../../src/checks/rules/max/characters-per-line.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKlC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEzF,SAAS,eAAe,CAAC,IAAY;IACnC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AACjC,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,WAAgC,EAChC,OAA6C;IAE7C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB;QAAE,OAAO,EAAE,CAAC;IAEnD,MAAM,QAAQ,GAAG,kBAAkB,CAAC;QAClC,QAAQ,EAAE,OAAO,CAAC,gBAAgB;QAClC,IAAI,EAAE,yBAAyB;QAC/B,UAAU,EAAE,WAAW,CAAC,MAAM;KAC/B,CAAC,CAAC;IACH,MAAM,UAAU,GAA8B,EAAE,CAAC;IAEjD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC3D,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAE,CAAC;QACjC,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE5E,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC,EAAE,CAAC;YACjE,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/D,IAAI,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG;gBAAE,SAAS;YAEvE,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,yBAAyB;gBAC/B,GAAG,EAAE,KAAK;gBACV,QAAQ,EAAE,IAAI,CAAC,uBAAuB;gBACtC,OAAO,EAAE,QAAQ,SAAS,GAAG,CAAC,QAAQ,cAAc,wCAAwC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,EAAE;gBACpI,OAAO,EAAE;oBACP,IAAI,EAAE,SAAS,GAAG,CAAC;oBACnB,cAAc;oBACd,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG;iBAC5C;aACF,CAAC,CAAC;QACL,CAAC;QAED,aAAa,CAAC,QAAQ,EAAE,KAAK,GAAG,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAC"}
+{"version":3,"file":"characters-per-line.js","sourceRoot":"","sources":["../../../../src/checks/rules/max/characters-per-line.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebired/code-discipline",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Configurable codebase discipline checks and rule-driven fixes for Bun and Node.js projects.",
   "license": "AGPL-3.0-only",
   "keywords": [