pickier 0.1.30 → 0.1.33

package/dist/bin/cli.js

@@ -296,6 +296,87 @@ function normalizeSpacingLine(line) {
   }
   return strings.length > 0 ? unmaskStrings(t, strings) : t;
 }
+function inTemplateText(stack) {
+  const top = stack[stack.length - 1];
+  return top !== undefined && top.t === "tmpl";
+}
+function skipQuoted(line, i, quote) {
+  i++;
+  while (i < line.length) {
+    const c = line[i];
+    if (c === "\\") {
+      i += 2;
+      continue;
+    }
+    if (c === quote)
+      return i + 1;
+    i++;
+  }
+  return i;
+}
+function advanceTemplateState(line, stack) {
+  for (const ctx of stack) {
+    if (ctx.t === "tmpl")
+      ctx.start = -1;
+  }
+  let i = 0;
+  while (i < line.length) {
+    const top = stack[stack.length - 1];
+    const ch = line[i];
+    if (top === undefined || top.t === "interp") {
+      if (ch === "`") {
+        stack.push({ t: "tmpl", start: i });
+        i++;
+        continue;
+      }
+      if (ch === "'" || ch === '"') {
+        i = skipQuoted(line, i, ch);
+        continue;
+      }
+      if (ch === "/" && line[i + 1] === "/")
+        break;
+      if (top !== undefined) {
+        if (ch === "{") {
+          top.braces++;
+          i++;
+          continue;
+        }
+        if (ch === "}") {
+          if (top.braces === 0)
+            stack.pop();
+          else
+            top.braces--;
+          i++;
+          continue;
+        }
+      }
+      i++;
+    } else {
+      if (ch === "\\") {
+        i += 2;
+        continue;
+      }
+      if (ch === "`") {
+        stack.pop();
+        i++;
+        continue;
+      }
+      if (ch === "$" && line[i + 1] === "{") {
+        stack.push({ t: "interp", braces: 0 });
+        i += 2;
+        continue;
+      }
+      i++;
+    }
+  }
+  if (inTemplateText(stack)) {
+    for (const ctx of stack) {
+      if (ctx.t === "tmpl" && ctx.start >= 0)
+        return ctx.start;
+    }
+  }
+  return -1;
+}
 function processCodeLinesFused(content, cfg) {
   const lines = content.split(`
 `);
@@ -304,8 +385,29 @@ function processCodeLinesFused(content, cfg) {
   const preferred = cfg.format.quotes;
   const doSemiRemoval = cfg.format.semi === true;
   let indentLevel = 0;
+  const tmplStack = [];
   for (let idx = 0;idx < len; idx++) {
     let line = lines[idx];
+    const protectedLine = inTemplateText(tmplStack);
+    let splitIdx = -1;
+    if (tmplStack.length > 0 || line.indexOf("`") !== -1)
+      splitIdx = advanceTemplateState(line, tmplStack);
+    if (protectedLine) {
+      result[idx] = line;
+      continue;
+    }
+    let tmplTail = "";
+    let prefixEndedWithSpace = false;
+    if (splitIdx >= 0) {
+      tmplTail = line.slice(splitIdx);
+      const prefix = line.slice(0, splitIdx);
+      if (prefix.length === 0) {
+        result[idx] = tmplTail;
+        continue;
+      }
+      prefixEndedWithSpace = RE_TRAILING_WS.test(prefix);
+      line = prefix;
+    }
     if (line.length === 0) {
       result[idx] = "";
       continue;
@@ -330,6 +432,11 @@ function processCodeLinesFused(content, cfg) {
         }
       }
     }
+    if (splitIdx >= 0) {
+      if (prefixEndedWithSpace && !RE_TRAILING_WS.test(line))
+        line += " ";
+      line += tmplTail;
+    }
     result[idx] = line;
   }
   return result.join(`
@@ -338,7 +445,16 @@ function processCodeLinesFused(content, cfg) {
 function collapseBlankLines(lines, maxConsecutive) {
   const out = [];
   let blank = 0;
+  const stack = [];
   for (const l of lines) {
+    const protectedLine = inTemplateText(stack);
+    if (stack.length > 0 || l.indexOf("`") !== -1)
+      advanceTemplateState(l, stack);
+    if (protectedLine) {
+      out.push(l);
+      blank = 0;
+      continue;
+    }
     if (l === "") {
       blank++;
       if (blank <= maxConsecutive)
@@ -362,7 +478,17 @@ function formatCode(src, cfg, filePath) {
     lines = [];
     let blank = 0;
     const maxConsecutive = Math.max(0, cfg.format.maxConsecutiveBlankLines);
+    const stack = [];
     for (const l of rawLines) {
+      const protectedLine = inTemplateText(stack);
+      let endsInTemplate = false;
+      if (stack.length > 0 || l.indexOf("`") !== -1)
+        endsInTemplate = advanceTemplateState(l, stack) >= 0;
+      if (protectedLine || endsInTemplate) {
+        lines.push(l);
+        blank = 0;
+        continue;
+      }
       const last = l[l.length - 1];
       const trimmed = last === " " || last === "\t" ? l.replace(RE_TRAILING_WS, "") : l;
       if (trimmed === "") {
@@ -21246,6 +21372,27 @@ var init_no_unused_vars = __esm(() => {
               continue;
             }
             if (inTmplExpr) {
+              if (ch === "/") {
+                const before = lineToProcess.slice(0, k).trimEnd();
+                const regexPrecedeRe = /[=([{,:;!&|?]$/;
+                if (!before || regexPrecedeRe.test(before) || before.endsWith("return")) {
+                  k++;
+                  while (k < lineToProcess.length) {
+                    if (lineToProcess[k] === "\\") {
+                      k += 2;
+                      continue;
+                    }
+                    if (lineToProcess[k] === "/") {
+                      while (k + 1 < lineToProcess.length && /[gimsuvy]/.test(lineToProcess[k + 1])) {
+                        k++;
+                      }
+                      break;
+                    }
+                    k++;
+                  }
+                  continue;
+                }
+              }
               if (ch === "`") {
                 depthTmplStack.push(-1);
                 continue;
@@ -40024,11 +40171,9 @@ class Command {
   isMatched(name) {
     if (this.aliasNames.includes(name))
       return true;
-    if (this.name === name)
-      return true;
-    if (this.namespace && `${this.namespace}:${this.name}` === name)
-      return true;
-    return false;
+    if (this.namespace)
+      return `${this.namespace}:${this.name}` === name;
+    return this.name === name;
   }
   get isDefaultCommand() {
     return this.name === "" || this.aliasNames.includes("!");
@@ -40036,6 +40181,9 @@ class Command {
   get isGlobalCommand() {
     return this instanceof GlobalCommand;
   }
+  get displayName() {
+    return this.namespace ? `${this.namespace}:${this.name}` : this.name;
+  }
   hasOption(name) {
     name = name.split(".")[0];
     return !!this.options.find((option) => {
@@ -40101,7 +40249,7 @@ class Command {
       });
       sections.push({
         title: `For more info, run any command with the \`--help\` flag`,
-        body: commands.map((command) => `  $ ${name}${command.name === "" ? "" : ` ${command.name}`} --help`).join(`
+        body: commands.map((command) => `  $ ${name}${command.displayName === "" ? "" : ` ${command.displayName}`} --help`).join(`
 `)
       });
     }
@@ -42573,8 +42721,8 @@ Received ${signal}, cleaning up...`);
       if (this.enableDidYouMean) {
         const allCommandNames = [];
         for (const command of this.commands) {
-          if (command.name) {
-            allCommandNames.push(command.name);
+          if (command.displayName) {
+            allCommandNames.push(command.displayName);
           }
           if (command.aliasNames) {
             allCommandNames.push(...command.aliasNames);
@@ -43079,7 +43227,7 @@ Run \`${this.name ?? "cli"} --help\` for usage.`;
         this.value = [];
       }
       if (item.group === true) {
-        const group = item.value;
+        const group = String(item.value);
         const groupedItems = this.getGroupItems(group);
         if (this.isGroupSelected(group)) {
           this.value = this.value.filter((v) => groupedItems.findIndex((i) => i.value === v) === -1);
@@ -43499,7 +43647,7 @@ var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "pickier",
     type: "module",
-    version: "0.1.30",
+    version: "0.1.33",
     description: "Format, lint and more in a fraction of seconds.",
     author: "Chris Breuer <chris@stacksjs.org>",
     license: "MIT",

package/dist/format.d.ts

@@ -3,4 +3,16 @@ export declare function formatCode(src: string, cfg: PickierConfig, filePath: st
 export declare function detectQuoteIssues(line: string, preferred: 'single' | 'double'): number[];
 export declare function hasIndentIssue(leading: string, indentSize: number, indentStyle?: 'spaces' | 'tabs', lineContent?: string): boolean;
 export declare function formatImports(source: string): string;
+// ── Multi-line template-literal tracking ──────────────────────────────────
+// The line-based formatter must never touch the *contents* of a template
+// literal (re-indenting, re-spacing `${` → `$ {`, re-quoting, or trimming would
+// corrupt the string and break interpolation). These helpers track, line by
+// line, whether we are inside a template literal's text so such lines can be
+// emitted verbatim. The scan degrades safely: on exotic input it can only ever
+// under-format (skip a line), never corrupt one.
+// `start` records the index of the backtick that opened the template, but only
+// while scanning the line on which it opened (carried-over contexts from earlier
+// lines are reset to -1 on entry). It lets callers split an opening line into a
+// formattable code prefix and a verbatim template tail.
+declare type TmplCtx = { t: 'tmpl', start: number } | { t: 'interp', braces: number }
 declare type ImportKind = 'value' | 'type' | 'side-effect';

package/dist/src/index.js

@@ -9130,6 +9130,87 @@ function normalizeSpacingLine(line) {
   }
   return strings.length > 0 ? unmaskStrings(t, strings) : t;
 }
+function inTemplateText(stack) {
+  const top = stack[stack.length - 1];
+  return top !== undefined && top.t === "tmpl";
+}
+function skipQuoted(line, i, quote) {
+  i++;
+  while (i < line.length) {
+    const c = line[i];
+    if (c === "\\") {
+      i += 2;
+      continue;
+    }
+    if (c === quote)
+      return i + 1;
+    i++;
+  }
+  return i;
+}
+function advanceTemplateState(line, stack) {
+  for (const ctx of stack) {
+    if (ctx.t === "tmpl")
+      ctx.start = -1;
+  }
+  let i = 0;
+  while (i < line.length) {
+    const top = stack[stack.length - 1];
+    const ch = line[i];
+    if (top === undefined || top.t === "interp") {
+      if (ch === "`") {
+        stack.push({ t: "tmpl", start: i });
+        i++;
+        continue;
+      }
+      if (ch === "'" || ch === '"') {
+        i = skipQuoted(line, i, ch);
+        continue;
+      }
+      if (ch === "/" && line[i + 1] === "/")
+        break;
+      if (top !== undefined) {
+        if (ch === "{") {
+          top.braces++;
+          i++;
+          continue;
+        }
+        if (ch === "}") {
+          if (top.braces === 0)
+            stack.pop();
+          else
+            top.braces--;
+          i++;
+          continue;
+        }
+      }
+      i++;
+    } else {
+      if (ch === "\\") {
+        i += 2;
+        continue;
+      }
+      if (ch === "`") {
+        stack.pop();
+        i++;
+        continue;
+      }
+      if (ch === "$" && line[i + 1] === "{") {
+        stack.push({ t: "interp", braces: 0 });
+        i += 2;
+        continue;
+      }
+      i++;
+    }
+  }
+  if (inTemplateText(stack)) {
+    for (const ctx of stack) {
+      if (ctx.t === "tmpl" && ctx.start >= 0)
+        return ctx.start;
+    }
+  }
+  return -1;
+}
 function processCodeLinesFused(content, cfg) {
   const lines = content.split(`
 `);
@@ -9138,8 +9219,29 @@ function processCodeLinesFused(content, cfg) {
   const preferred = cfg.format.quotes;
   const doSemiRemoval = cfg.format.semi === true;
   let indentLevel = 0;
+  const tmplStack = [];
   for (let idx = 0;idx < len; idx++) {
     let line = lines[idx];
+    const protectedLine = inTemplateText(tmplStack);
+    let splitIdx = -1;
+    if (tmplStack.length > 0 || line.indexOf("`") !== -1)
+      splitIdx = advanceTemplateState(line, tmplStack);
+    if (protectedLine) {
+      result[idx] = line;
+      continue;
+    }
+    let tmplTail = "";
+    let prefixEndedWithSpace = false;
+    if (splitIdx >= 0) {
+      tmplTail = line.slice(splitIdx);
+      const prefix = line.slice(0, splitIdx);
+      if (prefix.length === 0) {
+        result[idx] = tmplTail;
+        continue;
+      }
+      prefixEndedWithSpace = RE_TRAILING_WS.test(prefix);
+      line = prefix;
+    }
     if (line.length === 0) {
       result[idx] = "";
       continue;
@@ -9164,6 +9266,11 @@ function processCodeLinesFused(content, cfg) {
         }
       }
     }
+    if (splitIdx >= 0) {
+      if (prefixEndedWithSpace && !RE_TRAILING_WS.test(line))
+        line += " ";
+      line += tmplTail;
+    }
     result[idx] = line;
   }
   return result.join(`
@@ -9172,7 +9279,16 @@ function processCodeLinesFused(content, cfg) {
 function collapseBlankLines(lines, maxConsecutive) {
   const out = [];
   let blank = 0;
+  const stack = [];
   for (const l of lines) {
+    const protectedLine = inTemplateText(stack);
+    if (stack.length > 0 || l.indexOf("`") !== -1)
+      advanceTemplateState(l, stack);
+    if (protectedLine) {
+      out.push(l);
+      blank = 0;
+      continue;
+    }
     if (l === "") {
       blank++;
       if (blank <= maxConsecutive)
@@ -9196,7 +9312,17 @@ function formatCode(src, cfg, filePath) {
     lines = [];
     let blank = 0;
     const maxConsecutive = Math.max(0, cfg.format.maxConsecutiveBlankLines);
+    const stack = [];
     for (const l of rawLines) {
+      const protectedLine = inTemplateText(stack);
+      let endsInTemplate = false;
+      if (stack.length > 0 || l.indexOf("`") !== -1)
+        endsInTemplate = advanceTemplateState(l, stack) >= 0;
+      if (protectedLine || endsInTemplate) {
+        lines.push(l);
+        blank = 0;
+        continue;
+      }
       const last = l[l.length - 1];
       const trimmed = last === " " || last === "\t" ? l.replace(RE_TRAILING_WS, "") : l;
       if (trimmed === "") {
@@ -20844,6 +20970,27 @@ var init_no_unused_vars = __esm(() => {
               continue;
             }
             if (inTmplExpr) {
+              if (ch === "/") {
+                const before = lineToProcess.slice(0, k).trimEnd();
+                const regexPrecedeRe = /[=([{,:;!&|?]$/;
+                if (!before || regexPrecedeRe.test(before) || before.endsWith("return")) {
+                  k++;
+                  while (k < lineToProcess.length) {
+                    if (lineToProcess[k] === "\\") {
+                      k += 2;
+                      continue;
+                    }
+                    if (lineToProcess[k] === "/") {
+                      while (k + 1 < lineToProcess.length && /[gimsuvy]/.test(lineToProcess[k + 1])) {
+                        k++;
+                      }
+                      break;
+                    }
+                    k++;
+                  }
+                  continue;
+                }
+              }
               if (ch === "`") {
                 depthTmplStack.push(-1);
                 continue;

package/package.json

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

package/LICENSE.md

@@ -1,21 +0,0 @@
-# MIT License
-
-Copyright (c) 2024 Open Web Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.