imodel 0.1.0 → 0.2.0

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.1.0
+ * imodel v0.2.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
@@ -514,7 +514,7 @@ declare class Where {
     #private;
 }
 
-/** @typedef {SetValue.Increment | SetValue.Decrement | SetValue.Multiply | SetValue.Divide | string | number | bigint | boolean | null | typeof now} SetValue */
+/** @typedef {SetValue.Increment | SetValue.Decrement | SetValue.Multiply | SetValue.Divide | string | number | bigint | boolean | null | typeof now | (string | number | bigint | boolean)[]} SetValue */
 /** @typedef {{[values.increment]: number | bigint}} SetValue.Increment */
 /** @typedef {{[values.decrement]: number | bigint}} SetValue.Decrement */
 /** @typedef {{[values.multiply]: number | bigint}} SetValue.Multiply */
@@ -540,7 +540,7 @@ declare function multiply(value: number | bigint): SetValue.Multiply;
  */
 declare function divide(value: number | bigint): SetValue.Divide;
 
-type SetValue = SetValue.Increment | SetValue.Decrement | SetValue.Multiply | SetValue.Divide | string | number | bigint | boolean | null | typeof now;
+type SetValue = SetValue.Increment | SetValue.Decrement | SetValue.Multiply | SetValue.Divide | string | number | bigint | boolean | null | typeof now | (string | number | bigint | boolean)[];
 declare namespace SetValue {
     type Increment = {
         [increment$1]: number | bigint;
@@ -624,6 +624,11 @@ interface Constraint {
 }
 type MainFieldType = keyof FieldType | TableDefine;
 type ToFieldType<T> = T extends keyof FieldType ? FieldType[T] : unknown;
+type FieldSpecificValue = (string | number | bigint | boolean)[] | string | number | bigint | boolean | null | typeof now;
+type FieldSpecific = FieldSpecificValue | {
+    value: FieldSpecificValue;
+    computed?(): PromiseLike<FieldSpecificValue> | FieldSpecificValue;
+};
 interface FieldDefineOption {
     /** 精确度 */
     precision?: number;
@@ -639,12 +644,12 @@ interface FieldDefineOption {
     unique?: boolean;
     /** 索引信息 */
     index?: string | boolean;
-    /** 创建时，作为时间戳 */
-    timestampCreating?: boolean;
-    /** 更新时，作为时间戳 */
-    timestampUpdating?: boolean;
-    /** 伪删除时，作为时间戳 */
-    timestampDeleting?: boolean;
+    /** 创建时，自定义数据 */
+    creating?: FieldSpecific;
+    /** 更新时，自定义数据 */
+    updating?: FieldSpecific;
+    /** 伪删除时，自定义数据 */
+    deleting?: FieldSpecific;
     /** 是否为固定值 */
     immutable?: boolean;
     /** 文本查询 */
@@ -783,7 +788,7 @@ interface PseudoDestroy {
 }
 declare const Save: unique symbol;
 interface Save {
-    [Save](connection: Connection, run: (data: any, newData?: any) => Promise<object | null>, table: TableDefine): PromiseLike<this | null>;
+    [Save](connection: Connection, run: (data: any, newData?: any) => Promise<object | null>, newData: Record<string, any> | null, table: TableDefine): PromiseLike<this | null>;
 }
 declare const Create: unique symbol;
 interface Create<T = unknown> {
@@ -844,6 +849,10 @@ interface IConnection<E extends object = object> {
     dropMaterializedView(environment: Environment<E>, name: string): PromiseLike<number>;
     transaction<R>(environment: Environment<E>, fn: (t: E) => R | PromiseLike<R>): PromiseLike<R>;
 }
+interface Skip {
+    immutable?: boolean;
+    specific?: boolean;
+}
 interface TransactionFn {
     <T>(fn: (t: Connection) => PromiseLike<T> | T): Promise<T>;
 }
@@ -954,9 +963,10 @@ declare class Connection<E extends {} = {}> {
      * @template T
      * @param {TableDefine} model
      * @param {T} data
+     * @param {Record<string, any>?} [newData]
      * @returns {Promise<(T extends Save ? T : object)?>}
      */
-    save<T>(model: TableDefine, data: T): Promise<(T extends Save ? T : object) | null>;
+    save<T>(model: TableDefine, data: T, newData?: Record<string, any> | null): Promise<(T extends Save ? T : object) | null>;
     /**
      *
      * @template T
@@ -970,7 +980,7 @@ declare class Connection<E extends {} = {}> {
      * @template {object} T
      * @param {TableDefine} tableDef
      * @param {T} data
-* @param {Record<string, SetValue>} value
+     * @param {Record<string, SetValue>} value
      * @returns {Promise<(T extends PseudoDestroy ? T : object)?>}
      */
     pseudoDestroy<T extends unknown>(tableDef: TableDefine, data: T, value: Record<string, SetValue>): Promise<(T extends PseudoDestroy ? T : object) | null>;
@@ -1018,29 +1028,29 @@ declare class Connection<E extends {} = {}> {
      * @param {TableDefine} tableDefine
      * @param {Record<string, any>} update
      * @param {WhereValue[]?} [where]
-     * @param {boolean} [skip]
+     * @param {boolean | Skip} [skip]
      * @returns {Promise<number>}
      */
-    update({ table, fields }: TableDefine, update: Record<string, any>, where?: WhereValue[] | null, skip?: boolean): Promise<number>;
+    update({ table, fields }: TableDefine, update: Record<string, any>, where?: WhereValue[] | null, skip?: boolean | Skip): Promise<number>;
     /**
      * @template {Fields<MainFieldType>} T
      * @param {TableDefine<T>} tableDefine
      * @param {Record<string, any>} update
      * @param {string[]?} [returning]
      * @param {WhereValue[]?} [where]
-     * @param {boolean} [skip]
+     * @param {boolean | Skip} [skip]
      * @returns {Promise<any[]>}
      */
-    updateReturn<T extends Fields<MainFieldType>>({ table, fields }: TableDefine<T>, update: Record<string, any>, returning?: string[] | null, where?: WhereValue[] | null, skip?: boolean): Promise<any[]>;
+    updateReturn<T extends Fields<MainFieldType>>({ table, fields }: TableDefine<T>, update: Record<string, any>, returning?: string[] | null, where?: WhereValue[] | null, skip?: boolean | Skip): Promise<any[]>;
     /**
      * @param {TableDefine} tableDefine
      * @param {string[]} pKeys
      * @param {string[]} setKeys
      * @param {Record<string, any>[]} list
-     * @param {boolean} [skip]
+     * @param {boolean | Skip} [skip]
      * @returns {Promise<number>}
      */
-    updateMany({ table, fields }: TableDefine, pKeys: string[], setKeys: string[], list: Record<string, any>[], skip?: boolean): Promise<number>;
+    updateMany({ table, fields }: TableDefine, pKeys: string[], setKeys: string[], list: Record<string, any>[], skip?: boolean | Skip): Promise<number>;
     /**
      * @template {Fields<MainFieldType>} T
      * @param {TableDefine<T>} tableDefine
@@ -1048,10 +1058,10 @@ declare class Connection<E extends {} = {}> {
      * @param {string[]} setKeys
      * @param {Record<string, any>[]} list
      * @param {string[]?} [returning]
-     * @param {boolean} [skip]
+     * @param {boolean | Skip} [skip]
      * @returns {Promise<any[]>}
      */
-    updateManyReturn<T extends Fields<MainFieldType>>({ table, fields }: TableDefine<T>, pKeys: string[], setKeys: string[], list: Record<string, any>[], returning?: string[] | null, skip?: boolean): Promise<any[]>;
+    updateManyReturn<T extends Fields<MainFieldType>>({ table, fields }: TableDefine<T>, pKeys: string[], setKeys: string[], list: Record<string, any>[], returning?: string[] | null, skip?: boolean | Skip): Promise<any[]>;
     /**
      * @param {TableDefine} tableDefine
      * @param {WhereValue[]} [where]
@@ -1971,9 +1981,10 @@ declare class Model implements Save, Destroy, PseudoDestroy {
     /**
      * @param {Connection} t
      * @param {(data: any, newData?: any) => Promise<object?>} run
+     * @param {Record<string, any>?} newData
      * @returns {Promise<this?>}
      */
-    [Save](t: Connection, run: (data: any, newData?: any) => Promise<object | null>): Promise<this | null>;
+    [Save](t: Connection, run: (data: any, newData?: any) => Promise<object | null>, newData: Record<string, any> | null): Promise<this | null>;
     /**
      * @param {Connection} t
      * @param {(data: any) => Promise<object?>} run
@@ -2176,4 +2187,4 @@ declare function field<T extends MainFieldType>(type: T, options: {
 declare function setDevelopment(d?: boolean): void;
 declare let isDevelopment: boolean;
 
-export { Build, type BuildValue, type ClassDecorator, type Column, type ColumnOptions, Connection, type Constraint, type CountArg, Create, Destroy, type Environment, type FieldDecorator, type FieldDefine, type FieldDefineOption, type FieldDefineType, type FieldType, type FieldTypeDefine, type FieldValue, type Fields, type FindRange, type GetName, type IConnection, type Index, type IndexInfo, type IndexOptions, type Join, type JoinType, type MainFieldType, type MatchArg, type MaybePromise, Model, type Options, PseudoDestroy, type Querier, Query, type QueryOptions, type Queryable, Save, Select, type SelectArg, SetValue, Submodel, type Support, type TableDefine, type TableType, type ToFieldType, type ToType, type TransactionFn, Where, type WhereItem, type WhereLike, type WhereOr, type WhereRaw, type WhereValue, type Wheres, creating, decrement, field as define, deleted, deleting, divide, field$1 as field, getPrimaryKeys, id, immutable, increment, index, isDevelopment, isPseudo, submodel as model, multiply, now, primary, prop, pseudo, setDevelopment, sort, submodel, toNot, undeleted, updating, values, withDeleted };
+export { Build, type BuildValue, type ClassDecorator, type Column, type ColumnOptions, Connection, type Constraint, type CountArg, Create, Destroy, type Environment, type FieldDecorator, type FieldDefine, type FieldDefineOption, type FieldDefineType, type FieldSpecific, type FieldSpecificValue, type FieldType, type FieldTypeDefine, type FieldValue, type Fields, type FindRange, type GetName, type IConnection, type Index, type IndexInfo, type IndexOptions, type Join, type JoinType, type MainFieldType, type MatchArg, type MaybePromise, Model, type Options, PseudoDestroy, type Querier, Query, type QueryOptions, type Queryable, Save, Select, type SelectArg, SetValue, type Skip, Submodel, type Support, type TableDefine, type TableType, type ToFieldType, type ToType, type TransactionFn, Where, type WhereItem, type WhereLike, type WhereOr, type WhereRaw, type WhereValue, type Wheres, creating, decrement, field as define, deleted, deleting, divide, field$1 as field, getPrimaryKeys, id, immutable, increment, index, isDevelopment, isPseudo, submodel as model, multiply, now, primary, prop, pseudo, setDevelopment, sort, submodel, toNot, undeleted, updating, values, withDeleted };

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.1.0
+ * imodel v0.2.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
@@ -127,63 +127,63 @@ function getOptions(model) {
   return options;
 }
 
-/** @typedef {SetValue.Increment | SetValue.Decrement | SetValue.Multiply | SetValue.Divide | string | number | bigint | boolean | null | typeof now} SetValue */
-/** @typedef {{[values.increment]: number | bigint}} SetValue.Increment */
-/** @typedef {{[values.decrement]: number | bigint}} SetValue.Decrement */
-/** @typedef {{[values.multiply]: number | bigint}} SetValue.Multiply */
-/** @typedef {{[values.divide]: number | bigint}} SetValue.Divide */
-/**
- * @param {number | bigint} value
- * @returns {SetValue.Increment}
- */
-function increment(value) {
-  return {
-    [increment$1]: value
-  };
-}
+/** @import { FieldSpecific } from '../../types' */
 /**
- * @param {number | bigint} value
- * @returns {SetValue.Decrement}
- */
-function decrement(value) {
-  return {
-    [decrement$1]: value
-  };
-}
-/**
- * @param {number | bigint} value
- * @returns {SetValue.Multiply}
- */
-function multiply(value) {
-  return {
-    [multiply$1]: value
-  };
-}
-/**
- * @param {number | bigint} value
- * @returns {SetValue.Divide}
+ *
+ * @param {FieldSpecific} [val]
+ * @returns
  */
-function divide(value) {
-  return {
-    [divide$1]: value
-  };
+async function getSpecificValue(val) {
+  if (val === void 0) {
+    return;
+  }
+  if (!val) {
+    return val;
+  }
+  if (Array.isArray(val)) {
+    return val;
+  }
+  if (typeof val !== 'function' && typeof val !== 'object') {
+    return val;
+  }
+  const {
+    computed,
+    value
+  } = val;
+  if (value === void 0) {
+    return;
+  }
+  if (typeof computed === 'function') {
+    const value = await computed();
+    if (value !== void 0) {
+      return;
+    }
+  }
+  return value;
 }
 
 /** @import { SetValue } from '../../set.mjs' */
-/** @import { Fields } from '../../types' */
+/** @import { Fields, Skip } from '../../types' */
 /**
  *
  * @param {Fields} fields
  * @param {Record<string, SetValue> | null | undefined} [update]
- * @returns {Record<string, SetValue>}
+ * @param {boolean | Skip} [skip]
+ * @returns {Promise<Record<string, SetValue>>}
  */
-function getSetNewValue(fields, update) {
+async function getSetNewValue(fields, update, skip) {
   const data = {
     ...update
   };
-  for (const [name, field] of Object.entries(fields)) {
-    if (!field.primary && field.timestampUpdating) {
-      data[name] = now;
+  if (!(skip === true || skip && skip.specific)) {
+    for (const [name, field] of Object.entries(fields)) {
+      if (field.primary) {
+        continue;
+      }
+      const updating = await getSpecificValue(field.updating);
+      if (updating !== void 0) {
+        data[name] = updating;
+      }
     }
   }
   return Object.fromEntries(Object.entries(data).filter(([k, v]) => {
@@ -191,7 +191,15 @@ function getSetNewValue(fields, update) {
     if (!field) {
       return;
     }
-    if (field.immutable || field.serial && field.type === 'id') {
+    if (field.immutable) {
+      if (!skip) {
+        return;
+      }
+      if (skip !== true && !skip.immutable) {
+        return;
+      }
+    }
+    if (field.serial && field.type === 'id') {
       return;
     }
     return true;
@@ -203,13 +211,19 @@ function getSetNewValue(fields, update) {
  *
  * @param {Record<string, any>} data
  * @param {Fields} fields
- * @returns {Record<string, any>}
+ * @returns {Promise<Record<string, any>>}
  */
-function getInsertValue(data, fields) {
+async function getInsertValue(data, fields) {
   const insertValue = {};
   for (const [k, field] of Object.entries(fields)) {
-    if (field.timestampCreating) {
-      insertValue[k] = now;
+    const creating = await getSpecificValue(field.creating);
+    if (creating !== void 0) {
+      insertValue[k] = creating;
+      continue;
+    }
+    const updating = await getSpecificValue(field.updating);
+    if (updating !== void 0) {
+      insertValue[k] = updating;
       continue;
     }
     const val = data[k];
@@ -230,21 +244,51 @@ function getInsertValue(data, fields) {
   return insertValue;
 }
 
-/** @import { ColumnOptions } from '../../types' */
+/** @import { ColumnOptions, FieldSpecific } from '../../types' */
+/**
+ *
+ * @param {FieldSpecific} [val]
+ * @returns
+ */
+function getSpecificDefaultValue(val) {
+  if (val === void 0) {
+    return;
+  }
+  if (!val) {
+    return val;
+  }
+  if (Array.isArray(val)) {
+    return val;
+  }
+  if (typeof val !== 'function' && typeof val !== 'object') {
+    return val;
+  }
+  return val.value;
+}
 /**
  * @template {ColumnOptions} T
  * @param {T} v
  * @returns {T}
  */
-function timestampDef(v) {
-  const isTime = v.timestampCreating || v.timestampUpdating;
-  if (!isTime) {
+function setDefaultOptions(v) {
+  if (v.default !== void 0) {
     return v;
   }
-  return {
-    ...v,
-    default: now
-  };
+  const creating = getSpecificDefaultValue(v.creating);
+  if (creating !== void 0) {
+    return {
+      ...v,
+      default: creating
+    };
+  }
+  const updating = getSpecificDefaultValue(v.updating);
+  if (updating !== void 0) {
+    return {
+      ...v,
+      default: updating
+    };
+  }
+  return v;
 }
 
 /** @import { FieldDefine, Fields, FieldType, TableDefine } from '../../types' */
@@ -409,7 +453,7 @@ async function createSub(conn, getName, env, fields, newList, list) {
     }
     const [baseFields, tableFields] = separateFields(fields);
     const insertKeys = Object.entries(baseFields).filter(([, o]) => !o.serial || o.type !== 'id').map(v => v[0]);
-    const insertValues = fieldValues.map(d => getInsertValue(d, fields));
+    const insertValues = await Promise.all(fieldValues.map(d => getInsertValue(d, fields)));
     const {
       table
     } = type;
@@ -460,7 +504,7 @@ async function create(conn, getName, env, model, p, mapDo = defaultMap) {
     records.push(data);
   }
   const [baseFields, tableFields] = separateFields(fields);
-  const insertValues = records.map(d => getInsertValue(d, baseFields));
+  const insertValues = await Promise.all(records.map(d => getInsertValue(d, baseFields)));
   let insertKeys = [];
   if (!insertKeys.length && !isArray) {
     insertKeys = Object.entries(insertValues[0]).filter(([k, v]) => v !== undefined && k in baseFields).map(([k]) => k);
@@ -882,7 +926,7 @@ async function updateItem(conn, getName, env, updatedOldNewList, key, type, arra
   // 批量修改
   if (needUpdate.length) {
     const keys = new Set(needUpdate.map(v => Object.keys(v[0])).flat());
-    const update = getSetNewValue(baseFields);
+    const update = await getSetNewValue(baseFields);
     for (const k of Object.keys(update)) {
       keys.delete(k);
     }
@@ -908,7 +952,7 @@ async function updateItem(conn, getName, env, updatedOldNewList, key, type, arra
   // 批量新建
   if (needCreate.length) {
     const key = Object.entries(baseFields);
-    const list = typeof table === 'string' ? conn.insert(env, table, baseFields, needCreate.map(d => getInsertValue(d, baseFields)), key.filter(([, o]) => !o.serial || o.type !== 'id').map(v => v[0])) : table.insert(env, conn, '', baseFields, needCreate.map(d => getInsertValue(d, baseFields)), key.filter(([, o]) => !o.serial || o.type !== 'id').map(v => v[0]));
+    const list = typeof table === 'string' ? conn.insert(env, table, baseFields, await Promise.all(needCreate.map(d => getInsertValue(d, baseFields))), key.filter(([, o]) => !o.serial || o.type !== 'id').map(v => v[0])) : table.insert(env, conn, '', baseFields, await Promise.all(needCreate.map(d => getInsertValue(d, baseFields))), key.filter(([, o]) => !o.serial || o.type !== 'id').map(v => v[0]));
     listPromises.push(list);
     promises.push(list.then(list => createSub(conn, getName, env, tableFields, needCreate, list)));
   }
@@ -999,13 +1043,13 @@ async function updateData (conn, getName, model, data, newData, env) {
       table: '',
       fields: baseFields,
       where
-    }, getSetNewValue(fields, newData), Object.keys(baseFields));
+    }, await getSetNewValue(fields, newData), Object.keys(baseFields));
   } else {
     list = await conn.updateReturn(env, {
       table: getName(table),
       fields: baseFields,
       where
-    }, getSetNewValue(fields, newData), Object.keys(baseFields));
+    }, await getSetNewValue(fields, newData), Object.keys(baseFields));
   }
   const oldList = [data];
   const newList = [newData];
@@ -1023,10 +1067,14 @@ async function updateData (conn, getName, model, data, newData, env) {
  * @param {Record<string, SetValue>} update
  * @returns
  */
-function setDeleteTimestamp(fields, update) {
+async function setDeleteTimestamp(fields, update) {
   for (const [name, field] of Object.entries(fields)) {
-    if (!field.primary && field.timestampDeleting) {
-      update[name] = now;
+    if (field.primary) {
+      continue;
+    }
+    const deleting = await getSpecificValue(field.deleting);
+    if (deleting !== void 0) {
+      update[name] = deleting;
     }
   }
   return update;
@@ -1068,7 +1116,7 @@ async function pseudoDestroy (conn, getName, tableDef, data, update, env) {
   };
   const pseudoValue = Number(new Date());
   value[pseudo] = pseudoValue;
-  setDeleteTimestamp(fields, value);
+  await setDeleteTimestamp(fields, value);
   const [dataUpdated] = table && typeof table === 'object' ? await table.updateReturn(env, conn, {
     table: '',
     fields: baseFields,
@@ -1346,7 +1394,7 @@ async function pseudoDeleteMany(conn, getName, queryable, update, env) {
   const pseudoValue = Number(new Date());
   const pseudo = queryable.pseudo || '';
   value[pseudo] = pseudoValue;
-  setDeleteTimestamp(fields, value);
+  await setDeleteTimestamp(fields, value);
   const baseFields = toBaseFields(fields);
   const list = table && typeof table === 'object' ? await table.updateReturn(env, conn, {
     table: '',
@@ -1368,35 +1416,7 @@ async function pseudoDeleteMany(conn, getName, queryable, update, env) {
 /** @import { Fields, FieldType, FieldValue, IndexOptions, MainFieldType, TableDefine } from '../types/table' */
 /** @import { Queryable } from '../types/options' */
 /** @import { Column, ColumnOptions } from '../types/column' */
-/** @import { GetName, TableType } from '../types/connection' */
-/**
- *
- * @param {Record<string, any> | null | undefined} update
- * @param {Fields} fields
- * @param {boolean} [skip]
- * @returns {Record<string, SetValue>}
- */
-function getSetValue$1(update, fields, skip) {
-  /** @type {Record<string, SetValue>} */
-  const data = {
-    ...update
-  };
-  for (const [name, field] of Object.entries(fields)) {
-    if (!field.primary && field.timestampUpdating) {
-      data[name] = now;
-    }
-  }
-  return Object.fromEntries(Object.entries(data).filter(([k, v]) => {
-    const field = k in fields && fields[k];
-    if (!field) {
-      return;
-    }
-    if (!skip && field.immutable || field.serial && field.type === 'id') {
-      return;
-    }
-    return true;
-  }));
-}
+/** @import { GetName, Skip, TableType } from '../types/connection' */
 /**
  *
  * @param {Fields<keyof FieldType>} fields
@@ -1628,11 +1648,17 @@ class Connection {
    * @template T
    * @param {TableDefine} model
    * @param {T} data
+   * @param {Record<string, any>?} [newData]
    * @returns {Promise<(T extends Save ? T : object)?>}
    */
-  async save(model, data) {
+  async save(model, data, newData) {
     if (typeof data[Save] !== 'function') {
       const conn = await this.#getConnection();
+      if (newData) {
+        /** @type {any} */
+        const doc = data;
+        return updateData(conn, this.#getName, model, doc, newData, this.#env);
+      }
       return create(conn, this.#getName, this.#env, model, data);
     }
     const r = /** @type {Save}*/data;
@@ -1643,7 +1669,7 @@ class Connection {
         return updateData(conn, this.#getName, model, doc, newData, this.#env);
       }
       return create(conn, this.#getName, this.#env, model, doc);
-    }, model);
+    }, newData || null, model);
   }
   /**
    *
@@ -1669,7 +1695,7 @@ class Connection {
    * @template {object} T
    * @param {TableDefine} tableDef
    * @param {T} data
-  * @param {Record<string, SetValue>} value
+   * @param {Record<string, SetValue>} value
    * @returns {Promise<(T extends PseudoDestroy ? T : object)?>}
    */
   async pseudoDestroy(tableDef, data, value) {
@@ -1772,7 +1798,7 @@ class Connection {
    * @param {TableDefine} tableDefine
    * @param {Record<string, any>} update
    * @param {WhereValue[]?} [where]
-   * @param {boolean} [skip]
+   * @param {boolean | Skip} [skip]
    * @returns {Promise<number>}
    */
   async update({
@@ -1784,11 +1810,11 @@ class Connection {
       table: '',
       fields: toBaseFields(fields),
       where: where || undefined
-    }, getSetValue$1(update, fields, skip)) : conn.update(this.#env, {
+    }, await getSetNewValue(fields, update, skip)) : conn.update(this.#env, {
       table: this.#getName(table),
       fields: toBaseFields(fields),
       where: where || undefined
-    }, getSetValue$1(update, fields, skip));
+    }, await getSetNewValue(fields, update, skip));
   }
   /**
    * @template {Fields<MainFieldType>} T
@@ -1796,7 +1822,7 @@ class Connection {
    * @param {Record<string, any>} update
    * @param {string[]?} [returning]
    * @param {WhereValue[]?} [where]
-   * @param {boolean} [skip]
+   * @param {boolean | Skip} [skip]
    * @returns {Promise<any[]>}
    */
   async updateReturn({
@@ -1809,18 +1835,18 @@ class Connection {
       table: '',
       fields: baseFields,
       where: where || undefined
-    }, getSetValue$1(update, fields, skip), returning?.length ? returning : Object.keys(baseFields)) : conn.updateReturn(this.#env, {
+    }, await getSetNewValue(fields, update, skip), returning?.length ? returning : Object.keys(baseFields)) : conn.updateReturn(this.#env, {
       table: this.#getName(table),
       fields: baseFields,
       where: where || undefined
-    }, getSetValue$1(update, fields, skip), returning?.length ? returning : Object.keys(baseFields));
+    }, await getSetNewValue(fields, update, skip), returning?.length ? returning : Object.keys(baseFields));
   }
   /**
    * @param {TableDefine} tableDefine
    * @param {string[]} pKeys
    * @param {string[]} setKeys
    * @param {Record<string, any>[]} list
-   * @param {boolean} [skip]
+   * @param {boolean | Skip} [skip]
    * @returns {Promise<number>}
    */
   async updateMany({
@@ -1828,7 +1854,7 @@ class Connection {
     fields
   }, pKeys, setKeys, list, skip) {
     const baseFields = toBaseFields(fields);
-    const update = skip ? {} : getSetNewValue(fields);
+    const update = await getSetNewValue(fields, null, skip);
     const [whereFields, setFields] = getKeys(baseFields, update, pKeys, setKeys);
     const conn = await this.#getConnection();
     return table && typeof table === 'object' ? table.updateMany(this.#env, conn, '', baseFields, update, whereFields, setFields, list, []) : conn.updateMany(this.#env, this.#getName(table), baseFields, update, whereFields, setFields, list, []);
@@ -1840,7 +1866,7 @@ class Connection {
    * @param {string[]} setKeys
    * @param {Record<string, any>[]} list
    * @param {string[]?} [returning]
-   * @param {boolean} [skip]
+   * @param {boolean | Skip} [skip]
    * @returns {Promise<any[]>}
    */
   async updateManyReturn({
@@ -1848,7 +1874,7 @@ class Connection {
     fields
   }, pKeys, setKeys, list, returning, skip) {
     const baseFields = toBaseFields(fields);
-    const update = skip ? {} : getSetNewValue(fields);
+    const update = getSetNewValue(fields, null, skip);
     const [whereFields, setFields] = getKeys(baseFields, update, pKeys, setKeys);
     const conn = await this.#getConnection();
     return table && typeof table === 'object' ? table.updateManyReturn(this.#env, conn, '', baseFields, update, whereFields, setFields, list, [], returning?.length ? returning : Object.keys(baseFields)) : conn.updateManyReturn(this.#env, this.#getName(table), baseFields, update, whereFields, setFields, list, [], returning?.length ? returning : Object.keys(baseFields));
@@ -1956,7 +1982,7 @@ class Connection {
    */
   async addColumn(table, column, type, options) {
     const conn = await this.#getConnection();
-    return conn.addColumn(this.#env, this.#getName(table), column, type, timestampDef(options));
+    return conn.addColumn(this.#env, this.#getName(table), column, type, setDefaultOptions(options));
   }
   /**
    * @param {string} table
@@ -1967,7 +1993,7 @@ class Connection {
    */
   async changeColumn(table, column, type, options) {
     const conn = await this.#getConnection();
-    return conn.changeColumn(this.#env, this.#getName(table), column, type, timestampDef(options));
+    return conn.changeColumn(this.#env, this.#getName(table), column, type, setDefaultOptions(options));
   }
   /**
    * @param {string} table
@@ -2025,7 +2051,7 @@ class Connection {
    */
   async createTable(table, fields) {
     const conn = await this.#getConnection();
-    return conn.createTable(this.#env, this.#getName(table), fields.map(timestampDef));
+    return conn.createTable(this.#env, this.#getName(table), fields.map(setDefaultOptions));
   }
   /**
    * @param {string} table
@@ -3594,6 +3620,48 @@ class Where {
   }
 }
 
+/** @typedef {SetValue.Increment | SetValue.Decrement | SetValue.Multiply | SetValue.Divide | string | number | bigint | boolean | null | typeof now | (string | number | bigint | boolean)[]} SetValue */
+/** @typedef {{[values.increment]: number | bigint}} SetValue.Increment */
+/** @typedef {{[values.decrement]: number | bigint}} SetValue.Decrement */
+/** @typedef {{[values.multiply]: number | bigint}} SetValue.Multiply */
+/** @typedef {{[values.divide]: number | bigint}} SetValue.Divide */
+/**
+ * @param {number | bigint} value
+ * @returns {SetValue.Increment}
+ */
+function increment(value) {
+  return {
+    [increment$1]: value
+  };
+}
+/**
+ * @param {number | bigint} value
+ * @returns {SetValue.Decrement}
+ */
+function decrement(value) {
+  return {
+    [decrement$1]: value
+  };
+}
+/**
+ * @param {number | bigint} value
+ * @returns {SetValue.Multiply}
+ */
+function multiply(value) {
+  return {
+    [multiply$1]: value
+  };
+}
+/**
+ * @param {number | bigint} value
+ * @returns {SetValue.Divide}
+ */
+function divide(value) {
+  return {
+    [divide$1]: value
+  };
+}
+
 /** @import { Fields, Options, Queryable, Select } from './types' */
 /** @import { WhereValue, Wheres } from './Where.mjs' */
 /**
@@ -4829,13 +4897,18 @@ class Model {
   /**
    * @param {Connection} t
    * @param {(data: any, newData?: any) => Promise<object?>} run
+   * @param {Record<string, any>?} newData
    * @returns {Promise<this?>}
    */
-  async [Save](t, run) {
+  async [Save](t, run, newData) {
     const update = this.#saved;
-    return this.#do(() => this.$_onBeforeSave(t, update), () => update ? run(this.#data, this.#newData) : run({
+    return this.#do(() => this.$_onBeforeSave(t, update), () => update ? run(this.#data, {
+      ...this.#newData,
+      ...newData
+    }) : run({
       ...this.#data,
-      ...this.#newData
+      ...this.#newData,
+      ...newData
     }), () => this.$_onAfterSave(t, update));
   }
   /**

package/migrate.d.mts

@@ -1,10 +1,10 @@
 /*!
- * imodel v0.1.0
+ * imodel v0.2.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
 
-import { TransactionFn, Connection, IndexOptions, ColumnOptions, Column, Index, TableDefine } from 'imodel';
+import { TransactionFn, Connection, IndexOptions, FieldType, ColumnOptions, Column, Index, TableDefine } from 'imodel';
 
 /**
  *
@@ -185,7 +185,7 @@ declare class MigrationType implements Migrator$4 {
 }
 type Migrator$4 = Migrator;
 
-/** @import { IndexOptions, ColumnOptions } from 'imodel' */
+/** @import { IndexOptions, ColumnOptions, FieldType } from 'imodel' */
 /**
  * @abstract
  */
@@ -200,11 +200,11 @@ declare class TableAdder {
     /**
      * @abstract
      * @param {string} name
-     * @param {string} type
+     * @param {keyof FieldType} type
      * @param {ColumnOptions<any>} [options]
      * @returns {this}
      */
-    field(name: string, type: string, options?: ColumnOptions<any>): this;
+    field(name: string, type: keyof FieldType, options?: ColumnOptions<any>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<string>} [options]
@@ -241,12 +241,6 @@ declare class TableAdder {
      * @returns {this}
      */
     i32(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    i52(name: string, options?: ColumnOptions<number | bigint>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<number | bigint>} [options]
@@ -265,12 +259,6 @@ declare class TableAdder {
      * @returns {this}
      */
     u32(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    u52(name: string, options?: ColumnOptions<number | bigint>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<number | bigint>} [options]
@@ -385,6 +373,12 @@ declare class TableAdder {
      * @returns {this}
      */
     object(name: string, options?: ColumnOptions<object>): this;
+    /**
+     * @param {string} name
+     * @param {ColumnOptions<object>} [options]
+     * @returns {this}
+     */
+    json(name: string, options?: ColumnOptions<object>): this;
     /**
      * @returns {this}
      */

package/migrate.mjs

@@ -1,10 +1,10 @@
 /*!
- * imodel v0.1.0
+ * imodel v0.2.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
 
-import { Query, define } from 'imodel';
+import { now, Query, define } from 'imodel';
 
 /** @import { Connection } from 'imodel' */
 /** @typedef {import('./index.mjs').Migrator} Migrator */
@@ -55,7 +55,7 @@ class Reverter {
   }
 }
 
-/** @import { IndexOptions, ColumnOptions } from 'imodel' */
+/** @import { IndexOptions, ColumnOptions, FieldType } from 'imodel' */
 /**
  * @abstract
  */
@@ -72,7 +72,7 @@ class TableAdder {
   /**
    * @abstract
    * @param {string} name
-   * @param {string} type
+   * @param {keyof FieldType} type
    * @param {ColumnOptions<any>} [options]
    * @returns {this}
    */
@@ -127,14 +127,6 @@ class TableAdder {
   i32(name, options) {
     return this.field(name, 'i32', options);
   }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  i52(name, options) {
-    return this.field(name, 'i52', options);
-  }
   /**
    * @param {string} name
    * @param {ColumnOptions<number | bigint>} [options]
@@ -159,14 +151,6 @@ class TableAdder {
   u32(name, options) {
     return this.field(name, 'u32', options);
   }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  u52(name, options) {
-    return this.field(name, 'u52', options);
-  }
   /**
    * @param {string} name
    * @param {ColumnOptions<number | bigint>} [options]
@@ -221,7 +205,7 @@ class TableAdder {
    * @returns {this}
    */
   bin(name, options) {
-    return this.field(name, 'bin', options);
+    return this.field(name, 'binary', options);
   }
   /**
    * @param {string} name
@@ -319,7 +303,7 @@ class TableAdder {
    * @returns {this}
    */
   uuid(name, options) {
-    return this.field(name, 'bool', options);
+    return this.field(name, 'uuid', options);
   }
   /**
    * @param {string} name
@@ -327,7 +311,15 @@ class TableAdder {
    * @returns {this}
    */
   object(name, options) {
-    return this.field(name, 'bool', options);
+    return this.field(name, 'object', options);
+  }
+  /**
+   * @param {string} name
+   * @param {ColumnOptions<object>} [options]
+   * @returns {this}
+   */
+  json(name, options) {
+    return this.field(name, 'json', options);
   }
   /**
    * @returns {this}
@@ -335,7 +327,7 @@ class TableAdder {
   createTime() {
     return this.field('createOn', 'timestamp', {
       nullable: true,
-      timestampCreating: true
+      creating: now
     });
   }
   /**
@@ -344,7 +336,7 @@ class TableAdder {
   updateTime() {
     return this.field('updateOn', 'timestamp', {
       nullable: true,
-      timestampUpdating: true
+      updating: now
     });
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imodel",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "index.mjs",
   "type": "module",
   "repository": {