hekireki 0.2.2 → 0.2.4

package/dist/generator/ecto/generator/ecto.js

@@ -2,31 +2,58 @@ import fsp from 'node:fs/promises';
 import { join } from 'node:path';
 import { snakeCase } from '../../../shared/utils/index.js';
 import { prismaTypeToEctoType } from '../utils/prisma-type-to-ecto-type.js';
+/* ───────── Utilities ────────────────────────── */
+/** UUID PK → :binary_id / otherwise :id */
 function getPrimaryKeyType(field) {
     const def = field.default;
     return def && typeof def === 'object' && 'name' in def && def.name === 'uuid' ? 'binary_id' : 'id';
 }
+/** Convert readonly models to mutable copies */
 function makeMutable(models) {
     return models.map((m) => ({
         ...m,
         fields: m.fields?.map((f) => ({ ...f })) ?? [],
     }));
 }
+/* ───────── Main generator ───────────────────── */
 export function ectoSchemas(models, app) {
     const mutableModels = makeMutable(models);
+    /** Timestamp column aliases (snake_case & camelCase) */
+    const insertedAliases = ['inserted_at', 'created_at', 'createdAt'];
+    const updatedAliases = ['updated_at', 'modified_at', 'updatedAt', 'modifiedAt'];
     return mutableModels
         .map((model) => {
+        /* ── Primary-key handling ─────────────────── */
         const idFields = model.fields.filter((f) => f.isId);
         const isCompositePK = model.primaryKey && model.primaryKey.fields.length > 1;
-        if (!(idFields.length || isCompositePK)) {
+        if (!(idFields.length || isCompositePK))
             return '';
-        }
         const pkField = idFields[0];
-        const pkType = pkField ? getPrimaryKeyType(pkField) : ':id';
-        const excludedFieldNames = ['inserted_at', 'updated_at'];
-        const fields = model.fields.filter((f) => !(f.relationName || excludedFieldNames.includes(f.name)));
-        const hasInsertedAt = model.fields.some((f) => f.name === 'inserted_at');
-        const hasUpdatedAt = model.fields.some((f) => f.name === 'updated_at');
+        const pkType = pkField ? getPrimaryKeyType(pkField) : 'id';
+        /* ── Timestamp field detection ────────────── */
+        const insertedField = model.fields.find((f) => insertedAliases.includes(f.name));
+        const updatedField = model.fields.find((f) => updatedAliases.includes(f.name));
+        /** Columns removed from explicit `field/3` declarations */
+        const excludedNames = [
+            ...(insertedField ? [insertedField.name] : []),
+            ...(updatedField ? [updatedField.name] : []),
+        ];
+        /* ── Plain fields (no relations / no timestamps) ─ */
+        const fields = model.fields.filter((f) => !(f.relationName || excludedNames.includes(f.name)));
+        /* ── Build timestamps() line (const-only) ─────── */
+        const timestampsLine = (() => {
+            if (!(insertedField || updatedField))
+                return '';
+            const hasCustom = (insertedField && insertedField.name !== 'inserted_at') ||
+                (updatedField && updatedField.name !== 'updated_at');
+            if (!hasCustom)
+                return '    timestamps()'; // both defaults → short form
+            // Always include both keys when custom names are involved
+            const insertedName = insertedField ? insertedField.name : 'inserted_at';
+            const updatedName = updatedField ? updatedField.name : 'updated_at';
+            return `    timestamps(inserted_at: :${insertedName}, updated_at: :${updatedName})`;
+        })();
+        /* ── Assemble final module code ───────────── */
         const lines = [
             `defmodule ${app}.${model.name} do`,
             '  use Ecto.Schema',
@@ -37,8 +64,7 @@ export function ectoSchemas(models, app) {
                 const primary = f.isId && !isCompositePK ? ', primary_key: true' : '';
                 return `    field(:${f.name}, :${type}${primary})`;
             }),
-            ...(hasInsertedAt ? ['    field :inserted_at, :utc_datetime'] : []),
-            ...(hasUpdatedAt ? ['    field :updated_at, :utc_datetime'] : []),
+            ...(timestampsLine ? [timestampsLine] : []),
             '  end',
             'end',
         ];
@@ -47,6 +73,7 @@ export function ectoSchemas(models, app) {
         .filter(Boolean)
         .join('\n\n');
 }
+/* ───────── File writer ───────────────────────── */
 export async function writeEctoSchemasToFiles(models, app, outDir) {
     const mutableModels = makeMutable(models);
     await fsp.mkdir(outDir, { recursive: true });

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "hekireki",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "license": "MIT",
   "description": "Hekireki is a tool that generates validation schemas for Zod and Valibot, as well as ER diagrams, from Prisma schemas annotated with comments.",
   "keywords": [
     "prisma",
     "zod",
     "valibot",
-    "mermaid"
+    "mermaid",
+    "ecto"
   ],
   "homepage": "https://github.com/nakita628/hekireki",
   "publishConfig": {
@@ -49,7 +50,7 @@
     "tsx": "^4.20.3",
     "valibot": "1.1.0",
     "vitest": "^3.2.4",
-    "zod": "^3.25.67"
+    "zod": "^3.25.76"
   },
   "dependencies": {
     "@prisma/generator-helper": "^6.10.1",