@savvy-web/lint-staged 0.2.0 → 0.2.2

package/376.js

@@ -270,10 +270,14 @@ class Filter {
         if (options.exclude && options.exclude.length > 0) result = Filter.exclude(result, options.exclude);
         return result;
     }
+    static shellEscape(filenames) {
+        return filenames.map((f)=>`'${f.replace(/'/g, "'\\''")}'`).join(" ");
+    }
 }
 class Biome {
     static glob = "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}";
     static defaultExcludes = [
+        "package.json",
         "package-lock.json",
         "__fixtures__"
     ];
@@ -298,7 +302,7 @@ class Biome {
             const filtered = Filter.exclude(filenames, excludes);
             if (0 === filtered.length) return [];
             const biomeCmd = Command_Command.requireTool("biome", "Biome is not available. Install it globally (recommended) or add @biomejs/biome as a dev dependency.");
-            const files = filtered.join(" ");
+            const files = Filter.shellEscape(filtered);
             const flags = options.flags ?? [];
             const configFlag = config ? `--config-path=${config}` : "";
             const cmd = [
@@ -336,7 +340,7 @@ class Markdown {
             const filtered = Filter.exclude(filenames, excludes);
             if (0 === filtered.length) return [];
             const mdlintCmd = Command_Command.requireTool("markdownlint-cli2", "markdownlint-cli2 is not available. Install it globally or add it as a dev dependency.");
-            const files = filtered.join(" ");
+            const files = Filter.shellEscape(filtered);
             const fixFlag = noFix ? "" : "--fix";
             const configFlag = config ? `--config '${config}'` : "";
             const cmd = [
@@ -921,7 +925,7 @@ const CHECK_MARK = "\u2713";
 const WARNING = "\u26A0";
 const EXECUTABLE_MODE = 493;
 const HUSKY_HOOK_PATH = ".husky/pre-commit";
-const DEFAULT_CONFIG_PATH = "lib/configs/lint-staged.config.js";
+const DEFAULT_CONFIG_PATH = "lib/configs/lint-staged.config.ts";
 const BEGIN_MARKER = "# --- BEGIN SAVVY-LINT MANAGED SECTION ---";
 const END_MARKER = "# --- END SAVVY-LINT MANAGED SECTION ---";
 function generateManagedContent(configPath) {
@@ -1001,12 +1005,13 @@ function updateManagedSection(existingContent, configPath) {
 }
 function generateConfigContent(preset) {
     return `/**
- * @type {import('lint-staged').Configuration}
+ * lint-staged configuration
  * Generated by savvy-lint init
  */
+import type { Configuration } from "lint-staged";
 import { Preset } from "@savvy-web/lint-staged";
 
-export default Preset.${preset}();
+export default Preset.${preset}() satisfies Configuration;
 `;
 }
 const forceOption = Options.boolean("force").pipe(Options.withAlias("f"), Options.withDescription("Overwrite entire hook file (not just managed section)"), Options.withDefault(false));
@@ -1014,8 +1019,8 @@ const configOption = Options.text("config").pipe(Options.withAlias("c"), Options
 const presetOption = Options.choice("preset", [
     "minimal",
     "standard",
-    "full"
-]).pipe(Options.withAlias("p"), Options.withDescription("Preset to use: minimal, standard, or full"), Options.withDefault("full"));
+    "silk"
+]).pipe(Options.withAlias("p"), Options.withDescription("Preset to use: minimal, standard, or silk"), Options.withDefault("silk"));
 function makeExecutable(path) {
     return Effect.tryPromise(()=>import("node:fs/promises").then((fs)=>fs.chmod(path, EXECUTABLE_MODE)));
 }
@@ -1066,10 +1071,10 @@ const check_WARNING = "\u26A0";
 const BULLET = "\u2022";
 const check_HUSKY_HOOK_PATH = ".husky/pre-commit";
 const CONFIG_FILES = [
+    "lint-staged.config.ts",
     "lint-staged.config.js",
     "lint-staged.config.mjs",
     "lint-staged.config.cjs",
-    "lint-staged.config.ts",
     ".lintstagedrc",
     ".lintstagedrc.json",
     ".lintstagedrc.yaml",
@@ -1079,8 +1084,8 @@ const CONFIG_FILES = [
     ".lintstagedrc.mjs"
 ];
 const CONFIG_SEARCH_PATHS = [
-    "lib/configs/lint-staged.config.js",
     "lib/configs/lint-staged.config.ts",
+    "lib/configs/lint-staged.config.js",
     ...CONFIG_FILES
 ];
 function findConfigFile(fs) {
@@ -1189,7 +1194,7 @@ const rootCommand = Command.make("savvy-lint").pipe(Command.withSubcommands([
 ]));
 const cli = Command.run(rootCommand, {
     name: "savvy-lint",
-    version: "0.2.0"
+    version: "0.2.2"
 });
 function runCli() {
     const main = Effect.suspend(()=>cli(process.argv)).pipe(Effect.provide(NodeContext.layer));

package/README.md

@@ -59,7 +59,7 @@ export default {
 | ------ | -------- |
 | `minimal()` | PackageJson, Biome |
 | `standard()` | + Markdown, Yaml, PnpmWorkspace, ShellScripts |
-| `full()` | + TypeScript |
+| `silk()` | + TypeScript |
 
 Extend any preset with options:
 
@@ -77,7 +77,7 @@ export default Preset.standard({
 | Handler | Files | Description |
 | ------- | ----- | ----------- |
 | `PackageJson` | `**/package.json` | Sort and format with Biome |
-| `Biome` | `*.{js,ts,jsx,tsx,json}` | Format and lint |
+| `Biome` | `*.{js,ts,jsx,tsx,json,jsonc}` | Format and lint |
 | `Markdown` | `**/*.{md,mdx}` | Lint with markdownlint-cli2 |
 | `Yaml` | `**/*.{yml,yaml}` | Format and validate |
 | `PnpmWorkspace` | `pnpm-workspace.yaml` | Sort and format |

package/index.d.ts

@@ -77,9 +77,10 @@ export declare class Biome {
     static readonly glob = "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}";
     /**
      * Default patterns to exclude from processing.
-     * @defaultValue `['package-lock.json', '__fixtures__']`
+     * Excludes package.json since PackageJson handler processes those files.
+     * @defaultValue `['package.json', 'package-lock.json', '__fixtures__']`
      */
-    static readonly defaultExcludes: readonly ["package-lock.json", "__fixtures__"];
+    static readonly defaultExcludes: readonly ["package.json", "package-lock.json", "__fixtures__"];
     /**
      * Pre-configured handler with default options.
      * Auto-discovers biome command and config file location.
@@ -534,7 +535,7 @@ export declare type ExportsField = string | Record<string, unknown> | null;
  *
  * const handler = (filenames: readonly string[]) => {
  *   const filtered = Filter.exclude(filenames, ['dist/', '__fixtures__']);
- *   return filtered.length > 0 ? `biome check ${filtered.join(' ')}` : [];
+ *   return filtered.length > 0 ? `biome check ${Filter.shellEscape(filtered)}` : [];
  * };
  * ```
  */
@@ -593,6 +594,23 @@ export declare class Filter {
         include?: readonly string[];
         exclude?: readonly string[];
     }): string[];
+    /**
+     * Escape file paths for safe shell command construction.
+     *
+     * Wraps each path in single quotes and escapes any embedded single quotes.
+     * This prevents issues with paths containing spaces or special characters.
+     *
+     * @param filenames - Array of file paths
+     * @returns Space-separated string of shell-escaped paths
+     *
+     * @example
+     * ```typescript
+     * const files = ['/path/to/file.ts', '/path/with spaces/file.ts'];
+     * const escaped = Filter.shellEscape(files);
+     * // Result: "'/path/to/file.ts' '/path/with spaces/file.ts'"
+     * ```
+     */
+    static shellEscape(filenames: readonly string[]): string;
 }
 
 /**
@@ -788,7 +806,7 @@ export declare interface ImportGraphResult {
 export declare const initCommand: Command_2.Command<"init", FileSystem.FileSystem, Error | PlatformError, {
     readonly force: boolean;
     readonly config: string;
-    readonly preset: "full" | "minimal" | "standard";
+    readonly preset: "minimal" | "silk" | "standard";
 }>;
 
 /**
@@ -1151,7 +1169,7 @@ export declare class Preset {
      */
     static standard(extend?: PresetExtendOptions): LintStagedConfig;
     /**
-     * Full preset: all handlers enabled.
+     * Silk preset: all handlers enabled.
      *
      * Includes:
      * - PackageJson (sort + format)
@@ -1169,16 +1187,16 @@ export declare class Preset {
      * ```typescript
      * import { Preset } from '@savvy-web/lint-staged';
      *
-     * export default Preset.full({
+     * export default Preset.silk({
      *   typescript: { skipTypecheck: true },
      * });
      * ```
      */
-    static full(extend?: PresetExtendOptions): LintStagedConfig;
+    static silk(extend?: PresetExtendOptions): LintStagedConfig;
     /**
      * Get a preset by name.
      *
-     * @param name - The preset name: 'minimal', 'standard', or 'full'
+     * @param name - The preset name: 'minimal', 'standard', or 'silk'
      * @param extend - Options to customize or extend the preset
      * @returns A lint-staged configuration object
      *
@@ -1190,7 +1208,7 @@ export declare class Preset {
      * export default Preset.get(presetName);
      * ```
      */
-    static get(name: "minimal" | "standard" | "full", extend?: PresetExtendOptions): LintStagedConfig;
+    static get(name: "minimal" | "standard" | "silk", extend?: PresetExtendOptions): LintStagedConfig;
 }
 
 /**
@@ -1202,14 +1220,14 @@ export declare type PresetExtendOptions = CreateConfigOptions;
 /**
  * Preset type for standard configurations.
  */
-export declare type PresetType = "minimal" | "standard" | "full";
+export declare type PresetType = "minimal" | "standard" | "silk";
 
 /** Root command for the CLI with all subcommands. */
 export declare const rootCommand: Command_2.Command<"savvy-lint", FileSystem_2, Error | PlatformError, {
     readonly subcommand: Option<    {
     readonly force: boolean;
     readonly config: string;
-    readonly preset: "full" | "minimal" | "standard";
+    readonly preset: "minimal" | "silk" | "standard";
     } | {
     readonly quiet: boolean;
     }>;

package/index.js

@@ -1,5 +1,6 @@
+import sort_package_json from "sort-package-json";
 import { parse, stringify } from "yaml";
-import { Biome, Command as Command_Command, readFileSync, existsSync, TypeScript, writeFileSync, Markdown, Filter } from "./376.js";
+import { Biome, Markdown, readFileSync, TypeScript, writeFileSync, existsSync, Filter } from "./376.js";
 class PackageJson {
     static glob = "**/package.json";
     static defaultExcludes = [
@@ -15,21 +16,14 @@ class PackageJson {
         return (filenames)=>{
             const filtered = Filter.exclude(filenames, excludes);
             if (0 === filtered.length) return [];
-            const files = filtered.join(" ");
-            const commands = [];
-            if (!skipSort) {
-                const pm = Command_Command.detectPackageManager();
-                const prefix = Command_Command.getExecPrefix(pm);
-                const sortCmd = [
-                    ...prefix,
-                    "sort-package-json",
-                    files
-                ].join(" ");
-                commands.push(sortCmd);
+            if (!skipSort) for (const filepath of filtered){
+                const content = readFileSync(filepath, "utf-8");
+                const sorted = sort_package_json(content);
+                if (sorted !== content) writeFileSync(filepath, sorted, "utf-8");
             }
+            const files = Filter.shellEscape(filtered);
             const biomeCmd = options.biomeConfig ? `biome check --write --max-diagnostics=none --config-path=${options.biomeConfig} ${files}` : `biome check --write --max-diagnostics=none ${files}`;
-            commands.push(biomeCmd);
-            return commands.join(" && ");
+            return `${biomeCmd} && git add ${files}`;
         };
     }
 }
@@ -147,7 +141,7 @@ class Yaml {
             } catch (error) {
                 throw new Error(`Invalid YAML in ${filepath}: ${error instanceof Error ? error.message : String(error)}`);
             }
-            if (!skipFormat && filtered.length > 0) return `git add ${filtered.join(" ")}`;
+            if (!skipFormat && filtered.length > 0) return `git add ${Filter.shellEscape(filtered)}`;
             return [];
         };
     }
@@ -212,7 +206,7 @@ class Preset {
         if (void 0 !== extend.custom) options.custom = extend.custom;
         return createConfig(options);
     }
-    static full(extend = {}) {
+    static silk(extend = {}) {
         const options = {
             packageJson: extend.packageJson ?? {},
             biome: extend.biome ?? {},
@@ -229,8 +223,8 @@ class Preset {
         switch(name){
             case "minimal":
                 return Preset.minimal(extend);
-            case "full":
-                return Preset.full(extend);
+            case "silk":
+                return Preset.silk(extend);
             default:
                 return Preset.standard(extend);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/lint-staged",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"private": false,
 	"description": "Composable, configurable lint-staged handlers for pre-commit hooks. Provides reusable handlers for Biome, Markdown, YAML, TypeScript, and more.",
 	"keywords": [
@@ -20,7 +20,7 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/savvy-web/lint-staged.git"
+		"url": "git+https://github.com/savvy-web/lint-staged.git"
 	},
 	"license": "MIT",
 	"author": {