@omnifyjp/ts 5.8.39 → 5.9.0

package/dist/generator.js

@@ -333,15 +333,43 @@ function generateI18nFile(options) {
 /** Generate index.ts re-exports. */
 function generateIndexFile(schemas, schemaEnums, pluginEnums, typeAliases, hasFiles = false) {
     const parts = [generateBaseHeader()];
-    // Common types
+    // Common types.
+    // A generator-owned common type can collide with a user model schema of the
+    // same name (e.g. a `Locale` entity vs the `Locale` locale-code union). The
+    // model is the user's explicit schema and stays canonical (keeps the bare
+    // name in the model section below); the common type is re-exported under an
+    // alias here so the barrel never emits a duplicate identifier (TS2300).
     parts.push(`// Common Types\n`);
+    const modelNames = new Set(Object.values(schemas)
+        .filter((s) => s.kind !== 'enum' && s.options?.hidden !== true)
+        .map((s) => s.name));
+    // Preferred, human-readable aliases for the known common types. Any other
+    // collision falls back to a `Common<Name>` alias.
+    const COMMON_TYPE_ALIASES = {
+        Locale: 'LocaleCode',
+        LocaleMap: 'LocaleStringMap',
+        DateTimeString: 'CommonDateTimeString',
+        DateString: 'CommonDateString',
+        OmnifyFile: 'OmnifyFileType',
+    };
+    const commonTypeNames = hasFiles
+        ? ['LocaleMap', 'Locale', 'DateTimeString', 'DateString', 'OmnifyFile']
+        : ['LocaleMap', 'Locale', 'DateTimeString', 'DateString'];
+    const commonTypeExports = commonTypeNames.map((name) => {
+        if (!modelNames.has(name)) {
+            return name;
+        }
+        const alias = COMMON_TYPE_ALIASES[name] ?? `Common${name}`;
+        // eslint-disable-next-line no-console
+        console.warn(`[omnify-ts] Common type "${name}" collides with model schema "${name}"; ` +
+            `re-exporting the common type from index.ts as "${alias}". ` +
+            `The "${name}" model keeps the canonical name.`);
+        return `${name} as ${alias}`;
+    });
+    parts.push(`export type { ${commonTypeExports.join(', ')} } from './common';\n`);
     if (hasFiles) {
-        parts.push(`export type { LocaleMap, Locale, DateTimeString, DateString, OmnifyFile } from './common';\n`);
         parts.push(`export { OmnifyFileSchema } from './common';\n`);
     }
-    else {
-        parts.push(`export type { LocaleMap, Locale, DateTimeString, DateString } from './common';\n`);
-    }
     // I18n
     parts.push(`// i18n (Internationalization)\n`);
     parts.push(`export {\n`);

package/dist/php/model-generator.js

@@ -77,6 +77,19 @@ function generateBaseModel(name, schema, reader, config) {
     const expandedProperties = reader.getExpandedProperties(name);
     const propertyOrder = reader.getPropertyOrder(name);
     const tableName = reader.getTableName(name);
+    // Multi-database routing: a schema may declare a top-level `connection:`
+    // (matching an omnify.yaml connections key + a Laravel connection). Emit the
+    // matching `$connection` so the model resolves to the right database. The
+    // implicit `default` connection is left unset so Laravel uses its default.
+    const connectionName = schema['connection'];
+    const connectionSection = connectionName && connectionName !== 'default'
+        ? `
+    /**
+     * The database connection for the model.
+     */
+    protected $connection = '${connectionName}';
+`
+        : '';
     const isAuthenticatable = options['authenticatable'] ?? false;
     const hasSoftDelete = options.softDelete ?? false;
     const hasTimestamps = options.timestamps ?? false;
@@ -116,6 +129,31 @@ function generateBaseModel(name, schema, reader, config) {
     const fileAccessors = hasFiles ? buildFileAccessors(properties, propertyOrder, modelNamespace) : '';
     const auditSection = buildAuditSection(options, reader, modelNamespace);
     const nestedSetMethod = buildNestedSetParentIdMethod(nestedSetParentColumn);
+    // Authenticatable base models extend Illuminate's Authenticatable, not
+    // BaseModel, so they cannot inherit its getMorphClass() override. Give them
+    // their own copy so application subclasses (e.g.
+    // `App\Models\User extends App\Models\Omnify\User`) still resolve under an
+    // enforced morph map instead of throwing ClassMorphViolationException. #106
+    const morphClassMethod = isAuthenticatable ? `
+    /**
+     * Resolve the polymorphic alias from the morph map, walking up the class
+     * hierarchy so application subclasses of this generated model still resolve.
+     */
+    public function getMorphClass(): string
+    {
+        $morphMap = \\Illuminate\\Database\\Eloquent\\Relations\\Relation::morphMap();
+
+        for ($class = static::class; $class !== false; $class = get_parent_class($class)) {
+            $alias = array_search($class, $morphMap, true);
+
+            if ($alias !== false) {
+                return $alias;
+            }
+        }
+
+        return parent::getMorphClass();
+    }
+` : '';
     let keyTypeSection = '';
     if (idType === 'Uuid' || idType === 'Ulid' || idType === 'String') {
         keyTypeSection = `
@@ -147,7 +185,7 @@ ${imports}
 ${docProperties} */
 class ${modelName}BaseModel extends ${baseClass}${implementsClause}
 {
-${traits}    /**
+${traits}${connectionSection}    /**
      * The table associated with the model.
      */
     protected $table = '${tableName}';
@@ -212,7 +250,7 @@ ${appends}    ];
         return [
 ${casts}        ];
     }
-${auditLogProperties}${relations}${accessors}${fileAccessors}${auditSection}${nestedSetMethod}
+${auditLogProperties}${relations}${accessors}${fileAccessors}${auditSection}${nestedSetMethod}${morphClassMethod}
 }
 `;
     // Replace placeholder class name so the file matches resolved className

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

@@ -89,8 +89,15 @@ class OmnifyServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        // Load Omnify migrations from custom directory
-        $this->loadMigrationsFrom(database_path('migrations/omnify'));
+        // Load Omnify migrations: the default-connection directory plus every
+        // per-connection subdirectory (multi-database setups route each domain's
+        // migrations into its own subfolder; those migrations target their
+        // 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) {
+            $this->loadMigrationsFrom($connectionDir);
+        }
 ${packageMigrationsBlock}
         // Register morph map for polymorphic relationships
         Relation::enforceMorphMap([

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

@@ -17,7 +17,9 @@ export function generateTranslationModels(reader, config) {
         const translatableFields = reader.getTranslatableFieldDetails(name);
         if (translatableFields.length === 0)
             continue;
-        files.push(generateTranslationBaseModel(name, translatableFields, enforceLanguageFk, config));
+        // A translation table co-locates with its parent — same connection/database.
+        const connectionName = reader.getSchema(name)?.['connection'];
+        files.push(generateTranslationBaseModel(name, translatableFields, enforceLanguageFk, config, connectionName));
         files.push(generateTranslationUserModel(name, config));
     }
     return files;
@@ -53,9 +55,19 @@ function castFor(type) {
             return undefined;
     }
 }
-function generateTranslationBaseModel(name, translatableFields, enforceLanguageFk, config) {
+function generateTranslationBaseModel(name, translatableFields, enforceLanguageFk, config, connectionName) {
     const modelName = toPascalCase(name);
     const modelSnake = toSnakeCase(name);
+    // Multi-database routing: follow the parent schema's connection so the
+    // `*_translations` table resolves to the same database as its parent.
+    const connectionSection = connectionName && connectionName !== 'default'
+        ? `
+    /**
+     * The database connection for the model.
+     */
+    protected $connection = '${connectionName}';
+`
+        : '';
     // Issue #98 v5.8.2: consolidate every Translation model under one
     // dedicated `Translation/` subfolder + sub-namespace. Reporter's
     // rationale: 39 translation models flat at the top of `Models/`
@@ -123,7 +135,7 @@ use Illuminate\\Database\\Eloquent\\Model;
  */
 class ${baseClassName} extends Model
 {
-    /**
+${connectionSection}    /**
      * The table associated with the model.
      */
     protected $table = '${tableName}';

package/package.json

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