@omnifyjp/ts 5.8.16 → 5.8.18

package/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 } 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,29 @@ program
                 phpSkipped++;
                 continue;
             }
+            // Issue #98 v5.8.18: skip user-editable stub when a project-owned
+            // sibling with the same basename exists elsewhere in the layer's
+            // editable subtree (e.g. project organizes Requests by domain
+            // folder `Admin/BrandStoreRequest.php` while omnify wanted to
+            // emit the FLAT default stub `BrandStoreRequest.php` at the
+            // layer root). The flat stub is unused noise in that layout,
+            // and every `omnify generate` would otherwise re-create it,
+            // forcing the dev to delete it manually after each run.
+            // Only applies to user-editable files (overwrite=false); base
+            // files always regenerate. Scope: scan ONLY the file's parent
+            // directory recursively — not sibling directories — so a
+            // grouped `Cms/<Name>.php` stub doesn't get skipped by an
+            // unrelated `Admin/<Name>.php`.
+            if (!file.overwrite) {
+                const collision = findSiblingWithSameBasename(dirname(filePath), 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 +265,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/dist/php/resource-generator.js

@@ -46,7 +46,7 @@ function generateBaseResource(name, schema, reader, config) {
         if (isHiddenByDefault(type) || hidden)
             continue;
         if (type === 'Association') {
-            addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader);
+            addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader, config);
             continue;
         }
         if (expandedProperties[propName]) {
@@ -193,27 +193,38 @@ class ${editable.className} extends ${baseAlias}
 `;
     return userFile(`${editable.path}/${editable.fileName}`, content);
 }
-function addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader) {
+function addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader, config) {
     const relation = prop['relation'] ?? '';
     const target = prop['target'] ?? '';
     const methodName = toCamelCase(propName);
-    // Resolve resource namespace for the target (null if package without resource ns)
-    // Issue #98 v5.8.12: nest the resource FQCN by the TARGET schema's
-    // group folder so the inline `new \<ns>\<Name>Resource(...)` ref
-    // matches where the target Resource file actually lives. Pre-fix
-    // every cross-resource ref emitted FLAT (`use App\Omnify\Resources\PaymentProviderResource`)
-    // while the file lived at `App\Omnify\Resources\Payments\PaymentProviderResource` —
-    // PHP autoload failed at runtime on every base resource that
-    // referenced a sibling resource (whenLoaded relation).
-    const rawTargetResNs = target ? reader.resolveResourceNamespace(target, resourceNamespace) : resourceNamespace;
-    let targetResNs = rawTargetResNs;
-    if (rawTargetResNs && rawTargetResNs === resourceNamespace) {
-        // Project-owned target: nest by the target's group so the FQCN
-        // matches the grouped base resource. Package targets keep their
-        // own namespace.
+    // Resolve resource namespace for the target.
+    // Issue #98 v5.8.12 / #99 v5.8.17: cross-resource refs match where
+    // the target Resource file actually lives. Same pattern as the
+    // v5.8.10/11 model + service / controller fixes — point at the
+    // EDITABLE so app code consistently resolves the same class:
+    //   1. Package target → keep the package's resource namespace.
+    //   2. Project target on modular structure → use the resource
+    //      namespace as-is (modular has its own per-schema isolation).
+    //   3. `userEditableGroupByFolder: true` → nest editable namespace
+    //      by group so the FQCN matches the grouped editable file.
+    //   4. Default (flat editable) → use the editable namespace as-is.
+    //      v4 projects with `resource.namespace: App\\Http\\Resources`
+    //      single-tier flat layout (#99) hit this path and stay flat.
+    const packageResNs = target ? reader.resolveResourceNamespace(target, resourceNamespace) : resourceNamespace;
+    let targetResNs = packageResNs;
+    if (packageResNs && packageResNs === resourceNamespace) {
+        // Project-owned target: switch to editable namespace + apply
+        // optional group nesting. Modular structure aligns base + editable
+        // on the same namespace so this is a no-op.
+        const editableNs = config.resources.userEditableNamespace || resourceNamespace;
         const targetSchema = target ? reader.getSchema(target) : undefined;
-        if (targetSchema?.group) {
-            targetResNs = `${rawTargetResNs}\\${toPascalCase(targetSchema.group)}`;
+        if (config.structure !== 'modular'
+            && config.resources.userEditableGroupByFolder
+            && targetSchema?.group) {
+            targetResNs = `${editableNs}\\${toPascalCase(targetSchema.group)}`;
+        }
+        else {
+            targetResNs = editableNs;
         }
     }
     // If target is a package schema without a resource namespace, use simple whenLoaded

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

@@ -0,0 +1,29 @@
+/**
+ * User-editable stub collision detection. Issue #98 v5.8.18.
+ *
+ * Many Laravel projects organize Requests / Resources / Services by
+ * domain subfolder (`Admin/`, `Cms/`, `Audit/`, etc.) BEFORE adopting
+ * omnify. When omnify then emits the FLAT default stub at the layer
+ * root (e.g. `app/Http/Requests/BrandStoreRequest.php`), the stub
+ * collides ergonomically with the project's hand-written
+ * `app/Http/Requests/Admin/BrandStoreRequest.php` — same basename,
+ * unused by any caller, gets re-created every `omnify generate`,
+ * forcing the dev to delete it manually.
+ *
+ * Detection: scan the file's PARENT DIRECTORY recursively for any
+ * file with the same basename. If found at a path != target, skip
+ * emission.
+ *
+ * Scope rule: scan ONLY the file's parent directory (and its subdirs),
+ * NOT sibling directories. So a grouped editable at `Cms/Banner.php`
+ * isn't skipped by an unrelated `Admin/Banner.php`.
+ *
+ * Bounded by `MAX_FILES_SCANNED` so a project root with tens of
+ * thousands of files doesn't grind generate to a halt.
+ */
+/**
+ * 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/dist/php/sibling-skip.js

@@ -0,0 +1,69 @@
+/**
+ * User-editable stub collision detection. Issue #98 v5.8.18.
+ *
+ * Many Laravel projects organize Requests / Resources / Services by
+ * domain subfolder (`Admin/`, `Cms/`, `Audit/`, etc.) BEFORE adopting
+ * omnify. When omnify then emits the FLAT default stub at the layer
+ * root (e.g. `app/Http/Requests/BrandStoreRequest.php`), the stub
+ * collides ergonomically with the project's hand-written
+ * `app/Http/Requests/Admin/BrandStoreRequest.php` — same basename,
+ * unused by any caller, gets re-created every `omnify generate`,
+ * forcing the dev to delete it manually.
+ *
+ * Detection: scan the file's PARENT DIRECTORY recursively for any
+ * file with the same basename. If found at a path != target, skip
+ * emission.
+ *
+ * Scope rule: scan ONLY the file's parent directory (and its subdirs),
+ * NOT sibling directories. So a grouped editable at `Cms/Banner.php`
+ * isn't skipped by an unrelated `Admin/Banner.php`.
+ *
+ * Bounded by `MAX_FILES_SCANNED` so a project root with tens of
+ * thousands of files doesn't grind generate to a halt.
+ */
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { join } from 'node:path';
+const MAX_FILES_SCANNED = 5000;
+/**
+ * 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;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/ts",
-  "version": "5.8.16",
+  "version": "5.8.18",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",