@omnifyjp/omnify 5.8.19 → 5.8.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "5.8.19",
+  "version": "5.8.20",
   "description": "Schema-driven code generation for Laravel, TypeScript, and SQL",
   "license": "MIT",
   "repository": {
@@ -36,10 +36,10 @@
     "zod": "^3.24.0"
   },
   "optionalDependencies": {
-    "@omnifyjp/omnify-darwin-arm64": "5.8.19",
-    "@omnifyjp/omnify-darwin-x64": "5.8.19",
-    "@omnifyjp/omnify-linux-x64": "5.8.19",
-    "@omnifyjp/omnify-linux-arm64": "5.8.19",
-    "@omnifyjp/omnify-win32-x64": "5.8.19"
+    "@omnifyjp/omnify-darwin-arm64": "5.8.20",
+    "@omnifyjp/omnify-darwin-x64": "5.8.20",
+    "@omnifyjp/omnify-linux-x64": "5.8.20",
+    "@omnifyjp/omnify-linux-arm64": "5.8.20",
+    "@omnifyjp/omnify-win32-x64": "5.8.20"
   }
 }

package/ts-dist/cli.js

@@ -31,6 +31,7 @@ import { generateTypeScript } from './generator.js';
 import { generatePhp, derivePhpConfig } from './php/index.js';
 import { pruneOrphanServiceFiles } from './php/orphan-cleanup.js';
 import { findSiblingWithSameBasename, findAppRootAncestor } from './php/sibling-skip.js';
+import { runPintFormat } from './php/pint-format.js';
 import { resolveInput, sniffInputKind } from './input-resolver.js';
 function resolveFromConfig(configPath) {
     const raw = readFileSync(configPath, 'utf-8');
@@ -222,6 +223,7 @@ program
         let phpSkipped = 0;
         let phpSkippedSibling = 0;
         const skippedSiblingExamples = [];
+        const writtenPaths = [];
         for (const file of phpFiles) {
             const filePath = resolve(configDir, file.path);
             mkdirSync(dirname(filePath), { recursive: true });
@@ -261,6 +263,7 @@ program
                 }
             }
             writeFileSync(filePath, file.content, 'utf-8');
+            writtenPaths.push(filePath);
             if (file.overwrite || !existsSync(filePath)) {
                 phpOverwritten++;
             }
@@ -282,6 +285,26 @@ program
                 console.log(`    ... and ${phpSkippedSibling - skippedSiblingExamples.length} more`);
             }
         }
+        // Issue #100 v5.8.20: auto-format every written PHP file via
+        // Laravel Pint when it's installed in the project. Same preset
+        // the project's CI already uses, so codegen output stops failing
+        // `pint --test` and devs no longer need a manual sweep after
+        // every `omnify generate`. Silent no-op when Pint isn't found.
+        if (writtenPaths.length > 0) {
+            const pintResult = runPintFormat(writtenPaths);
+            if (pintResult.ran) {
+                if (pintResult.exitStatus === 0) {
+                    console.log(`  Formatted ${pintResult.formattedCount} PHP file(s) via Laravel Pint`);
+                }
+                else {
+                    console.warn(`  [omnify] Laravel Pint exited with status ${pintResult.exitStatus}; generated files may not match project formatting preset.`);
+                    if (pintResult.errorMessage) {
+                        const trimmed = pintResult.errorMessage.trim().split('\n').slice(0, 5).join('\n');
+                        console.warn(`  ${trimmed}`);
+                    }
+                }
+            }
+        }
         // Orphan cleanup: when a schema is removed, renamed, flipped from
         // kind:object → kind:pivot, or opted out via `options.service: false`,
         // its previously-emitted `*ServiceBase.php` becomes orphan and

package/ts-dist/php/pint-format.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Auto-format generated PHP files via Laravel Pint. Issue #100 v5.8.20.
+ *
+ * Reporter scenario (godx-jp/godx-kintai 2026-04-26 audit): every
+ * `omnify generate --force` produces 150+ PHP files that fail Laravel
+ * Pint's standard preset (`vendor/bin/pint --test`):
+ *
+ *   - ordered_imports — `use` statements not alphabetised
+ *   - fully_qualified_strict_types — exception types referenced via FQN
+ *   - class_attributes_separation — missing blank lines between members
+ *   - function_declaration — function-keyword spacing
+ *   - unary_operator_spaces — `! \$x` vs `!\$x`
+ *   - no_unused_imports — codegen leaves the occasional dangling import
+ *   - single_line_empty_body — empty class bodies on multiple lines
+ *   - self_static_accessor — `self::` vs `static::` on enums
+ *   - blank_line_before_statement — enum `case` separators
+ *
+ * Auto-detect: when `<rootPath>/vendor/bin/pint` exists, run it on the
+ * files we just wrote. Same Pint preset the project's CI already uses,
+ * so no risk of formatter drift between codegen and CI checks.
+ *
+ * Opt-out: future config field; for now `chmod -x vendor/bin/pint` or
+ * deleting it disables the auto-run.
+ */
+/**
+ * Resolve the `vendor/bin/pint` path for the project. Walks up from
+ * the first written file until we find a sibling `vendor/bin/pint`,
+ * stopping at filesystem root or after 12 levels (defensive against
+ * pathological inputs). Returns the absolute path or null.
+ */
+export declare function findPintBinary(anyWrittenPhpPath: string): string | null;
+export interface PintFormatResult {
+    ran: boolean;
+    pintPath: string | null;
+    /** Files passed to pint. */
+    formattedCount: number;
+    /** Pint's exit status if it ran. 0 = success. */
+    exitStatus: number | null;
+    /** Captured stderr when pint failed (status != 0). */
+    errorMessage?: string;
+}
+/**
+ * Run Laravel Pint on the given PHP files (absolute paths). No-op if
+ * Pint isn't installed in the project. Pint is invoked with `--quiet`
+ * so it stays out of the way unless something breaks.
+ *
+ * Pint takes a list of files (or directories) and formats them in
+ * place. It uses the project's `pint.json` config if present, else the
+ * Laravel preset.
+ */
+export declare function runPintFormat(writtenPhpPaths: string[]): PintFormatResult;

package/ts-dist/php/pint-format.js

@@ -0,0 +1,92 @@
+/**
+ * Auto-format generated PHP files via Laravel Pint. Issue #100 v5.8.20.
+ *
+ * Reporter scenario (godx-jp/godx-kintai 2026-04-26 audit): every
+ * `omnify generate --force` produces 150+ PHP files that fail Laravel
+ * Pint's standard preset (`vendor/bin/pint --test`):
+ *
+ *   - ordered_imports — `use` statements not alphabetised
+ *   - fully_qualified_strict_types — exception types referenced via FQN
+ *   - class_attributes_separation — missing blank lines between members
+ *   - function_declaration — function-keyword spacing
+ *   - unary_operator_spaces — `! \$x` vs `!\$x`
+ *   - no_unused_imports — codegen leaves the occasional dangling import
+ *   - single_line_empty_body — empty class bodies on multiple lines
+ *   - self_static_accessor — `self::` vs `static::` on enums
+ *   - blank_line_before_statement — enum `case` separators
+ *
+ * Auto-detect: when `<rootPath>/vendor/bin/pint` exists, run it on the
+ * files we just wrote. Same Pint preset the project's CI already uses,
+ * so no risk of formatter drift between codegen and CI checks.
+ *
+ * Opt-out: future config field; for now `chmod -x vendor/bin/pint` or
+ * deleting it disables the auto-run.
+ */
+import { existsSync, statSync } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+import { dirname, join } from 'node:path';
+/**
+ * Resolve the `vendor/bin/pint` path for the project. Walks up from
+ * the first written file until we find a sibling `vendor/bin/pint`,
+ * stopping at filesystem root or after 12 levels (defensive against
+ * pathological inputs). Returns the absolute path or null.
+ */
+export function findPintBinary(anyWrittenPhpPath) {
+    let cur = dirname(anyWrittenPhpPath);
+    for (let i = 0; i < 12; i++) {
+        const candidate = join(cur, 'vendor', 'bin', 'pint');
+        if (existsSync(candidate)) {
+            try {
+                const st = statSync(candidate);
+                if (st.isFile())
+                    return candidate;
+            }
+            catch {
+                // ignore stat errors and keep climbing
+            }
+        }
+        const parent = dirname(cur);
+        if (parent === cur)
+            break;
+        cur = parent;
+    }
+    return null;
+}
+/**
+ * Run Laravel Pint on the given PHP files (absolute paths). No-op if
+ * Pint isn't installed in the project. Pint is invoked with `--quiet`
+ * so it stays out of the way unless something breaks.
+ *
+ * Pint takes a list of files (or directories) and formats them in
+ * place. It uses the project's `pint.json` config if present, else the
+ * Laravel preset.
+ */
+export function runPintFormat(writtenPhpPaths) {
+    if (writtenPhpPaths.length === 0) {
+        return { ran: false, pintPath: null, formattedCount: 0, exitStatus: null };
+    }
+    const pintPath = findPintBinary(writtenPhpPaths[0]);
+    if (!pintPath) {
+        return { ran: false, pintPath: null, formattedCount: 0, exitStatus: null };
+    }
+    // Pint's working dir should be the Laravel project root (where
+    // composer.json + pint.json live). The pint binary is at
+    // `<projectRoot>/vendor/bin/pint`, so projectRoot is two parents up.
+    const projectRoot = dirname(dirname(dirname(pintPath)));
+    // Pass each file as its own arg. Pint accepts multiple file/dir
+    // arguments; capping the batch is unnecessary up to a few hundred
+    // files (well under the OS arg limit).
+    const result = spawnSync(pintPath, ['--quiet', ...writtenPhpPaths], {
+        cwd: projectRoot,
+        stdio: ['ignore', 'pipe', 'pipe'],
+        encoding: 'utf-8',
+    });
+    const exitStatus = result.status ?? null;
+    return {
+        ran: true,
+        pintPath,
+        formattedCount: writtenPhpPaths.length,
+        exitStatus,
+        errorMessage: exitStatus !== 0 ? (result.stderr || result.stdout || undefined) : undefined,
+    };
+}