@omnifyjp/omnify 5.8.19 → 5.8.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "5.8.19",
+  "version": "5.8.21",
   "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.21",
+    "@omnifyjp/omnify-darwin-x64": "5.8.21",
+    "@omnifyjp/omnify-linux-x64": "5.8.21",
+    "@omnifyjp/omnify-linux-arm64": "5.8.21",
+    "@omnifyjp/omnify-win32-x64": "5.8.21"
   }
 }

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/architecture-doc-generator.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Architecture documentation generator. Issue #102 v5.8.21.
+ *
+ * Auto-emits a `docs/contributing/omnify-architecture.md` (or whichever
+ * path the project configured) describing the project's Omnify layout:
+ *
+ *   - Two-layer structure (auto-gen base zone + project-owned editable)
+ *   - Per-schema FQN reference table (computed from schemas.json + the
+ *     project's resolved codegen config)
+ *   - Hard rules + anti-patterns the project must follow
+ *   - Astrotomic translatable hookup, Pivot/Translation always-grouped
+ *
+ * The content is fully derivable from the codegen state — every Omnify
+ * project hand-wrote some version of this doc and let it drift the
+ * moment a schema changed. Auto-generating it keeps the doc
+ * consistent with the actual file layout, version after version.
+ */
+import { SchemaReader } from './schema-reader.js';
+import type { GeneratedFile, PhpConfig } from './types.js';
+/** Generate `omnify-architecture.md` describing the project's Omnify layout. */
+export declare function generateArchitectureDoc(reader: SchemaReader, config: PhpConfig): GeneratedFile[];

package/ts-dist/php/architecture-doc-generator.js

@@ -0,0 +1,156 @@
+/**
+ * Architecture documentation generator. Issue #102 v5.8.21.
+ *
+ * Auto-emits a `docs/contributing/omnify-architecture.md` (or whichever
+ * path the project configured) describing the project's Omnify layout:
+ *
+ *   - Two-layer structure (auto-gen base zone + project-owned editable)
+ *   - Per-schema FQN reference table (computed from schemas.json + the
+ *     project's resolved codegen config)
+ *   - Hard rules + anti-patterns the project must follow
+ *   - Astrotomic translatable hookup, Pivot/Translation always-grouped
+ *
+ * The content is fully derivable from the codegen state — every Omnify
+ * project hand-wrote some version of this doc and let it drift the
+ * moment a schema changed. Auto-generating it keeps the doc
+ * consistent with the actual file layout, version after version.
+ */
+import { toPascalCase } from './naming-helper.js';
+import { baseFile, nestByGroup } from './types.js';
+/** Generate `omnify-architecture.md` describing the project's Omnify layout. */
+export function generateArchitectureDoc(reader, config) {
+    const schemas = reader.getProjectVisibleObjectSchemas();
+    const allSchemaNames = Object.keys(schemas).sort();
+    if (allSchemaNames.length === 0)
+        return [];
+    // Group schemas by yaml group folder.
+    const byGroup = new Map();
+    for (const name of allSchemaNames) {
+        const schema = schemas[name];
+        const group = schema.group ?? '_root';
+        const arr = byGroup.get(group) ?? [];
+        arr.push(name);
+        byGroup.set(group, arr);
+    }
+    const groups = Array.from(byGroup.keys()).sort();
+    const lines = [];
+    // ── Header ────────────────────────────────────────────────────────────────
+    const today = new Date().toISOString().slice(0, 10);
+    lines.push('---');
+    lines.push('title: Omnify Architecture (auto-generated)');
+    lines.push(`generated_at: ${today}`);
+    lines.push('generated_by: omnify');
+    lines.push(`schema_count: ${allSchemaNames.length}`);
+    lines.push(`group_count: ${groups.length}`);
+    lines.push('---');
+    lines.push('');
+    lines.push('# Omnify Architecture');
+    lines.push('');
+    lines.push('> AUTO-GENERATED — do not edit. Regenerate via `omnify generate`.');
+    lines.push('');
+    lines.push('This project follows the Omnify v5.8.x canonical Laravel layout. The');
+    lines.push('`app/Omnify/` zone is owned by the codegen; `app/Models/`, `app/Http/`,');
+    lines.push('`app/Services/`, `app/Policies/` are project-owned and extend the');
+    lines.push('auto-gen bases.');
+    lines.push('');
+    // ── Layer map ─────────────────────────────────────────────────────────────
+    lines.push('## Layer map');
+    lines.push('');
+    lines.push('| Layer | Auto-gen base | User-editable (Laravel-canonical) |');
+    lines.push('|-------|---------------|-----------------------------------|');
+    lines.push(`| Model | \`${config.models.basePath}/<Group>/<Name>.php\` | \`${config.models.userEditablePath}/<Name>.php\` (FLAT) |`);
+    lines.push(`| Translation | \`${config.models.basePath}/Translation/<Name>Translation.php\` | \`${config.models.userEditablePath}/Translation/<Name>Translation.php\` |`);
+    lines.push(`| Pivot | \`${config.models.basePath}/Pivot/<Name>.php\` | \`${config.models.userEditablePath}/Pivot/<Name>.php\` |`);
+    lines.push(`| Enum | \`${config.globalEnums.path}/<Name>Enum.php\` | _(no user-editable)_ |`);
+    lines.push(`| Request | \`${config.requests.basePath}/<Group>/<Name>StoreRequest.php\` | \`${config.requests.userEditablePath}/<Name>StoreRequest.php\` (FLAT) |`);
+    lines.push(`| Resource | \`${config.resources.basePath}/<Group>/<Name>Resource.php\` | \`${config.resources.userEditablePath}/<Name>Resource.php\` (FLAT) |`);
+    lines.push(`| Service | \`${config.services.basePath}/<Group>/<Name>Service.php\` | \`${config.services.userEditablePath}/<Name>Service.php\` (FLAT) |`);
+    lines.push(`| Policy | \`${config.policies.basePath}/<Group>/<Name>Policy.php\` | \`${config.policies.userEditablePath}/<Name>Policy.php\` (FLAT) |`);
+    lines.push('');
+    // ── Per-schema FQN reference ──────────────────────────────────────────────
+    lines.push('## Schema → Base FQN reference');
+    lines.push('');
+    lines.push('Every schema in the project, organized by YAML group folder. The');
+    lines.push('FQN columns are the **base** classes — extend these from your');
+    lines.push('user-editable wrappers.');
+    lines.push('');
+    for (const group of groups) {
+        const groupNames = byGroup.get(group).sort();
+        const heading = group === '_root' ? '_ungrouped_' : group;
+        lines.push(`### ${heading} (${groupNames.length} schema${groupNames.length === 1 ? '' : 's'})`);
+        lines.push('');
+        lines.push('| Schema | Model base | Service base | Resource base | Request base | Policy base |');
+        lines.push('|---|---|---|---|---|---|');
+        for (const name of groupNames) {
+            const schema = schemas[name];
+            const modelName = toPascalCase(name);
+            const groupSegment = schema.group;
+            const isPivot = schema.kind === 'pivot';
+            const nestNs = (baseNs) => {
+                if (config.structure === 'modular')
+                    return baseNs;
+                if (isPivot)
+                    return `${baseNs}\\Pivot`;
+                if (groupSegment) {
+                    return nestByGroup({ path: '', namespace: baseNs }, groupSegment).namespace;
+                }
+                return baseNs;
+            };
+            const modelFqn = `${nestNs(config.models.baseNamespace)}\\${modelName}${config.models.flatBase ? '' : 'BaseModel'}`;
+            const serviceFqn = `${nestNs(config.services.baseNamespace)}\\${modelName}Service${config.services.flatBase ? '' : 'Base'}`;
+            const resourceFqn = `${nestNs(config.resources.baseNamespace)}\\${modelName}Resource${config.resources.flatBase ? '' : 'Base'}`;
+            const requestFqn = `${nestNs(config.requests.baseNamespace)}\\${modelName}StoreRequest${config.requests.flatBase ? '' : 'Base'}`;
+            const policyFqn = `${nestNs(config.policies.baseNamespace)}\\${modelName}Policy${config.policies.flatBase ? '' : 'Base'}`;
+            lines.push(`| ${modelName} | \`${modelFqn}\` | \`${serviceFqn}\` | \`${resourceFqn}\` | \`${requestFqn}\` | \`${policyFqn}\` |`);
+        }
+        lines.push('');
+    }
+    // ── Hard rules ────────────────────────────────────────────────────────────
+    lines.push('## Hard rules');
+    lines.push('');
+    lines.push('1. **Never edit anything under the `Omnify/` auto-gen zone.** Files');
+    lines.push('   here carry a `DO NOT EDIT` header and are overwritten on every');
+    lines.push('   `omnify generate`.');
+    lines.push('2. **Schema-derived classes MUST extend the omnify base.** Do not');
+    lines.push('   extend `Eloquent\\Model`, `JsonResource`, `FormRequest`, etc.');
+    lines.push('   directly when a base exists for that schema.');
+    lines.push('3. **User-editable lives at canonical Laravel paths** — flat at the');
+    lines.push('   top level (`app/Models/<Name>.php`, NOT `app/Models/<Group>/<Name>.php`).');
+    lines.push('4. **Custom (non-schema) classes go in subfolders**, not at the FLAT');
+    lines.push('   top (`app/Services/Auth/PasswordResetService.php`, etc.).');
+    lines.push('5. **Translation / Pivot / Enum always grouped** — even when other');
+    lines.push('   layers are flat, these three keep their dedicated subfolder.');
+    lines.push('6. **`config/translatable.php` must set `translation_model_namespace`**');
+    lines.push(`   to \`${config.models.userEditableNamespace}\\Translation\` so Astrotomic auto-resolves.`);
+    lines.push('');
+    // ── Anti-patterns ─────────────────────────────────────────────────────────
+    lines.push('## Anti-patterns');
+    lines.push('');
+    lines.push('- Editing files under the `Omnify/` auto-gen zone');
+    lines.push('- Re-declaring `$table` / `$fillable` / `$casts` in user-editable');
+    lines.push('  models (duplicates schema, drifts on next regeneration)');
+    lines.push('- Importing the auto-gen base namespace directly from controllers /');
+    lines.push('  services when a user-editable wrapper exists');
+    lines.push('- Adding manual `Gate::policy()` registrations for schema-derived');
+    lines.push('  models (Laravel auto-discovery handles them)');
+    lines.push('- Writing the same schema definition twice (once in YAML, once');
+    lines.push('  hand-written)');
+    lines.push('- Putting custom (non-schema) resources at the FLAT top-level path');
+    lines.push('');
+    // ── Footer ────────────────────────────────────────────────────────────────
+    lines.push('## Regenerate');
+    lines.push('');
+    lines.push('```bash');
+    lines.push('omnify generate');
+    lines.push('```');
+    lines.push('');
+    lines.push(`Last updated: ${today} by omnify.`);
+    lines.push('');
+    // Honor `rootPath` so monorepo layouts (`rootPath: backend`) get the
+    // doc emitted under `backend/docs/contributing/...` like the rest of
+    // the codegen output.
+    const docPath = config.rootPath
+        ? `${config.rootPath}/docs/contributing/omnify-architecture.md`
+        : 'docs/contributing/omnify-architecture.md';
+    return [baseFile(docPath, lines.join('\n'))];
+}

package/ts-dist/php/index.js

@@ -36,6 +36,7 @@ import { generateServices } from './service-generator.js';
 import { generateRoutes } from './route-generator.js';
 import { generateEnums } from './enum-generator.js';
 import { generateOpenApi } from './openapi-generator.js';
+import { generateArchitectureDoc } from './architecture-doc-generator.js';
 export { derivePhpConfig } from './types.js';
 /** Generate all PHP files from schemas.json data. */
 export function generatePhp(data, overrides) {
@@ -104,5 +105,11 @@ export function generatePhp(data, overrides) {
     files.push(...generateResources(reader, config));
     files.push(...generateFactories(reader, config));
     files.push(...generatePolicies(reader, config));
+    // Issue #102 v5.8.21: emit `docs/contributing/omnify-architecture.md`
+    // describing the project's resolved Omnify layout — layer paths,
+    // per-schema FQN reference, hard rules, anti-patterns. Pure additive;
+    // no behavior change for existing consumers, and the doc updates
+    // automatically as schemas / config change so it never drifts.
+    files.push(...generateArchitectureDoc(reader, config));
     return files;
 }

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,
+    };
+}