@omnifyjp/ts 8.0.1 → 8.0.3

package/dist/cli.js

@@ -31,7 +31,7 @@ import { generateTypeScript } from './generator.js';
 import { generatePhp, derivePhpConfig } from './php/index.js';
 import { evaluateShadowingConflicts } from './php/shadowing-conflicts.js';
 import { collectReferencedClasses, hasEditableSubclassForBase, pruneDisabledScaffoldLayerBases, pruneOrphanServiceFilesIfEnabled } from './php/orphan-cleanup.js';
-import { findSiblingWithSameBasename, findAppRootAncestor } from './php/sibling-skip.js';
+import { findSiblingWithSameBasename, findAppRootAncestor, isOmnifyWrapper } from './php/sibling-skip.js';
 import { resolveInput, sniffInputKind } from './input-resolver.js';
 function resolveFromConfig(configPath) {
     const raw = readFileSync(configPath, 'utf-8');
@@ -295,7 +295,9 @@ program
             // files always regenerate.
             if (!file.overwrite) {
                 const scanRoot = findAppRootAncestor(filePath) ?? dirname(filePath);
-                const collision = findSiblingWithSameBasename(scanRoot, basename(filePath), filePath);
+                // #299: only an omnify wrapper replaces the stub, never an
+                // unrelated class that shares its name (Laravel's stock User.php).
+                const collision = findSiblingWithSameBasename(scanRoot, basename(filePath), filePath, (path) => isOmnifyWrapper(readFileSync(path, 'utf-8'), file.content));
                 if (collision) {
                     phpSkippedSibling++;
                     if (skippedSiblingExamples.length < 3) {

package/dist/php/audit-trait-generator.js

@@ -39,7 +39,9 @@ namespace ${traitsNamespace};
  * Trait that records every Eloquent lifecycle event into the central
  * audits history table. Apply via \`use HasOmnifyAuditLog;\` on any model
  * whose schema has \`options.audit.log: true\` (or when the global
- * \`audit.log\` flag is enabled).
+ * \`audit.log\` flag is enabled). The using class declares
+ * \`protected static array $auditExclude\` and \`$auditTags\` (the generated
+ * base model always does).
  *
  * DO NOT EDIT — auto-generated by Omnify. Any manual changes are lost on
  * the next \`omnify generate\` run.
@@ -110,7 +112,7 @@ trait HasOmnifyAuditLog
 
         $exclude = array_unique(array_merge(
             (array) config('omnify.audit.logExclude', []),
-            (array) (static::$auditExclude ?? [])
+            static::$auditExclude
         ));
         if (!empty($exclude)) {
             $flip = array_flip($exclude);
@@ -124,7 +126,7 @@ trait HasOmnifyAuditLog
 
         $request = function_exists('request') ? request() : null;
         $user = Auth::user();
-        $tags = static::$auditTags ?? [];
+        $tags = static::$auditTags;
 
         $payload = [
             'auditable_type' => $this->getMorphClass(),

package/dist/php/file-model-generator.js

@@ -422,6 +422,16 @@ class FileLocales
     public const PROPERTY_DISPLAY_NAMES = [
 ${propertyNamesPhp},
     ];
+
+    /**
+     * Localized display names for properties, widened to the declared shape.
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function propertyDisplayNames(): array
+    {
+        return self::PROPERTY_DISPLAY_NAMES;
+    }
 }
 `;
     return baseFile(resolveModularBasePath(config, 'File', 'Locales', 'FileLocales.php', config.models.basePath + '/Locales'), content);

package/dist/php/locales-generator.js

@@ -47,6 +47,16 @@ class ${modelName}Locales
      * @var array<string, array<string, string>>
      */
     public const PROPERTY_DISPLAY_NAMES = ${propertyDisplayNamesPhp};
+
+    /**
+     * Localized display names for properties, widened to the declared shape.
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function propertyDisplayNames(): array
+    {
+        return self::PROPERTY_DISPLAY_NAMES;
+    }
 }
 `;
     return baseFile(resolveModularBasePath(config, name, 'Locales', `${modelName}Locales.php`, config.models.basePath + '/Locales'), content);

package/dist/php/model-generator.js

@@ -1205,8 +1205,8 @@ function buildNestedSetParentIdMethod(parentColumn) {
  *   - `$auditTags` is the static tag list applied to every audit row
  *     from this model; useful for grouping (e.g. ["billing"]).
  *
- * Empty arrays are omitted entirely so the trait falls through to its
- * own static defaults — keeps the generated PHP minimal.
+ * Both are declared on every audited model, as `[]` when empty: the trait
+ * reads them directly (#298).
  */
 function buildAuditLogProperties(schemaName, reader) {
     if (!reader.isAuditLogEnabled(schemaName))
@@ -1214,9 +1214,13 @@ function buildAuditLogProperties(schemaName, reader) {
     const excludes = reader.getAuditExcludesFor(schemaName);
     const tags = reader.getAuditTagsFor(schemaName);
     const parts = [];
-    if (excludes.length > 0) {
-        const lines = excludes.map((c) => `        ${JSON.stringify(c).replace(/"/g, "'")},`).join('\n');
-        parts.push(`
+    // #298: both statics are always declared on an audited model, empty or not,
+    // so HasOmnifyAuditLog reads them directly instead of `?? []` on a property
+    // that may not exist (PHPStan nullCoalesce.property when it does).
+    const phpList = (items) => items.length === 0
+        ? '[]'
+        : `[\n${items.map((c) => `        ${JSON.stringify(c).replace(/"/g, "'")},`).join('\n')}\n    ]`;
+    parts.push(`
     /**
      * Columns scrubbed from old_values / new_values BEFORE the audit row
      * is built. Merged at runtime with the global \`config('omnify.audit.logExclude')\`
@@ -1224,13 +1228,8 @@ function buildAuditLogProperties(schemaName, reader) {
      *
      * @var array<int, string>
      */
-    protected static array $auditExclude = [
-${lines}
-    ];`);
-    }
-    if (tags.length > 0) {
-        const lines = tags.map((t) => `        ${JSON.stringify(t).replace(/"/g, "'")},`).join('\n');
-        parts.push(`
+    protected static array $auditExclude = ${phpList(excludes)};`);
+    parts.push(`
     /**
      * Static tags applied to every audit row from this model. Surfaces
      * in the audits table's \`tags\` column for grouping in the activity
@@ -1238,11 +1237,8 @@ ${lines}
      *
      * @var array<int, string>
      */
-    protected static array $auditTags = [
-${lines}
-    ];`);
-    }
-    return parts.length === 0 ? '' : parts.join('\n') + '\n';
+    protected static array $auditTags = ${phpList(tags)};`);
+    return parts.join('\n') + '\n';
 }
 function buildAuditSection(options, reader, modelNamespace) {
     const opts = options;

package/dist/php/policy-generator.js

@@ -361,6 +361,12 @@ function operandToPhp(operand, schema, reader, side) {
             if (prop?.relation === 'ManyToOne') {
                 return `$record->${toFkColumnName(propName)}`;
             }
+            // #295: an EnumRef column is cast to its backed enum (same predicate as
+            // the model's casts), so `$record->status === 'published'` compares an
+            // enum instance with a string and is never true. Compare the value.
+            if (prop?.type === 'EnumRef' && typeof prop.enum === 'string' && reader.getSchema(prop.enum)?.kind === 'enum') {
+                return `$record->${toSnakeCase(propName)}${prop.nullable ? '?->' : '->'}value`;
+            }
             return `$record->${toSnakeCase(propName)}`;
         }
         case 'variable': {

package/dist/php/relation-builder.js

@@ -62,7 +62,8 @@ export function getReturnType(relation) {
         case 'MorphOne': return 'MorphOne';
         case 'MorphMany': return 'MorphMany';
         case 'MorphToMany': return 'MorphToMany';
-        case 'MorphedByMany': return 'MorphedByMany';
+        // Laravel has no MorphedByMany class: morphedByMany() returns MorphToMany (#297).
+        case 'MorphedByMany': return 'MorphToMany';
         default: return 'BelongsTo';
     }
 }
@@ -255,7 +256,7 @@ function morphedByMany(propName, property, target, ns) {
     return `    /**
      * The ${propName} that belong to this model.
      */
-    public function ${methodName}(): MorphedByMany
+    public function ${methodName}(): MorphToMany
     {
         return $this->morphedByMany(${fqcn}::class, '${morphName}')
             ->withTimestamps();

package/dist/php/request-generator.js

@@ -244,7 +244,7 @@ function generateBaseRequest(name, schema, reader, config, action) {
             '    {',
             "        $locale = app()->getLocale();",
             "        $fallback = config('app.fallback_locale', 'en');",
-            `        $propertyNames = ${modelName}Locales::PROPERTY_DISPLAY_NAMES;`,
+            `        $propertyNames = ${modelName}Locales::propertyDisplayNames();`,
             '        $attributes = [];',
             '',
             '        $keys = [',

package/dist/php/service-generator.js

@@ -1158,7 +1158,7 @@ ${listExample}
     // disable LIMIT (whole-table dump) and a huge one is unbounded.
     lines.push(`
         $perPage = filter_var($filters['per_page'] ?? null, FILTER_VALIDATE_INT);
-        $perPage = $perPage === false || $perPage === null ? ${perPage} : $perPage;
+        $perPage = $perPage === false ? ${perPage} : $perPage;
         $perPage = max(1, min($perPage, ${maxPerPage}));
 
         return $query->paginate($perPage);

package/dist/php/service-provider-generator.js

@@ -95,7 +95,7 @@ class OmnifyServiceProvider extends ServiceProvider
         // connection via Schema::connection(), so a single migrate run suffices).
         $omnifyMigrations = database_path('migrations/omnify');
         $this->loadMigrationsFrom($omnifyMigrations);
-        foreach (glob($omnifyMigrations.'/*', GLOB_ONLYDIR) as $connectionDir) {
+        foreach (glob($omnifyMigrations.'/*', GLOB_ONLYDIR) ?: [] as $connectionDir) {
             $this->loadMigrationsFrom($connectionDir);
         }
 ${packageMigrationsBlock}

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

@@ -62,4 +62,20 @@ export declare function findOmnifyRoot(filePath: string): string | null;
  * skip rule is "any directory whose name starts with `Omnify` is
  * codegen-owned", which matches `Omnify/`, `OmnifyBase/`, etc.
  */
-export declare function findSiblingWithSameBasename(rootDir: string, baseName: string, excludePath: string): string | null;
+export declare function findSiblingWithSameBasename(rootDir: string, baseName: string, excludePath: string, 
+/** #299: a same-name file counts only when this accepts it; scanning continues otherwise. */
+accept?: (path: string) => boolean): string | null;
+/**
+ * Whether `siblingContent` is an omnify wrapper that may stand in for the stub
+ * whose content is `stubContent`. Issue #299.
+ *
+ * Skipping a stub is only safe on positive evidence: a wrongly skipped model
+ * stub leaves every relation, service and policy pointing at a class nothing
+ * declares, while a wrongly emitted one is a single unused file. Laravel's
+ * stock `app/Models/User.php` shares the User stub's basename and is neither.
+ *
+ * Evidence is either omnify's own marker (the stub header, `Omnify` /
+ * `OmnifyBase` namespaces of v4 wrappers, #99) or a reference to the class the
+ * stub extends, by its real short name (#98 domain subfolders).
+ */
+export declare function isOmnifyWrapper(siblingContent: string, stubContent: string): boolean;

package/dist/php/sibling-skip.js

@@ -87,7 +87,9 @@ export function findOmnifyRoot(filePath) {
  * skip rule is "any directory whose name starts with `Omnify` is
  * codegen-owned", which matches `Omnify/`, `OmnifyBase/`, etc.
  */
-export function findSiblingWithSameBasename(rootDir, baseName, excludePath) {
+export function findSiblingWithSameBasename(rootDir, baseName, excludePath, 
+/** #299: a same-name file counts only when this accepts it; scanning continues otherwise. */
+accept = () => true) {
     // #178: only a file generated from the SAME omnify root can be a relocated
     // version of this stub. One from another root is a different class that
     // merely shares a filename, and skipping on it leaves the class nothing
@@ -135,9 +137,43 @@ export function findSiblingWithSameBasename(rootDir, baseName, excludePath) {
             else if (entry === baseName && fullPath !== excludePath) {
                 if (findOmnifyRoot(fullPath) !== ownerRoot)
                     continue;
+                if (!accept(fullPath))
+                    continue;
                 return fullPath;
             }
         }
     }
     return null;
 }
+/**
+ * Whether `siblingContent` is an omnify wrapper that may stand in for the stub
+ * whose content is `stubContent`. Issue #299.
+ *
+ * Skipping a stub is only safe on positive evidence: a wrongly skipped model
+ * stub leaves every relation, service and policy pointing at a class nothing
+ * declares, while a wrongly emitted one is a single unused file. Laravel's
+ * stock `app/Models/User.php` shares the User stub's basename and is neither.
+ *
+ * Evidence is either omnify's own marker (the stub header, `Omnify` /
+ * `OmnifyBase` namespaces of v4 wrappers, #99) or a reference to the class the
+ * stub extends, by its real short name (#98 domain subfolders).
+ */
+export function isOmnifyWrapper(siblingContent, stubContent) {
+    if (/omnify/i.test(siblingContent))
+        return true;
+    const stub = stubContent.match(/\bclass\s+(\w+)\s+extends\s+(\w+)/);
+    if (!stub)
+        return false;
+    const [, stubClass, extendsName] = stub;
+    let baseClass = extendsName;
+    for (const m of stubContent.matchAll(/^use\s+([\w\\]+?)(?:\s+as\s+(\w+))?\s*;/gm)) {
+        const short = m[1].slice(m[1].lastIndexOf('\\') + 1);
+        if ((m[2] ?? short) === extendsName)
+            baseClass = short;
+    }
+    // With flatBase the base shares the stub's short name, which every
+    // same-name file "references" — that says nothing.
+    if (baseClass === stubClass)
+        return false;
+    return new RegExp(`\\b${baseClass}\\b`).test(siblingContent);
+}

package/package.json

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