@omnifyjp/omnify 5.9.0 → 5.9.2

package/package.json

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

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

@@ -115,7 +115,7 @@ function generateBaseModel(name, schema, reader, config) {
     // the generated base model.
     const hasAuditLog = reader.isAuditLogEnabled(name);
     const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace, hasFiles, modelNamespace, localesNamespace, traitsNamespace, sharedModelsNamespace, config, hasAuditLog);
-    const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder);
+    const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder, reader, config);
     const baseClass = isAuthenticatable ? 'Authenticatable' : 'BaseModel';
     const implementsClause = hasTranslatable ? ' implements TranslatableContract' : '';
     const traits = buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait, needsUlidTrait, hasNestedSet, hasFiles, hasAuditLog);
@@ -386,12 +386,14 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
         }
     }
     if (hasAuditLog) {
-        // HasOmnifyAuditLog is a global Omnify trait emitted by
-        // audit-trait-generator.ts. Same global-traits placement as HasFiles
-        // so consumers can update the trait in place without per-schema
-        // duplication.
+        // HasOmnifyAuditLog is a GLOBAL Omnify trait emitted by
+        // audit-trait-generator.ts at `config.models.baseNamespace\Traits`
+        // (e.g. App\Models\Omnify\Base\Traits). The import here must resolve to
+        // that SAME global namespace — using the per-model (group) `baseNamespace`
+        // (e.g. ...\Base\Logistics) yields `Base\Logistics\Traits\HasOmnifyAuditLog`
+        // which does not exist → "Trait not found" fatal on every model load.
         const auditTraitsNs = config
-            ? resolveGlobalTraitNamespace(config, baseNamespace + '\\Traits')
+            ? resolveGlobalTraitNamespace(config, config.models.baseNamespace + '\\Traits')
             : (traitsNamespace || baseNamespace + '\\Traits');
         lines.push(`use ${auditTraitsNs}\\HasOmnifyAuditLog;`);
     }
@@ -407,8 +409,14 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
     }
     return lines.join('\n') + '\n';
 }
-function buildDocProperties(properties, expandedProperties, propertyOrder) {
+function buildDocProperties(properties, expandedProperties, propertyOrder, reader, config) {
     const lines = [];
+    // Mirror buildCasts: EnumRef columns are cast to their generated enum class,
+    // so document them with that class (not `string`) — otherwise static analysis
+    // sees a string and rejects `$model->col->value` / enum comparisons.
+    const globalEnumNs = config
+        ? resolveGlobalEnumNamespace(config, config.models.namespace)
+        : '';
     for (const propName of propertyOrder) {
         const prop = properties[propName];
         if (!prop)
@@ -443,6 +451,16 @@ function buildDocProperties(properties, expandedProperties, propertyOrder) {
         }
         const nullable = prop['nullable'] ?? false;
         const snakeName = toSnakeCase(propName);
+        // EnumRef → document the generated enum class (fully-qualified, matching the
+        // cast) only when the referenced enum schema exists; else fall through.
+        if (type === 'EnumRef') {
+            const enumName = prop['enum'];
+            if (typeof enumName === 'string' && reader.getSchema(enumName)?.kind === 'enum' && globalEnumNs) {
+                const enumType = `\\${globalEnumNs}\\${enumClassName(enumName)}`;
+                lines.push(` * @property ${nullable ? `${enumType}|null` : enumType} $${snakeName}`);
+                continue;
+            }
+        }
         const phpDocType = toPhpDocType(type, nullable);
         lines.push(` * @property ${phpDocType} $${snakeName}`);
     }

package/ts-dist/php/request-generator.js

@@ -195,7 +195,7 @@ namespace ${baseNamespace};
 use Illuminate\\Foundation\\Http\\FormRequest;${ruleImport}
 use ${localesClass};
 
-abstract class ${modelName}${action}RequestBase extends FormRequest
+class ${modelName}${action}RequestBase extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -277,7 +277,10 @@ ${attributeKeysList}
         const nested = nestByGroup({ path: raw.path, namespace: '' }, schema.group);
         baseDescriptor = { className: raw.className, path: nested.path };
     }
-    const finalContent = content.replace(new RegExp(`class ${modelName}${action}RequestBase\\b`, 'g'), `class ${baseDescriptor.className}`).replace(new RegExp(`abstract class ${modelName}${action}RequestBase\\b`, 'g'), `abstract class ${baseDescriptor.className}`);
+    // Issue #114: the request base is the class controllers inject directly
+    // (#101) — so it must be CONCRETE, not abstract (an abstract FormRequest is
+    // not container-resolvable → BindingResolutionException / HTTP 500).
+    const finalContent = content.replace(new RegExp(`class ${modelName}${action}RequestBase\\b`, 'g'), `class ${baseDescriptor.className}`);
     return baseFile(`${baseDescriptor.path}/${baseDescriptor.className}.php`, finalContent);
 }
 function generateUserRequest(name, schema, config, action) {

package/ts-dist/php/resource-generator.d.ts

@@ -5,9 +5,12 @@ import { SchemaReader } from './schema-reader.js';
 import type { GeneratedFile, PhpConfig } from './types.js';
 /** Generate Resource classes for all project-owned visible object schemas.
  *
- * Issue #101 v5.8.23: only the base is emitted. Empty editable stubs
- * (every project's 30+ thin `class XResource extends Base {}`) are
- * pure scaffolding noise — devs hand-create wrappers only when custom
- * serialization logic IS needed.
+ * Issue #101 v5.8.23 emitted ONLY the base — but child resources embed a
+ * parent relation via `new \App\Http\Resources\<Parent>Resource(...)` (the
+ * editable sibling). With the sibling gone, any loaded relation fatals with a
+ * "class not found" Error (issue #114). So the editable sibling is re-emitted
+ * as a create-if-missing user file (`overwrite: false`): written once, never
+ * regenerated (so it is not the scaffolding noise #101 removed), and the
+ * cross-resource reference always resolves.
  */
 export declare function generateResources(reader: SchemaReader, config: PhpConfig): GeneratedFile[];

package/ts-dist/php/resource-generator.js

@@ -6,10 +6,13 @@ import { isHiddenByDefault, toResourceExpression } from './type-mapper.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 /** Generate Resource classes for all project-owned visible object schemas.
  *
- * Issue #101 v5.8.23: only the base is emitted. Empty editable stubs
- * (every project's 30+ thin `class XResource extends Base {}`) are
- * pure scaffolding noise — devs hand-create wrappers only when custom
- * serialization logic IS needed.
+ * Issue #101 v5.8.23 emitted ONLY the base — but child resources embed a
+ * parent relation via `new \App\Http\Resources\<Parent>Resource(...)` (the
+ * editable sibling). With the sibling gone, any loaded relation fatals with a
+ * "class not found" Error (issue #114). So the editable sibling is re-emitted
+ * as a create-if-missing user file (`overwrite: false`): written once, never
+ * regenerated (so it is not the scaffolding noise #101 removed), and the
+ * cross-resource reference always resolves.
  */
 export function generateResources(reader, config) {
     const files = [];
@@ -17,6 +20,7 @@ export function generateResources(reader, config) {
         if (schema.kind === 'extend')
             continue;
         files.push(generateBaseResource(name, schema, reader, config));
+        files.push(generateUserResource(name, schema, config));
     }
     return files;
 }