@omnifyjp/omnify 5.8.17 → 5.8.19

package/package.json

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

package/ts-dist/cli.js

@@ -24,12 +24,13 @@
  *   omnify-ts --update                      # force re-fetch remote input
  */
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'node:fs';
-import { resolve, dirname, join } from 'node:path';
+import { resolve, dirname, basename, join, relative } from 'node:path';
 import { Command } from 'commander';
 import { parse as parseYaml } from 'yaml';
 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 { resolveInput, sniffInputKind } from './input-resolver.js';
 function resolveFromConfig(configPath) {
     const raw = readFileSync(configPath, 'utf-8');
@@ -219,6 +220,8 @@ program
         let phpCreated = 0;
         let phpOverwritten = 0;
         let phpSkipped = 0;
+        let phpSkippedSibling = 0;
+        const skippedSiblingExamples = [];
         for (const file of phpFiles) {
             const filePath = resolve(configDir, file.path);
             mkdirSync(dirname(filePath), { recursive: true });
@@ -226,6 +229,37 @@ program
                 phpSkipped++;
                 continue;
             }
+            // Issue #98 v5.8.18 / #99 v5.8.19: skip user-editable stub
+            // when a project-owned sibling with the same basename exists
+            // elsewhere under the project's `app/` root. Two patterns
+            // covered:
+            //   1. Domain subfolder organization (#98 v5.8.18): project
+            //      hand-writes `app/Http/Requests/Admin/BrandStoreRequest.php`;
+            //      omnify wants to emit the flat default
+            //      `app/Http/Requests/BrandStoreRequest.php`. The flat
+            //      stub is unused noise.
+            //   2. v4 → v5 upgrade (#99 v5.8.19): project has v4 wrapper at
+            //      `app/Services/Omnify/<Name>Service.php`; v5 wants to
+            //      emit at the new modular path
+            //      `app/Omnify/Services/<Name>Service.php`. Two wrappers
+            //      compete; the v4 one carries the project's actual logic.
+            //
+            // Scope: scan from the project's `app/` directory (walked up
+            // from the target). Falls back to the file's parent dir when
+            // no `app/` ancestor is found (e.g. unusual rootPath layout).
+            // Only applies to user-editable files (`overwrite=false`); base
+            // files always regenerate.
+            if (!file.overwrite) {
+                const scanRoot = findAppRootAncestor(filePath) ?? dirname(filePath);
+                const collision = findSiblingWithSameBasename(scanRoot, basename(filePath), filePath);
+                if (collision) {
+                    phpSkippedSibling++;
+                    if (skippedSiblingExamples.length < 3) {
+                        skippedSiblingExamples.push(`${relative(configDir, filePath)} (sibling: ${relative(configDir, collision)})`);
+                    }
+                    continue;
+                }
+            }
             writeFileSync(filePath, file.content, 'utf-8');
             if (file.overwrite || !existsSync(filePath)) {
                 phpOverwritten++;
@@ -239,6 +273,15 @@ program
             console.log(`  ${phpCreated} files created (user-editable)`);
         if (phpSkipped > 0)
             console.log(`  ${phpSkipped} files skipped (already exist)`);
+        if (phpSkippedSibling > 0) {
+            console.log(`  ${phpSkippedSibling} user-editable stub(s) skipped (project sibling with same name found in subfolder)`);
+            for (const ex of skippedSiblingExamples) {
+                console.log(`    e.g. ${ex}`);
+            }
+            if (phpSkippedSibling > skippedSiblingExamples.length) {
+                console.log(`    ... and ${phpSkippedSibling - skippedSiblingExamples.length} more`);
+            }
+        }
         // 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/sibling-skip.d.ts

@@ -0,0 +1,42 @@
+/**
+ * User-editable stub collision detection. Issue #98 v5.8.18 / #99 v5.8.19.
+ *
+ * Many Laravel projects organize Requests / Resources / Services by
+ * domain subfolder (`Admin/`, `Cms/`, `Audit/`) BEFORE adopting omnify,
+ * OR they upgrade from v4 with wrappers at v4 paths
+ * (`app/Services/Omnify/<Name>Service.php`) and v5 wants to emit at
+ * the new modular path (`app/Omnify/Services/<Name>Service.php`). In
+ * both cases the auto-emitted user-editable stub is unused noise that
+ * regenerates every `omnify generate`, forcing the dev to delete it.
+ *
+ * Detection: scan a configurable root directory recursively for any
+ * file with the same basename. If found at a path != target, skip
+ * emission.
+ *
+ * Scope decision:
+ *   - Wide scope (e.g. project's `app/`): finds cross-layer wrappers
+ *     like the v4 → v5 upgrade case (#99).
+ *   - Narrow scope (file's parent dir): finds same-layer siblings only,
+ *     like a domain-organized `Admin/Brand.php` next to the flat
+ *     default (#98 v5.8.18).
+ *
+ * The CLI passes whichever scope matches the layout. Bounded by
+ * `MAX_FILES_SCANNED` so a project with tens of thousands of files
+ * doesn't grind generate to a halt.
+ */
+/**
+ * Walk up from `filePath` looking for the closest ancestor directory
+ * named `app`. Returns its absolute path or null. Used by the CLI to
+ * pick a project-wide search root for sibling-skip — covers v4 → v5
+ * cross-layer wrappers (e.g. v4 wrapper at `app/Services/Omnify/<X>Service.php`
+ * vs v5 modular emit at `app/Omnify/Services/<X>Service.php`). Capped
+ * at 12 levels of climbing so we don't traverse the entire FS on a
+ * malformed input.
+ */
+export declare function findAppRootAncestor(filePath: string): string | null;
+/**
+ * Scan `rootDir` recursively for a file whose basename matches
+ * `baseName`, excluding `excludePath` itself. Returns the first
+ * match's full path or null.
+ */
+export declare function findSiblingWithSameBasename(rootDir: string, baseName: string, excludePath: string): string | null;

package/ts-dist/php/sibling-skip.js

@@ -0,0 +1,93 @@
+/**
+ * User-editable stub collision detection. Issue #98 v5.8.18 / #99 v5.8.19.
+ *
+ * Many Laravel projects organize Requests / Resources / Services by
+ * domain subfolder (`Admin/`, `Cms/`, `Audit/`) BEFORE adopting omnify,
+ * OR they upgrade from v4 with wrappers at v4 paths
+ * (`app/Services/Omnify/<Name>Service.php`) and v5 wants to emit at
+ * the new modular path (`app/Omnify/Services/<Name>Service.php`). In
+ * both cases the auto-emitted user-editable stub is unused noise that
+ * regenerates every `omnify generate`, forcing the dev to delete it.
+ *
+ * Detection: scan a configurable root directory recursively for any
+ * file with the same basename. If found at a path != target, skip
+ * emission.
+ *
+ * Scope decision:
+ *   - Wide scope (e.g. project's `app/`): finds cross-layer wrappers
+ *     like the v4 → v5 upgrade case (#99).
+ *   - Narrow scope (file's parent dir): finds same-layer siblings only,
+ *     like a domain-organized `Admin/Brand.php` next to the flat
+ *     default (#98 v5.8.18).
+ *
+ * The CLI passes whichever scope matches the layout. Bounded by
+ * `MAX_FILES_SCANNED` so a project with tens of thousands of files
+ * doesn't grind generate to a halt.
+ */
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
+const MAX_FILES_SCANNED = 5000;
+/**
+ * Walk up from `filePath` looking for the closest ancestor directory
+ * named `app`. Returns its absolute path or null. Used by the CLI to
+ * pick a project-wide search root for sibling-skip — covers v4 → v5
+ * cross-layer wrappers (e.g. v4 wrapper at `app/Services/Omnify/<X>Service.php`
+ * vs v5 modular emit at `app/Omnify/Services/<X>Service.php`). Capped
+ * at 12 levels of climbing so we don't traverse the entire FS on a
+ * malformed input.
+ */
+export function findAppRootAncestor(filePath) {
+    let cur = dirname(filePath);
+    for (let i = 0; i < 12; i++) {
+        if (basename(cur) === 'app')
+            return cur;
+        const parent = dirname(cur);
+        if (parent === cur)
+            break;
+        cur = parent;
+    }
+    return null;
+}
+/**
+ * Scan `rootDir` recursively for a file whose basename matches
+ * `baseName`, excluding `excludePath` itself. Returns the first
+ * match's full path or null.
+ */
+export function findSiblingWithSameBasename(rootDir, baseName, excludePath) {
+    let scanned = 0;
+    const stack = [rootDir];
+    while (stack.length > 0) {
+        if (scanned >= MAX_FILES_SCANNED)
+            return null;
+        const dir = stack.pop();
+        if (!existsSync(dir))
+            continue;
+        let entries;
+        try {
+            entries = readdirSync(dir);
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            scanned++;
+            if (scanned >= MAX_FILES_SCANNED)
+                return null;
+            const fullPath = join(dir, entry);
+            let stats;
+            try {
+                stats = statSync(fullPath);
+            }
+            catch {
+                continue;
+            }
+            if (stats.isDirectory()) {
+                stack.push(fullPath);
+            }
+            else if (entry === baseName && fullPath !== excludePath) {
+                return fullPath;
+            }
+        }
+    }
+    return null;
+}