@omnifyjp/ts 5.9.15 → 5.9.17

package/dist/php/model-generator.js

@@ -92,7 +92,28 @@ function generateBaseModel(name, schema, reader, config) {
         : '';
     const isAuthenticatable = options['authenticatable'] ?? false;
     const hasSoftDelete = options.softDelete ?? false;
-    const hasTimestamps = options.timestamps ?? false;
+    // `timestamps` is a bool or a map naming the columns individually. Eloquent
+    // has no half-way switch, so a schema carrying only one of the two keeps
+    // $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;
     // NodeTrait is added to the user-editable Model, not BaseModel
     const hasNestedSet = false;
     const nestedSetParentColumn = null;
@@ -199,7 +220,17 @@ ${keyTypeSection}
     /**
      * Indicates if the model should be timestamped.
      */
-    public $timestamps = ${hasTimestamps ? 'true' : 'false'};
+    public $timestamps = ${hasTimestamps ? 'true' : 'false'};${hasTimestamps && !hasCreatedAt ? `
+
+    /**
+     * This table has no created_at column.
+     */
+    const CREATED_AT = null;` : ''}${hasTimestamps && !hasUpdatedAt ? `
+
+    /**
+     * This table has no updated_at column.
+     */
+    const UPDATED_AT = null;` : ''}
 
     /**
      * Localized display names for this model.

package/dist/types.d.ts

@@ -174,7 +174,12 @@ export interface ServiceOptions {
 /** Schema options. */
 export interface SchemaOptions {
     readonly id?: boolean | string;
-    readonly timestamps?: boolean;
+    readonly timestamps?: boolean | {
+        createdAt?: boolean;
+        updatedAt?: boolean;
+        created_at?: boolean;
+        updated_at?: boolean;
+    };
     readonly softDelete?: boolean;
     readonly hidden?: boolean;
     readonly nestedSet?: boolean;

package/package.json

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