@omnifyjp/omnify 3.21.0 → 3.21.2

package/package.json

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

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

@@ -1250,7 +1250,13 @@ ${lookupExample}
 
 ${filterBlock}${softDeleteBlock}${limitBlock}
 
-        return $query->get()->toArray();
+        // #76 followup (v3.21.2): use getAttributes() to bypass Astrotomic's
+        // Translatable::attributesToArray() override, which would overwrite
+        // our COALESCE'd translatable columns with its own locale fallback
+        // resolution (use_property_fallback-gated, default off). getAttributes()
+        // returns the raw DB-column → value map as Eloquent populated it from
+        // the SELECT, preserving our carefully crafted locale-aware values.
+        return $query->get()->map(fn ($row) => $row->getAttributes())->toArray();
     }`;
     }
     // #76: translatable branch — leftJoin the sidecar keyed by
@@ -1320,7 +1326,13 @@ ${lookupExample}
 
 ${filterBlock}${softDeleteBlock}${limitBlock}
 
-        return $query->get()->toArray();
+        // #76 followup (v3.21.2): use getAttributes() to bypass Astrotomic's
+        // Translatable::attributesToArray() override, which would overwrite
+        // our COALESCE'd translatable columns with its own locale fallback
+        // resolution (use_property_fallback-gated, default off). getAttributes()
+        // returns the raw DB-column → value map as Eloquent populated it from
+        // the SELECT, preserving our carefully crafted locale-aware values.
+        return $query->get()->map(fn ($row) => $row->getAttributes())->toArray();
     }`;
 }
 // ── flushTranslations() ────────────────────────────────────────────────────
@@ -1334,6 +1346,15 @@ function buildFlushTranslationsMethod(modelName) {
     // Model::withoutEvents(...) that hook doesn't fire. Walking the collection
     // and calling save() on dirty rows makes the persistence path explicit and
     // seeder-safe.
+    //
+    // #78 Step 3 followup (v3.21.1): mirror Astrotomic's own saveTranslations()
+    // FK-assignment step (Translatable::saveTranslations:382-401) — when the
+    // parent row is created via Model::create() inside WithoutModelEvents, the
+    // new translation models are queued before the parent INSERT runs, so the
+    // belongsTo backref never fires. We must explicitly stamp the FK from the
+    // saved parent before calling $translation->save() or MySQL rejects the
+    // row with "Column 'product_id' cannot be null". Same applies to the
+    // connection name for multi-connection projects.
     return `
     /**
      * Persist pending translation rows (seeder-safe).
@@ -1344,15 +1365,27 @@ function buildFlushTranslationsMethod(modelName) {
      * models queued on \\$model->translations. Astrotomic's own \`saved\` event
      * hook flushes them at runtime — but that hook is suppressed under
      * DatabaseSeeder::WithoutModelEvents or any call to Model::withoutEvents.
-     * This helper walks the collection and saves dirty/new rows explicitly so
-     * both runtime and seeder paths write to the sidecar table.
+     * This helper walks the collection and saves dirty/new rows explicitly
+     * (mirroring Astrotomic's own saveTranslations()) so both runtime and
+     * seeder paths write to the sidecar table.
      *
-     * @see https://github.com/Astrotomic/laravel-translatable/blob/main/src/Translatable/Translatable.php Translatable::fill()
+     * @see https://github.com/Astrotomic/laravel-translatable/blob/main/src/Translatable/Translatable.php Translatable::saveTranslations()
      */
     protected function flushTranslations(${modelName} $model): void
     {
         foreach ($model->translations as $translation) {
             if (! $translation->exists || $translation->isDirty()) {
+                // Mirror Astrotomic\\Translatable\\Translatable::saveTranslations() —
+                // explicitly stamp the FK and (when set) the connection so the
+                // save works even inside Model::withoutEvents(), where the
+                // belongsTo backref never fires.
+                if (! empty($connectionName = $model->getConnectionName())) {
+                    $translation->setConnection($connectionName);
+                }
+                $translation->setAttribute(
+                    $model->getTranslationRelationKey(),
+                    $model->getKey()
+                );
                 $translation->save();
             }
         }