ts-repo-utils 6.0.5 → 6.2.0

package/dist/functions/format.mjs

@@ -1,28 +1,40 @@
 import * as prettier from 'prettier';
-import { Result, Arr } from 'ts-data-forge';
+import { Result, Arr, isNotUndefined } from 'ts-data-forge';
 import '../node-global.mjs';
-import { getDiffFrom, getUntrackedFiles } from './diff.mjs';
+import { getDiffFrom, getUntrackedFiles, getModifiedFiles, getStagedFiles } from './diff.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
  */
-const formatFilesList = async (files, options) => {
+const formatFiles = async (files, options) => {
     const silent = options?.silent ?? false;
     if (files.length === 0) {
         if (!silent) {
             echo('No files to format');
         }
-        return 'ok';
+        return Result.ok(undefined);
     }
     if (!silent) {
         echo(`Formatting ${files.length} files...`);
     }
     // Format each file
-    const results = await Promise.allSettled(files.map(async (filePath) => {
+    const results = 
+    // NOTE: Using Promise.allSettled to ensure all files are processed even if some fail
+    await Promise.allSettled(files.map(async (filePath) => {
         try {
+            // Check if file exists first
+            try {
+                await fs.access(filePath);
+            }
+            catch {
+                // File doesn't exist, skip it
+                if (!silent) {
+                    echo(`Skipping non-existent file: ${filePath}`);
+                }
+                return Result.ok(undefined);
+            }
             // Read file content
             const content = await fs.readFile(filePath, 'utf8');
             // Resolve prettier config for this file
@@ -35,7 +47,7 @@ const formatFilesList = async (files, options) => {
                 if (!silent) {
                     echo(`Skipping ignored file: ${filePath}`);
                 }
-                return;
+                return Result.ok(undefined);
             }
             // Format the content
             const formatted = await prettier.format(content, {
@@ -43,29 +55,51 @@ const formatFilesList = async (files, options) => {
                 filepath: filePath,
             });
             // Only write if content changed
-            if (formatted !== content) {
+            if (formatted === content) {
+                if (!silent) {
+                    echo(`Unchanged: ${filePath}`);
+                }
+            }
+            else {
                 await fs.writeFile(filePath, formatted, 'utf8');
                 if (!silent) {
                     echo(`Formatted: ${filePath}`);
                 }
             }
+            return Result.ok(undefined);
         }
         catch (error) {
-            console.error(`Error formatting ${filePath}:`, error);
-            throw error;
+            if (!silent) {
+                console.error(`Error formatting ${filePath}:`, error);
+            }
+            return Result.err(error);
         }
     }));
-    // Check if any formatting failed
-    const hasErrors = results.some((result) => result.status === 'rejected');
-    return hasErrors ? 'err' : 'ok';
+    if (results.every((r) => r.status === 'fulfilled')) {
+        const fulfilled = results.map((r) => r.value);
+        if (fulfilled.every(Result.isOk)) {
+            return Result.ok(undefined);
+        }
+        else {
+            const errors = fulfilled
+                .filter(Result.isErr)
+                .map((r) => r.value);
+            return Result.err(errors);
+        }
+    }
+    else {
+        const errors = results
+            .filter((r) => r.status === 'rejected')
+            .map((r) => r.reason);
+        return Result.err(errors);
+    }
 };
 /**
  * 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
  */
-const formatFiles = async (pathGlob, options) => {
+const formatFilesGlob = async (pathGlob, options) => {
     const silent = options?.silent ?? false;
     try {
         // Find all files matching the glob
@@ -78,63 +112,56 @@ const formatFiles = async (pathGlob, options) => {
             if (!silent) {
                 echo('No files found matching pattern:', pathGlob);
             }
-            return 'ok';
+            return Result.ok(undefined);
         }
-        return await formatFilesList(files, { silent });
+        return await formatFiles(files, { silent });
     }
     catch (error) {
-        console.error('Error in formatFiles:', error);
-        return 'err';
+        if (!silent) {
+            console.error('Error in formatFiles:', error);
+        }
+        return Result.err(error);
     }
 };
 /**
  * Format only files that have been changed (git status)
  *
  * @param options - Options for formatting
- * @returns 'ok' if successful, 'err' if any errors occurred
  */
-const formatUntracked = async (options) => {
-    const silent = options?.silent ?? false;
-    try {
-        const untrackedFilesResult = await getUntrackedFiles({
-            silent,
-        });
+const formatUncommittedFiles = async (options) => {
+    const { untracked = true, modified = true, staged = true, silent = false, } = options ?? {};
+    const mut_files = [];
+    if (untracked) {
+        const untrackedFilesResult = await getUntrackedFiles({ silent });
         if (Result.isErr(untrackedFilesResult)) {
-            console.error('Error getting changed files:', untrackedFilesResult.value);
-            return 'err';
-        }
-        const files = untrackedFilesResult.value;
-        if (files.length === 0) {
             if (!silent) {
-                echo('No changed files to format');
+                console.error('Error getting changed files:', untrackedFilesResult.value);
             }
-            return 'ok';
+            return untrackedFilesResult;
         }
-        if (!silent) {
-            echo('Formatting changed files:', files);
-        }
-        // Filter out non-existent files before formatting
-        const fileExistenceChecks = await Promise.allSettled(files.map(async (filePath) => {
-            try {
-                await fs.readFile(filePath, 'utf8');
-                return filePath;
-            }
-            catch {
-                if (!silent) {
-                    echo(`Skipping non-existent file: ${filePath}`);
-                }
-                return undefined;
+        mut_files.push(...untrackedFilesResult.value);
+    }
+    if (modified) {
+        const diffFilesResult = await getModifiedFiles({ silent });
+        if (Result.isErr(diffFilesResult)) {
+            if (!silent) {
+                console.error('Error getting changed files:', diffFilesResult.value);
             }
-        }));
-        const existingFiles = fileExistenceChecks
-            .filter((result) => result.status === 'fulfilled' && result.value !== undefined)
-            .map((result) => result.value);
-        return await formatFilesList(existingFiles, { silent });
+            return diffFilesResult;
+        }
+        mut_files.push(...diffFilesResult.value);
     }
-    catch (error) {
-        console.error('Error in formatUntracked:', error);
-        return 'err';
+    if (staged) {
+        const stagedFilesResult = await getStagedFiles({ silent });
+        if (Result.isErr(stagedFilesResult)) {
+            if (!silent) {
+                console.error('Error getting changed files:', stagedFilesResult.value);
+            }
+            return stagedFilesResult;
+        }
+        mut_files.push(...stagedFilesResult.value);
     }
+    return formatFiles(Arr.uniq(mut_files), { silent });
 };
 /**
  * Format only files that differ from the specified base branch or commit
@@ -144,57 +171,69 @@ const formatUntracked = async (options) => {
  * @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
  */
 const formatDiffFrom = async (base, options) => {
-    const silent = options?.silent ?? false;
-    try {
-        // Get files that differ from base branch/commit (excluding deleted files)
-        const diffFromBaseResult = await getDiffFrom(base, {
-            silent,
-        });
-        if (Result.isErr(diffFromBaseResult)) {
+    // const silent = options?.silent ?? false;
+    const { silent = false, includeUntracked = true, includeModified = true, includeStaged = true, } = options ?? {};
+    // Get files that differ from base branch/commit (excluding deleted files)
+    const diffFromBaseResult = await getDiffFrom(base, {
+        silent,
+    });
+    if (Result.isErr(diffFromBaseResult)) {
+        if (!silent) {
             console.error('Error getting changed files:', diffFromBaseResult.value);
-            return 'err';
         }
-        const diffFiles = diffFromBaseResult.value;
-        let mut_allFiles = diffFiles;
-        // If includeUntracked is true, also get untracked files
-        if (options?.includeUntracked ?? true) {
-            const untrackedFilesResult = await getUntrackedFiles({
-                silent,
-            });
-            if (Result.isErr(untrackedFilesResult)) {
-                console.error('Error getting untracked files:', untrackedFilesResult.value);
-                return 'err';
+        return diffFromBaseResult;
+    }
+    const diffFiles = diffFromBaseResult.value;
+    const mut_allFiles = diffFiles.slice();
+    // If includeUntracked is true, also get untracked files
+    for (const { type, flag, fn } of [
+        { type: 'untracked', flag: includeUntracked, fn: getUntrackedFiles },
+        { type: 'modified', flag: includeModified, fn: getModifiedFiles },
+        { type: 'staged', flag: includeStaged, fn: getStagedFiles },
+    ]) {
+        if (flag) {
+            // eslint-disable-next-line no-await-in-loop
+            const filesResult = await fn({ silent });
+            if (Result.isErr(filesResult)) {
+                if (!silent) {
+                    console.error(`Error getting ${type} files:`, filesResult.value);
+                }
+                return filesResult;
             }
-            const untrackedFiles = untrackedFilesResult.value;
+            const files = filesResult.value;
             // Combine and deduplicate files
-            mut_allFiles = Arr.uniq([...diffFiles, ...untrackedFiles]);
-            if (!silent) {
-                echo(`Formatting files that differ from ${base} and untracked files:`, mut_allFiles);
-            }
-        }
-        else {
-            if (!silent) {
-                echo(`Formatting files that differ from ${base}:`, mut_allFiles);
-            }
+            mut_allFiles.push(...files);
         }
-        if (mut_allFiles.length === 0) {
-            if (!silent) {
-                echo(`No files to format`);
-            }
-            return 'ok';
-        }
-        return await formatFilesList(mut_allFiles, { silent });
     }
-    catch (error) {
-        console.error('Error in formatDiffFrom:', error);
-        return 'err';
+    const allFiles = Arr.uniq(mut_allFiles);
+    if (!silent) {
+        const includedFileTypes = [
+            includeUntracked ? 'untracked files' : undefined,
+            includeModified ? 'modified files' : undefined,
+            includeStaged ? 'staged files' : undefined,
+        ].filter(isNotUndefined);
+        const message = [
+            `Formatting files that differ from ${base}`,
+            includedFileTypes
+                .map((s, i) => i !== includedFileTypes.length - 1 ? `, ${s}` : ` and ${s}`)
+                .join(''),
+        ].join('');
+        echo(`${message}:`, allFiles);
+    }
+    if (allFiles.length === 0) {
+        if (!silent) {
+            echo('No files to format');
+        }
+        return Result.ok(undefined);
     }
+    return formatFiles(allFiles, { silent });
 };
 
-export { formatDiffFrom, formatFiles, formatFilesList, formatUntracked };
+export { formatDiffFrom, formatFiles, formatFilesGlob, formatUncommittedFiles };
 //# sourceMappingURL=format.mjs.map

package/dist/functions/format.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"format.mjs","sources":["../../src/functions/format.mts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"format.mjs","sources":["../../src/functions/format.mts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/dist/functions/index.mjs

@@ -1,9 +1,9 @@
 export { assertExt } from './assert-ext.mjs';
 export { assertPathExists, pathExists } from './assert-path-exists.mjs';
 export { assertRepoIsClean, repoIsDirty } from './assert-repo-is-clean.mjs';
-export { getDiffFrom, getUntrackedFiles } from './diff.mjs';
+export { getDiffFrom, getModifiedFiles, getStagedFiles, getUntrackedFiles } from './diff.mjs';
 export { $ } from './exec-async.mjs';
-export { formatDiffFrom, formatFiles, formatFilesList, formatUntracked } from './format.mjs';
+export { formatDiffFrom, formatFiles, formatFilesGlob, formatUncommittedFiles } from './format.mjs';
 export { genIndex } from './gen-index.mjs';
 export { checkShouldRunTypeChecks } from './should-run.mjs';
 export { executeParallel, executeStages } from './workspace-utils/execute-parallel.mjs';

package/dist/index.d.mts

@@ -1,2 +1,3 @@
 export * from './functions/index.mjs';
+export { Result } from 'ts-data-forge';
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.mts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.mts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AAEtC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC"}

package/dist/index.mjs

@@ -1,13 +1,14 @@
 export { assertExt } from './functions/assert-ext.mjs';
 export { assertPathExists, pathExists } from './functions/assert-path-exists.mjs';
 export { assertRepoIsClean, repoIsDirty } from './functions/assert-repo-is-clean.mjs';
-export { getDiffFrom, getUntrackedFiles } from './functions/diff.mjs';
+export { getDiffFrom, getModifiedFiles, getStagedFiles, getUntrackedFiles } from './functions/diff.mjs';
 export { $ } from './functions/exec-async.mjs';
-export { formatDiffFrom, formatFiles, formatFilesList, formatUntracked } from './functions/format.mjs';
+export { formatDiffFrom, formatFiles, formatFilesGlob, formatUncommittedFiles } from './functions/format.mjs';
 export { genIndex } from './functions/gen-index.mjs';
 export { checkShouldRunTypeChecks } from './functions/should-run.mjs';
 export { executeParallel, executeStages } from './functions/workspace-utils/execute-parallel.mjs';
 export { getWorkspacePackages } from './functions/workspace-utils/get-workspace-packages.mjs';
 export { runCmdInParallelAcrossWorkspaces } from './functions/workspace-utils/run-cmd-in-parallel.mjs';
 export { runCmdInStagesAcrossWorkspaces } from './functions/workspace-utils/run-cmd-in-stages.mjs';
+export { Result } from 'ts-data-forge';
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-repo-utils",
-  "version": "6.0.5",
+  "version": "6.2.0",
   "private": false,
   "keywords": [
     "typescript"
@@ -27,7 +27,7 @@
     "assert-repo-is-clean": "./src/cmd/assert-repo-is-clean.mts",
     "check-should-run-type-checks": "./src/cmd/check-should-run-type-checks.mts",
     "format-diff-from": "./src/cmd/format-diff-from.mts",
-    "format-untracked": "./src/cmd/format-untracked.mts",
+    "format-uncommitted": "./src/cmd/format-uncommitted.mts",
     "gen-index-ts": "./src/cmd/gen-index-ts.mts"
   },
   "files": [

package/src/cmd/assert-repo-is-clean.mts

@@ -5,7 +5,7 @@ import { assertRepoIsClean } from '../functions/index.mjs';
 
 const cmdDef = cmd.command({
   name: 'assert-repo-is-clean-cli',
-  version: '6.0.5',
+  version: '6.2.0',
   args: {
     silent: cmd.flag({
       long: 'silent',

package/src/cmd/check-should-run-type-checks.mts

@@ -5,7 +5,7 @@ import { checkShouldRunTypeChecks } from '../functions/index.mjs';
 
 const cmdDef = cmd.command({
   name: 'check-should-run-type-checks-cli',
-  version: '6.0.5',
+  version: '6.2.0',
   args: {
     pathsIgnore: cmd.multioption({
       long: 'paths-ignore',

package/src/cmd/format-diff-from.mts

@@ -1,22 +1,35 @@
 #!/usr/bin/env -S npx tsx
 
 import * as cmd from 'cmd-ts';
+import { Result } from 'ts-data-forge';
 import { formatDiffFrom } from '../functions/index.mjs';
 
 const cmdDef = cmd.command({
   name: 'format-diff-from-cli',
-  version: '6.0.5',
+  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)',
+        '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',
@@ -25,7 +38,13 @@ 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);
     });
@@ -35,13 +54,20 @@ const cmdDef = cmd.command({
 const main = async (
   args: Readonly<{
     base: string;
-    includeUntracked?: boolean;
-    silent?: boolean;
+    excludeUntracked: boolean;
+    excludeModified: boolean;
+    excludeStaged: boolean;
+    silent: boolean;
   }>,
 ): Promise<void> => {
-  const result = await formatDiffFrom(args.base, args);
+  const result = await formatDiffFrom(args.base, {
+    includeUntracked: !args.excludeUntracked,
+    includeModified: !args.excludeModified,
+    includeStaged: !args.excludeStaged,
+    silent: args.silent,
+  });
 
-  if (result === 'err') {
+  if (Result.isErr(result)) {
     process.exit(1);
   }
 };

package/src/cmd/format-uncommitted.mts

@@ -0,0 +1,67 @@
+#!/usr/bin/env -S npx tsx
+
+import * as cmd from 'cmd-ts';
+import { Result } from 'ts-data-forge';
+import { formatUncommittedFiles } from '../functions/index.mjs';
+
+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: Readonly<{
+    excludeUntracked: boolean;
+    excludeModified: boolean;
+    excludeStaged: boolean;
+    silent: boolean;
+  }>,
+): Promise<void> => {
+  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));

package/src/cmd/gen-index-ts.mts

@@ -38,7 +38,7 @@ const nonEmptyArray = <T extends cmd.Type<any, any>>(
 
 const cmdDef = cmd.command({
   name: 'gen-index-ts-cli',
-  version: '6.0.5',
+  version: '6.2.0',
   args: {
     // required args
     targetDirectory: cmd.positional({