inline-sql-toolkit 0.5.0 → 0.5.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.5.2 - 2026-10-09
+
+- Fixed: with `inlineSql.format.commaPosition: "before"`, the rest of a
+  multi-line item (`CASE … END`, a subquery, a wrapped function call) now
+  moves right with its leading `, `, so `END` and the closing `)` no longer
+  line up with the comma. Only lines up to the `)` / `]` / `END` that closes
+  the item move; a following `JOIN` or statement stays put. Nested items add
+  up; lines that continue a string or block comment are left untouched.
+
+## 0.5.1 - 2026-10-02
+
+- Security: pins patched versions of OSV-flagged transitive dependencies
+  (`brace-expansion` 5.0.12, `fast-uri` 3.1.8, `undici` 7.29.1) and refreshes
+  `markdown-it` to 14.3.2, clearing the 17 advisories that failed the scheduled
+  OSV scan on main.
+- No formatting behavior changes: the shipped runtime dependency
+  (`sql-formatter`) is unchanged.
+
 ## 0.5.0 - 2026-10-01
 
 - Changed: `inlineSql.format.replaceOrdinals` now defaults to `false`, since it

package/dist/cli.js

@@ -1907,8 +1907,9 @@ function wrappingComma(line) {
   if (comma < 0) return -1;
   return /^[ \t]*(?:--.*)?$/.test(line.slice(comma + 1)) ? comma : -1;
 }
-function moveCommasToLineStarts(text) {
+function moveCommasToLineStarts(text, dialect) {
   const lines = text.split("\n");
+  const inserts = /* @__PURE__ */ new Map();
   for (let index = 0; index + 1 < lines.length; index++) {
     const line = lines[index] ?? "";
     const next = lines[index + 1] ?? "";
@@ -1920,8 +1921,43 @@ function moveCommasToLineStarts(text) {
     const content = nextParts?.[2] ?? "";
     lines[index] = `${line.slice(0, comma)}${line.slice(comma + 1)}`.trimEnd();
     lines[index + 1] = `${indent}, ${content}`;
+    inserts.set(index + 1, indent.length);
   }
-  return lines.join("\n");
+  if (inserts.size === 0) return text;
+  return shiftMovedItems(lines, inserts, dialect).join("\n");
+}
+function shiftMovedItems(lines, inserts, dialect) {
+  const starts = [];
+  let offset = 0;
+  for (const line of lines) {
+    starts.push(offset);
+    offset += line.length + 1;
+  }
+  const tokens = lexSql(lines.join("\n"), dialect);
+  const textLines = /* @__PURE__ */ new Set();
+  for (const token of tokens) {
+    if (token.kind === "space" || !token.text.includes("\n")) continue;
+    starts.forEach((start, line) => {
+      if (start > token.start && start < token.end) textLines.add(line);
+    });
+  }
+  const shifts = new Array(lines.length).fill(0);
+  for (const [target, column] of inserts) {
+    for (let index = target + 1; index < lines.length; index++) {
+      const line = lines[index] ?? "";
+      const indent = line.length - line.trimStart().length;
+      if (indent === line.length || textLines.has(index)) continue;
+      if (indent < column) break;
+      if (indent === column && !/^(?:[)\]]|END\b)/i.test(line.slice(indent))) break;
+      shifts[index] = (shifts[index] ?? 0) + 2;
+    }
+  }
+  return lines.map((line, index) => {
+    const shift = shifts[index] ?? 0;
+    if (shift === 0) return line;
+    const indent = line.length - line.trimStart().length;
+    return `${line.slice(0, indent)}${" ".repeat(shift)}${line.slice(indent)}`;
+  });
 }
 var DOLLAR_QUOTE = /\$[A-Za-z_][A-Za-z0-9_]*\$|\$\$/y;
 function rejoinFunctionCalls(text) {
@@ -2047,7 +2083,7 @@ function formatOnce(analysis, literal, detection, options, nonce, sqlFormatter,
     formatted = rejoinFunctionCalls(formatted);
   }
   if (options.commaPosition === "before") {
-    formatted = moveCommasToLineStarts(formatted);
+    formatted = moveCommasToLineStarts(formatted, options.dialect);
   }
   formatted = breakTrailingDistributeLines(formatted, options.dialect);
   const difference = sqlTokenDifference(plan.protectedSql, formatted, options.dialect);

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/hidenobunagai/inline-sql-toolkit/issues"
   },
-  "version": "0.5.0",
+  "version": "0.5.2",
   "icon": "icon.png",
   "type": "module",
   "bin": {
@@ -176,12 +176,12 @@
     "yaml": "2.9.0"
   },
   "overrides": {
-    "brace-expansion": "5.0.9",
-    "fast-uri": "3.1.6",
+    "brace-expansion": "5.0.12",
+    "fast-uri": "3.1.8",
     "js-yaml": "4.3.2",
     "nanoid": "3.3.18",
     "postcss": "8.5.23",
     "qs": "6.16.0",
-    "undici": "7.29.0"
+    "undici": "7.29.1"
   }
 }