ts-repo-utils 6.1.0 → 6.2.0

package/README.md

@@ -72,21 +72,24 @@ npm exec -- assert-repo-is-clean --silent
 
 - `--silent` - Suppress output messages (optional)
 
-### `format-untracked`
+### `format-uncommitted`
 
 Formats only untracked/modified files using Prettier.
 
 ```bash
 # Basic usage
-npm exec -- format-untracked
+npm exec -- format-uncommitted
 
 # Silent mode
-npm exec -- format-untracked --silent
+npm exec -- format-uncommitted --silent
 ```
 
 **Options:**
 
-- `--silent` - Suppress output messages (optional)
+- `--exclude-untracked` - Exclude untracked files in addition to diff files (default: false)
+- `--exclude-modified` - Exclude modified files in addition to diff files (default: false)
+- `--exclude-staged` - Exclude staged files in addition to diff files (default: false)
+- `--silent` - Suppress output messages (default: false)
 
 ### `format-diff-from`
 
@@ -112,9 +115,10 @@ npm exec -- format-diff-from main --silent
 **Options:**
 
 - `<base>` - Base branch name or commit hash to compare against (required)
-- `--include-untracked` - Include untracked files in addition to diff files (default: true)
-- `--exclude-untracked` - Exclude untracked files, only format diff files (optional)
-- `--silent` - Suppress output messages (optional)
+- `--exclude-untracked` - Exclude untracked files in addition to diff files (default: false)
+- `--exclude-modified` - Exclude modified files in addition to diff files (default: false)
+- `--exclude-staged` - Exclude staged files in addition to diff files (default: false)
+- `--silent` - Suppress output messages (default: false)
 
 ### `check-should-run-type-checks`
 

package/dist/cmd/assert-repo-is-clean.mjs

@@ -10,7 +10,7 @@ import 'child_process';
 
 const cmdDef = cmd.command({
     name: 'assert-repo-is-clean-cli',
-    version: '6.1.0',
+    version: '6.2.0',
     args: {
         silent: cmd.flag({
             long: 'silent',

package/dist/cmd/check-should-run-type-checks.mjs

@@ -10,7 +10,7 @@ import 'child_process';
 
 const cmdDef = cmd.command({
     name: 'check-should-run-type-checks-cli',
-    version: '6.1.0',
+    version: '6.2.0',
     args: {
         pathsIgnore: cmd.multioption({
             long: 'paths-ignore',

package/dist/cmd/format-diff-from.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S npx tsx
 import * as cmd from 'cmd-ts';
-import 'ts-data-forge';
+import { Result } from 'ts-data-forge';
 import '../node-global.mjs';
 import 'node:child_process';
 import { formatDiffFrom } from '../functions/format.mjs';
@@ -9,17 +9,27 @@ import 'child_process';
 
 const cmdDef = cmd.command({
     name: 'format-diff-from-cli',
-    version: '6.1.0',
+    version: '6.2.0',
     args: {
         base: cmd.positional({
             type: cmd.string,
             displayName: 'base',
             description: 'Base branch name or commit hash to compare against',
         }),
-        includeUntracked: cmd.flag({
-            long: 'include-untracked',
+        excludeUntracked: cmd.flag({
+            long: 'exclude-untracked',
             type: cmd.optional(cmd.boolean),
-            description: 'Include untracked files in addition to diff files (default: true)',
+            description: 'Exclude untracked files in addition to diff files (default: false)',
+        }),
+        excludeModified: cmd.flag({
+            long: 'exclude-modified',
+            type: cmd.optional(cmd.boolean),
+            description: 'Exclude modified files in addition to diff files (default: false)',
+        }),
+        excludeStaged: cmd.flag({
+            long: 'exclude-staged',
+            type: cmd.optional(cmd.boolean),
+            description: 'Exclude staged files in addition to diff files (default: false)',
         }),
         silent: cmd.flag({
             long: 'silent',
@@ -28,15 +38,26 @@ const cmdDef = cmd.command({
         }),
     },
     handler: (args) => {
-        main(args).catch((error) => {
+        main({
+            base: args.base,
+            excludeUntracked: args.excludeUntracked ?? false,
+            excludeModified: args.excludeModified ?? false,
+            excludeStaged: args.excludeStaged ?? false,
+            silent: args.silent ?? false,
+        }).catch((error) => {
             console.error('An error occurred:', error);
             process.exit(1);
         });
     },
 });
 const main = async (args) => {
-    const result = await formatDiffFrom(args.base, args);
-    if (result === 'err') {
+    const result = await formatDiffFrom(args.base, {
+        includeUntracked: !args.excludeUntracked,
+        includeModified: !args.excludeModified,
+        includeStaged: !args.excludeStaged,
+        silent: args.silent,
+    });
+    if (Result.isErr(result)) {
         process.exit(1);
     }
 };

package/dist/cmd/format-diff-from.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"format-diff-from.mjs","sources":["../../src/cmd/format-diff-from.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;AAKA,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;AACzB,IAAA,IAAI,EAAE,sBAAsB;AAC5B,IAAA,OAAO,EAAE,OAAO;AAChB,IAAA,IAAI,EAAE;AACJ,QAAA,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC;YACnB,IAAI,EAAE,GAAG,CAAC,MAAM;AAChB,YAAA,WAAW,EAAE,MAAM;AACnB,YAAA,WAAW,EAAE,oDAAoD;SAClE,CAAC;AACF,QAAA,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC;AACzB,YAAA,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EACT,mEAAmE;SACtE,CAAC;AACF,QAAA,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;AACf,YAAA,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EAAE,sDAAsD;SACpE,CAAC;AACH,KAAA;AACD,IAAA,OAAO,EAAE,CAAC,IAAI,KAAI;QAChB,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,KAAI;AACzB,YAAA,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC;AAC1C,YAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AACjB,QAAA,CAAC,CAAC;IACJ,CAAC;AACF,CAAA,CAAC;AAEF,MAAM,IAAI,GAAG,OACX,IAIE,KACe;IACjB,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;AAEpD,IAAA,IAAI,MAAM,KAAK,KAAK,EAAE;AACpB,QAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACjB;AACF,CAAC;AAED,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"format-diff-from.mjs","sources":["../../src/cmd/format-diff-from.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;AAMA,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;AACzB,IAAA,IAAI,EAAE,sBAAsB;AAC5B,IAAA,OAAO,EAAE,OAAO;AAChB,IAAA,IAAI,EAAE;AACJ,QAAA,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC;YACnB,IAAI,EAAE,GAAG,CAAC,MAAM;AAChB,YAAA,WAAW,EAAE,MAAM;AACnB,YAAA,WAAW,EAAE,oDAAoD;SAClE,CAAC;AACF,QAAA,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC;AACzB,YAAA,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EACT,oEAAoE;SACvE,CAAC;AACF,QAAA,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC;AACxB,YAAA,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EACT,mEAAmE;SACtE,CAAC;AACF,QAAA,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC;AACtB,YAAA,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EACT,iEAAiE;SACpE,CAAC;AACF,QAAA,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;AACf,YAAA,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EAAE,sDAAsD;SACpE,CAAC;AACH,KAAA;AACD,IAAA,OAAO,EAAE,CAAC,IAAI,KAAI;AAChB,QAAA,IAAI,CAAC;YACH,IAAI,EAAE,IAAI,CAAC,IAAI;AACf,YAAA,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,IAAI,KAAK;AAChD,YAAA,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,KAAK;AAC9C,YAAA,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,KAAK;AAC1C,YAAA,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK;AAC7B,SAAA,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,KAAI;AACjB,YAAA,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC;AAC1C,YAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AACjB,QAAA,CAAC,CAAC;IACJ,CAAC;AACF,CAAA,CAAC;AAEF,MAAM,IAAI,GAAG,OACX,IAME,KACe;IACjB,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE;AAC7C,QAAA,gBAAgB,EAAE,CAAC,IAAI,CAAC,gBAAgB;AACxC,QAAA,eAAe,EAAE,CAAC,IAAI,CAAC,eAAe;AACtC,QAAA,aAAa,EAAE,CAAC,IAAI,CAAC,aAAa;QAClC,MAAM,EAAE,IAAI,CAAC,MAAM;AACpB,KAAA,CAAC;AAEF,IAAA,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;AACxB,QAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACjB;AACF,CAAC;AAED,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC"}

package/dist/cmd/format-uncommitted.d.mts

@@ -0,0 +1,3 @@
+#!/usr/bin/env -S npx tsx
+export {};
+//# sourceMappingURL=format-uncommitted.d.mts.map

package/dist/cmd/format-uncommitted.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"format-uncommitted.d.mts","sourceRoot":"","sources":["../../src/cmd/format-uncommitted.mts"],"names":[],"mappings":""}

package/dist/cmd/format-uncommitted.mjs

@@ -0,0 +1,59 @@
+#!/usr/bin/env -S npx tsx
+import * as cmd from 'cmd-ts';
+import { Result } from 'ts-data-forge';
+import '../node-global.mjs';
+import 'node:child_process';
+import { formatUncommittedFiles } from '../functions/format.mjs';
+import 'micromatch';
+import 'child_process';
+
+const cmdDef = cmd.command({
+    name: 'format-uncommitted-cli',
+    version: '6.2.0',
+    args: {
+        excludeUntracked: cmd.flag({
+            long: 'exclude-untracked',
+            type: cmd.optional(cmd.boolean),
+            description: 'Exclude untracked files in addition to diff files (default: false)',
+        }),
+        excludeModified: cmd.flag({
+            long: 'exclude-modified',
+            type: cmd.optional(cmd.boolean),
+            description: 'Exclude modified files in addition to diff files (default: false)',
+        }),
+        excludeStaged: cmd.flag({
+            long: 'exclude-staged',
+            type: cmd.optional(cmd.boolean),
+            description: 'Exclude staged files in addition to diff files (default: false)',
+        }),
+        silent: cmd.flag({
+            long: 'silent',
+            type: cmd.optional(cmd.boolean),
+            description: 'If true, suppresses output messages (default: false)',
+        }),
+    },
+    handler: (args) => {
+        main({
+            excludeUntracked: args.excludeUntracked ?? false,
+            excludeModified: args.excludeModified ?? false,
+            excludeStaged: args.excludeStaged ?? false,
+            silent: args.silent ?? false,
+        }).catch((error) => {
+            console.error('An error occurred:', error);
+            process.exit(1);
+        });
+    },
+});
+const main = async (args) => {
+    const result = await formatUncommittedFiles({
+        untracked: !args.excludeUntracked,
+        modified: !args.excludeModified,
+        staged: !args.excludeStaged,
+        silent: args.silent,
+    });
+    if (Result.isErr(result)) {
+        process.exit(1);
+    }
+};
+await cmd.run(cmdDef, process.argv.slice(2));
+//# sourceMappingURL=format-uncommitted.mjs.map

package/dist/cmd/format-uncommitted.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"format-uncommitted.mjs","sources":["../../src/cmd/format-uncommitted.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;AAMA,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;AACzB,IAAA,IAAI,EAAE,wBAAwB;AAC9B,IAAA,OAAO,EAAE,OAAO;AAChB,IAAA,IAAI,EAAE;AACJ,QAAA,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC;AACzB,YAAA,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EACT,oEAAoE;SACvE,CAAC;AACF,QAAA,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC;AACxB,YAAA,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EACT,mEAAmE;SACtE,CAAC;AACF,QAAA,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC;AACtB,YAAA,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EACT,iEAAiE;SACpE,CAAC;AACF,QAAA,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;AACf,YAAA,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AAC/B,YAAA,WAAW,EAAE,sDAAsD;SACpE,CAAC;AACH,KAAA;AACD,IAAA,OAAO,EAAE,CAAC,IAAI,KAAI;AAChB,QAAA,IAAI,CAAC;AACH,YAAA,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,IAAI,KAAK;AAChD,YAAA,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,KAAK;AAC9C,YAAA,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,KAAK;AAC1C,YAAA,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK;AAC7B,SAAA,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,KAAI;AACjB,YAAA,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC;AAC1C,YAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AACjB,QAAA,CAAC,CAAC;IACJ,CAAC;AACF,CAAA,CAAC;AAEF,MAAM,IAAI,GAAG,OACX,IAKE,KACe;AACjB,IAAA,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC;AAC1C,QAAA,SAAS,EAAE,CAAC,IAAI,CAAC,gBAAgB;AACjC,QAAA,QAAQ,EAAE,CAAC,IAAI,CAAC,eAAe;AAC/B,QAAA,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa;QAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;AACpB,KAAA,CAAC;AACF,IAAA,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;AACxB,QAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACjB;AACF,CAAC;AAED,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC"}

package/dist/cmd/gen-index-ts.mjs

@@ -28,7 +28,7 @@ const nonEmptyArray = (t, commandName) => cmd.extendType(cmd.array(t), {
 });
 const cmdDef = cmd.command({
     name: 'gen-index-ts-cli',
-    version: '6.1.0',
+    version: '6.2.0',
     args: {
         // required args
         targetDirectory: cmd.positional({

package/dist/functions/diff.d.mts

@@ -1,7 +1,10 @@
 import { type ExecException } from 'node:child_process';
 import { Result } from 'ts-data-forge';
 import '../node-global.mjs';
-/** Get files that have been changed (git status). */
+/**
+ * Get untracked files from the working tree (files not added to git). Runs `git
+ * ls-files --others --exclude-standard [--deleted]`
+ */
 export declare const getUntrackedFiles: (options?: Readonly<{
     /** @default true */
     excludeDeleted?: boolean;
@@ -10,7 +13,34 @@ export declare const getUntrackedFiles: (options?: Readonly<{
 }>) => Promise<Result<readonly string[], ExecException | Readonly<{
     message: string;
 }>>>;
-/** Get files that differ from the specified base branch or commit */
+/**
+ * Get untracked files from the working tree (files not added to git). Runs `git
+ * git diff --staged --name-only [--diff-filter=d]`
+ */
+export declare const getModifiedFiles: (options?: Readonly<{
+    /** @default true */
+    excludeDeleted?: boolean;
+    /** @default false */
+    silent?: boolean;
+}>) => Promise<Result<readonly string[], ExecException | Readonly<{
+    message: string;
+}>>>;
+/**
+ * Get files that are staged for commit (files added with git add). Runs `git
+ * diff --staged --name-only [--diff-filter=d]`
+ */
+export declare const getStagedFiles: (options?: Readonly<{
+    /** @default true */
+    excludeDeleted?: boolean;
+    /** @default false */
+    silent?: boolean;
+}>) => Promise<Result<readonly string[], ExecException | Readonly<{
+    message: string;
+}>>>;
+/**
+ * Get files that differ from the specified base branch or commit. Runs `git
+ * diff --name-only <base> [--diff-filter=d]`
+ */
 export declare const getDiffFrom: (base: string, options?: Readonly<{
     /** @default true */
     excludeDeleted?: boolean;

package/dist/functions/diff.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"diff.d.mts","sourceRoot":"","sources":["../../src/functions/diff.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,oBAAoB,CAAC;AAE5B,qDAAqD;AACrD,eAAO,MAAM,iBAAiB,GAC5B,UAAU,QAAQ,CAAC;IACjB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,aAAa,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CA2BzE,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,UAAU,QAAQ,CAAC;IACjB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,aAAa,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CA2BzE,CAAC"}
+{"version":3,"file":"diff.d.mts","sourceRoot":"","sources":["../../src/functions/diff.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,oBAAoB,CAAC;AAE5B;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,UAAU,QAAQ,CAAC;IACjB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,aAAa,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAOtE,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAC3B,UAAU,QAAQ,CAAC;IACjB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,aAAa,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAOtE,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,UAAU,QAAQ,CAAC;IACjB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,aAAa,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAOtE,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,UAAU,QAAQ,CAAC;IACjB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,aAAa,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAOtE,CAAC"}

package/dist/functions/diff.mjs

@@ -1,13 +1,52 @@
 import { Result } from 'ts-data-forge';
 import '../node-global.mjs';
 
-/** Get files that have been changed (git status). */
-const getUntrackedFiles = async (options) => {
-    // Get changed files from git status
+/**
+ * Get untracked files from the working tree (files not added to git). Runs `git
+ * ls-files --others --exclude-standard [--deleted]`
+ */
+const getUntrackedFiles = async (options) => cmdResultToFiles({
+    cmd: `git ls-files --others --exclude-standard`,
+    cmdOptionToExcludeDeleted: '',
+    cmdOptionToIncludeDeleted: '--deleted',
+    options,
+});
+/**
+ * Get untracked files from the working tree (files not added to git). Runs `git
+ * git diff --staged --name-only [--diff-filter=d]`
+ */
+const getModifiedFiles = async (options) => cmdResultToFiles({
+    cmd: `git diff --name-only`,
+    cmdOptionToExcludeDeleted: '--diff-filter=d',
+    cmdOptionToIncludeDeleted: '',
+    options,
+});
+/**
+ * Get files that are staged for commit (files added with git add). Runs `git
+ * diff --staged --name-only [--diff-filter=d]`
+ */
+const getStagedFiles = async (options) => cmdResultToFiles({
+    cmd: `git diff --staged --name-only`,
+    cmdOptionToExcludeDeleted: '--diff-filter=d',
+    cmdOptionToIncludeDeleted: '',
+    options,
+});
+/**
+ * Get files that differ from the specified base branch or commit. Runs `git
+ * diff --name-only <base> [--diff-filter=d]`
+ */
+const getDiffFrom = async (base, options) => cmdResultToFiles({
+    cmd: `git diff --name-only ${base}`,
+    cmdOptionToExcludeDeleted: '--diff-filter=d',
+    cmdOptionToIncludeDeleted: '',
+    options,
+});
+const cmdResultToFiles = async ({ cmd, cmdOptionToExcludeDeleted, cmdOptionToIncludeDeleted, options, }) => {
     const result = await $([
-        `git ls-files --others --exclude-standard`,
-        // Append '--deleted' to include deleted files only if excludeDeleted is explicitly false
-        (options?.excludeDeleted ?? true) ? '' : '--deleted',
+        cmd,
+        (options?.excludeDeleted ?? true)
+            ? cmdOptionToExcludeDeleted
+            : cmdOptionToIncludeDeleted,
     ]
         .filter((s) => s !== '')
         .join(' '), { silent: options?.silent ?? false });
@@ -15,28 +54,7 @@ const getUntrackedFiles = async (options) => {
         return result;
     }
     const { stdout } = result.value;
-    // Parse git status output
-    const files = stdout
-        .split('\n')
-        .map((s) => s.trim())
-        .filter((s) => s !== '');
-    return Result.ok(files);
-};
-/** Get files that differ from the specified base branch or commit */
-const getDiffFrom = async (base, options) => {
-    // Get files that differ from base branch/commit (excluding deleted files)
-    const result = await $([
-        `git diff --name-only`,
-        base,
-        (options?.excludeDeleted ?? true) ? '--diff-filter=d' : '',
-    ]
-        .filter((s) => s !== '')
-        .join(' '), { silent: options?.silent ?? false });
-    if (Result.isErr(result)) {
-        return result;
-    }
-    const { stdout } = result.value;
-    // Parse git diff output
+    // Parse git output
     const files = stdout
         .split('\n')
         .map((line) => line.trim())
@@ -44,5 +62,5 @@ const getDiffFrom = async (base, options) => {
     return Result.ok(files);
 };
 
-export { getDiffFrom, getUntrackedFiles };
+export { getDiffFrom, getModifiedFiles, getStagedFiles, getUntrackedFiles };
 //# sourceMappingURL=diff.mjs.map

package/dist/functions/diff.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"diff.mjs","sources":["../../src/functions/diff.mts"],"sourcesContent":[null],"names":[],"mappings":";;;AAIA;MACa,iBAAiB,GAAG,OAC/B,OAKE,KAGA;;AAEF,IAAA,MAAM,MAAM,GAAG,MAAM,CAAC,CACpB;QACE,CAAA,wCAAA,CAA0C;;AAE1C,QAAA,CAAC,OAAO,EAAE,cAAc,IAAI,IAAI,IAAI,EAAE,GAAG,WAAW;AACrD;SACE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE;AACtB,SAAA,IAAI,CAAC,GAAG,CAAC,EACZ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,KAAK,EAAE,CACrC;AAED,IAAA,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;AACxB,QAAA,OAAO,MAAM;IACf;AAEA,IAAA,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK;;IAG/B,MAAM,KAAK,GAAG;SACX,KAAK,CAAC,IAAI;SACV,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE;SACnB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;AAE1B,IAAA,OAAO,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC;AACzB;AAEA;AACO,MAAM,WAAW,GAAG,OACzB,IAAY,EACZ,OAKE,KAGA;;AAEF,IAAA,MAAM,MAAM,GAAG,MAAM,CAAC,CACpB;QACE,CAAA,oBAAA,CAAsB;QACtB,IAAI;AACJ,QAAA,CAAC,OAAO,EAAE,cAAc,IAAI,IAAI,IAAI,iBAAiB,GAAG,EAAE;AAC3D;SACE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE;AACtB,SAAA,IAAI,CAAC,GAAG,CAAC,EACZ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,KAAK,EAAE,CACrC;AAED,IAAA,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;AACxB,QAAA,OAAO,MAAM;IACf;AAEA,IAAA,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK;;IAG/B,MAAM,KAAK,GAAG;SACX,KAAK,CAAC,IAAI;SACV,GAAG,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;SACzB,MAAM,CAAC,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;AAEhC,IAAA,OAAO,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC;AACzB;;;;"}
+{"version":3,"file":"diff.mjs","sources":["../../src/functions/diff.mts"],"sourcesContent":[null],"names":[],"mappings":";;;AAIA;;;AAGG;AACI,MAAM,iBAAiB,GAAG,OAC/B,OAKE,KAIF,gBAAgB,CAAC;AACf,IAAA,GAAG,EAAE,CAAA,wCAAA,CAA0C;AAC/C,IAAA,yBAAyB,EAAE,EAAE;AAC7B,IAAA,yBAAyB,EAAE,WAAW;IACtC,OAAO;AACR,CAAA;AAEH;;;AAGG;AACI,MAAM,gBAAgB,GAAG,OAC9B,OAKE,KAIF,gBAAgB,CAAC;AACf,IAAA,GAAG,EAAE,CAAA,oBAAA,CAAsB;AAC3B,IAAA,yBAAyB,EAAE,iBAAiB;AAC5C,IAAA,yBAAyB,EAAE,EAAE;IAC7B,OAAO;AACR,CAAA;AAEH;;;AAGG;AACI,MAAM,cAAc,GAAG,OAC5B,OAKE,KAIF,gBAAgB,CAAC;AACf,IAAA,GAAG,EAAE,CAAA,6BAAA,CAA+B;AACpC,IAAA,yBAAyB,EAAE,iBAAiB;AAC5C,IAAA,yBAAyB,EAAE,EAAE;IAC7B,OAAO;AACR,CAAA;AAEH;;;AAGG;AACI,MAAM,WAAW,GAAG,OACzB,IAAY,EACZ,OAKE,KAIF,gBAAgB,CAAC;IACf,GAAG,EAAE,CAAA,qBAAA,EAAwB,IAAI,CAAA,CAAE;AACnC,IAAA,yBAAyB,EAAE,iBAAiB;AAC5C,IAAA,yBAAyB,EAAE,EAAE;IAC7B,OAAO;AACR,CAAA;AAEH,MAAM,gBAAgB,GAAG,OAAO,EAC9B,GAAG,EACH,yBAAyB,EACzB,yBAAyB,EACzB,OAAO,GAWP,KAEE;AACF,IAAA,MAAM,MAAM,GAAG,MAAM,CAAC,CACpB;QACE,GAAG;AACH,QAAA,CAAC,OAAO,EAAE,cAAc,IAAI,IAAI;AAC9B,cAAE;AACF,cAAE,yBAAyB;AAC9B;SACE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE;AACtB,SAAA,IAAI,CAAC,GAAG,CAAC,EACZ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,KAAK,EAAE,CACrC;AAED,IAAA,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;AACxB,QAAA,OAAO,MAAM;IACf;AAEA,IAAA,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK;;IAG/B,MAAM,KAAK,GAAG;SACX,KAAK,CAAC,IAAI;SACV,GAAG,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;SACzB,MAAM,CAAC,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;AAEhC,IAAA,OAAO,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC;AACzB,CAAC;;;;"}

package/dist/functions/exec-async.d.mts

@@ -3,8 +3,8 @@ import { Result } from 'ts-data-forge';
 type ExecOptionsCustom = Readonly<{
     silent?: boolean;
 }>;
-type ExecOptions = DeepReadonly<ExecOptions_ & ExecOptionsCustom>;
-type ExecResult<T extends string | Buffer> = Result<Readonly<{
+export type ExecOptions = DeepReadonly<ExecOptions_ & ExecOptionsCustom>;
+export type ExecResult<T extends string | Buffer> = Result<Readonly<{
     stdout: T;
     stderr: T;
 }>, ExecException>;

package/dist/functions/exec-async.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"exec-async.d.mts","sourceRoot":"","sources":["../../src/functions/exec-async.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,WAAW,IAAI,YAAY,EACjC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,KAAK,iBAAiB,GAAG,QAAQ,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,CAAC;AAEH,KAAK,WAAW,GAAG,YAAY,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC;AAElE,KAAK,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CACjD,QAAQ,CAAC;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,EAClC,aAAa,CACd,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,CAAC,CACf,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AAE/B,wBAAgB,CAAC,CACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,CAAC;IAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;CAAE,GAAG,WAAW,CAAC,GAC7D,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AAE/B,wBAAgB,CAAC,CACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,CAAC;IAAE,QAAQ,EAAE,cAAc,CAAA;CAAE,GAAG,WAAW,CAAC,GAC5D,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC"}
+{"version":3,"file":"exec-async.d.mts","sourceRoot":"","sources":["../../src/functions/exec-async.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,WAAW,IAAI,YAAY,EACjC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,KAAK,iBAAiB,GAAG,QAAQ,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC;AAEzE,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CACxD,QAAQ,CAAC;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,EAClC,aAAa,CACd,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,CAAC,CACf,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AAE/B,wBAAgB,CAAC,CACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,CAAC;IAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;CAAE,GAAG,WAAW,CAAC,GAC7D,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AAE/B,wBAAgB,CAAC,CACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,CAAC;IAAE,QAAQ,EAAE,cAAc,CAAA;CAAE,GAAG,WAAW,CAAC,GAC5D,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC"}

package/dist/functions/format.d.mts

@@ -1,31 +1,35 @@
+import { type ExecException } from 'node:child_process';
+import { Result } from 'ts-data-forge';
 import '../node-global.mjs';
 /**
  * Format a list of files using Prettier
  *
  * @param files - Array of file paths to format
- * @returns 'ok' if successful, 'err' if any errors occurred
  */
-export declare const formatFilesList: (files: readonly string[], options?: Readonly<{
+export declare const formatFiles: (files: readonly string[], options?: Readonly<{
     silent?: boolean;
-}>) => Promise<"ok" | "err">;
+}>) => Promise<Result<undefined, readonly unknown[]>>;
 /**
  * Format files matching the given glob pattern using Prettier
  *
  * @param pathGlob - Glob pattern to match files
- * @returns 'ok' if successful, 'err' if any errors occurred
  */
-export declare const formatFiles: (pathGlob: string, options?: Readonly<{
+export declare const formatFilesGlob: (pathGlob: string, options?: Readonly<{
     silent?: boolean;
-}>) => Promise<"ok" | "err">;
+}>) => Promise<Result<undefined, unknown>>;
 /**
  * Format only files that have been changed (git status)
  *
  * @param options - Options for formatting
- * @returns 'ok' if successful, 'err' if any errors occurred
  */
-export declare const formatUntracked: (options?: Readonly<{
+export declare const formatUncommittedFiles: (options?: Readonly<{
+    untracked?: boolean;
+    modified?: boolean;
+    staged?: boolean;
     silent?: boolean;
-}>) => Promise<"ok" | "err">;
+}>) => Promise<Result<undefined, ExecException | Readonly<{
+    message: string;
+}> | readonly unknown[]>>;
 /**
  * Format only files that differ from the specified base branch or commit
  *
@@ -34,12 +38,17 @@ export declare const formatUntracked: (options?: Readonly<{
  * @param options - Options for formatting
  * @param options.includeUntracked - Include untracked files in addition to diff
  *   files (default is true)
+ * @param options.includeStaged - Include staged files in addition to diff files
+ *   (default is true)
  * @param options.silent - Silent mode to suppress command output (default is
  *   false)
- * @returns 'ok' if successful, 'err' if any errors occurred
  */
 export declare const formatDiffFrom: (base: string, options?: Readonly<{
     includeUntracked?: boolean;
+    includeModified?: boolean;
+    includeStaged?: boolean;
     silent?: boolean;
-}>) => Promise<"ok" | "err">;
+}>) => Promise<Result<undefined, ExecException | Readonly<{
+    message: string;
+}> | readonly unknown[]>>;
 //# sourceMappingURL=format.d.mts.map

package/dist/functions/format.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.mts","sourceRoot":"","sources":["../../src/functions/format.mts"],"names":[],"mappings":"AAEA,OAAO,oBAAoB,CAAC;AAG5B;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,SAAS,MAAM,EAAE,EACxB,UAAU,QAAQ,CAAC;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,KACvC,OAAO,CAAC,IAAI,GAAG,KAAK,CA2DtB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GACtB,UAAU,MAAM,EAChB,UAAU,QAAQ,CAAC;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,KACvC,OAAO,CAAC,IAAI,GAAG,KAAK,CAuBtB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,QAAQ,CAAC;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,KACvC,OAAO,CAAC,IAAI,GAAG,KAAK,CAqDtB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EACZ,UAAU,QAAQ,CAAC;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,KACnE,OAAO,CAAC,IAAI,GAAG,KAAK,CA4DtB,CAAC"}
+{"version":3,"file":"format.d.mts","sourceRoot":"","sources":["../../src/functions/format.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,EAAuB,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,oBAAoB,CAAC;AAQ5B;;;;GAIG;AACH,eAAO,MAAM,WAAW,GACtB,OAAO,SAAS,MAAM,EAAE,EACxB,UAAU,QAAQ,CAAC;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,KACvC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,CAAC,CA+F/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAChB,UAAU,QAAQ,CAAC;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,KACvC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAyBpC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GACjC,UAAU,QAAQ,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CACJ,SAAS,EACT,aAAa,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,SAAS,OAAO,EAAE,CACnE,CAsDF,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EACZ,UAAU,QAAQ,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,KACD,OAAO,CACR,MAAM,CACJ,SAAS,EACP,aAAa,GACb,QAAQ,CAAC;IACP,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,GACF,SAAS,OAAO,EAAE,CACrB,CA8EF,CAAC"}