@omnifyjp/ts 2.1.2 → 2.1.4

package/dist/php/model-generator.js

@@ -276,6 +276,13 @@ function buildDocProperties(properties, expandedProperties, propertyOrder) {
                 const phpType = nullable ? 'int|null' : 'int';
                 lines.push(` * @property ${phpType} $${snakeName}`);
             }
+            else if (relation === 'MorphTo') {
+                const morphName = prop['morphName'] || toSnakeCase(propName);
+                const nullable = prop['nullable'] ?? true;
+                const nullSuffix = nullable ? '|null' : '';
+                lines.push(` * @property string${nullSuffix} $${morphName}_type`);
+                lines.push(` * @property string${nullSuffix} $${morphName}_id`);
+            }
             continue;
         }
         if (expandedProperties[propName]) {
@@ -329,6 +336,11 @@ function buildFillable(properties, expandedProperties, propertyOrder) {
             if (relation === 'ManyToOne') {
                 fields.push(toSnakeCase(propName) + '_id');
             }
+            else if (relation === 'MorphTo') {
+                const morphName = prop['morphName'] || toSnakeCase(propName);
+                fields.push(morphName + '_type');
+                fields.push(morphName + '_id');
+            }
             continue;
         }
         if (expandedProperties[propName]) {

package/dist/php/relation-builder.js

@@ -30,6 +30,12 @@ export function buildRelation(propName, property, modelNamespace, context) {
         case 'MorphMany':
             method = morphMany(propName, property, target, modelNamespace);
             break;
+        case 'MorphToMany':
+            method = morphToMany(propName, property, target, modelNamespace, context);
+            break;
+        case 'MorphedByMany':
+            method = morphedByMany(propName, property, target, modelNamespace);
+            break;
     }
     if (method === null)
         return null;
@@ -50,6 +56,8 @@ export function getReturnType(relation) {
         case 'MorphTo': return 'MorphTo';
         case 'MorphOne': return 'MorphOne';
         case 'MorphMany': return 'MorphMany';
+        case 'MorphToMany': return 'MorphToMany';
+        case 'MorphedByMany': return 'MorphedByMany';
         default: return 'BelongsTo';
     }
 }
@@ -153,3 +161,30 @@ function morphMany(propName, property, target, ns) {
         return $this->morphMany(${fqcn}::class, '${morphName}');
     }`;
 }
+function morphToMany(propName, property, target, ns, context) {
+    const morphName = property['morphName'] ?? toSnakeCase(propName);
+    const joinTable = property['joinTable'] ?? (morphName + 's');
+    const methodName = toCamelCase(propName);
+    const fqcn = `\\${ns}\\${target}`;
+    return `    /**
+     * The ${propName} that belong to this model.
+     */
+    public function ${methodName}(): MorphToMany
+    {
+        return $this->morphToMany(${fqcn}::class, '${morphName}', '${joinTable}')
+            ->withTimestamps();
+    }`;
+}
+function morphedByMany(propName, property, target, ns) {
+    const morphName = property['morphName'] ?? toSnakeCase(propName);
+    const methodName = toCamelCase(propName);
+    const fqcn = `\\${ns}\\${target}`;
+    return `    /**
+     * The ${propName} that belong to this model.
+     */
+    public function ${methodName}(): MorphedByMany
+    {
+        return $this->morphedByMany(${fqcn}::class, '${morphName}')
+            ->withTimestamps();
+    }`;
+}

package/dist/php/request-generator.js

@@ -73,17 +73,34 @@ function generateBaseRequest(name, schema, reader, config, action) {
             }
             continue;
         }
-        // Skip non-fillable associations except ManyToOne
+        // Association handling
         if (type === 'Association') {
             const relation = prop['relation'] ?? '';
-            if (relation !== 'ManyToOne')
-                continue;
-            const snakeName = toSnakeCase(propName) + '_id';
-            const rules = isUpdate
-                ? toUpdateRules(prop, tableName, modelRouteParam)
-                : toStoreRules(prop, tableName);
-            rulesLines.push(`            '${snakeName}' => ${formatRules(rules)},`);
-            attributeKeys.push(snakeName);
+            if (relation === 'ManyToOne') {
+                const snakeName = toSnakeCase(propName) + '_id';
+                const rules = isUpdate
+                    ? toUpdateRules(prop, tableName, modelRouteParam)
+                    : toStoreRules(prop, tableName);
+                rulesLines.push(`            '${snakeName}' => ${formatRules(rules)},`);
+                attributeKeys.push(snakeName);
+            }
+            else if (relation === 'MorphTo') {
+                const morphName = prop['morphName'] || toSnakeCase(propName);
+                const nullable = prop['nullable'] ?? true;
+                const requiredRule = nullable ? 'nullable' : 'required';
+                const targets = prop['targets'] ?? [];
+                // {morphName}_type rules
+                const typeRules = [requiredRule, 'string'];
+                if (targets.length > 0) {
+                    typeRules.push(`in:${targets.join(',')}`);
+                }
+                rulesLines.push(`            '${morphName}_type' => [${typeRules.map(r => `'${r}'`).join(', ')}],`);
+                attributeKeys.push(morphName + '_type');
+                // {morphName}_id rules
+                const idRules = [requiredRule, 'string'];
+                rulesLines.push(`            '${morphName}_id' => [${idRules.map(r => `'${r}'`).join(', ')}],`);
+                attributeKeys.push(morphName + '_id');
+            }
             continue;
         }
         // File type: generate array item rules for multiple files

package/package.json

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