refactor: attribute transforms

src/baseModel.ts

@@ -12,6 +12,8 @@ import {
 } from './errors'
 
 import result from 'lodash.result'
+import forEach from 'lodash.foreach'
+import mapValues from 'lodash.mapvalues'
 
 import type {
   Attributes,
@@ -22,10 +24,8 @@ import type {
   Scoped,
   ToJSON,
   ID,
+  Transform,
 } from './types'
-import { Transform } from './transform'
-import forEach from 'lodash.foreach'
-import mapValues from 'lodash.mapvalues'
 
 export class BaseModel {
   static client: SupabaseClient<any, any, any>
@@ -244,5 +244,4 @@ export class BaseModel {
     }
   }
 }
-
 export default BaseModel

src/model.ts

@@ -4,11 +4,16 @@ import forEach from 'lodash.foreach'
 
 import { baseModel } from './config'
 import { BaseModel } from './baseModel'
-import { Transform } from './transform'
 import { zodSchemaOf } from './schema'
-import { Dict } from './util'
+import { Dict, identity } from './util'
 
-import type { Attributes, SchemaOf, Extend, ModelOptions } from './types'
+import type {
+  ModelOptions,
+  Attributes,
+  Transform,
+  SchemaOf,
+  Extend,
+} from './types'
 
 export function defineModel<Attrs extends Attributes>(
   attributes: Attrs,
@@ -25,12 +30,12 @@ export function defineModel<Attrs extends Attributes>(
   if (tableName) model.tableName = tableName
   if (primaryKey) model.primaryKey = primaryKey
 
-  forEach(attributes, ({ column, take, emit }, key) => {
-    model.transforms[key] = new Transform(
-      column || model.naming(key),
+  forEach(attributes, ({ column, take = identity, emit = identity }, key) => {
+    model.transforms[key] = {
+      column: column || model.naming(key),
       take,
       emit,
-    )
+    }
 
     Object.defineProperty(model.prototype, key, {
       get() {

src/types.ts

@@ -79,8 +79,10 @@ export interface KeyMapper {
   (key: string): string
 }
 
-export interface TransformFn<In = any, Out = any> {
-  (val: In): Out
+export interface Transform<In = any, Out = any> {
+  column: string
+  take: (val: Out) => In
+  emit: (val: In) => Out
 }
 
 export interface Scoped<T = any> {