@omnifyjp/ts 5.5.0 → 5.6.1

package/dist/php/types.d.ts

@@ -39,15 +39,35 @@ export declare function resolveSharedBasePath(config: PhpConfig, category: BaseC
  */
 export declare function resolveSharedBaseNamespace(config: PhpConfig, category: BaseCategory, legacyNamespace: string): string;
 /**
- * Resolve global Omnify enum file path. Used for system enums that aren't tied
- * to a single user-defined schema (e.g. FileStatusEnum belongs to the Omnify
- * file-attachment subsystem). In modular mode these live under their own
- * top-level folder so they're easy to find. In legacy mode the original
- * `legacyPath` is preserved for backward compat.
+ * Resolve global Omnify enum file path. ALWAYS uses
+ * `config.globalEnums.path` regardless of structure mode — enums are
+ * conceptually independent of the model tree they describe and belong
+ * in their own dedicated folder for discoverability. The `legacyPath`
+ * argument is kept for callsite compatibility but ignored.
+ *
+ * Default: `app/Omnify/Enums/`. Override via `codegen.laravel.enums.path`
+ * in `omnify.yaml` (e.g. set to `app/Models/Omnify` to restore the
+ * pre-v5.6 legacy behavior of co-locating enums with models).
+ *
+ * History: pre-v5.6, legacy structure dumped enums into the model dir
+ * (`app/Models/Omnify/<Name>Enum.php`), mixing them with the user
+ * models — confusing for code reviewers and inconsistent with modular
+ * mode. Fixed via dedicated dir always.
+ */
+export declare function resolveGlobalEnumPath(config: PhpConfig, fileName: string, _legacyPath: string): string;
+/**
+ * Resolve global Omnify enum namespace. ALWAYS uses
+ * `config.globalEnums.namespace`. The `legacyNamespace` argument is
+ * kept for callsite compatibility but ignored.
+ *
+ * Default: `App\Omnify\Enums`. Override via
+ * `codegen.laravel.enums.namespace` to match a custom path.
+ *
+ * History: pre-v5.6, legacy structure used the model namespace
+ * (`App\Models\Omnify`), forcing every model file to import enums via
+ * the model dir. Fixed via dedicated namespace always.
  */
-export declare function resolveGlobalEnumPath(config: PhpConfig, fileName: string, legacyPath: string): string;
-/** Resolve global Omnify enum namespace. Modular: {globalEnums.namespace}. Legacy: passthrough. */
-export declare function resolveGlobalEnumNamespace(config: PhpConfig, legacyNamespace: string): string;
+export declare function resolveGlobalEnumNamespace(config: PhpConfig, _legacyNamespace: string): string;
 /** Resolve global Omnify trait file path (HasFiles, HasLocalizedDisplayName, ...). */
 export declare function resolveGlobalTraitPath(config: PhpConfig, fileName: string, legacyPath: string): string;
 /** Resolve global Omnify trait namespace. */

package/dist/php/types.js

@@ -54,24 +54,38 @@ export function resolveSharedBaseNamespace(config, category, legacyNamespace) {
     return legacyNamespace;
 }
 /**
- * Resolve global Omnify enum file path. Used for system enums that aren't tied
- * to a single user-defined schema (e.g. FileStatusEnum belongs to the Omnify
- * file-attachment subsystem). In modular mode these live under their own
- * top-level folder so they're easy to find. In legacy mode the original
- * `legacyPath` is preserved for backward compat.
+ * Resolve global Omnify enum file path. ALWAYS uses
+ * `config.globalEnums.path` regardless of structure mode — enums are
+ * conceptually independent of the model tree they describe and belong
+ * in their own dedicated folder for discoverability. The `legacyPath`
+ * argument is kept for callsite compatibility but ignored.
+ *
+ * Default: `app/Omnify/Enums/`. Override via `codegen.laravel.enums.path`
+ * in `omnify.yaml` (e.g. set to `app/Models/Omnify` to restore the
+ * pre-v5.6 legacy behavior of co-locating enums with models).
+ *
+ * History: pre-v5.6, legacy structure dumped enums into the model dir
+ * (`app/Models/Omnify/<Name>Enum.php`), mixing them with the user
+ * models — confusing for code reviewers and inconsistent with modular
+ * mode. Fixed via dedicated dir always.
  */
-export function resolveGlobalEnumPath(config, fileName, legacyPath) {
-    if (config.structure === 'modular') {
-        return `${config.globalEnums.path}/${fileName}`;
-    }
-    return `${legacyPath}/${fileName}`;
+export function resolveGlobalEnumPath(config, fileName, _legacyPath) {
+    return `${config.globalEnums.path}/${fileName}`;
 }
-/** Resolve global Omnify enum namespace. Modular: {globalEnums.namespace}. Legacy: passthrough. */
-export function resolveGlobalEnumNamespace(config, legacyNamespace) {
-    if (config.structure === 'modular') {
-        return config.globalEnums.namespace;
-    }
-    return legacyNamespace;
+/**
+ * Resolve global Omnify enum namespace. ALWAYS uses
+ * `config.globalEnums.namespace`. The `legacyNamespace` argument is
+ * kept for callsite compatibility but ignored.
+ *
+ * Default: `App\Omnify\Enums`. Override via
+ * `codegen.laravel.enums.namespace` to match a custom path.
+ *
+ * History: pre-v5.6, legacy structure used the model namespace
+ * (`App\Models\Omnify`), forcing every model file to import enums via
+ * the model dir. Fixed via dedicated namespace always.
+ */
+export function resolveGlobalEnumNamespace(config, _legacyNamespace) {
+    return config.globalEnums.namespace;
 }
 /** Resolve global Omnify trait file path (HasFiles, HasLocalizedDisplayName, ...). */
 export function resolveGlobalTraitPath(config, fileName, legacyPath) {

package/package.json

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