pickier 0.1.22 → 0.1.23

package/dist/bin/cli.js

@@ -19287,8 +19287,12 @@ var init_link_fragments = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       const headingIds = new Set;
-      for (const line of lines) {
+      for (let li = 0;li < lines.length; li++) {
+        if (inCode.has(li))
+          continue;
+        const line = lines[li];
         const atxMatch = line.match(/^#{1,6}\s+(.+?)(?:\s*#+\s*)?$/);
         if (atxMatch) {
           const headingText = atxMatch[1].trim();
@@ -19297,6 +19301,8 @@ var init_link_fragments = __esm(() => {
         }
       }
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const matches = line.matchAll(/\[[^\]]+\]\(#([^)]+)\)/g);
         for (const match of matches) {
@@ -19329,8 +19335,11 @@ var init_link_image_reference_definitions = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       const definitions = new Map;
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const defMatch = line.match(/^\[([^\]]+)\]:\s*\S+/);
         if (defMatch) {
@@ -19338,7 +19347,10 @@ var init_link_image_reference_definitions = __esm(() => {
         }
       }
       const usages = new Set;
-      for (const line of lines) {
+      for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
+        const line = lines[i];
         if (line.match(/^\[(?:[^\]]+)\]:\s*\S+/)) {
           continue;
         }
@@ -20309,7 +20321,10 @@ var init_no_reversed_links = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const matches = line.matchAll(/\(([^)]+)\)\[(?:[^\]]+)\]/g);
         for (const match of matches) {
@@ -20469,7 +20484,10 @@ var init_no_space_in_links = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const matches = line.matchAll(/\[(\s+(?:\S.*?|[\t\v\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF])|\s*(?:\S.*?|[\t\v\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF])\s+)\]\([^)]+\)/g);
         for (const match of matches) {
@@ -20715,16 +20733,11 @@ var init_proper_names = __esm(() => {
       if (properNames.length === 0) {
         return issues;
       }
-      let inCodeBlock = false;
+      const inCode = getCodeBlockLines(lines);
       for (let i = 0;i < lines.length; i++) {
-        const line = lines[i];
-        if (/^(?:`{3,}|~{3,})/.test(line)) {
-          inCodeBlock = !inCodeBlock;
+        if (inCode.has(i) && !checkCodeBlocks)
           continue;
-        }
-        if (inCodeBlock && !checkCodeBlocks) {
-          continue;
-        }
+        const line = lines[i];
         for (const properName of properNames) {
           const regex = new RegExp(`\\b${properName}\\b`, "gi");
           const matches = line.matchAll(regex);
@@ -20954,10 +20967,13 @@ var init_strong_style = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       const options = ctx.options || {};
       const style = options.style || "consistent";
       let detectedStyle = null;
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const asteriskMatches = line.matchAll(/\*\*([^*]+)\*\*/g);
         for (const match of asteriskMatches) {
@@ -21017,27 +21033,51 @@ var init_strong_style = __esm(() => {
     fix: (text, ctx) => {
       const options = ctx.options || {};
       const style = options.style || "consistent";
+      const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       let targetStyle = "asterisk";
       if (style === "asterisk") {
         targetStyle = "asterisk";
       } else if (style === "underscore") {
         targetStyle = "underscore";
       } else if (style === "consistent") {
-        const asteriskMatch = text.match(/\*\*([^*]+)\*\*/);
-        const underscoreMatch = text.match(/__([^_]+)__/);
-        if (asteriskMatch && (!underscoreMatch || asteriskMatch.index < underscoreMatch.index)) {
+        let firstAsterisk = null;
+        let firstUnderscore = null;
+        for (let i = 0;i < lines.length; i++) {
+          if (inCode.has(i))
+            continue;
+          if (firstAsterisk === null) {
+            const m = lines[i].match(/\*\*([^*]+)\*\*/);
+            if (m)
+              firstAsterisk = { line: i, col: m.index };
+          }
+          if (firstUnderscore === null) {
+            const m = lines[i].match(/__([^_]+)__/);
+            if (m)
+              firstUnderscore = { line: i, col: m.index };
+          }
+          if (firstAsterisk && firstUnderscore)
+            break;
+        }
+        const cmp = (a, b) => a.line !== b.line ? a.line - b.line : a.col - b.col;
+        if (firstAsterisk && (!firstUnderscore || cmp(firstAsterisk, firstUnderscore) < 0))
           targetStyle = "asterisk";
-        } else if (underscoreMatch) {
+        else if (firstUnderscore)
           targetStyle = "underscore";
-        }
       }
-      let fixed = text;
-      if (targetStyle === "asterisk") {
-        fixed = fixed.replace(/__([^_]+)__/g, "**$1**");
-      } else {
-        fixed = fixed.replace(/\*\*([^*]+)\*\*/g, "__$1__");
+      let changed = false;
+      for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
+        const before = lines[i];
+        const after = targetStyle === "asterisk" ? before.replace(/__([^_]+)__/g, "**$1**") : before.replace(/\*\*([^*]+)\*\*/g, "__$1__");
+        if (after !== before) {
+          lines[i] = after;
+          changed = true;
+        }
       }
-      return fixed;
+      return changed ? lines.join(`
+`) : text;
     }
   };
 });
@@ -37844,7 +37884,7 @@ var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "pickier",
     type: "module",
-    version: "0.1.22",
+    version: "0.1.23",
     description: "Format, lint and more in a fraction of seconds.",
     author: "Chris Breuer <chris@stacksjs.org>",
     license: "MIT",

package/dist/src/index.js

@@ -18904,8 +18904,12 @@ var init_link_fragments = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       const headingIds = new Set;
-      for (const line of lines) {
+      for (let li = 0;li < lines.length; li++) {
+        if (inCode.has(li))
+          continue;
+        const line = lines[li];
         const atxMatch = line.match(/^#{1,6}\s+(.+?)(?:\s*#+\s*)?$/);
         if (atxMatch) {
           const headingText = atxMatch[1].trim();
@@ -18914,6 +18918,8 @@ var init_link_fragments = __esm(() => {
         }
       }
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const matches = line.matchAll(/\[[^\]]+\]\(#([^)]+)\)/g);
         for (const match of matches) {
@@ -18946,8 +18952,11 @@ var init_link_image_reference_definitions = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       const definitions = new Map;
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const defMatch = line.match(/^\[([^\]]+)\]:\s*\S+/);
         if (defMatch) {
@@ -18955,7 +18964,10 @@ var init_link_image_reference_definitions = __esm(() => {
         }
       }
       const usages = new Set;
-      for (const line of lines) {
+      for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
+        const line = lines[i];
         if (line.match(/^\[(?:[^\]]+)\]:\s*\S+/)) {
           continue;
         }
@@ -19926,7 +19938,10 @@ var init_no_reversed_links = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const matches = line.matchAll(/\(([^)]+)\)\[(?:[^\]]+)\]/g);
         for (const match of matches) {
@@ -20086,7 +20101,10 @@ var init_no_space_in_links = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const matches = line.matchAll(/\[(\s+(?:\S.*?|[\t\v\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF])|\s*(?:\S.*?|[\t\v\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF])\s+)\]\([^)]+\)/g);
         for (const match of matches) {
@@ -20332,16 +20350,11 @@ var init_proper_names = __esm(() => {
       if (properNames.length === 0) {
         return issues;
       }
-      let inCodeBlock = false;
+      const inCode = getCodeBlockLines(lines);
       for (let i = 0;i < lines.length; i++) {
-        const line = lines[i];
-        if (/^(?:`{3,}|~{3,})/.test(line)) {
-          inCodeBlock = !inCodeBlock;
+        if (inCode.has(i) && !checkCodeBlocks)
           continue;
-        }
-        if (inCodeBlock && !checkCodeBlocks) {
-          continue;
-        }
+        const line = lines[i];
         for (const properName of properNames) {
           const regex = new RegExp(`\\b${properName}\\b`, "gi");
           const matches = line.matchAll(regex);
@@ -20571,10 +20584,13 @@ var init_strong_style = __esm(() => {
     check: (text, ctx) => {
       const issues = [];
       const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       const options = ctx.options || {};
       const style = options.style || "consistent";
       let detectedStyle = null;
       for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
         const line = lines[i];
         const asteriskMatches = line.matchAll(/\*\*([^*]+)\*\*/g);
         for (const match of asteriskMatches) {
@@ -20634,27 +20650,51 @@ var init_strong_style = __esm(() => {
     fix: (text, ctx) => {
       const options = ctx.options || {};
       const style = options.style || "consistent";
+      const lines = text.split(/\r?\n/);
+      const inCode = getCodeBlockLines(lines);
       let targetStyle = "asterisk";
       if (style === "asterisk") {
         targetStyle = "asterisk";
       } else if (style === "underscore") {
         targetStyle = "underscore";
       } else if (style === "consistent") {
-        const asteriskMatch = text.match(/\*\*([^*]+)\*\*/);
-        const underscoreMatch = text.match(/__([^_]+)__/);
-        if (asteriskMatch && (!underscoreMatch || asteriskMatch.index < underscoreMatch.index)) {
+        let firstAsterisk = null;
+        let firstUnderscore = null;
+        for (let i = 0;i < lines.length; i++) {
+          if (inCode.has(i))
+            continue;
+          if (firstAsterisk === null) {
+            const m = lines[i].match(/\*\*([^*]+)\*\*/);
+            if (m)
+              firstAsterisk = { line: i, col: m.index };
+          }
+          if (firstUnderscore === null) {
+            const m = lines[i].match(/__([^_]+)__/);
+            if (m)
+              firstUnderscore = { line: i, col: m.index };
+          }
+          if (firstAsterisk && firstUnderscore)
+            break;
+        }
+        const cmp = (a, b) => a.line !== b.line ? a.line - b.line : a.col - b.col;
+        if (firstAsterisk && (!firstUnderscore || cmp(firstAsterisk, firstUnderscore) < 0))
           targetStyle = "asterisk";
-        } else if (underscoreMatch) {
+        else if (firstUnderscore)
           targetStyle = "underscore";
-        }
       }
-      let fixed = text;
-      if (targetStyle === "asterisk") {
-        fixed = fixed.replace(/__([^_]+)__/g, "**$1**");
-      } else {
-        fixed = fixed.replace(/\*\*([^*]+)\*\*/g, "__$1__");
+      let changed = false;
+      for (let i = 0;i < lines.length; i++) {
+        if (inCode.has(i))
+          continue;
+        const before = lines[i];
+        const after = targetStyle === "asterisk" ? before.replace(/__([^_]+)__/g, "**$1**") : before.replace(/\*\*([^*]+)\*\*/g, "__$1__");
+        if (after !== before) {
+          lines[i] = after;
+          changed = true;
+        }
       }
-      return fixed;
+      return changed ? lines.join(`
+`) : text;
     }
   };
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pickier",
   "type": "module",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "Format, lint and more in a fraction of seconds.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",