pickier 0.1.33 → 0.1.35

package/dist/bin/cli.js

@@ -48,6 +48,37 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
 // src/format.ts
+function isHangingControlLine(code) {
+  const m = RE_CONTROL_OPEN.exec(code);
+  if (!m)
+    return /^(?:else|do)\s*$/.test(code);
+  let depth = 0;
+  let inStr = null;
+  for (let i = m[0].length - 1;i < code.length; i++) {
+    const ch = code[i];
+    if (inStr) {
+      if (ch === "\\") {
+        i++;
+        continue;
+      }
+      if (ch === inStr)
+        inStr = null;
+      continue;
+    }
+    if (ch === "'" || ch === '"' || ch === "`") {
+      inStr = ch;
+      continue;
+    }
+    if (ch === "(") {
+      depth++;
+    } else if (ch === ")") {
+      depth--;
+      if (depth === 0)
+        return code.slice(i + 1).trim().length === 0;
+    }
+  }
+  return false;
+}
 function getFileExt(filePath) {
   const idx = filePath.lastIndexOf(".");
   return idx >= 0 ? filePath.slice(idx) : "";
@@ -198,6 +229,25 @@ function fixQuotesLine(line, preferred) {
   while (i < line.length) {
     const ch = line[i];
     if (inString === 0) {
+      if (ch === "/") {
+        const nxt = line[i + 1];
+        if (nxt === "/")
+          break;
+        if (nxt === "*") {
+          const end = line.indexOf("*/", i + 2);
+          i = end === -1 ? line.length : end + 2;
+          continue;
+        }
+        if (isRegexStart(line, i)) {
+          const end = scanRegexEnd(line, i);
+          if (end !== -1) {
+            i = end;
+            continue;
+          }
+        }
+        i++;
+        continue;
+      }
       if (ch === '"') {
         inString = 2;
         stringStart = i;
@@ -265,6 +315,8 @@ function normalizeSpacingLine(line) {
     const c = line[firstNonSpace];
     if (c === "/" && (line[firstNonSpace + 1] === "/" || line[firstNonSpace + 1] === "*"))
       return line;
+    if (c === "*")
+      return line;
   }
   let hasSpacingChar = false;
   for (let j = firstNonSpace;j < line.length; j++) {
@@ -377,6 +429,49 @@ function advanceTemplateState(line, stack) {
   }
   return -1;
 }
+function blockCommentStateAfter(line, startsIn) {
+  let inBlock = startsIn;
+  let inStr = null;
+  let i = 0;
+  while (i < line.length) {
+    const ch = line[i];
+    if (inBlock) {
+      if (ch === "*" && line[i + 1] === "/") {
+        inBlock = false;
+        i += 2;
+        continue;
+      }
+      i++;
+      continue;
+    }
+    if (inStr) {
+      if (ch === "\\") {
+        i += 2;
+        continue;
+      }
+      if (ch === inStr)
+        inStr = null;
+      i++;
+      continue;
+    }
+    if (ch === "'" || ch === '"' || ch === "`") {
+      inStr = ch;
+      i++;
+      continue;
+    }
+    if (ch === "/") {
+      if (line[i + 1] === "/")
+        break;
+      if (line[i + 1] === "*") {
+        inBlock = true;
+        i += 2;
+        continue;
+      }
+    }
+    i++;
+  }
+  return inBlock;
+}
 function processCodeLinesFused(content, cfg) {
   const lines = content.split(`
 `);
@@ -385,9 +480,16 @@ function processCodeLinesFused(content, cfg) {
   const preferred = cfg.format.quotes;
   const doSemiRemoval = cfg.format.semi === true;
   let indentLevel = 0;
+  let hangDepth = 0;
+  let inBlockComment = false;
   const tmplStack = [];
   for (let idx = 0;idx < len; idx++) {
     let line = lines[idx];
+    if (inBlockComment) {
+      inBlockComment = blockCommentStateAfter(line, true);
+      result[idx] = line;
+      continue;
+    }
     const protectedLine = inTemplateText(tmplStack);
     let splitIdx = -1;
     if (tmplStack.length > 0 || line.indexOf("`") !== -1)
@@ -396,6 +498,8 @@ function processCodeLinesFused(content, cfg) {
       result[idx] = line;
       continue;
     }
+    if (splitIdx < 0 && tmplStack.length === 0)
+      inBlockComment = blockCommentStateAfter(line, false);
     let tmplTail = "";
     let prefixEndedWithSpace = false;
     if (splitIdx >= 0) {
@@ -419,9 +523,15 @@ function processCodeLinesFused(content, cfg) {
     const trimmed = line.slice(wsEnd).trimEnd();
     if (RE_CLOSING_BRACE.test(trimmed))
       indentLevel = Math.max(0, indentLevel - 1);
-    line = makeIndent(indentLevel, cfg) + trimmed;
-    if (RE_OPENING_BRACE.test(trimmed))
+    const continuationBump = RE_CONTINUATION_LINE.test(trimmed) ? 1 : 0;
+    line = makeIndent(indentLevel + hangDepth + continuationBump, cfg) + trimmed;
+    if (RE_OPENING_BRACE.test(trimmed)) {
       indentLevel += 1;
+      hangDepth = 0;
+    } else if (!trimmed.startsWith("//") && !trimmed.startsWith("*") && !trimmed.startsWith("/*")) {
+      const code = trimmed.replace(RE_TRAILING_LINE_COMMENT, "");
+      hangDepth = isHangingControlLine(code) ? hangDepth + 1 : 0;
+    }
     line = normalizeSpacingLine(line);
     if (doSemiRemoval) {
       if (!RE_FOR_LOOP.test(line)) {
@@ -614,8 +724,87 @@ function hasIndentIssue(leading, indentSize, indentStyle = "spaces", lineContent
   }
   return spaces % indentSize !== 0;
 }
+function skipTemplate(input, start) {
+  let i = start + 1;
+  while (i < input.length) {
+    const c = input[i];
+    if (c === "\\") {
+      i += 2;
+      continue;
+    }
+    if (c === "`")
+      return i + 1;
+    if (c === "$" && input[i + 1] === "{") {
+      i += 2;
+      let depth = 1;
+      while (i < input.length && depth > 0) {
+        const d = input[i];
+        if (d === "\\") {
+          i += 2;
+          continue;
+        }
+        if (d === "`") {
+          i = skipTemplate(input, i);
+          continue;
+        }
+        if (d === "'" || d === '"') {
+          i = skipQuoted(input, i, d);
+          continue;
+        }
+        if (d === "{")
+          depth++;
+        else if (d === "}")
+          depth--;
+        i++;
+      }
+      continue;
+    }
+    i++;
+  }
+  return i;
+}
+function isRegexStart(input, slashIdx) {
+  let j = slashIdx - 1;
+  while (j >= 0 && (input[j] === " " || input[j] === "\t"))
+    j--;
+  if (j < 0)
+    return true;
+  const prev = input[j];
+  if ("(,=:[!&|?;{}<>+-*%^~".includes(prev))
+    return true;
+  if (/[\w$]/.test(prev)) {
+    let k = j;
+    while (k >= 0 && /[\w$]/.test(input[k]))
+      k--;
+    return REGEX_PRECEDING_KEYWORDS.has(input.slice(k + 1, j + 1));
+  }
+  return false;
+}
+function scanRegexEnd(input, start) {
+  let i = start + 1;
+  let inClass = false;
+  while (i < input.length) {
+    const c = input[i];
+    if (c === "\\") {
+      i += 2;
+      continue;
+    }
+    if (c === "[") {
+      inClass = true;
+    } else if (c === "]") {
+      inClass = false;
+    } else if (c === "/" && !inClass) {
+      i++;
+      while (i < input.length && /[a-z]/i.test(input[i]))
+        i++;
+      return i;
+    }
+    i++;
+  }
+  return -1;
+}
 function maskStrings(input) {
-  if (!input.includes("'") && !input.includes('"') && !input.includes("`"))
+  if (!input.includes("'") && !input.includes('"') && !input.includes("`") && !input.includes("/"))
     return { text: input, strings: [] };
   const strings = [];
   const parts = [];
@@ -623,22 +812,62 @@ function maskStrings(input) {
   let segStart = 0;
   while (i < input.length) {
     const ch = input[i];
+    if (ch === "/") {
+      const next = input[i + 1];
+      if (next === "/") {
+        if (i > segStart)
+          parts.push(input.slice(segStart, i));
+        strings.push(input.slice(i));
+        parts.push(`@@S${strings.length - 1}@@`);
+        segStart = input.length;
+        break;
+      }
+      if (next === "*") {
+        const end = input.indexOf("*/", i + 2);
+        const stop = end === -1 ? input.length : end + 2;
+        if (i > segStart)
+          parts.push(input.slice(segStart, i));
+        strings.push(input.slice(i, stop));
+        parts.push(`@@S${strings.length - 1}@@`);
+        i = stop;
+        segStart = i;
+        continue;
+      }
+      if (isRegexStart(input, i)) {
+        const end = scanRegexEnd(input, i);
+        if (end !== -1) {
+          if (i > segStart)
+            parts.push(input.slice(segStart, i));
+          strings.push(input.slice(i, end));
+          parts.push(`@@S${strings.length - 1}@@`);
+          i = end;
+          segStart = i;
+          continue;
+        }
+      }
+      i++;
+      continue;
+    }
     if (ch === "'" || ch === '"' || ch === "`") {
       if (i > segStart)
         parts.push(input.slice(segStart, i));
       const start = i;
-      const close = ch;
-      i++;
-      while (i < input.length) {
-        if (input[i] === "\\") {
-          i += 2;
-          continue;
-        }
-        if (input[i] === close) {
+      if (ch === "`") {
+        i = skipTemplate(input, i);
+      } else {
+        const close = ch;
+        i++;
+        while (i < input.length) {
+          if (input[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (input[i] === close) {
+            i++;
+            break;
+          }
           i++;
-          break;
         }
-        i++;
       }
       strings.push(input.slice(start, i));
       parts.push(`@@S${strings.length - 1}@@`);
@@ -674,24 +903,65 @@ function formatImports(source) {
   const lines = source.split(`
 `);
   const imports = [];
+  const preamble = [];
+  const interleaved = [];
   let idx = 0;
+  let lastEnd = 0;
+  let pendingStart = -1;
+  let sawImport = false;
   while (idx < lines.length) {
     const line = lines[idx];
-    if (RE_BLANK_LINE.test(line) || RE_LINE_COMMENT.test(line) || RE_BLOCK_COMMENT.test(line)) {
+    if (RE_BLANK_LINE.test(line)) {
       idx++;
       continue;
     }
+    if (RE_LINE_COMMENT.test(line) || RE_BLOCK_COMMENT.test(line)) {
+      const start = idx;
+      if (RE_BLOCK_COMMENT.test(line)) {
+        while (idx < lines.length && !lines[idx].includes("*/"))
+          idx++;
+        idx++;
+      } else {
+        idx++;
+      }
+      if (!sawImport) {
+        for (let k = start;k < idx && k < lines.length; k++)
+          preamble.push(lines[k]);
+        lastEnd = idx;
+      } else if (pendingStart < 0) {
+        pendingStart = start;
+      }
+      continue;
+    }
     if (!RE_IMPORT_STMT.test(line))
       break;
-    const stmt = line.trim();
+    let stmt = line.trim();
+    let stmtEnd = idx + 1;
+    while (!RE_IMPORT_COMPLETE.test(stmt) && stmtEnd < lines.length && stmtEnd - idx < 50) {
+      stmt += ` ${lines[stmtEnd].trim()}`;
+      stmtEnd++;
+    }
+    if (!RE_IMPORT_COMPLETE.test(stmt))
+      return source;
     const parsed = parseImportStatement(stmt);
-    if (parsed)
-      imports.push(parsed);
-    idx++;
+    if (!parsed)
+      return source;
+    if (pendingStart >= 0) {
+      for (let k = pendingStart;k < idx; k++) {
+        if (!RE_BLANK_LINE.test(lines[k]))
+          interleaved.push(lines[k]);
+      }
+      pendingStart = -1;
+    }
+    imports.push(parsed);
+    idx = stmtEnd;
+    lastEnd = idx;
+    sawImport = true;
   }
   if (imports.length === 0)
     return source;
-  const rest = lines.slice(idx).join(`
+  const restStart = pendingStart >= 0 ? pendingStart : lastEnd;
+  const rest = lines.slice(restStart).join(`
 `);
   const usedIdentifiers = collectIdentifierSet(rest);
   const used = (name) => usedIdentifiers.has(name);
@@ -812,17 +1082,29 @@ function formatImports(source) {
     }
     return a.source.localeCompare(b.source);
   });
+  const head = preamble.length > 0 ? `${preamble.join(`
+`)}
+` : "";
   if (entries.length === 0) {
-    return rest.replace(/^\n+/, "");
+    const restClean2 = rest.replace(/^\n+/, "");
+    const kept = [...interleaved];
+    if (head || kept.length > 0)
+      return `${head}${kept.length > 0 ? `${kept.join(`
+`)}
+` : ""}${restClean2}`;
+    return restClean2;
   }
   const rendered = entries.map(renderImport).join(`
 `);
-  const sep = rest.length > 0 && !rest.startsWith(`
-`) ? `
+  const mid = interleaved.length > 0 ? `
+${interleaved.join(`
+`)}` : "";
+  const restClean = rest.replace(/^\n+/, "");
+  const sep = restClean.length > 0 ? `
 
 ` : `
 `;
-  return `${rendered}${sep}${rest.replace(/^\n+/, "")}`;
+  return `${head}${rendered}${mid}${sep}${restClean}`;
 }
 function renderImport(imp) {
   if (imp.kind === "side-effect")
@@ -1125,39 +1407,44 @@ function sortTsconfigContent(text) {
   }
   return JSON.stringify(outTop, null, 2);
 }
-var CODE_EXTS, JSON_EXTS, YAML_EXTS, SHELL_EXTS, SHELL_SHEBANG_RE, RE_CLOSING_BRACE, RE_OPENING_BRACE, RE_FOR_LOOP, RE_EMPTY_SEMI, RE_DUP_SEMI, RE_SPACE_BEFORE_BRACE, RE_SPACE_AFTER_BRACE_KW, RE_COMMA_SPACE, RE_EQUALS_SPACE, RE_PLUS_OP, RE_MINUS_OP, RE_STAR_OP, RE_SLASH_OP, RE_SEMI_SPACE, RE_LT_OP, RE_GT_OP, RE_MULTI_SPACE, RE_BLANK_LINE, RE_LINE_COMMENT, RE_BLOCK_COMMENT, RE_IMPORT_STMT, RE_PACKAGE_JSON, RE_TSCONFIG_JSON, RE_TRAILING_WS, RE_LEADING_BLANKS, SPACING_CHARS;
+var CODE_EXTS, JSON_EXTS, YAML_EXTS, SHELL_EXTS, SHELL_SHEBANG_RE, RE_CLOSING_BRACE, RE_OPENING_BRACE, RE_TRAILING_LINE_COMMENT, RE_CONTROL_OPEN, RE_CONTINUATION_LINE, RE_FOR_LOOP, RE_EMPTY_SEMI, RE_DUP_SEMI, RE_SPACE_BEFORE_BRACE, RE_SPACE_AFTER_BRACE_KW, RE_COMMA_SPACE, RE_EQUALS_SPACE, RE_PLUS_OP, RE_MINUS_OP, RE_STAR_OP, RE_SLASH_OP, RE_SEMI_SPACE, RE_LT_OP, RE_GT_OP, RE_MULTI_SPACE, RE_BLANK_LINE, RE_LINE_COMMENT, RE_BLOCK_COMMENT, RE_IMPORT_STMT, RE_IMPORT_COMPLETE, RE_PACKAGE_JSON, RE_TSCONFIG_JSON, RE_TRAILING_WS, RE_LEADING_BLANKS, SPACING_CHARS, REGEX_PRECEDING_KEYWORDS;
 var init_format = __esm(() => {
   CODE_EXTS = new Set([".ts", ".js"]);
   JSON_EXTS = new Set([".json", ".jsonc"]);
   YAML_EXTS = new Set([".yaml", ".yml"]);
   SHELL_EXTS = new Set([".sh", ".bash", ".zsh", ".ksh", ".dash"]);
   SHELL_SHEBANG_RE = /^#!\s*(?:\/usr\/bin\/env\s+)?(?:ba|z|k|da)?sh\b/;
-  RE_CLOSING_BRACE = /^\}/;
-  RE_OPENING_BRACE = /\{\s*$/;
+  RE_CLOSING_BRACE = /^[}\])]/;
+  RE_OPENING_BRACE = /[{[(]\s*$/;
+  RE_TRAILING_LINE_COMMENT = /\s*\/\/.*$/;
+  RE_CONTROL_OPEN = /^(?:if|else\s+if|for|while)\s*\(/;
+  RE_CONTINUATION_LINE = /^(?:\.[\w$[]|\?[\s.:]|:\s|&&|\|\|)/;
   RE_FOR_LOOP = /^\s*for\s*\(/;
   RE_EMPTY_SEMI = new RegExp("^\\s*" + ";" + "\\s*$");
   RE_DUP_SEMI = new RegExp(";" + "{2,}\\s*$");
-  RE_SPACE_BEFORE_BRACE = /(\S)\{/g;
+  RE_SPACE_BEFORE_BRACE = /([\w)])\{/g;
   RE_SPACE_AFTER_BRACE_KW = /\{(return|if|for|while|switch|const|let|var|function)\b/g;
   RE_COMMA_SPACE = /,(\S)/g;
-  RE_EQUALS_SPACE = /(?<![=!<>])=(?![=><])/g;
+  RE_EQUALS_SPACE = /(?<![=!<>+\-*/%&|^?])=(?![=><])/g;
   RE_PLUS_OP = /(\w)\+(\w)/g;
   RE_MINUS_OP = /(\w)-(\w)/g;
   RE_STAR_OP = /(\w)\*(\w)/g;
   RE_SLASH_OP = /(\w)\/(\w)/g;
-  RE_SEMI_SPACE = new RegExp(";" + "([^\\s" + ";" + "])", "g");
-  RE_LT_OP = /([\w\])])<(\S)/g;
-  RE_GT_OP = /(\S)>([\w[(])/g;
+  RE_SEMI_SPACE = new RegExp("(?<=\\S);" + "([^\\s" + ";" + "])", "g");
+  RE_LT_OP = /([\w)\]])<(\d)/g;
+  RE_GT_OP = /([\w)\]])>(\d)/g;
   RE_MULTI_SPACE = /\s{2,}/g;
   RE_BLANK_LINE = /^\s*$/;
   RE_LINE_COMMENT = /^\s*\/\//;
   RE_BLOCK_COMMENT = /^\s*\/\*/;
   RE_IMPORT_STMT = /^\s*import\b/;
+  RE_IMPORT_COMPLETE = /\bfrom\s*['"][^'"]+['"]|^\s*import\s+['"][^'"]+['"]/;
   RE_PACKAGE_JSON = /package\.json$/i;
   RE_TSCONFIG_JSON = /[jt]sconfig(?:\..+)?\.json$/i;
   RE_TRAILING_WS = /[ \t]+$/;
   RE_LEADING_BLANKS = /^\n+/;
   SPACING_CHARS = new Set(["{", ",", "=", "+", "-", "*", "/", ";", "<", ">"]);
+  REGEX_PRECEDING_KEYWORDS = new Set(["return", "typeof", "instanceof", "in", "of", "new", "delete", "void", "do", "else", "case", "yield", "await"]);
 });
 
 // ../../node_modules/bunfig/dist/index.js
@@ -20724,7 +21011,7 @@ var init_no_unused_vars = __esm(() => {
         let tInBlockComment = false;
         let tEscaped = false;
         let prevSig = "";
-        const isRegexStart = () => {
+        const isRegexStart2 = () => {
           if (prevSig === "")
             return true;
           if ("=([{,;!&|?:+-*/%^~<>".includes(prevSig))
@@ -20826,7 +21113,7 @@ var init_no_unused_vars = __esm(() => {
                 else
                   tmplStack.pop();
                 prevSig = "}";
-              } else if (ch === "/" && isRegexStart()) {
+              } else if (ch === "/" && isRegexStart2()) {
                 tInRegex = true;
               } else if (!/\s/.test(ch)) {
                 prevSig = ch;
@@ -20842,7 +21129,7 @@ var init_no_unused_vars = __esm(() => {
             } else if (ch === '"') {
               tInDouble = true;
               prevSig = '"';
-            } else if (ch === "/" && isRegexStart()) {
+            } else if (ch === "/" && isRegexStart2()) {
               tInRegex = true;
             } else if (!/\s/.test(ch)) {
               prevSig = ch;
@@ -22041,7 +22328,7 @@ function computeLineStartsInTemplate(text) {
   let inBlockComment = false;
   let escaped = false;
   let prevSig = "";
-  const isRegexStart = () => {
+  const isRegexStart2 = () => {
     if (prevSig === "")
       return true;
     return "=([{,;!&|?:+-*/%^~<>".includes(prevSig);
@@ -22141,7 +22428,7 @@ function computeLineStartsInTemplate(text) {
           else
             tmplStack.pop();
           prevSig = "}";
-        } else if (ch === "/" && isRegexStart())
+        } else if (ch === "/" && isRegexStart2())
           inRegex = true;
         else if (!/\s/.test(ch))
           prevSig = ch;
@@ -22156,7 +22443,7 @@ function computeLineStartsInTemplate(text) {
       } else if (ch === '"') {
         inDouble = true;
         prevSig = '"';
-      } else if (ch === "/" && isRegexStart())
+      } else if (ch === "/" && isRegexStart2())
         inRegex = true;
       else if (!/\s/.test(ch))
         prevSig = ch;
@@ -32802,7 +33089,7 @@ function findMatching(text, start, open, close) {
     }
     return i;
   };
-  const isRegexStart = (i) => {
+  const isRegexStart2 = (i) => {
     let j = i - 1;
     while (j >= 0 && isWhitespace(text[j])) {
       j--;
@@ -32858,7 +33145,7 @@ function findMatching(text, start, open, close) {
       i = skipBlockComment(i) - 1;
       continue;
     }
-    if (ch === "/" && isRegexStart(i)) {
+    if (ch === "/" && isRegexStart2(i)) {
       i = skipRegex(i) - 1;
       continue;
     }
@@ -38635,7 +38922,7 @@ function stripRegexLiterals(line) {
   }
   return result;
 }
-function isRegexStart(lastSignificant, line, idx) {
+function isRegexStart2(lastSignificant, line, idx) {
   if (lastSignificant === "")
     return true;
   const regexAfter = "([{,:;!?&|=<>~^+*%-";
@@ -39058,7 +39345,7 @@ function scanContentOptimized(filePath, content, cfg, suppress, commentLines) {
             prev = ch;
             continue;
           }
-          if (ch === "/" && ln[k + 1] !== "/" && ln[k + 1] !== "*" && isRegexStart(lastSig, ln, k)) {
+          if (ch === "/" && ln[k + 1] !== "/" && ln[k + 1] !== "*" && isRegexStart2(lastSig, ln, k)) {
             inRegex = true;
             inRegexClass = false;
             prev = ch;
@@ -43647,7 +43934,7 @@ var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "pickier",
     type: "module",
-    version: "0.1.33",
+    version: "0.1.35",
     description: "Format, lint and more in a fraction of seconds.",
     author: "Chris Breuer <chris@stacksjs.org>",
     license: "MIT",

package/dist/src/index.js

@@ -8882,6 +8882,37 @@ var init_config = __esm(() => {
 });
 
 // src/format.ts
+function isHangingControlLine(code) {
+  const m = RE_CONTROL_OPEN.exec(code);
+  if (!m)
+    return /^(?:else|do)\s*$/.test(code);
+  let depth = 0;
+  let inStr = null;
+  for (let i = m[0].length - 1;i < code.length; i++) {
+    const ch = code[i];
+    if (inStr) {
+      if (ch === "\\") {
+        i++;
+        continue;
+      }
+      if (ch === inStr)
+        inStr = null;
+      continue;
+    }
+    if (ch === "'" || ch === '"' || ch === "`") {
+      inStr = ch;
+      continue;
+    }
+    if (ch === "(") {
+      depth++;
+    } else if (ch === ")") {
+      depth--;
+      if (depth === 0)
+        return code.slice(i + 1).trim().length === 0;
+    }
+  }
+  return false;
+}
 function getFileExt(filePath) {
   const idx = filePath.lastIndexOf(".");
   return idx >= 0 ? filePath.slice(idx) : "";
@@ -9032,6 +9063,25 @@ function fixQuotesLine(line, preferred) {
   while (i < line.length) {
     const ch = line[i];
     if (inString === 0) {
+      if (ch === "/") {
+        const nxt = line[i + 1];
+        if (nxt === "/")
+          break;
+        if (nxt === "*") {
+          const end = line.indexOf("*/", i + 2);
+          i = end === -1 ? line.length : end + 2;
+          continue;
+        }
+        if (isRegexStart(line, i)) {
+          const end = scanRegexEnd(line, i);
+          if (end !== -1) {
+            i = end;
+            continue;
+          }
+        }
+        i++;
+        continue;
+      }
       if (ch === '"') {
         inString = 2;
         stringStart = i;
@@ -9099,6 +9149,8 @@ function normalizeSpacingLine(line) {
     const c = line[firstNonSpace];
     if (c === "/" && (line[firstNonSpace + 1] === "/" || line[firstNonSpace + 1] === "*"))
       return line;
+    if (c === "*")
+      return line;
   }
   let hasSpacingChar = false;
   for (let j = firstNonSpace;j < line.length; j++) {
@@ -9211,6 +9263,49 @@ function advanceTemplateState(line, stack) {
   }
   return -1;
 }
+function blockCommentStateAfter(line, startsIn) {
+  let inBlock = startsIn;
+  let inStr = null;
+  let i = 0;
+  while (i < line.length) {
+    const ch = line[i];
+    if (inBlock) {
+      if (ch === "*" && line[i + 1] === "/") {
+        inBlock = false;
+        i += 2;
+        continue;
+      }
+      i++;
+      continue;
+    }
+    if (inStr) {
+      if (ch === "\\") {
+        i += 2;
+        continue;
+      }
+      if (ch === inStr)
+        inStr = null;
+      i++;
+      continue;
+    }
+    if (ch === "'" || ch === '"' || ch === "`") {
+      inStr = ch;
+      i++;
+      continue;
+    }
+    if (ch === "/") {
+      if (line[i + 1] === "/")
+        break;
+      if (line[i + 1] === "*") {
+        inBlock = true;
+        i += 2;
+        continue;
+      }
+    }
+    i++;
+  }
+  return inBlock;
+}
 function processCodeLinesFused(content, cfg) {
   const lines = content.split(`
 `);
@@ -9219,9 +9314,16 @@ function processCodeLinesFused(content, cfg) {
   const preferred = cfg.format.quotes;
   const doSemiRemoval = cfg.format.semi === true;
   let indentLevel = 0;
+  let hangDepth = 0;
+  let inBlockComment = false;
   const tmplStack = [];
   for (let idx = 0;idx < len; idx++) {
     let line = lines[idx];
+    if (inBlockComment) {
+      inBlockComment = blockCommentStateAfter(line, true);
+      result[idx] = line;
+      continue;
+    }
     const protectedLine = inTemplateText(tmplStack);
     let splitIdx = -1;
     if (tmplStack.length > 0 || line.indexOf("`") !== -1)
@@ -9230,6 +9332,8 @@ function processCodeLinesFused(content, cfg) {
       result[idx] = line;
       continue;
     }
+    if (splitIdx < 0 && tmplStack.length === 0)
+      inBlockComment = blockCommentStateAfter(line, false);
     let tmplTail = "";
     let prefixEndedWithSpace = false;
     if (splitIdx >= 0) {
@@ -9253,9 +9357,15 @@ function processCodeLinesFused(content, cfg) {
     const trimmed = line.slice(wsEnd).trimEnd();
     if (RE_CLOSING_BRACE.test(trimmed))
       indentLevel = Math.max(0, indentLevel - 1);
-    line = makeIndent(indentLevel, cfg) + trimmed;
-    if (RE_OPENING_BRACE.test(trimmed))
+    const continuationBump = RE_CONTINUATION_LINE.test(trimmed) ? 1 : 0;
+    line = makeIndent(indentLevel + hangDepth + continuationBump, cfg) + trimmed;
+    if (RE_OPENING_BRACE.test(trimmed)) {
       indentLevel += 1;
+      hangDepth = 0;
+    } else if (!trimmed.startsWith("//") && !trimmed.startsWith("*") && !trimmed.startsWith("/*")) {
+      const code = trimmed.replace(RE_TRAILING_LINE_COMMENT, "");
+      hangDepth = isHangingControlLine(code) ? hangDepth + 1 : 0;
+    }
     line = normalizeSpacingLine(line);
     if (doSemiRemoval) {
       if (!RE_FOR_LOOP.test(line)) {
@@ -9448,8 +9558,87 @@ function hasIndentIssue(leading, indentSize, indentStyle = "spaces", lineContent
   }
   return spaces % indentSize !== 0;
 }
+function skipTemplate(input, start) {
+  let i = start + 1;
+  while (i < input.length) {
+    const c = input[i];
+    if (c === "\\") {
+      i += 2;
+      continue;
+    }
+    if (c === "`")
+      return i + 1;
+    if (c === "$" && input[i + 1] === "{") {
+      i += 2;
+      let depth = 1;
+      while (i < input.length && depth > 0) {
+        const d = input[i];
+        if (d === "\\") {
+          i += 2;
+          continue;
+        }
+        if (d === "`") {
+          i = skipTemplate(input, i);
+          continue;
+        }
+        if (d === "'" || d === '"') {
+          i = skipQuoted(input, i, d);
+          continue;
+        }
+        if (d === "{")
+          depth++;
+        else if (d === "}")
+          depth--;
+        i++;
+      }
+      continue;
+    }
+    i++;
+  }
+  return i;
+}
+function isRegexStart(input, slashIdx) {
+  let j = slashIdx - 1;
+  while (j >= 0 && (input[j] === " " || input[j] === "\t"))
+    j--;
+  if (j < 0)
+    return true;
+  const prev = input[j];
+  if ("(,=:[!&|?;{}<>+-*%^~".includes(prev))
+    return true;
+  if (/[\w$]/.test(prev)) {
+    let k = j;
+    while (k >= 0 && /[\w$]/.test(input[k]))
+      k--;
+    return REGEX_PRECEDING_KEYWORDS.has(input.slice(k + 1, j + 1));
+  }
+  return false;
+}
+function scanRegexEnd(input, start) {
+  let i = start + 1;
+  let inClass = false;
+  while (i < input.length) {
+    const c = input[i];
+    if (c === "\\") {
+      i += 2;
+      continue;
+    }
+    if (c === "[") {
+      inClass = true;
+    } else if (c === "]") {
+      inClass = false;
+    } else if (c === "/" && !inClass) {
+      i++;
+      while (i < input.length && /[a-z]/i.test(input[i]))
+        i++;
+      return i;
+    }
+    i++;
+  }
+  return -1;
+}
 function maskStrings(input) {
-  if (!input.includes("'") && !input.includes('"') && !input.includes("`"))
+  if (!input.includes("'") && !input.includes('"') && !input.includes("`") && !input.includes("/"))
     return { text: input, strings: [] };
   const strings = [];
   const parts = [];
@@ -9457,22 +9646,62 @@ function maskStrings(input) {
   let segStart = 0;
   while (i < input.length) {
     const ch = input[i];
+    if (ch === "/") {
+      const next = input[i + 1];
+      if (next === "/") {
+        if (i > segStart)
+          parts.push(input.slice(segStart, i));
+        strings.push(input.slice(i));
+        parts.push(`@@S${strings.length - 1}@@`);
+        segStart = input.length;
+        break;
+      }
+      if (next === "*") {
+        const end = input.indexOf("*/", i + 2);
+        const stop = end === -1 ? input.length : end + 2;
+        if (i > segStart)
+          parts.push(input.slice(segStart, i));
+        strings.push(input.slice(i, stop));
+        parts.push(`@@S${strings.length - 1}@@`);
+        i = stop;
+        segStart = i;
+        continue;
+      }
+      if (isRegexStart(input, i)) {
+        const end = scanRegexEnd(input, i);
+        if (end !== -1) {
+          if (i > segStart)
+            parts.push(input.slice(segStart, i));
+          strings.push(input.slice(i, end));
+          parts.push(`@@S${strings.length - 1}@@`);
+          i = end;
+          segStart = i;
+          continue;
+        }
+      }
+      i++;
+      continue;
+    }
     if (ch === "'" || ch === '"' || ch === "`") {
       if (i > segStart)
         parts.push(input.slice(segStart, i));
       const start = i;
-      const close = ch;
-      i++;
-      while (i < input.length) {
-        if (input[i] === "\\") {
-          i += 2;
-          continue;
-        }
-        if (input[i] === close) {
+      if (ch === "`") {
+        i = skipTemplate(input, i);
+      } else {
+        const close = ch;
+        i++;
+        while (i < input.length) {
+          if (input[i] === "\\") {
+            i += 2;
+            continue;
+          }
+          if (input[i] === close) {
+            i++;
+            break;
+          }
           i++;
-          break;
         }
-        i++;
       }
       strings.push(input.slice(start, i));
       parts.push(`@@S${strings.length - 1}@@`);
@@ -9508,24 +9737,65 @@ function formatImports(source) {
   const lines = source.split(`
 `);
   const imports = [];
+  const preamble = [];
+  const interleaved = [];
   let idx = 0;
+  let lastEnd = 0;
+  let pendingStart = -1;
+  let sawImport = false;
   while (idx < lines.length) {
     const line = lines[idx];
-    if (RE_BLANK_LINE.test(line) || RE_LINE_COMMENT.test(line) || RE_BLOCK_COMMENT.test(line)) {
+    if (RE_BLANK_LINE.test(line)) {
       idx++;
       continue;
     }
+    if (RE_LINE_COMMENT.test(line) || RE_BLOCK_COMMENT.test(line)) {
+      const start = idx;
+      if (RE_BLOCK_COMMENT.test(line)) {
+        while (idx < lines.length && !lines[idx].includes("*/"))
+          idx++;
+        idx++;
+      } else {
+        idx++;
+      }
+      if (!sawImport) {
+        for (let k = start;k < idx && k < lines.length; k++)
+          preamble.push(lines[k]);
+        lastEnd = idx;
+      } else if (pendingStart < 0) {
+        pendingStart = start;
+      }
+      continue;
+    }
     if (!RE_IMPORT_STMT.test(line))
       break;
-    const stmt = line.trim();
+    let stmt = line.trim();
+    let stmtEnd = idx + 1;
+    while (!RE_IMPORT_COMPLETE.test(stmt) && stmtEnd < lines.length && stmtEnd - idx < 50) {
+      stmt += ` ${lines[stmtEnd].trim()}`;
+      stmtEnd++;
+    }
+    if (!RE_IMPORT_COMPLETE.test(stmt))
+      return source;
     const parsed = parseImportStatement(stmt);
-    if (parsed)
-      imports.push(parsed);
-    idx++;
+    if (!parsed)
+      return source;
+    if (pendingStart >= 0) {
+      for (let k = pendingStart;k < idx; k++) {
+        if (!RE_BLANK_LINE.test(lines[k]))
+          interleaved.push(lines[k]);
+      }
+      pendingStart = -1;
+    }
+    imports.push(parsed);
+    idx = stmtEnd;
+    lastEnd = idx;
+    sawImport = true;
   }
   if (imports.length === 0)
     return source;
-  const rest = lines.slice(idx).join(`
+  const restStart = pendingStart >= 0 ? pendingStart : lastEnd;
+  const rest = lines.slice(restStart).join(`
 `);
   const usedIdentifiers = collectIdentifierSet(rest);
   const used = (name) => usedIdentifiers.has(name);
@@ -9646,17 +9916,29 @@ function formatImports(source) {
     }
     return a.source.localeCompare(b.source);
   });
+  const head = preamble.length > 0 ? `${preamble.join(`
+`)}
+` : "";
   if (entries.length === 0) {
-    return rest.replace(/^\n+/, "");
+    const restClean2 = rest.replace(/^\n+/, "");
+    const kept = [...interleaved];
+    if (head || kept.length > 0)
+      return `${head}${kept.length > 0 ? `${kept.join(`
+`)}
+` : ""}${restClean2}`;
+    return restClean2;
   }
   const rendered = entries.map(renderImport).join(`
 `);
-  const sep = rest.length > 0 && !rest.startsWith(`
-`) ? `
+  const mid = interleaved.length > 0 ? `
+${interleaved.join(`
+`)}` : "";
+  const restClean = rest.replace(/^\n+/, "");
+  const sep = restClean.length > 0 ? `
 
 ` : `
 `;
-  return `${rendered}${sep}${rest.replace(/^\n+/, "")}`;
+  return `${head}${rendered}${mid}${sep}${restClean}`;
 }
 function renderImport(imp) {
   if (imp.kind === "side-effect")
@@ -9959,39 +10241,44 @@ function sortTsconfigContent(text) {
   }
   return JSON.stringify(outTop, null, 2);
 }
-var CODE_EXTS, JSON_EXTS, YAML_EXTS, SHELL_EXTS, SHELL_SHEBANG_RE, RE_CLOSING_BRACE, RE_OPENING_BRACE, RE_FOR_LOOP, RE_EMPTY_SEMI, RE_DUP_SEMI, RE_SPACE_BEFORE_BRACE, RE_SPACE_AFTER_BRACE_KW, RE_COMMA_SPACE, RE_EQUALS_SPACE, RE_PLUS_OP, RE_MINUS_OP, RE_STAR_OP, RE_SLASH_OP, RE_SEMI_SPACE, RE_LT_OP, RE_GT_OP, RE_MULTI_SPACE, RE_BLANK_LINE, RE_LINE_COMMENT, RE_BLOCK_COMMENT, RE_IMPORT_STMT, RE_PACKAGE_JSON, RE_TSCONFIG_JSON, RE_TRAILING_WS, RE_LEADING_BLANKS, SPACING_CHARS;
+var CODE_EXTS, JSON_EXTS, YAML_EXTS, SHELL_EXTS, SHELL_SHEBANG_RE, RE_CLOSING_BRACE, RE_OPENING_BRACE, RE_TRAILING_LINE_COMMENT, RE_CONTROL_OPEN, RE_CONTINUATION_LINE, RE_FOR_LOOP, RE_EMPTY_SEMI, RE_DUP_SEMI, RE_SPACE_BEFORE_BRACE, RE_SPACE_AFTER_BRACE_KW, RE_COMMA_SPACE, RE_EQUALS_SPACE, RE_PLUS_OP, RE_MINUS_OP, RE_STAR_OP, RE_SLASH_OP, RE_SEMI_SPACE, RE_LT_OP, RE_GT_OP, RE_MULTI_SPACE, RE_BLANK_LINE, RE_LINE_COMMENT, RE_BLOCK_COMMENT, RE_IMPORT_STMT, RE_IMPORT_COMPLETE, RE_PACKAGE_JSON, RE_TSCONFIG_JSON, RE_TRAILING_WS, RE_LEADING_BLANKS, SPACING_CHARS, REGEX_PRECEDING_KEYWORDS;
 var init_format = __esm(() => {
   CODE_EXTS = new Set([".ts", ".js"]);
   JSON_EXTS = new Set([".json", ".jsonc"]);
   YAML_EXTS = new Set([".yaml", ".yml"]);
   SHELL_EXTS = new Set([".sh", ".bash", ".zsh", ".ksh", ".dash"]);
   SHELL_SHEBANG_RE = /^#!\s*(?:\/usr\/bin\/env\s+)?(?:ba|z|k|da)?sh\b/;
-  RE_CLOSING_BRACE = /^\}/;
-  RE_OPENING_BRACE = /\{\s*$/;
+  RE_CLOSING_BRACE = /^[}\])]/;
+  RE_OPENING_BRACE = /[{[(]\s*$/;
+  RE_TRAILING_LINE_COMMENT = /\s*\/\/.*$/;
+  RE_CONTROL_OPEN = /^(?:if|else\s+if|for|while)\s*\(/;
+  RE_CONTINUATION_LINE = /^(?:\.[\w$[]|\?[\s.:]|:\s|&&|\|\|)/;
   RE_FOR_LOOP = /^\s*for\s*\(/;
   RE_EMPTY_SEMI = new RegExp("^\\s*" + ";" + "\\s*$");
   RE_DUP_SEMI = new RegExp(";" + "{2,}\\s*$");
-  RE_SPACE_BEFORE_BRACE = /(\S)\{/g;
+  RE_SPACE_BEFORE_BRACE = /([\w)])\{/g;
   RE_SPACE_AFTER_BRACE_KW = /\{(return|if|for|while|switch|const|let|var|function)\b/g;
   RE_COMMA_SPACE = /,(\S)/g;
-  RE_EQUALS_SPACE = /(?<![=!<>])=(?![=><])/g;
+  RE_EQUALS_SPACE = /(?<![=!<>+\-*/%&|^?])=(?![=><])/g;
   RE_PLUS_OP = /(\w)\+(\w)/g;
   RE_MINUS_OP = /(\w)-(\w)/g;
   RE_STAR_OP = /(\w)\*(\w)/g;
   RE_SLASH_OP = /(\w)\/(\w)/g;
-  RE_SEMI_SPACE = new RegExp(";" + "([^\\s" + ";" + "])", "g");
-  RE_LT_OP = /([\w\])])<(\S)/g;
-  RE_GT_OP = /(\S)>([\w[(])/g;
+  RE_SEMI_SPACE = new RegExp("(?<=\\S);" + "([^\\s" + ";" + "])", "g");
+  RE_LT_OP = /([\w)\]])<(\d)/g;
+  RE_GT_OP = /([\w)\]])>(\d)/g;
   RE_MULTI_SPACE = /\s{2,}/g;
   RE_BLANK_LINE = /^\s*$/;
   RE_LINE_COMMENT = /^\s*\/\//;
   RE_BLOCK_COMMENT = /^\s*\/\*/;
   RE_IMPORT_STMT = /^\s*import\b/;
+  RE_IMPORT_COMPLETE = /\bfrom\s*['"][^'"]+['"]|^\s*import\s+['"][^'"]+['"]/;
   RE_PACKAGE_JSON = /package\.json$/i;
   RE_TSCONFIG_JSON = /[jt]sconfig(?:\..+)?\.json$/i;
   RE_TRAILING_WS = /[ \t]+$/;
   RE_LEADING_BLANKS = /^\n+/;
   SPACING_CHARS = new Set(["{", ",", "=", "+", "-", "*", "/", ";", "<", ">"]);
+  REGEX_PRECEDING_KEYWORDS = new Set(["return", "typeof", "instanceof", "in", "of", "new", "delete", "void", "do", "else", "case", "yield", "await"]);
 });
 
 // ../../node_modules/@stacksjs/clarity/dist/src/index.js
@@ -20322,7 +20609,7 @@ var init_no_unused_vars = __esm(() => {
         let tInBlockComment = false;
         let tEscaped = false;
         let prevSig = "";
-        const isRegexStart = () => {
+        const isRegexStart2 = () => {
           if (prevSig === "")
             return true;
           if ("=([{,;!&|?:+-*/%^~<>".includes(prevSig))
@@ -20424,7 +20711,7 @@ var init_no_unused_vars = __esm(() => {
                 else
                   tmplStack.pop();
                 prevSig = "}";
-              } else if (ch === "/" && isRegexStart()) {
+              } else if (ch === "/" && isRegexStart2()) {
                 tInRegex = true;
               } else if (!/\s/.test(ch)) {
                 prevSig = ch;
@@ -20440,7 +20727,7 @@ var init_no_unused_vars = __esm(() => {
             } else if (ch === '"') {
               tInDouble = true;
               prevSig = '"';
-            } else if (ch === "/" && isRegexStart()) {
+            } else if (ch === "/" && isRegexStart2()) {
               tInRegex = true;
             } else if (!/\s/.test(ch)) {
               prevSig = ch;
@@ -21639,7 +21926,7 @@ function computeLineStartsInTemplate(text) {
   let inBlockComment = false;
   let escaped = false;
   let prevSig = "";
-  const isRegexStart = () => {
+  const isRegexStart2 = () => {
     if (prevSig === "")
       return true;
     return "=([{,;!&|?:+-*/%^~<>".includes(prevSig);
@@ -21739,7 +22026,7 @@ function computeLineStartsInTemplate(text) {
           else
             tmplStack.pop();
           prevSig = "}";
-        } else if (ch === "/" && isRegexStart())
+        } else if (ch === "/" && isRegexStart2())
           inRegex = true;
         else if (!/\s/.test(ch))
           prevSig = ch;
@@ -21754,7 +22041,7 @@ function computeLineStartsInTemplate(text) {
       } else if (ch === '"') {
         inDouble = true;
         prevSig = '"';
-      } else if (ch === "/" && isRegexStart())
+      } else if (ch === "/" && isRegexStart2())
         inRegex = true;
       else if (!/\s/.test(ch))
         prevSig = ch;
@@ -32400,7 +32687,7 @@ function findMatching(text, start, open, close) {
     }
     return i;
   };
-  const isRegexStart = (i) => {
+  const isRegexStart2 = (i) => {
     let j = i - 1;
     while (j >= 0 && isWhitespace(text[j])) {
       j--;
@@ -32456,7 +32743,7 @@ function findMatching(text, start, open, close) {
       i = skipBlockComment(i) - 1;
       continue;
     }
-    if (ch === "/" && isRegexStart(i)) {
+    if (ch === "/" && isRegexStart2(i)) {
       i = skipRegex(i) - 1;
       continue;
     }
@@ -38634,7 +38921,7 @@ function stripRegexLiterals(line) {
   }
   return result;
 }
-function isRegexStart(lastSignificant, line, idx) {
+function isRegexStart2(lastSignificant, line, idx) {
   if (lastSignificant === "")
     return true;
   const regexAfter = "([{,:;!?&|=<>~^+*%-";
@@ -39057,7 +39344,7 @@ function scanContentOptimized(filePath, content, cfg, suppress, commentLines) {
             prev = ch;
             continue;
           }
-          if (ch === "/" && ln[k + 1] !== "/" && ln[k + 1] !== "*" && isRegexStart(lastSig, ln, k)) {
+          if (ch === "/" && ln[k + 1] !== "/" && ln[k + 1] !== "*" && isRegexStart2(lastSig, ln, k)) {
             inRegex = true;
             inRegexClass = false;
             prev = ch;

package/package.json

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