@omnifyjp/ts 5.9.17 → 5.9.19

package/dist/interface-generator.d.ts

@@ -8,6 +8,15 @@
 import type { SchemaDefinition, PropertyDefinition, TSInterface, TSProperty, GeneratorOptions } from './types.js';
 /** Convert PascalCase/camelCase to snake_case. */
 export declare function toSnakeCase(str: string): string;
+/**
+ * Physical FK column name for an owning-side association property.
+ *
+ * The convention is `<property_snake>_id`, but a property already named with
+ * that suffix IS the column — `table_session_id` is what Laravel's `belongsTo`
+ * convention names it and what a legacy table already has. Appending
+ * unconditionally produced `table_session_id_id` (issue #149).
+ */
+export declare function toFkColumnName(propertyName: string): string;
 /** Gets TypeScript type for a property. */
 export declare function getPropertyType(property: PropertyDefinition, allSchemas: Record<string, SchemaDefinition>): string;
 /**

package/dist/interface-generator.js

@@ -12,6 +12,18 @@ export function toSnakeCase(str) {
         .replace(/^_/, '')
         .toLowerCase();
 }
+/**
+ * Physical FK column name for an owning-side association property.
+ *
+ * The convention is `<property_snake>_id`, but a property already named with
+ * that suffix IS the column — `table_session_id` is what Laravel's `belongsTo`
+ * convention names it and what a legacy table already has. Appending
+ * unconditionally produced `table_session_id_id` (issue #149).
+ */
+export function toFkColumnName(propertyName) {
+    const snake = toSnakeCase(propertyName);
+    return snake.endsWith('_id') ? snake : `${snake}_id`;
+}
 /** Maps Omnify property types to TypeScript types. */
 const TYPE_MAP = {
     String: 'string',
@@ -184,7 +196,7 @@ export function propertyToTSProperties(propertyName, property, schema, allSchema
         }
         return [
             {
-                name: `${propertyName}_id`,
+                name: toFkColumnName(propertyName),
                 type: fkType,
                 optional: isNullable,
                 nullable: isNullable,

package/dist/metadata-generator.js

@@ -13,7 +13,7 @@
  * The metadata is a *new* artifact emitted in addition to the existing
  * interface, zod schemas, and i18n object — none of those are modified.
  */
-import { toSnakeCase } from './interface-generator.js';
+import { toSnakeCase, toFkColumnName } from './interface-generator.js';
 // ---------------------------------------------------------------------------
 // Type classification — single source of truth so #55 (payload builder)
 // can reuse the same field-type decisions.
@@ -178,7 +178,7 @@ export function buildSchemaMetadata(schema, allSchemas, options, displayNames) {
                 (prop.relation === 'ManyToOne' || prop.relation === 'OneToOne') &&
                 !prop.mappedBy;
             const fieldKey = isOwningAssoc
-                ? `${toSnakeCase(propName)}_id`
+                ? toFkColumnName(propName)
                 : toSnakeCase(propName);
             const fieldType = classifyFieldType(prop, allSchemas, options.customTypes.simple);
             const required = isFieldRequired(prop);

package/dist/payload-builder-generator.js

@@ -20,7 +20,7 @@
  * codegen output root in `payload-helpers.ts` so per-model files can
  * import it.
  */
-import { toSnakeCase } from './interface-generator.js';
+import { toSnakeCase, toFkColumnName } from './interface-generator.js';
 import { classifyFieldType } from './metadata-generator.js';
 import { toEnumMemberName } from './enum-generator.js';
 // ---------------------------------------------------------------------------
@@ -186,7 +186,7 @@ export function buildFormShape(schema, allSchemas, options) {
             (prop.relation === 'ManyToOne' || prop.relation === 'OneToOne') &&
             !prop.mappedBy;
         const fieldName = isOwningAssoc
-            ? `${toSnakeCase(propName)}_id`
+            ? toFkColumnName(propName)
             : toSnakeCase(propName);
         // rules.required overrides nullable inference
         const required = prop.rules?.required === false

package/dist/php/faker-mapper.js

@@ -1,7 +1,7 @@
 /**
  * Port of FakerMapper.php — generates Faker expressions for factories.
  */
-import { toSnakeCase } from './naming-helper.js';
+import { toSnakeCase, toFkColumnName } from './naming-helper.js';
 import { resolveEnumValues } from './type-mapper.js';
 /** Generate faker expression for a property. */
 export function toFaker(propName, property, schemas = {}) {
@@ -69,8 +69,7 @@ export function associationFaker(propName, property, modelNamespace, currentSche
     const target = property['target'] ?? '';
     if (relation !== 'ManyToOne' || !target)
         return null;
-    const snakeName = toSnakeCase(propName);
-    const foreignKey = `${snakeName}_id`;
+    const foreignKey = toFkColumnName(propName);
     const nullable = property['nullable'] ?? false;
     const fake = nullable
         ? `'${foreignKey}' => ${target}::query()->inRandomOrder()->first()?->id,`

package/dist/php/model-generator.js

@@ -1,7 +1,8 @@
 /**
  * Port of ModelGenerator.php — generates Eloquent model base + user classes.
  */
-import { toPascalCase, toSnakeCase, toCamelCase, pluralize } from './naming-helper.js';
+import { toPascalCase, toSnakeCase, toCamelCase, toFkColumnName, pluralize } from './naming-helper.js';
+import { resolveTimestamps } from './timestamps.js';
 import { toCast, toPhpDocType, isHiddenByDefault } from './type-mapper.js';
 import { buildRelation } from './relation-builder.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveSharedBaseNamespace, resolveGlobalTraitNamespace, resolveGlobalEnumNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup, } from './types.js';
@@ -97,23 +98,7 @@ function generateBaseModel(name, schema, reader, config) {
     // $timestamps = true and nulls the constant for the absent column — otherwise
     // Eloquent writes a column the table does not have and every insert dies with
     // "Unknown column 'created_at'" (omnify-go#143).
-    const timestampsOption = options.timestamps ?? false;
-    const resolveTimestampColumn = (camel, snake) => {
-        if (typeof timestampsOption === 'boolean')
-            return timestampsOption;
-        if (timestampsOption && typeof timestampsOption === 'object') {
-            const map = timestampsOption;
-            if (typeof map[camel] === 'boolean')
-                return map[camel];
-            if (typeof map[snake] === 'boolean')
-                return map[snake];
-            return false;
-        }
-        return false;
-    };
-    const hasCreatedAt = resolveTimestampColumn('createdAt', 'created_at');
-    const hasUpdatedAt = resolveTimestampColumn('updatedAt', 'updated_at');
-    const hasTimestamps = hasCreatedAt || hasUpdatedAt;
+    const { createdAt: hasCreatedAt, updatedAt: hasUpdatedAt, any: hasTimestamps } = resolveTimestamps(options);
     // NodeTrait is added to the user-editable Model, not BaseModel
     const hasNestedSet = false;
     const nestedSetParentColumn = null;
@@ -456,7 +441,7 @@ function buildDocProperties(properties, expandedProperties, propertyOrder, reade
         if (type === 'Association') {
             const relation = prop['relation'] ?? '';
             if (relation === 'ManyToOne') {
-                const snakeName = toSnakeCase(propName) + '_id';
+                const snakeName = toFkColumnName(propName);
                 const nullable = prop['nullable'] ?? false;
                 const phpType = nullable ? 'int|null' : 'int';
                 lines.push(` * @property ${phpType} $${snakeName}`);
@@ -533,7 +518,7 @@ function buildFillable(properties, expandedProperties, propertyOrder) {
         if (type === 'Association') {
             const relation = prop['relation'] ?? '';
             if (relation === 'ManyToOne') {
-                fields.push(toSnakeCase(propName) + '_id');
+                fields.push(toFkColumnName(propName));
             }
             else if (relation === 'MorphTo') {
                 const morphName = prop['morphName'] || toSnakeCase(propName);
@@ -641,8 +626,7 @@ function buildCasts(properties, expandedProperties, propertyOrder, reader, confi
                     ? targetSchema.options.id
                     : 'BigInt';
                 if (targetIdType !== 'Uuid' && targetIdType !== 'Ulid') {
-                    const snakeName = toSnakeCase(propName);
-                    casts.push(`'${snakeName}_id' => 'integer',`);
+                    casts.push(`'${toFkColumnName(propName)}' => 'integer',`);
                 }
             }
             continue;
@@ -846,7 +830,7 @@ function buildInverseRelations(parentName, modelNamespace, reader, declaredMetho
             // generate a child-side accessor, not a parent-side one.
             // Here we're emitting the *parent* accessor, so the child's ManyToOne
             // (or owning OneToOne) is what we react to.
-            const fkColumn = `${toSnakeCase(childPropName)}_id`;
+            const fkColumn = toFkColumnName(childPropName);
             // Issue #98 v5.8.6: nest the inverse-side FQCN by the CHILD's
             // group / Pivot/ so the relation resolves to the child's actual
             // file location (which lives in `<childGroup>/<Child>.php` or

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

@@ -3,6 +3,15 @@
  */
 /** Convert camelCase/PascalCase to snake_case. */
 export declare function toSnakeCase(value: string): string;
+/**
+ * Physical FK column name for an owning-side association property.
+ *
+ * The convention is `<property_snake>_id`, but a property already named with
+ * that suffix IS the column — `table_session_id` is what Laravel's `belongsTo`
+ * convention names it and what a legacy table already has. Appending
+ * unconditionally produced `table_session_id_id` (issue #149).
+ */
+export declare function toFkColumnName(propertyName: string): string;
 /** Convert any string to PascalCase. */
 export declare function toPascalCase(value: string): string;
 /** Convert any string to camelCase. */

package/dist/php/naming-helper.js

@@ -8,6 +8,18 @@ export function toSnakeCase(value) {
         .replace(/^_/, '')
         .toLowerCase();
 }
+/**
+ * Physical FK column name for an owning-side association property.
+ *
+ * The convention is `<property_snake>_id`, but a property already named with
+ * that suffix IS the column — `table_session_id` is what Laravel's `belongsTo`
+ * convention names it and what a legacy table already has. Appending
+ * unconditionally produced `table_session_id_id` (issue #149).
+ */
+export function toFkColumnName(propertyName) {
+    const snake = toSnakeCase(propertyName);
+    return snake.endsWith('_id') ? snake : `${snake}_id`;
+}
 /** Convert any string to PascalCase. */
 export function toPascalCase(value) {
     return value

package/dist/php/policy-generator.js

@@ -4,7 +4,7 @@
  * Generates Policy classes from Cedar-style ABAC policy definitions.
  * Only generates for schemas that have `policies` defined.
  */
-import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
+import { toPascalCase, toSnakeCase, toCamelCase, toFkColumnName } from './naming-helper.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 // ============================================================================
 // Action mapping: Omnify → Laravel
@@ -337,7 +337,7 @@ function operandToPhp(operand, schema, reader, side) {
             // Check if it's an association (ManyToOne) → use _id
             const prop = schema.properties?.[propName];
             if (prop?.relation === 'ManyToOne') {
-                return `$record->${toSnakeCase(propName)}_id`;
+                return `$record->${toFkColumnName(propName)}`;
             }
             return `$record->${toSnakeCase(propName)}`;
         }

package/dist/php/relation-builder.js

@@ -1,7 +1,7 @@
 /**
  * Port of RelationBuilder.php — generates Eloquent relation methods.
  */
-import { toSnakeCase, toCamelCase, singularize } from './naming-helper.js';
+import { toSnakeCase, toCamelCase, toFkColumnName, singularize } from './naming-helper.js';
 /** Build Eloquent relation method PHP code. */
 export function buildRelation(propName, property, modelNamespace, context) {
     const relation = property['relation'] ?? '';
@@ -62,8 +62,7 @@ export function getReturnType(relation) {
     }
 }
 function belongsTo(propName, target, ns) {
-    const snakeName = toSnakeCase(propName);
-    const foreignKey = `${snakeName}_id`;
+    const foreignKey = toFkColumnName(propName);
     const methodName = toCamelCase(propName);
     const fqcn = `\\${ns}\\${target}`;
     return `    /**
@@ -79,7 +78,7 @@ function oneToOne(propName, property, target, ns) {
     const methodName = toCamelCase(propName);
     const fqcn = `\\${ns}\\${target}`;
     if (mappedBy) {
-        const foreignKey = `${toSnakeCase(mappedBy)}_id`;
+        const foreignKey = toFkColumnName(mappedBy);
         return `    /**
      * Get the ${propName} associated with this model.
      */
@@ -92,7 +91,7 @@ function oneToOne(propName, property, target, ns) {
 }
 function hasMany(propName, property, target, ns) {
     const inverse = property['mappedBy'] ?? property['inversedBy'] ?? null;
-    const foreignKey = inverse ? `${toSnakeCase(inverse)}_id` : `${toSnakeCase(propName)}_id`;
+    const foreignKey = inverse ? toFkColumnName(inverse) : toFkColumnName(propName);
     const methodName = toCamelCase(propName);
     const fqcn = `\\${ns}\\${target}`;
     const orderChain = formatOrderByChain(property['orderBy']);

package/dist/php/request-generator.js

@@ -1,7 +1,7 @@
 /**
  * Port of RequestGenerator.php — generates Store/Update request classes.
  */
-import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
+import { toPascalCase, toSnakeCase, toCamelCase, toFkColumnName } from './naming-helper.js';
 import { toStoreRules, toUpdateRules, formatRules, hasRuleObject } from './type-mapper.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 /**
@@ -106,7 +106,7 @@ function generateBaseRequest(name, schema, reader, config, action) {
         if (type === 'Association') {
             const relation = prop['relation'] ?? '';
             if (relation === 'ManyToOne') {
-                const snakeName = toSnakeCase(propName) + '_id';
+                const snakeName = toFkColumnName(propName);
                 const target = prop['target'] ?? '';
                 const targetIdType = resolveFkRuleType(target, reader);
                 const rules = isUpdate

package/dist/php/resource-generator.js

@@ -1,7 +1,8 @@
 /**
  * Port of ResourceGenerator.php — generates API Resource classes.
  */
-import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
+import { toPascalCase, toSnakeCase, toCamelCase, toFkColumnName } from './naming-helper.js';
+import { resolveTimestamps } from './timestamps.js';
 import { isHiddenByDefault, toResourceExpression } from './type-mapper.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 /** Generate Resource classes for all project-owned visible object schemas.
@@ -39,7 +40,7 @@ function generateBaseResource(name, schema, reader, config) {
     const expandedProperties = reader.getExpandedProperties(name);
     const propertyOrder = reader.getPropertyOrder(name);
     const options = schema.options ?? {};
-    const hasTimestamps = options.timestamps ?? false;
+    const timestamps = resolveTimestamps(options);
     const hasSoftDelete = options.softDelete ?? false;
     const hasId = options.id ?? true;
     const fields = [];
@@ -87,8 +88,13 @@ function generateBaseResource(name, schema, reader, config) {
     if (translatableFields.length > 0) {
         fields.push("            'translations' => $this->getTranslationsArray(),");
     }
-    if (hasTimestamps) {
+    // Emit each column on its own condition — a table declaring only one of
+    // the two would otherwise expose a field the model never fills, or hide one
+    // it does (omnify-go#151).
+    if (timestamps.createdAt) {
         fields.push("            'created_at' => $this->created_at?->toISOString(),");
+    }
+    if (timestamps.updatedAt) {
         fields.push("            'updated_at' => $this->updated_at?->toISOString(),");
     }
     if (hasSoftDelete) {
@@ -239,7 +245,7 @@ function addAssociationFields(propName, prop, fields, resourceNamespace, modelNa
     // If target is a package schema without a resource namespace, use simple whenLoaded
     if (!targetResNs && relation !== 'MorphTo') {
         if (relation === 'ManyToOne') {
-            const snakeName = toSnakeCase(propName) + '_id';
+            const snakeName = toFkColumnName(propName);
             fields.push(`            '${snakeName}' => $this->${snakeName},`);
         }
         fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}'),`);
@@ -248,7 +254,7 @@ function addAssociationFields(propName, prop, fields, resourceNamespace, modelNa
     const targetResource = toPascalCase(target) + 'Resource';
     switch (relation) {
         case 'ManyToOne': {
-            const snakeName = toSnakeCase(propName) + '_id';
+            const snakeName = toFkColumnName(propName);
             fields.push(`            '${snakeName}' => $this->${snakeName},`);
             fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}', fn() => new \\${targetResNs}\\${targetResource}($this->${methodName})),`);
             break;

package/dist/php/timestamps.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Timestamp column resolution — the single source of truth for "does this
+ * table have created_at / updated_at", shared by every PHP generator.
+ *
+ * This MUST agree with the Go side (`SchemaOptions.HasCreatedAt` /
+ * `HasUpdatedAt` in internal/schema/types.go), because the Go side is what
+ * writes the migration. When the two disagree the failure is silent: the
+ * column exists in the database and the model refuses to fill it (or the
+ * reverse, and every insert dies on an unknown column).
+ *
+ * The rules, in Go's words:
+ *   - option absent        → BOTH columns (the long-standing default)
+ *   - `timestamps: false`  → neither
+ *   - `timestamps: true`   → both
+ *   - object form          → only the keys explicitly set to true
+ *     (a key absent from the map means that column is absent — this is the
+ *     one place where "unset" does NOT mean "default on", because naming the
+ *     map at all is the author declaring the columns individually)
+ */
+export interface TimestampColumns {
+    createdAt: boolean;
+    updatedAt: boolean;
+    /** True when the model should carry `$timestamps = true`. */
+    any: boolean;
+}
+export declare function resolveTimestamps(options: {
+    timestamps?: unknown;
+} | undefined | null): TimestampColumns;

package/dist/php/timestamps.js

@@ -0,0 +1,23 @@
+export function resolveTimestamps(options) {
+    // Absent means both — matching the Go default. Reading it as `false` made
+    // every schema that never mentioned `timestamps` generate
+    // `public $timestamps = false;` against a table the migration gave both
+    // columns, so Eloquent silently stopped stamping them (omnify-go#151).
+    const raw = (options?.timestamps ?? true);
+    const column = (camel, snake) => {
+        if (typeof raw === 'boolean')
+            return raw;
+        if (raw && typeof raw === 'object') {
+            const map = raw;
+            if (typeof map[camel] === 'boolean')
+                return map[camel];
+            if (typeof map[snake] === 'boolean')
+                return map[snake];
+            return false;
+        }
+        return true;
+    };
+    const createdAt = column('createdAt', 'created_at');
+    const updatedAt = column('updatedAt', 'updated_at');
+    return { createdAt, updatedAt, any: createdAt || updatedAt };
+}

package/package.json

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