@runtimestudio/tailwind-sort-php 0.2.1 → 0.3.0

package/src/html.ts

@@ -19,28 +19,28 @@ import type { Island } from './islands.ts';
  * Location of a sortable class attribute value within the source.
  */
 export interface ClassAttr {
-  /**
-   * Attribute name as written (e.g. `class`, `className`).
-   */
-  name: string;
-  /**
-   * Offset of the first character inside the quotes.
-   */
-  valueStart: number;
-  /**
-   * Offset just past the last character inside the quotes (exclusive).
-   */
-  valueEnd: number;
+    /**
+     * Attribute name as written (e.g. `class`, `className`).
+     */
+    name: string;
+    /**
+     * Offset of the first character inside the quotes.
+     */
+    valueStart: number;
+    /**
+     * Offset just past the last character inside the quotes (exclusive).
+     */
+    valueEnd: number;
 }
 
 /**
  * Options controlling which attributes are collected.
  */
 export interface HtmlScanOptions {
-  /**
-   * Lowercase attribute names to collect; default `['class', 'classname']`.
-   */
-  attributes?: string[];
+    /**
+     * Lowercase attribute names to collect; default `['class', 'classname']`.
+     */
+    attributes?: string[];
 }
 
 const RAW_TEXT_TAGS = new Set(['script', 'style', 'textarea', 'title']);
@@ -56,16 +56,16 @@ const NUL = '\x00';
  * @returns Masked source of identical length.
  */
 export function maskIslands(src: string, islands: Island[]): string {
-  if (islands.length === 0) return src;
-  let out = '';
-  let pos = 0;
-  for (const isl of islands) {
-    out += src.slice(pos, isl.start);
-    out += NUL.repeat(isl.end - isl.start);
-    pos = isl.end;
-  }
-  out += src.slice(pos);
-  return out;
+    if (islands.length === 0) return src;
+    let out = '';
+    let pos = 0;
+    for (const isl of islands) {
+        out += src.slice(pos, isl.start);
+        out += NUL.repeat(isl.end - isl.start);
+        pos = isl.end;
+    }
+    out += src.slice(pos);
+    return out;
 }
 
 /**
@@ -76,58 +76,58 @@ export function maskIslands(src: string, islands: Island[]): string {
  * @returns Attribute value locations in document order. Offsets index into the original source.
  */
 export function findClassAttributes(masked: string, opts: HtmlScanOptions = {}): ClassAttr[] {
-  const wanted = new Set((opts.attributes ?? ['class', 'classname']).map((a) => a.toLowerCase()));
-  const out: ClassAttr[] = [];
-  const len = masked.length;
-  let i = 0;
-
-  while (i < len) {
-    const lt = masked.indexOf('<', i);
-    if (lt === -1) break;
-
-    // HTML comment.
-    if (masked.startsWith('<!--', lt)) {
-      const close = masked.indexOf('-->', lt + 4);
-      i = close === -1 ? len : close + 3;
-      continue;
-    }
-
-    // Doctype / CDATA / other declarations.
-    if (masked[lt + 1] === '!') {
-      const close = masked.indexOf('>', lt + 2);
-      i = close === -1 ? len : close + 1;
-      continue;
-    }
-
-    // Closing tag.
-    if (masked[lt + 1] === '/') {
-      const close = masked.indexOf('>', lt + 2);
-      i = close === -1 ? len : close + 1;
-      continue;
-    }
-
-    // Opening tag?
-    if (lt + 1 < len && /[A-Za-z]/.test(masked[lt + 1])) {
-      let j = lt + 1;
-      while (j < len && /[A-Za-z0-9:-]/.test(masked[j])) j++;
-      const tagName = masked.slice(lt + 1, j).toLowerCase();
-
-      j = scanTagAttributes(masked, j, wanted, out);
-
-      // Skip raw-text element content up to its closing tag.
-      if (RAW_TEXT_TAGS.has(tagName)) {
-        const closer = `</${tagName}`;
-        const idx = masked.toLowerCase().indexOf(closer, j);
-        j = idx === -1 ? len : idx;
-      }
-      i = j;
-      continue;
+    const wanted = new Set((opts.attributes ?? ['class', 'classname']).map((a) => a.toLowerCase()));
+    const out: ClassAttr[] = [];
+    const len = masked.length;
+    let i = 0;
+
+    while (i < len) {
+        const lt = masked.indexOf('<', i);
+        if (lt === -1) break;
+
+        // HTML comment.
+        if (masked.startsWith('<!--', lt)) {
+            const close = masked.indexOf('-->', lt + 4);
+            i = close === -1 ? len : close + 3;
+            continue;
+        }
+
+        // Doctype / CDATA / other declarations.
+        if (masked[lt + 1] === '!') {
+            const close = masked.indexOf('>', lt + 2);
+            i = close === -1 ? len : close + 1;
+            continue;
+        }
+
+        // Closing tag.
+        if (masked[lt + 1] === '/') {
+            const close = masked.indexOf('>', lt + 2);
+            i = close === -1 ? len : close + 1;
+            continue;
+        }
+
+        // Opening tag?
+        if (lt + 1 < len && /[A-Za-z]/.test(masked[lt + 1])) {
+            let j = lt + 1;
+            while (j < len && /[A-Za-z0-9:-]/.test(masked[j])) j++;
+            const tagName = masked.slice(lt + 1, j).toLowerCase();
+
+            j = scanTagAttributes(masked, j, wanted, out);
+
+            // Skip raw-text element content up to its closing tag.
+            if (RAW_TEXT_TAGS.has(tagName)) {
+                const closer = `</${tagName}`;
+                const idx = masked.toLowerCase().indexOf(closer, j);
+                j = idx === -1 ? len : idx;
+            }
+            i = j;
+            continue;
+        }
+
+        i = lt + 1;
     }
 
-    i = lt + 1;
-  }
-
-  return out;
+    return out;
 }
 
 const isTagWs = (c: string) => c === ' ' || c === '\t' || c === '\n' || c === '\r' || c === '\f' || c === NUL;
@@ -137,48 +137,48 @@ const isTagWs = (c: string) => c === ' ' || c === '\t' || c === '\n' || c === '\
  * Returns the offset after `>` (or EOF). Pushes matches into `out`.
  */
 function scanTagAttributes(masked: string, i: number, wanted: Set<string>, out: ClassAttr[]): number {
-  const len = masked.length;
-
-  while (i < len) {
-    while (i < len && isTagWs(masked[i])) i++;
-    if (i >= len) return len;
-
-    const c = masked[i];
-    if (c === '>') return i + 1;
-    if (c === '/') {
-      i++;
-      continue;
-    }
-
-    // Attribute name.
-    const nameStart = i;
-    while (i < len && !isTagWs(masked[i]) && masked[i] !== '=' && masked[i] !== '>' && masked[i] !== '/') i++;
-    const name = masked.slice(nameStart, i);
-    if (name.length === 0) {
-      i++;
-      continue;
-    }
-
-    while (i < len && isTagWs(masked[i])) i++;
-    if (masked[i] !== '=') continue; // boolean attribute
-
-    i++;
-    while (i < len && isTagWs(masked[i])) i++;
-
-    const q = masked[i];
-    if (q === '"' || q === "'") {
-      const valueStart = i + 1;
-      const close = masked.indexOf(q, valueStart);
-      const valueEnd = close === -1 ? len : close;
-      if (wanted.has(name.toLowerCase())) {
-        out.push({ name, valueStart, valueEnd });
-      }
-      i = valueEnd + 1;
-    } else {
-      // Unquoted value — read it but never rewrite (too risky to widen).
-      while (i < len && !isTagWs(masked[i]) && masked[i] !== '>') i++;
+    const len = masked.length;
+
+    while (i < len) {
+        while (i < len && isTagWs(masked[i])) i++;
+        if (i >= len) return len;
+
+        const c = masked[i];
+        if (c === '>') return i + 1;
+        if (c === '/') {
+            i++;
+            continue;
+        }
+
+        // Attribute name.
+        const nameStart = i;
+        while (i < len && !isTagWs(masked[i]) && masked[i] !== '=' && masked[i] !== '>' && masked[i] !== '/') i++;
+        const name = masked.slice(nameStart, i);
+        if (name.length === 0) {
+            i++;
+            continue;
+        }
+
+        while (i < len && isTagWs(masked[i])) i++;
+        if (masked[i] !== '=') continue; // boolean attribute
+
+        i++;
+        while (i < len && isTagWs(masked[i])) i++;
+
+        const q = masked[i];
+        if (q === '"' || q === "'") {
+            const valueStart = i + 1;
+            const close = masked.indexOf(q, valueStart);
+            const valueEnd = close === -1 ? len : close;
+            if (wanted.has(name.toLowerCase())) {
+                out.push({ name, valueStart, valueEnd });
+            }
+            i = valueEnd + 1;
+        } else {
+            // Unquoted value — read it but never rewrite (too risky to widen).
+            while (i < len && !isTagWs(masked[i]) && masked[i] !== '>') i++;
+        }
     }
-  }
 
-  return len;
+    return len;
 }

package/src/index.ts

@@ -11,4 +11,5 @@
 export { transform, type SortFn, type TransformOptions } from './transform.ts';
 export { findIslands, type Island, type IslandOptions } from './islands.ts';
 export { maskIslands, findClassAttributes, type ClassAttr, type HtmlScanOptions } from './html.ts';
+export { findSortablePhpStrings, type PhpStringRange } from './php-strings.ts';
 export { createTailwindSortFn, type SorterOptions } from './sorter.ts';

package/src/init.ts

@@ -51,9 +51,9 @@ exit 1
 `;
 
 interface InitCli {
-  fix: boolean;
-  force: boolean;
-  dryRun: boolean;
+    fix: boolean;
+    force: boolean;
+    dryRun: boolean;
 }
 
 /**
@@ -63,17 +63,17 @@ interface InitCli {
  * @returns Parsed flags with defaults applied.
  */
 function parseArgs(argv: string[]): InitCli {
-  const cli: InitCli = { fix: false, force: false, dryRun: false };
-  for (const a of argv) {
-    if (a === '--fix') cli.fix = true;
-    else if (a === '--force') cli.force = true;
-    else if (a === '--dry-run') cli.dryRun = true;
-    else {
-      console.error(`Unknown init option: ${a}`);
-      process.exit(2);
+    const cli: InitCli = { fix: false, force: false, dryRun: false };
+    for (const a of argv) {
+        if (a === '--fix') cli.fix = true;
+        else if (a === '--force') cli.force = true;
+        else if (a === '--dry-run') cli.dryRun = true;
+        else {
+            console.error(`Unknown init option: ${a}`);
+            process.exit(2);
+        }
     }
-  }
-  return cli;
+    return cli;
 }
 
 /**
@@ -83,11 +83,11 @@ function parseArgs(argv: string[]): InitCli {
  * @returns Trimmed stdout, or `null` when git exits non-zero (unset config, not a repo, …).
  */
 function git(args: string[]): string | null {
-  try {
-    return execFileSync('git', args, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
-  } catch {
-    return null;
-  }
+    try {
+        return execFileSync('git', args, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    } catch {
+        return null;
+    }
 }
 
 /**
@@ -96,8 +96,8 @@ function git(args: string[]): string | null {
  * @param message Error text explaining why init refused to proceed.
  */
 function fail(message: string): never {
-  console.error(message);
-  process.exit(1);
+    console.error(message);
+    process.exit(1);
 }
 
 /**
@@ -106,81 +106,89 @@ function fail(message: string): never {
  * @param argv Arguments after the `init` subcommand name.
  */
 export async function runInit(argv: string[]): Promise<void> {
-  const cli = parseArgs(argv);
-  const hookBody = cli.fix ? HOOK_FIX : HOOK_CHECK;
-  const variant = cli.fix ? 'fix' : 'check';
+    const cli = parseArgs(argv);
+    const hookBody = cli.fix ? HOOK_FIX : HOOK_CHECK;
+    const variant = cli.fix ? 'fix' : 'check';
 
-  // Anchor everything at the repository root: a relative `core.hooksPath` resolves there,
-  // and the hook's `./node_modules/...` path assumes hooks run from it (they do, for pre-commit).
-  const top = git(['rev-parse', '--show-toplevel']);
-  if (top === null) fail('Not a git repository (or a bare one) — run init from inside a working tree.');
-  const gitDir = git(['rev-parse', '--absolute-git-dir'])!;
-  const hookAbs = join(top, HOOK_PATH);
+    // Anchor everything at the repository root: a relative `core.hooksPath` resolves there,
+    // and the hook's `./node_modules/...` path assumes hooks run from it (they do, for pre-commit).
+    const top = git(['rev-parse', '--show-toplevel']);
+    if (top === null) fail('Not a git repository (or a bare one) — run init from inside a working tree.');
+    const gitDir = git(['rev-parse', '--absolute-git-dir'])!;
+    const hookAbs = join(top, HOOK_PATH);
 
-  // Decide whether `core.hooksPath` needs to change. Repointing it makes git ignore `.git/hooks` entirely,
-  // so refuse to silently disable hooks that already live there.
-  const hooksPath = git(['config', '--get', 'core.hooksPath']);
-  let setConfig = false;
-  if (hooksPath === null) {
-    const live = (await readdir(join(gitDir, 'hooks')).catch(() => [])).filter((f) => !f.endsWith('.sample'));
-    if (live.length > 0 && !cli.force) {
-      fail(
-        `Found existing hook(s) in .git/hooks: ${live.join(', ')}.\n` +
-          `Setting core.hooksPath would disable them. Move them into ${HOOKS_DIR}/ first, ` +
-          'or re-run with --force to proceed anyway.',
-      );
-    }
-    setConfig = true;
-  } else if (hooksPath !== HOOKS_DIR) {
-    if (!cli.force) {
-      fail(
-        `core.hooksPath is already set to "${hooksPath}" — add the hook there yourself, or re-run ` +
-          `with --force to repoint it to ${HOOKS_DIR}. Hook body:\n\n${hookBody}`,
-      );
+    // Decide whether `core.hooksPath` needs to change. Repointing it makes git ignore `.git/hooks` entirely,
+    // so refuse to silently disable hooks that already live there.
+    const hooksPath = git(['config', '--get', 'core.hooksPath']);
+    let setConfig = false;
+    if (hooksPath === null) {
+        const live = (await readdir(join(gitDir, 'hooks')).catch(() => [])).filter((f) => !f.endsWith('.sample'));
+        if (live.length > 0 && !cli.force) {
+            fail(
+                `Found existing hook(s) in .git/hooks: ${live.join(', ')}.\n` +
+                    `Setting core.hooksPath would disable them. Move them into ${HOOKS_DIR}/ first, ` +
+                    'or re-run with --force to proceed anyway.',
+            );
+        }
+        setConfig = true;
+    } else if (hooksPath !== HOOKS_DIR) {
+        if (!cli.force) {
+            fail(
+                `core.hooksPath is already set to "${hooksPath}" — add the hook there yourself, or re-run ` +
+                    `with --force to repoint it to ${HOOKS_DIR}. Hook body:\n\n${hookBody}`,
+            );
+        }
+        setConfig = true;
     }
-    setConfig = true;
-  }
 
-  // Decide whether the hook file needs writing; overwriting a differing hook needs --force.
-  const current = await readFile(hookAbs, 'utf8').catch(() => null);
-  let writeHook = current === null;
-  let repairMode = false;
-  if (current !== null && current !== hookBody) {
-    if (!cli.force) {
-      const installed =
-        current === HOOK_CHECK ? 'the check variant' : current === HOOK_FIX ? 'the --fix variant' : 'a custom hook';
-      fail(`${HOOK_PATH} already exists and differs (${installed} is installed). Re-run with --force to overwrite.`);
+    // Decide whether the hook file needs writing; overwriting a differing hook needs --force.
+    const current = await readFile(hookAbs, 'utf8').catch(() => null);
+    let writeHook = current === null;
+    let repairMode = false;
+    if (current !== null && current !== hookBody) {
+        if (!cli.force) {
+            const installed =
+                current === HOOK_CHECK
+                    ? 'the check variant'
+                    : current === HOOK_FIX
+                      ? 'the --fix variant'
+                      : 'a custom hook';
+            fail(
+                `${HOOK_PATH} already exists and differs (${installed} is installed). Re-run with --force to overwrite.`,
+            );
+        }
+        writeHook = true;
+    }
+    if (current === hookBody) {
+        // Content is already right; still repair a missing executable bit, or git silently skips the hook.
+        repairMode = ((await stat(hookAbs)).mode & 0o111) === 0;
     }
-    writeHook = true;
-  }
-  if (current === hookBody) {
-    // Content is already right; still repair a missing executable bit, or git silently skips the hook.
-    repairMode = ((await stat(hookAbs)).mode & 0o111) === 0;
-  }
 
-  const done: string[] = [];
-  if (writeHook) {
-    if (!cli.dryRun) {
-      await mkdir(join(top, HOOKS_DIR), { recursive: true });
-      await writeFile(hookAbs, hookBody);
-      await chmod(hookAbs, 0o755);
+    const done: string[] = [];
+    if (writeHook) {
+        if (!cli.dryRun) {
+            await mkdir(join(top, HOOKS_DIR), { recursive: true });
+            await writeFile(hookAbs, hookBody);
+            await chmod(hookAbs, 0o755);
+        }
+        done.push(
+            cli.dryRun
+                ? `would install ${HOOK_PATH} (${variant} variant)`
+                : `installed ${HOOK_PATH} (${variant} variant)`,
+        );
+    }
+    if (repairMode) {
+        if (!cli.dryRun) await chmod(hookAbs, 0o755);
+        done.push(cli.dryRun ? `would make ${HOOK_PATH} executable` : `made ${HOOK_PATH} executable`);
+    }
+    if (setConfig) {
+        if (!cli.dryRun) git(['config', 'core.hooksPath', HOOKS_DIR]);
+        done.push(cli.dryRun ? `would set core.hooksPath = ${HOOKS_DIR}` : `set core.hooksPath = ${HOOKS_DIR}`);
     }
-    done.push(
-      cli.dryRun ? `would install ${HOOK_PATH} (${variant} variant)` : `installed ${HOOK_PATH} (${variant} variant)`,
-    );
-  }
-  if (repairMode) {
-    if (!cli.dryRun) await chmod(hookAbs, 0o755);
-    done.push(cli.dryRun ? `would make ${HOOK_PATH} executable` : `made ${HOOK_PATH} executable`);
-  }
-  if (setConfig) {
-    if (!cli.dryRun) git(['config', 'core.hooksPath', HOOKS_DIR]);
-    done.push(cli.dryRun ? `would set core.hooksPath = ${HOOKS_DIR}` : `set core.hooksPath = ${HOOKS_DIR}`);
-  }
 
-  if (done.length === 0) {
-    console.log(`Nothing to do — ${HOOK_PATH} (${variant} variant) is already installed.`);
-    return;
-  }
-  for (const line of done) console.log(line);
+    if (done.length === 0) {
+        console.log(`Nothing to do — ${HOOK_PATH} (${variant} variant) is already installed.`);
+        return;
+    }
+    for (const line of done) console.log(line);
 }