@omnifyjp/ts 3.0.0 → 3.1.0

package/dist/cli.js

@@ -47,12 +47,16 @@ function resolveFromConfig(configPath) {
     const laravelConfig = config.codegen?.laravel;
     const laravelEnabled = laravelConfig?.enable === true;
     const laravelOverrides = laravelEnabled ? {
+        structure: laravelConfig?.structure,
         model: laravelConfig?.model,
         request: laravelConfig?.request,
         resource: laravelConfig?.resource,
         factory: laravelConfig?.factory,
         provider: laravelConfig?.provider,
         policy: laravelConfig?.policy,
+        controller: laravelConfig?.controller,
+        service: laravelConfig?.service,
+        route: laravelConfig?.route,
         nestedset: laravelConfig?.nestedset,
     } : undefined;
     return {

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

@@ -2,13 +2,13 @@
  * Generates the BaseModel class.
  * Morph map registration is handled exclusively by OmnifyServiceProvider.
  */
-import { baseFile } from './types.js';
+import { baseFile, resolveSharedBasePath, resolveSharedBaseNamespace } from './types.js';
 /** Generate the BaseModel class. */
 export function generateBaseModel(config) {
-    const baseNamespace = config.models.baseNamespace;
+    const ns = resolveSharedBaseNamespace(config, 'Models', config.models.baseNamespace);
     const content = `<?php
 
-namespace ${baseNamespace};
+namespace ${ns};
 
 /**
  * Base model class for all Omnify-generated models.
@@ -25,7 +25,8 @@ class BaseModel extends Model
 {
 }
 `;
+    const path = resolveSharedBasePath(config, 'Models', 'BaseModel.php', config.models.basePath);
     return [
-        baseFile(`${config.models.basePath}/BaseModel.php`, content),
+        baseFile(path, content),
     ];
 }

package/dist/php/controller-generator.js

@@ -2,7 +2,7 @@
  * Generates base + editable controller classes for schemas with `options.api`.
  */
 import { toPascalCase } from './naming-helper.js';
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 const DEFAULT_ACTIONS = ['index', 'store', 'show', 'update', 'destroy'];
 /** Generate controller classes for all schemas with api config. */
 export function generateControllers(reader, config) {
@@ -25,9 +25,9 @@ function generateBaseController(name, schema, reader, config) {
     const lookup = api.lookup ?? true;
     const bulkDelete = api.bulkDelete ?? false;
     const restore = api.restore ?? (schema.options?.softDelete ?? false);
-    const baseNs = config.controllers.baseNamespace;
+    const baseNs = resolveModularBaseNamespace(config, name, 'Controllers', config.controllers.baseNamespace);
     const modelNs = config.models.namespace;
-    const serviceBaseNs = config.services.baseNamespace;
+    const serviceBaseNs = resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace);
     const requestNs = config.requests.namespace;
     const resourceNs = config.resources.namespace;
     // Build imports
@@ -145,12 +145,12 @@ abstract class ${modelName}ControllerBase extends Controller
 ${methods.join('\n')}
 }
 `;
-    return baseFile(`${config.controllers.basePath}/${modelName}ControllerBase.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Controllers', `${modelName}ControllerBase.php`, config.controllers.basePath), content);
 }
 function generateUserController(name, schema, config) {
     const modelName = toPascalCase(name);
     const group = schema.group ? toPascalCase(schema.group) : null;
-    const baseNs = config.controllers.baseNamespace;
+    const baseNs = resolveModularBaseNamespace(config, name, 'Controllers', config.controllers.baseNamespace);
     const userNs = group
         ? `${config.controllers.namespace}\\Api\\V1\\${group}`
         : `${config.controllers.namespace}\\Api\\V1`;

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

@@ -5,7 +5,7 @@
  * - FileStatusEnum.php (base, always overwritten)
  * - FileLocales.php (base, always overwritten)
  */
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveSharedBaseNamespace } from './types.js';
 /** Generate all File model infrastructure files. */
 export function generateFileModels(reader, config) {
     if (!reader.hasFileProperties())
@@ -22,7 +22,11 @@ export function generateFileModels(reader, config) {
     return files;
 }
 function generateFileBaseModel(config, defaultDisk) {
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, 'File', 'Models', config.models.baseNamespace);
+    const localesNamespace = resolveModularBaseNamespace(config, 'File', 'Locales', config.models.baseNamespace + '\\Locales');
+    const traitsNamespace = resolveSharedBaseNamespace(config, 'Traits', config.models.baseNamespace + '\\Traits');
+    const sharedModelsNamespace = resolveSharedBaseNamespace(config, 'Models', config.models.baseNamespace);
+    const enumNamespace = resolveModularBaseNamespace(config, 'File', 'Enums', config.models.namespace);
     const modelNamespace = config.models.namespace;
     const content = `<?php
 
@@ -39,8 +43,8 @@ use Illuminate\\Database\\Eloquent\\Concerns\\HasUuids;
 use Illuminate\\Database\\Eloquent\\Relations\\MorphTo;
 use Illuminate\\Database\\Eloquent\\SoftDeletes;
 use Illuminate\\Database\\Eloquent\\Builder;
-use ${baseNamespace}\\Locales\\FileLocales;
-use ${baseNamespace}\\Traits\\HasLocalizedDisplayName;
+use ${localesNamespace}\\FileLocales;
+use ${traitsNamespace}\\HasLocalizedDisplayName;${sharedModelsNamespace !== baseNamespace ? `\nuse ${sharedModelsNamespace}\\BaseModel;` : ''}
 
 /**
  * FileBaseModel
@@ -55,7 +59,7 @@ use ${baseNamespace}\\Traits\\HasLocalizedDisplayName;
  * @property string $original_name
  * @property string $mime_type
  * @property int $size
- * @property \\${modelNamespace}\\FileStatusEnum $status
+ * @property \\${enumNamespace}\\FileStatusEnum $status
  * @property \\Illuminate\\Support\\Carbon|null $expires_at
  * @property int $sort_order
  */
@@ -126,7 +130,7 @@ class FileBaseModel extends BaseModel
         return [
             'size' => 'integer',
             'sort_order' => 'integer',
-            'status' => \\${modelNamespace}\\FileStatusEnum::class,
+            'status' => \\${enumNamespace}\\FileStatusEnum::class,
             'expires_at' => 'datetime',
         ];
     }
@@ -190,7 +194,7 @@ class FileBaseModel extends BaseModel
      */
     public function isPermanent(): bool
     {
-        return $this->status === \\${modelNamespace}\\FileStatusEnum::Permanent;
+        return $this->status === \\${enumNamespace}\\FileStatusEnum::Permanent;
     }
 
     /**
@@ -198,7 +202,7 @@ class FileBaseModel extends BaseModel
      */
     public function isExpired(): bool
     {
-        return $this->status === \\${modelNamespace}\\FileStatusEnum::Temporary
+        return $this->status === \\${enumNamespace}\\FileStatusEnum::Temporary
             && $this->expires_at !== null
             && $this->expires_at->isPast();
     }
@@ -209,7 +213,7 @@ class FileBaseModel extends BaseModel
     public function makePermanent(): static
     {
         $this->update([
-            'status' => \\${modelNamespace}\\FileStatusEnum::Permanent,
+            'status' => \\${enumNamespace}\\FileStatusEnum::Permanent,
             'expires_at' => null,
         ]);
 
@@ -217,11 +221,11 @@ class FileBaseModel extends BaseModel
     }
 }
 `;
-    return baseFile(`${config.models.basePath}/FileBaseModel.php`, content);
+    return baseFile(resolveModularBasePath(config, 'File', 'Models', 'FileBaseModel.php', config.models.basePath), content);
 }
 function generateFileUserModel(config) {
     const modelNamespace = config.models.namespace;
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, 'File', 'Models', config.models.baseNamespace);
     const factoryNamespace = config.factories.namespace;
     const content = `<?php
 
@@ -258,7 +262,7 @@ class File extends FileBaseModel
     return userFile(`${config.models.path}/File.php`, content);
 }
 function generateFileStatusEnum(config) {
-    const modelNamespace = config.models.namespace;
+    const modelNamespace = resolveModularBaseNamespace(config, 'File', 'Enums', config.models.namespace);
     const content = `<?php
 
 namespace ${modelNamespace};
@@ -296,10 +300,10 @@ enum FileStatusEnum: string
     }
 }
 `;
-    return baseFile(`${config.models.path}/FileStatusEnum.php`, content);
+    return baseFile(resolveModularBasePath(config, 'File', 'Enums', 'FileStatusEnum.php', config.models.path), content);
 }
 function generateFileLocales(config, locales) {
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, 'File', 'Locales', config.models.baseNamespace + '\\Locales');
     // Display names for the File model
     const displayNames = {
         ja: 'ファイル',
@@ -329,7 +333,7 @@ function generateFileLocales(config, locales) {
         .join(',\n');
     const content = `<?php
 
-namespace ${baseNamespace}\\Locales;
+namespace ${baseNamespace};
 
 /**
  * DO NOT EDIT - This file is auto-generated by Omnify.
@@ -346,7 +350,7 @@ ${propertyNamesPhp},
     ];
 }
 `;
-    return baseFile(`${config.models.basePath}/Locales/FileLocales.php`, content);
+    return baseFile(resolveModularBasePath(config, 'File', 'Locales', 'FileLocales.php', config.models.basePath + '/Locales'), content);
 }
 function formatPhpArray(obj) {
     const entries = Object.entries(obj)

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

@@ -1,14 +1,15 @@
 /**
  * Generates the HasFiles trait for models with File-type properties.
  */
-import { baseFile } from './types.js';
+import { baseFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 /** Generate the HasFiles trait. */
 export function generateFileTrait(config) {
-    const baseNamespace = config.models.baseNamespace;
+    const traitsNamespace = resolveModularBaseNamespace(config, 'File', 'Traits', config.models.baseNamespace + '\\Traits');
+    const enumNamespace = resolveModularBaseNamespace(config, 'File', 'Enums', config.models.namespace);
     const modelNamespace = config.models.namespace;
     const content = `<?php
 
-namespace ${baseNamespace}\\Traits;
+namespace ${traitsNamespace};
 
 /**
  * Trait for models with polymorphic file attachments.
@@ -21,7 +22,7 @@ namespace ${baseNamespace}\\Traits;
 
 use Illuminate\\Database\\Eloquent\\Relations\\MorphMany;
 use ${modelNamespace}\\File;
-use ${modelNamespace}\\FileStatusEnum;
+use ${enumNamespace}\\FileStatusEnum;
 
 trait HasFiles
 {
@@ -91,6 +92,6 @@ trait HasFiles
 }
 `;
     return [
-        baseFile(`${config.models.basePath}/Traits/HasFiles.php`, content),
+        baseFile(resolveModularBasePath(config, 'File', 'Traits', 'HasFiles.php', config.models.basePath + '/Traits'), content),
     ];
 }

package/dist/php/locales-generator.js

@@ -2,7 +2,7 @@
  * Port of LocalesGenerator.php — generates Locales classes with display name constants.
  */
 import { toPascalCase, toSnakeCase } from './naming-helper.js';
-import { baseFile } from './types.js';
+import { baseFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 /** Generate Locales classes for all project-owned object schemas. */
 export function generateLocales(reader, config) {
     const files = [];
@@ -15,14 +15,14 @@ export function generateLocales(reader, config) {
 }
 function generateLocalesClass(name, schema, reader, config) {
     const modelName = toPascalCase(name);
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Locales', config.models.baseNamespace + '\\Locales');
     const displayNames = buildDisplayNames(schema);
     const propertyDisplayNames = buildPropertyDisplayNames(schema, reader, name);
     const displayNamesPhp = formatArrayConstant(displayNames, 8);
     const propertyDisplayNamesPhp = formatNestedArrayConstant(propertyDisplayNames, 8);
     const content = `<?php
 
-namespace ${baseNamespace}\\Locales;
+namespace ${baseNamespace};
 
 /**
  * Localized display names for ${modelName}.
@@ -49,7 +49,7 @@ class ${modelName}Locales
     public const PROPERTY_DISPLAY_NAMES = ${propertyDisplayNamesPhp};
 }
 `;
-    return baseFile(`${config.models.basePath}/Locales/${modelName}Locales.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Locales', `${modelName}Locales.php`, config.models.basePath + '/Locales'), content);
 }
 function buildDisplayNames(schema) {
     const displayName = schema.displayName;

package/dist/php/model-generator.js

@@ -4,7 +4,7 @@
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
 import { toCast, toPhpDocType, isHiddenByDefault } from './type-mapper.js';
 import { buildRelation } from './relation-builder.js';
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveSharedBaseNamespace } from './types.js';
 /** Generate base model and user model for all project-owned object schemas,
  *  plus user models for package schemas (extending the package model). */
 export function generateModels(reader, config) {
@@ -33,7 +33,10 @@ function generateForSchema(name, schema, reader, config) {
 }
 function generateBaseModel(name, schema, reader, config) {
     const modelName = toPascalCase(name);
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace);
+    const localesNamespace = resolveModularBaseNamespace(config, name, 'Locales', config.models.baseNamespace + '\\Locales');
+    const traitsNamespace = resolveSharedBaseNamespace(config, 'Traits', config.models.baseNamespace + '\\Traits');
+    const sharedModelsNamespace = resolveSharedBaseNamespace(config, 'Models', config.models.baseNamespace);
     const modelNamespace = config.models.namespace;
     const options = schema.options ?? {};
     const properties = (schema.properties ?? {});
@@ -59,7 +62,7 @@ function generateBaseModel(name, schema, reader, config) {
         const prop = properties[p];
         return prop && prop['type'] === 'File';
     });
-    const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace, hasFiles, modelNamespace);
+    const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace, hasFiles, modelNamespace, localesNamespace, traitsNamespace, sharedModelsNamespace);
     const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder);
     const baseClass = isAuthenticatable ? 'Authenticatable' : 'BaseModel';
     const implementsClause = hasTranslatable ? ' implements TranslatableContract' : '';
@@ -171,12 +174,12 @@ ${casts}        ];
 ${relations}${accessors}${fileAccessors}${nestedSetMethod}
 }
 `;
-    return baseFile(`${config.models.basePath}/${modelName}BaseModel.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Models', `${modelName}BaseModel.php`, config.models.basePath), content);
 }
 function generateUserModel(name, config, hasNestedSet = false) {
     const modelName = toPascalCase(name);
     const modelNamespace = config.models.namespace;
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace);
     const factoryNamespace = config.factories.namespace;
     const nestedSetNamespace = config.nestedset.namespace;
     const imports = [
@@ -223,8 +226,12 @@ ${traits.join('\n')}
 `;
     return userFile(`${config.models.path}/${modelName}.php`, content);
 }
-function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait = false, needsUlidTrait = false, hasNestedSet = false, nestedSetNamespace = 'Aimeos\\Nestedset', hasFiles = false, modelNamespace = '') {
+function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait = false, needsUlidTrait = false, hasNestedSet = false, nestedSetNamespace = 'Aimeos\\Nestedset', hasFiles = false, modelNamespace = '', localesNamespace = '', traitsNamespace = '', sharedModelsNamespace = '') {
     const lines = [];
+    // Import BaseModel from shared namespace when in modular mode
+    if (sharedModelsNamespace && sharedModelsNamespace !== baseNamespace && !isAuthenticatable) {
+        lines.push(`use ${sharedModelsNamespace}\\BaseModel;`);
+    }
     if (isAuthenticatable) {
         lines.push('use Illuminate\\Foundation\\Auth\\User as Authenticatable;');
         lines.push('use Illuminate\\Notifications\\Notifiable;');
@@ -241,10 +248,10 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
         lines.push(`use Illuminate\\Database\\Eloquent\\Relations\\${type};`);
     }
     lines.push('use Illuminate\\Database\\Eloquent\\Collection as EloquentCollection;');
-    lines.push(`use ${baseNamespace}\\Traits\\HasLocalizedDisplayName;`);
-    lines.push(`use ${baseNamespace}\\Locales\\${modelName}Locales;`);
+    lines.push(`use ${traitsNamespace || baseNamespace + '\\Traits'}\\HasLocalizedDisplayName;`);
+    lines.push(`use ${localesNamespace || baseNamespace + '\\Locales'}\\${modelName}Locales;`);
     if (hasFiles) {
-        lines.push(`use ${baseNamespace}\\Traits\\HasFiles;`);
+        lines.push(`use ${traitsNamespace || baseNamespace + '\\Traits'}\\HasFiles;`);
         if (modelNamespace) {
             lines.push(`use ${modelNamespace}\\File;`);
         }

package/dist/php/policy-generator.js

@@ -5,7 +5,7 @@
  * Only generates for schemas that have `policies` defined.
  */
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 // ============================================================================
 // Action mapping: Omnify → Laravel
 // ============================================================================
@@ -45,7 +45,7 @@ function generateForSchema(name, schema, reader, config) {
 }
 function generateBasePolicyClass(name, schema, reader, config) {
     const modelName = toPascalCase(name);
-    const baseNamespace = config.policies.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Policies', config.policies.baseNamespace);
     const modelNamespace = config.models.namespace;
     const policies = schema.policies;
     const hasSoftDelete = schema.options?.softDelete ?? false;
@@ -89,12 +89,12 @@ class ${modelName}PolicyBase
 ${methods.join('\n')}${cidrHelper}
 }
 `;
-    return baseFile(`${config.policies.basePath}/${modelName}PolicyBase.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Policies', `${modelName}PolicyBase.php`, config.policies.basePath), content);
 }
 function generateUserPolicyClass(name, config) {
     const modelName = toPascalCase(name);
     const policyNamespace = config.policies.namespace;
-    const baseNamespace = config.policies.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Policies', config.policies.baseNamespace);
     const content = `<?php
 
 namespace ${policyNamespace};

package/dist/php/request-generator.js

@@ -3,7 +3,7 @@
  */
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
 import { toStoreRules, toUpdateRules, formatRules, hasRuleObject } from './type-mapper.js';
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 /** Generate Store/Update request classes for all project-owned visible object schemas. */
 export function generateRequests(reader, config) {
     const files = [];
@@ -24,8 +24,8 @@ function generateForSchema(name, schema, reader, config) {
 }
 function generateBaseRequest(name, schema, reader, config, action) {
     const modelName = toPascalCase(name);
-    const baseNamespace = config.requests.baseNamespace;
-    const modelBaseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Requests', config.requests.baseNamespace);
+    const modelLocalesNamespace = resolveModularBaseNamespace(config, name, 'Locales', config.models.baseNamespace + '\\Locales');
     const properties = (schema.properties ?? {});
     const expandedProperties = reader.getExpandedProperties(name);
     const propertyOrder = reader.getPropertyOrder(name);
@@ -136,7 +136,7 @@ function generateBaseRequest(name, schema, reader, config, action) {
         attributeKeys.push(snakeName);
     }
     const rulesContent = rulesLines.join('\n');
-    const localesClass = `${modelBaseNamespace}\\Locales\\${modelName}Locales`;
+    const localesClass = `${modelLocalesNamespace}\\${modelName}Locales`;
     const attributeKeysList = attributeKeys.map(k => `            '${k}',`).join('\n');
     const ruleImport = needsRuleImport ? '\nuse Illuminate\\Validation\\Rule;' : '';
     const content = `<?php
@@ -222,12 +222,12 @@ ${attributeKeysList}
     }
 }
 `;
-    return baseFile(`${config.requests.basePath}/${modelName}${action}RequestBase.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Requests', `${modelName}${action}RequestBase.php`, config.requests.basePath), content);
 }
 function generateUserRequest(name, config, action) {
     const modelName = toPascalCase(name);
     const requestNamespace = config.requests.namespace;
-    const baseNamespace = config.requests.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Requests', config.requests.baseNamespace);
     const content = `<?php
 
 /**

package/dist/php/resource-generator.js

@@ -3,7 +3,7 @@
  */
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
 import { isHiddenByDefault, toResourceExpression } from './type-mapper.js';
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 /** Generate Resource classes for all project-owned visible object schemas. */
 export function generateResources(reader, config) {
     const files = [];
@@ -17,7 +17,7 @@ export function generateResources(reader, config) {
 }
 function generateBaseResource(name, schema, reader, config) {
     const modelName = toPascalCase(name);
-    const baseNamespace = config.resources.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Resources', config.resources.baseNamespace);
     const resourceNamespace = config.resources.namespace;
     const modelNamespace = config.models.namespace;
     const properties = (schema.properties ?? {});
@@ -114,12 +114,12 @@ ${fieldsContent}
     }
 }
 `;
-    return baseFile(`${config.resources.basePath}/${modelName}ResourceBase.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Resources', `${modelName}ResourceBase.php`, config.resources.basePath), content);
 }
 function generateUserResource(name, config) {
     const modelName = toPascalCase(name);
     const resourceNamespace = config.resources.namespace;
-    const baseNamespace = config.resources.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Resources', config.resources.baseNamespace);
     const content = `<?php
 
 /**

package/dist/php/service-generator.js

@@ -2,7 +2,7 @@
  * Generates base + editable service classes for schemas with `options.api`.
  */
 import { toPascalCase, toSnakeCase } from './naming-helper.js';
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 /** Generate service classes for all schemas with api config. */
 export function generateServices(reader, config) {
     const files = [];
@@ -27,7 +27,7 @@ function generateBaseService(name, schema, reader, config) {
     const restore = api.restore ?? (schema.options?.softDelete ?? false);
     const perPage = api.perPage ?? 15;
     const lookup = api.lookup ?? true;
-    const baseNs = config.services.baseNamespace;
+    const baseNs = resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace);
     const modelNs = config.models.namespace;
     const properties = schema.properties ?? {};
     const propertyOrder = reader.getPropertyOrder(name);
@@ -186,7 +186,7 @@ class ${modelName}ServiceBase
 ${methods.join('\n')}
 }
 `;
-    return baseFile(`${config.services.basePath}/${modelName}ServiceBase.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Services', `${modelName}ServiceBase.php`, config.services.basePath), content);
 }
 // ============================================================================
 // Search / Filter / Sort block builders
@@ -291,7 +291,7 @@ function buildSortBlock(sortableFields) {
 function generateUserService(name, schema, config) {
     const modelName = toPascalCase(name);
     const group = schema.group ? toPascalCase(schema.group) : null;
-    const baseNs = config.services.baseNamespace;
+    const baseNs = resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace);
     const userNs = group
         ? `${config.services.namespace}\\${group}`
         : config.services.namespace;

package/dist/php/trait-generator.js

@@ -1,13 +1,13 @@
 /**
  * Port of TraitGenerator.php — generates HasLocalizedDisplayName trait.
  */
-import { baseFile } from './types.js';
+import { baseFile, resolveSharedBasePath, resolveSharedBaseNamespace } from './types.js';
 /** Generate the HasLocalizedDisplayName trait. */
 export function generateTrait(config) {
-    const baseNamespace = config.models.baseNamespace;
+    const ns = resolveSharedBaseNamespace(config, 'Traits', config.models.baseNamespace + '\\Traits');
     const content = `<?php
 
-namespace ${baseNamespace}\\Traits;
+namespace ${ns};
 
 /**
  * Trait for localized display names.
@@ -99,6 +99,6 @@ trait HasLocalizedDisplayName
 }
 `;
     return [
-        baseFile(`${config.models.basePath}/Traits/HasLocalizedDisplayName.php`, content),
+        baseFile(resolveSharedBasePath(config, 'Traits', 'HasLocalizedDisplayName.php', config.models.basePath + '/Traits'), content),
     ];
 }

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

@@ -8,7 +8,7 @@
  * - $fillable = [translatable field names]
  */
 import { toPascalCase, toSnakeCase } from './naming-helper.js';
-import { baseFile, userFile } from './types.js';
+import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
 /** Generate translation model files for all project schemas with translatable fields. */
 export function generateTranslationModels(reader, config) {
     const files = [];
@@ -24,7 +24,7 @@ export function generateTranslationModels(reader, config) {
 function generateTranslationBaseModel(name, translatableFields, config) {
     const modelName = toPascalCase(name);
     const modelSnake = toSnakeCase(name);
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace);
     const tableName = `${modelSnake}_translations`;
     const fillableLines = translatableFields
         .map(f => `        '${f}',`)
@@ -65,12 +65,12 @@ ${fillableLines}
     ];
 }
 `;
-    return baseFile(`${config.models.basePath}/${modelName}TranslationBaseModel.php`, content);
+    return baseFile(resolveModularBasePath(config, name, 'Models', `${modelName}TranslationBaseModel.php`, config.models.basePath), content);
 }
 function generateTranslationUserModel(name, config) {
     const modelName = toPascalCase(name);
     const modelNamespace = config.models.namespace;
-    const baseNamespace = config.models.baseNamespace;
+    const baseNamespace = resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace);
     const content = `<?php
 
 namespace ${modelNamespace};

package/dist/php/types.d.ts

@@ -12,6 +12,32 @@ export interface GeneratedFile {
 export declare function baseFile(path: string, content: string): GeneratedFile;
 /** Create a user file (created once, skip if exists). */
 export declare function userFile(path: string, content: string): GeneratedFile;
+/** Category of base file for modular path resolution. */
+export type BaseCategory = 'Models' | 'Controllers' | 'Requests' | 'Resources' | 'Services' | 'Enums' | 'Traits' | 'Locales' | 'Policies';
+/**
+ * Resolve base file path for a schema based on structure.
+ * Modular: app/Modules/{SchemaName}/{category}/{fileName}
+ * Legacy: {legacyPath}/{fileName}
+ */
+export declare function resolveModularBasePath(config: PhpConfig, schemaName: string, category: BaseCategory, fileName: string, legacyPath: string): string;
+/**
+ * Resolve base namespace for a schema based on structure.
+ * Modular: App\Modules\{SchemaName}\{Category}
+ * Legacy: {legacyNamespace}
+ */
+export declare function resolveModularBaseNamespace(config: PhpConfig, schemaName: string, category: BaseCategory, legacyNamespace: string): string;
+/**
+ * Resolve shared base path (for cross-module files like BaseModel, HasLocalizedDisplayName).
+ * Modular: app/Modules/Shared/{category}/{fileName}
+ * Legacy: {legacyPath}/{fileName}
+ */
+export declare function resolveSharedBasePath(config: PhpConfig, category: BaseCategory, fileName: string, legacyPath: string): string;
+/**
+ * Resolve shared base namespace.
+ * Modular: App\Modules\Shared\{Category}
+ * Legacy: {legacyNamespace}
+ */
+export declare function resolveSharedBaseNamespace(config: PhpConfig, category: BaseCategory, legacyNamespace: string): string;
 /** Per-target path and namespace override from codegen.laravel config. */
 export interface LaravelPathOverride {
     path?: string;
@@ -23,6 +49,7 @@ export interface NestedSetOverride {
 }
 /** Overrides from codegen.laravel YAML config (all optional). */
 export interface LaravelCodegenOverrides {
+    structure?: 'legacy' | 'modular';
     model?: LaravelPathOverride;
     request?: LaravelPathOverride;
     resource?: LaravelPathOverride;
@@ -36,6 +63,8 @@ export interface LaravelCodegenOverrides {
 }
 /** PHP codegen configuration (resolved with defaults). */
 export interface PhpConfig {
+    structure: 'legacy' | 'modular';
+    modulesPath: string;
     models: {
         namespace: string;
         baseNamespace: string;

package/dist/php/types.js

@@ -9,6 +9,50 @@ export function baseFile(path, content) {
 export function userFile(path, content) {
     return { path, content, overwrite: false, type: 'user' };
 }
+/**
+ * Resolve base file path for a schema based on structure.
+ * Modular: app/Modules/{SchemaName}/{category}/{fileName}
+ * Legacy: {legacyPath}/{fileName}
+ */
+export function resolveModularBasePath(config, schemaName, category, fileName, legacyPath) {
+    if (config.structure === 'modular') {
+        return `${config.modulesPath}/${schemaName}/${category}/${fileName}`;
+    }
+    return `${legacyPath}/${fileName}`;
+}
+/**
+ * Resolve base namespace for a schema based on structure.
+ * Modular: App\Modules\{SchemaName}\{Category}
+ * Legacy: {legacyNamespace}
+ */
+export function resolveModularBaseNamespace(config, schemaName, category, legacyNamespace) {
+    if (config.structure === 'modular') {
+        return pathToNamespace(`${config.modulesPath}/${schemaName}/${category}`);
+    }
+    return legacyNamespace;
+}
+/**
+ * Resolve shared base path (for cross-module files like BaseModel, HasLocalizedDisplayName).
+ * Modular: app/Modules/Shared/{category}/{fileName}
+ * Legacy: {legacyPath}/{fileName}
+ */
+export function resolveSharedBasePath(config, category, fileName, legacyPath) {
+    if (config.structure === 'modular') {
+        return `${config.modulesPath}/Shared/${category}/${fileName}`;
+    }
+    return `${legacyPath}/${fileName}`;
+}
+/**
+ * Resolve shared base namespace.
+ * Modular: App\Modules\Shared\{Category}
+ * Legacy: {legacyNamespace}
+ */
+export function resolveSharedBaseNamespace(config, category, legacyNamespace) {
+    if (config.structure === 'modular') {
+        return pathToNamespace(`${config.modulesPath}/Shared/${category}`);
+    }
+    return legacyNamespace;
+}
 /** Convert a file path to a PHP namespace (e.g., app/Models/Omnify → App\Models\Omnify). */
 function pathToNamespace(p) {
     return p
@@ -49,7 +93,11 @@ export function derivePhpConfig(overrides) {
     const serviceNs = overrides?.service?.namespace ?? pathToNamespace(servicePath);
     const routePath = overrides?.route?.path ?? DEFAULT_ROUTE_PATH;
     const nestedsetNs = overrides?.nestedset?.namespace ?? 'Aimeos\\Nestedset';
+    const structure = overrides?.structure ?? 'legacy';
+    const modulesPath = 'app/Modules';
     return {
+        structure,
+        modulesPath,
         models: {
             namespace: modelNs,
             baseNamespace: `${modelNs}\\Base`,

package/package.json

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