@omnifyjp/ts 1.0.0 → 1.0.1

package/dist/php/model-generator.js

@@ -48,7 +48,7 @@ function generateBaseModel(name, schema, reader, config) {
     const hidden = buildHidden(properties, expandedProperties, propertyOrder);
     const appends = buildAppends(expandedProperties);
     const casts = buildCasts(properties, expandedProperties, propertyOrder);
-    const relations = buildRelations(properties, propertyOrder, modelNamespace, reader);
+    const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader);
     const accessors = buildAccessors(expandedProperties);
     const primaryKey = options['primaryKey'] ?? 'id';
     const rawId = options.id;
@@ -354,8 +354,9 @@ function buildCasts(properties, expandedProperties, propertyOrder) {
         return '';
     return casts.map(c => `            ${c}`).join('\n') + '\n';
 }
-function buildRelations(properties, propertyOrder, modelNamespace, reader) {
+function buildRelations(schemaName, properties, propertyOrder, modelNamespace, reader) {
     const methods = [];
+    const sourceTableName = reader.getTableName(schemaName);
     for (const propName of propertyOrder) {
         const prop = properties[propName];
         if (!prop || prop['type'] !== 'Association')
@@ -363,7 +364,8 @@ function buildRelations(properties, propertyOrder, modelNamespace, reader) {
         // Resolve namespace per-target (package schemas use their own namespace)
         const target = prop['target'] ?? '';
         const ns = target ? reader.resolveModelNamespace(target, modelNamespace) : modelNamespace;
-        const result = buildRelation(propName, prop, ns);
+        const targetTableName = target ? reader.getTableName(target) : '';
+        const result = buildRelation(propName, prop, ns, { sourceTableName, targetTableName });
         if (result) {
             methods.push('\n' + result.method);
         }

package/dist/php/naming-helper.d.ts

@@ -12,6 +12,10 @@ export declare function toCamelCase(value: string): string;
  * Handles common cases: -y → -ies, -s/-sh/-ch/-x/-z → -es, default → -s
  */
 export declare function pluralize(value: string): string;
+/**
+ * Singularize a word (simple English rules — reverse of pluralize).
+ */
+export declare function singularize(value: string): string;
 /** Convert a schema name to a table name (snake_case + pluralized). */
 export declare function toTableName(schemaName: string): string;
 /**

package/dist/php/naming-helper.js

@@ -38,6 +38,30 @@ export function pluralize(value) {
     }
     return value + 's';
 }
+/**
+ * Singularize a word (simple English rules — reverse of pluralize).
+ */
+export function singularize(value) {
+    // Already singular or empty
+    if (!value || value.length <= 2)
+        return value;
+    if (value.endsWith('ies')) {
+        return value.slice(0, -3) + 'y';
+    }
+    if (value.endsWith('ves')) {
+        // knives → knife, leaves → leaf
+        const stem = value.slice(0, -3);
+        // Try -fe first (e.g., "knives" → "knife"), fallback to -f (e.g., "leaves" → "leaf")
+        return stem + 'f';
+    }
+    if (value.endsWith('ses') || value.endsWith('shes') || value.endsWith('ches') || value.endsWith('xes') || value.endsWith('zes')) {
+        return value.slice(0, -2);
+    }
+    if (value.endsWith('s') && !value.endsWith('ss')) {
+        return value.slice(0, -1);
+    }
+    return value;
+}
 /** Convert a schema name to a table name (snake_case + pluralized). */
 export function toTableName(schemaName) {
     return pluralize(toSnakeCase(schemaName));

package/dist/php/relation-builder.d.ts

@@ -5,8 +5,14 @@ interface RelationResult {
     method: string;
     imports: string[];
 }
+interface RelationContext {
+    sourceTableName: string;
+    targetTableName: string;
+}
 /** Build Eloquent relation method PHP code. */
-export declare function buildRelation(propName: string, property: Record<string, unknown>, modelNamespace: string): RelationResult | null;
+export declare function buildRelation(propName: string, property: Record<string, unknown>, modelNamespace: string, context?: RelationContext): RelationResult | null;
+/** Generate pivot table name matching Go's GeneratePivotTableName logic. */
+export declare function generatePivotTableName(sourceTable: string, targetTable: string): string;
 /** Get the return type hint for a relation. */
 export declare function getReturnType(relation: string): string;
 export {};

package/dist/php/relation-builder.js

@@ -1,9 +1,9 @@
 /**
  * Port of RelationBuilder.php — generates Eloquent relation methods.
  */
-import { toSnakeCase, toCamelCase } from './naming-helper.js';
+import { toSnakeCase, toCamelCase, singularize } from './naming-helper.js';
 /** Build Eloquent relation method PHP code. */
-export function buildRelation(propName, property, modelNamespace) {
+export function buildRelation(propName, property, modelNamespace, context) {
     const relation = property['relation'] ?? '';
     const target = property['target'] ?? '';
     const imports = [];
@@ -19,7 +19,7 @@ export function buildRelation(propName, property, modelNamespace) {
             method = hasMany(propName, property, target, modelNamespace);
             break;
         case 'ManyToMany':
-            method = belongsToMany(propName, property, target, modelNamespace);
+            method = belongsToMany(propName, property, target, modelNamespace, context);
             break;
         case 'MorphTo':
             method = morphTo(propName);
@@ -35,6 +35,11 @@ export function buildRelation(propName, property, modelNamespace) {
         return null;
     return { method, imports };
 }
+/** Generate pivot table name matching Go's GeneratePivotTableName logic. */
+export function generatePivotTableName(sourceTable, targetTable) {
+    const tables = [singularize(sourceTable), singularize(targetTable)].sort();
+    return tables.join('_');
+}
 /** Get the return type hint for a relation. */
 export function getReturnType(relation) {
     switch (relation) {
@@ -90,8 +95,11 @@ function hasMany(propName, property, target, ns) {
         return $this->hasMany(${fqcn}::class, '${foreignKey}');
     }`;
 }
-function belongsToMany(propName, property, target, ns) {
-    const joinTable = property['joinTable'] ?? '';
+function belongsToMany(propName, property, target, ns, context) {
+    let joinTable = property['joinTable'] ?? '';
+    if (!joinTable && context?.sourceTableName && context?.targetTableName) {
+        joinTable = generatePivotTableName(context.sourceTableName, context.targetTableName);
+    }
     const methodName = toCamelCase(propName);
     const pivotFields = property['pivotFields'] ?? {};
     const fqcn = `\\${ns}\\${target}`;

package/package.json

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