ts-ag 1.0.21 → 1.0.23

package/dist/scripts/ts-build-config.js

@@ -5,6 +5,7 @@ import { dirname, join, resolve, relative } from 'path';
 import { parseArgs } from 'util';
 import { watch } from 'chokidar';
 import { getTsconfig } from 'get-tsconfig';
+import { format as formatWithOxfmt } from 'oxfmt';
 import { colorText } from '../utils/cli.js';
 const DEFAULT_TEST_EXCLUDES = [
     '**/*.test.ts',
@@ -73,7 +74,33 @@ function computeExtraExcludes(config) {
     }
     return uniq(extra);
 }
-function writeBuildTsconfig(tsconfigPath, config, dryRun) {
+function withTrailingNewline(value) {
+    return value.endsWith('\n') ? value : `${value}\n`;
+}
+async function formatBuildTsconfigJson(config) {
+    const fallback = JSON.stringify(config, null, 2);
+    try {
+        const result = await formatWithOxfmt('tsconfig.build.json', fallback, {
+            useTabs: false,
+            singleQuote: true,
+            trailingComma: 'none',
+            printWidth: 120,
+            objectWrap: 'collapse',
+            semi: true,
+            proseWrap: 'always',
+            sortPackageJson: { sortScripts: true },
+            sortImports: {}
+        });
+        if (!result.errors.length && typeof result.code === 'string' && result.code.length > 0) {
+            return withTrailingNewline(result.code);
+        }
+    }
+    catch {
+        // Fallback to plain JSON below.
+    }
+    return withTrailingNewline(fallback);
+}
+async function writeBuildTsconfig(tsconfigPath, config, dryRun) {
     const dir = dirname(tsconfigPath);
     const outPath = join(dir, 'tsconfig.build.json');
     const existingExclude = asArray(config.exclude);
@@ -93,7 +120,8 @@ function writeBuildTsconfig(tsconfigPath, config, dryRun) {
     // If you want to force them, do it in the base tsconfig.json or pass flags later.
     if (!dryRun) {
         mkdirSync(dir, { recursive: true });
-        writeFileSync(outPath, `${GENERATED_FILE_HEADER}\n${JSON.stringify(buildConfig, null, 2)}\n`, 'utf8');
+        const formattedJson = await formatBuildTsconfigJson(buildConfig);
+        writeFileSync(outPath, `${GENERATED_FILE_HEADER}\n${formattedJson}`, 'utf8');
     }
     return outPath;
 }
@@ -172,7 +200,7 @@ function replaceRefsWithBuildConfigs(tsconfigPath, config, buildConfigSet) {
     });
     return { ...config, references: mapped };
 }
-function generateBuildConfigs(entry, options) {
+async function generateBuildConfigs(entry, options) {
     const { dryRun, force, verbose } = options;
     const loadedConfigs = new Map();
     const visited = new Set();
@@ -212,7 +240,7 @@ function generateBuildConfigs(entry, options) {
         }
         else {
             const rewrittenCfg = replaceRefsWithBuildConfigs(tsconfigPath, cfg, buildConfigSet);
-            const written = writeBuildTsconfig(tsconfigPath, rewrittenCfg, dryRun);
+            const written = await writeBuildTsconfig(tsconfigPath, rewrittenCfg, dryRun);
             created.push({ src: tsconfigPath, out: written });
             if (verbose || dryRun) {
                 const verb = dryRun ? colorText('yellow', '[dry-run] write') : colorText('green', 'write');
@@ -247,7 +275,7 @@ function createRegenerator(entry, options) {
                     logInfo(`${colorText('cyan', 'regenerate')} (${reason})`);
                     reason = undefined;
                 }
-                const result = generateBuildConfigs(entry, options);
+                const result = await generateBuildConfigs(entry, options);
                 watchedConfigs = new Set(result.visitedConfigs);
             } while (rerunRequested);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ag",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Useful TS stuff",
   "bugs": "https://github.com/ageorgeh/ts-ag/issues",
   "author": "Alexander Hornung",
@@ -57,6 +57,7 @@
     "glob": "^13.0.6",
     "jose": "6.1.3",
     "neverthrow": "8.2.0",
+    "oxfmt": "^0.35.0",
     "radash": "^12.1.1",
     "rehype-parse": "9.0.1",
     "tsc-alias": "1.8.16",
@@ -70,13 +71,12 @@
     "@types/hast": "3.0.4",
     "@types/node": "^24.11.0",
     "@types/ungap__structured-clone": "1.2.0",
-    "@typescript/native-preview": "7.0.0-dev.20260227.1",
+    "@typescript/native-preview": "7.0.0-dev.20260228.1",
     "concurrently": "^9.2.1",
     "globals": "^17.3.0",
     "husky": "^9.1.7",
     "jiti": "2.6.1",
     "lint-staged": "^16.2.7",
-    "oxfmt": "^0.35.0",
     "oxlint": "^1.50.0",
     "semantic-release": "^25.0.3",
     "typescript": "^5.9.3",

package/src/scripts/ts-build-config.ts

@@ -8,9 +8,12 @@ import { parseArgs } from 'util';
 import type { FSWatcher } from 'chokidar';
 import { watch } from 'chokidar';
 import { getTsconfig } from 'get-tsconfig';
+import { format as formatWithOxfmt } from 'oxfmt';
 
 import { colorText } from '../utils/cli.js';
 
+// TODO on startup check cwd for oxfmt config and use that instead of my default
+
 type TsConfigJson = Record<string, any>;
 
 const DEFAULT_TEST_EXCLUDES = [
@@ -91,7 +94,36 @@ function computeExtraExcludes(config: TsConfigJson): string[] {
   return uniq(extra);
 }
 
-function writeBuildTsconfig(tsconfigPath: string, config: TsConfigJson, dryRun: boolean): string {
+function withTrailingNewline(value: string): string {
+  return value.endsWith('\n') ? value : `${value}\n`;
+}
+
+async function formatBuildTsconfigJson(config: TsConfigJson): Promise<string> {
+  const fallback = JSON.stringify(config, null, 2);
+
+  try {
+    const result = await formatWithOxfmt('tsconfig.build.json', fallback, {
+      useTabs: false,
+      singleQuote: true,
+      trailingComma: 'none',
+      printWidth: 120,
+      objectWrap: 'collapse',
+      semi: true,
+      proseWrap: 'always',
+      sortPackageJson: { sortScripts: true },
+      sortImports: {}
+    });
+    if (!result.errors.length && typeof result.code === 'string' && result.code.length > 0) {
+      return withTrailingNewline(result.code);
+    }
+  } catch {
+    // Fallback to plain JSON below.
+  }
+
+  return withTrailingNewline(fallback);
+}
+
+async function writeBuildTsconfig(tsconfigPath: string, config: TsConfigJson, dryRun: boolean): Promise<string> {
   const dir = dirname(tsconfigPath);
   const outPath = join(dir, 'tsconfig.build.json');
 
@@ -116,7 +148,8 @@ function writeBuildTsconfig(tsconfigPath: string, config: TsConfigJson, dryRun:
 
   if (!dryRun) {
     mkdirSync(dir, { recursive: true });
-    writeFileSync(outPath, `${GENERATED_FILE_HEADER}\n${JSON.stringify(buildConfig, null, 2)}\n`, 'utf8');
+    const formattedJson = await formatBuildTsconfigJson(buildConfig);
+    writeFileSync(outPath, `${GENERATED_FILE_HEADER}\n${formattedJson}`, 'utf8');
   }
 
   return outPath;
@@ -207,10 +240,10 @@ function replaceRefsWithBuildConfigs(
 
 type GenerateOptions = { dryRun: boolean; force: boolean; verbose: boolean };
 
-function generateBuildConfigs(
+async function generateBuildConfigs(
   entry: string,
   options: GenerateOptions
-): { created: { src: string; out: string }[]; visitedConfigs: string[] } {
+): Promise<{ created: { src: string; out: string }[]; visitedConfigs: string[] }> {
   const { dryRun, force, verbose } = options;
 
   const loadedConfigs = new Map<string, TsConfigJson>();
@@ -251,7 +284,7 @@ function generateBuildConfigs(
       }
     } else {
       const rewrittenCfg = replaceRefsWithBuildConfigs(tsconfigPath, cfg, buildConfigSet);
-      const written = writeBuildTsconfig(tsconfigPath, rewrittenCfg, dryRun);
+      const written = await writeBuildTsconfig(tsconfigPath, rewrittenCfg, dryRun);
       created.push({ src: tsconfigPath, out: written });
       if (verbose || dryRun) {
         const verb = dryRun ? colorText('yellow', '[dry-run] write') : colorText('green', 'write');
@@ -294,7 +327,7 @@ function createRegenerator(
           logInfo(`${colorText('cyan', 'regenerate')} (${reason})`);
           reason = undefined;
         }
-        const result = generateBuildConfigs(entry, options);
+        const result = await generateBuildConfigs(entry, options);
         watchedConfigs = new Set(result.visitedConfigs);
       } while (rerunRequested);
     } finally {