@omnifyjp/ts 5.6.1 → 5.6.2

package/dist/php/controller-generator.js

@@ -187,6 +187,13 @@ function generateUserController(name, schema, config) {
     const userPath = group
         ? `${editable.path}/Api/V1/${group}`
         : `${editable.path}/Api/V1`;
+    // Issue #98: alias on class-name collision (flatBase + userEditablePath).
+    const baseAlias = baseDescriptor.className === editable.className
+        ? `${baseDescriptor.className}Base`
+        : baseDescriptor.className;
+    const baseImport = baseAlias === baseDescriptor.className
+        ? `use ${baseDescriptor.fqn};`
+        : `use ${baseDescriptor.fqn} as ${baseAlias};`;
     const content = `<?php
 
 /**
@@ -197,9 +204,9 @@ function generateUserController(name, schema, config) {
 
 namespace ${userNs};
 
-use ${baseDescriptor.fqn};
+${baseImport}
 
-class ${editable.className} extends ${baseDescriptor.className}
+class ${editable.className} extends ${baseAlias}
 {
     //
 }

package/dist/php/model-generator.js

@@ -221,8 +221,17 @@ function generateUserModel(name, config, hasNestedSet = false) {
         : resolveBaseClass(config.models, modelName, 'BaseModel');
     const factoryNamespace = config.factories.namespace;
     const nestedSetNamespace = config.nestedset.namespace;
+    // Issue #98: when flatBase + userEditablePath both set, base.className
+    // (`Banner`) collides with the editable class (`Banner`). A bare
+    // `use App\Omnify\Models\Banner;` + `class Banner extends Banner`
+    // self-references and crashes at autoload. Alias the import in that
+    // case so the editable resolves to a distinct symbol.
+    const baseAlias = base.className === editable.className ? `${base.className}Base` : base.className;
+    const baseImport = baseAlias === base.className
+        ? `use ${base.fqn};`
+        : `use ${base.fqn} as ${baseAlias};`;
     const imports = [
-        `use ${base.fqn};`,
+        baseImport,
         `use ${factoryNamespace}\\${modelName}Factory;`,
         `use Illuminate\\Database\\Eloquent\\Factories\\HasFactory;`,
     ];
@@ -248,7 +257,7 @@ ${imports.join('\n')}
 /**
  * ${modelName} — add project-specific model logic here.
  */
-class ${modelName} extends ${base.className}
+class ${modelName} extends ${baseAlias}
 {
 ${traits.join('\n')}
 

package/dist/php/policy-generator.js

@@ -111,11 +111,18 @@ function generateUserPolicyClass(name, config) {
     const editable = config.structure === 'modular'
         ? { className: `${modelName}Policy`, fileName: `${modelName}Policy.php`, namespace: config.policies.namespace, path: config.policies.path }
         : resolveEditableClass(config.policies, modelName, 'Policy');
+    // Issue #98: alias on class-name collision (flatBase + userEditablePath).
+    const baseAlias = baseDescriptor.className === editable.className
+        ? `${baseDescriptor.className}Base`
+        : baseDescriptor.className;
+    const baseImport = baseAlias === baseDescriptor.className
+        ? `use ${baseDescriptor.fqn};`
+        : `use ${baseDescriptor.fqn} as ${baseAlias};`;
     const content = `<?php
 
 namespace ${editable.namespace};
 
-use ${baseDescriptor.fqn};
+${baseImport}
 
 /**
  * ${modelName} Policy
@@ -123,7 +130,7 @@ use ${baseDescriptor.fqn};
  * This file is generated once and can be customized.
  * Add your custom authorization logic here.
  */
-class ${editable.className} extends ${baseDescriptor.className}
+class ${editable.className} extends ${baseAlias}
 {
     // Add your custom policy methods here
 }

package/dist/php/request-generator.js

@@ -281,6 +281,13 @@ function generateUserRequest(name, config, action) {
     const editable = config.structure === 'modular'
         ? { className: `${modelName}${action}Request`, fileName: `${modelName}${action}Request.php`, namespace: config.requests.namespace, path: config.requests.path }
         : resolveEditableClass(config.requests, modelName, `${action}Request`);
+    // Issue #98: alias on class-name collision (flatBase + userEditablePath).
+    const baseAlias = baseDescriptor.className === editable.className
+        ? `${baseDescriptor.className}Base`
+        : baseDescriptor.className;
+    const baseImport = baseAlias === baseDescriptor.className
+        ? `use ${baseDescriptor.fqn};`
+        : `use ${baseDescriptor.fqn} as ${baseAlias};`;
     const content = `<?php
 
 /**
@@ -291,7 +298,7 @@ function generateUserRequest(name, config, action) {
 
 namespace ${editable.namespace};
 
-use ${baseDescriptor.fqn};
+${baseImport}
 
 /**
  * ${modelName}${action}Request — add project-specific authorization and validation here.
@@ -301,7 +308,7 @@ use ${baseDescriptor.fqn};
  *   - rules(): array     (returns schemaRules() — override to add custom rules)
  *   - attributes(): array (returns schemaAttributes() — override to rename fields)
  */
-class ${editable.className} extends ${baseDescriptor.className}
+class ${editable.className} extends ${baseAlias}
 {
     //
 }

package/dist/php/resource-generator.js

@@ -143,6 +143,13 @@ function generateUserResource(name, config) {
     const editable = config.structure === 'modular'
         ? { className: `${modelName}Resource`, fileName: `${modelName}Resource.php`, namespace: config.resources.namespace, path: config.resources.path }
         : resolveEditableClass(config.resources, modelName, 'Resource');
+    // Issue #98: alias on class-name collision (flatBase + userEditablePath).
+    const baseAlias = baseDescriptor.className === editable.className
+        ? `${baseDescriptor.className}Base`
+        : baseDescriptor.className;
+    const baseImport = baseAlias === baseDescriptor.className
+        ? `use ${baseDescriptor.fqn};`
+        : `use ${baseDescriptor.fqn} as ${baseAlias};`;
     const content = `<?php
 
 /**
@@ -153,7 +160,7 @@ function generateUserResource(name, config) {
 
 namespace ${editable.namespace};
 
-use ${baseDescriptor.fqn};
+${baseImport}
 
 /**
  * ${modelName}Resource — add project-specific serialization here.
@@ -161,7 +168,7 @@ use ${baseDescriptor.fqn};
  * Inherited from base:
  *   - toArray(Request \\$request): array  (returns schemaArray(\\$request) — override to add fields)
  */
-class ${editable.className} extends ${baseDescriptor.className}
+class ${editable.className} extends ${baseAlias}
 {
     //
 }

package/dist/php/service-generator.js

@@ -1764,6 +1764,15 @@ function generateUserService(name, schema, config) {
         : resolveEditableClass(config.services, modelName, 'Service');
     const userNs = group ? `${editable.namespace}\\${group}` : editable.namespace;
     const userPath = group ? `${editable.path}/${group}` : editable.path;
+    // Issue #98: alias on class-name collision (flatBase + userEditablePath)
+    // so `class BannerService extends BannerService` becomes
+    // `class BannerService extends BannerServiceBase` via aliased import.
+    const baseAlias = baseDescriptor.className === editable.className
+        ? `${baseDescriptor.className}Base`
+        : baseDescriptor.className;
+    const baseImport = baseAlias === baseDescriptor.className
+        ? `use ${baseDescriptor.fqn};`
+        : `use ${baseDescriptor.fqn} as ${baseAlias};`;
     const content = `<?php
 
 /**
@@ -1774,9 +1783,9 @@ function generateUserService(name, schema, config) {
 
 namespace ${userNs};
 
-use ${baseDescriptor.fqn};
+${baseImport}
 
-class ${editable.className} extends ${baseDescriptor.className}
+class ${editable.className} extends ${baseAlias}
 {
     //
 }

package/package.json

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