@omnifyjp/ts 6.3.2 → 6.3.4

package/dist/interface-generator.js

@@ -62,6 +62,31 @@ function getIdType(options) {
         return id;
     return 'BigInt';
 }
+/**
+ * TS type for a MorphTo `<name>_id` column. It was hardcoded to `number`, so a
+ * morph over Uuid or Ulid targets — whose ids are strings at runtime — was typed
+ * as a number for every consumer (#176, the TS half of the same wrong
+ * assumption that emitted `unsignedBigInteger` for an all-Ulid morph).
+ *
+ * `idType:` on the property wins, as it does on the migration side; otherwise
+ * the targets decide, and a set mixing numeric and textual keys is honestly
+ * `string | number`.
+ */
+function morphIdTsType(property, allSchemas) {
+    const override = property.idType;
+    if (override)
+        return PK_TYPE_MAP[override] ?? 'number';
+    const types = new Set();
+    for (const target of property.targets ?? []) {
+        const schema = allSchemas[target];
+        if (!schema)
+            continue;
+        types.add(PK_TYPE_MAP[getIdType(schema.options)] ?? 'number');
+    }
+    if (types.size === 0)
+        return 'number';
+    return [...types].sort().join(' | ');
+}
 /** Gets TypeScript type for a property. */
 /**
  * The interface name to write for a relation target, or `unknown` when the
@@ -193,7 +218,7 @@ export function propertyToTSProperties(propertyName, property, schema, allSchema
             },
             {
                 name: `${propertyName}_id`,
-                type: 'number',
+                type: morphIdTsType(property, allSchemas),
                 optional: true,
                 readonly: isReadonly,
             },

package/dist/php/model-generator.js

@@ -550,6 +550,29 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
     }
     return lines.join('\n') + '\n';
 }
+/**
+ * PHP type for a MorphTo `<name>_id` column: `string` for Uuid/Ulid/String
+ * targets, `int` for integer ones, `int|string` when the targets disagree
+ * (#176). `idType:` on the property wins, matching the migration side.
+ */
+function morphIdPhpType(prop, reader) {
+    const phpFor = (idType) => idType === 'Int' || idType === 'BigInt' ? 'int' : 'string';
+    const override = prop['idType'];
+    if (typeof override === 'string' && override !== '')
+        return phpFor(override);
+    const targets = prop['targets'] ?? [];
+    const kinds = new Set();
+    for (const target of targets) {
+        const schema = reader.getSchema(target);
+        if (!schema)
+            continue;
+        const id = schema.options?.id;
+        kinds.add(phpFor(typeof id === 'string' ? id : 'BigInt'));
+    }
+    if (kinds.size === 0)
+        return 'int';
+    return [...kinds].sort().join('|');
+}
 function buildDocProperties(properties, expandedProperties, propertyOrder, reader, config) {
     const lines = [];
     // Mirror buildCasts: EnumRef columns are cast to their generated enum class,
@@ -580,7 +603,10 @@ function buildDocProperties(properties, expandedProperties, propertyOrder, reade
                 const nullable = prop['nullable'] ?? true;
                 const nullSuffix = nullable ? '|null' : '';
                 lines.push(` * @property string${nullSuffix} $${morphName}_type`);
-                lines.push(` * @property string${nullSuffix} $${morphName}_id`);
+                // The id column follows the targets' key types (#176) — documenting it
+                // as a string when the morph is over integer keys tells static analysis
+                // the opposite of what Eloquent returns.
+                lines.push(` * @property ${morphIdPhpType(prop, reader)}${nullSuffix} $${morphName}_id`);
             }
             continue;
         }

package/dist/types.d.ts

@@ -329,6 +329,17 @@ export interface PropertyDefinition {
     readonly min?: number;
     readonly max?: number;
     readonly unsigned?: boolean;
+    /**
+     * AUTO_INCREMENT on this column (#175). TinyInt/Int/BigInt only, and only on
+     * the table's single-column primary key. Read by the model generator: an
+     * integer primary key WITHOUT it gets `$incrementing = false`.
+     */
+    readonly autoIncrement?: boolean;
+    /**
+     * Target primary key type for a relation's FK column. Honoured on MorphTo as
+     * the explicit override for the `<name>_id` column's type (#176).
+     */
+    readonly idType?: string;
     readonly precision?: number;
     readonly scale?: number;
     readonly pattern?: string;

package/package.json

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