imodel 0.4.1 → 0.5.0

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.4.1
+ * imodel v0.5.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
@@ -612,6 +612,7 @@ interface Constraint {
     noField?: boolean;
     field?: string;
     value?: any;
+    writeOnly?: boolean;
 }
 type MainFieldType = keyof FieldType | TableDefine | null;
 type ToFieldType<T> = T extends keyof FieldType ? FieldType[T] : unknown;
@@ -640,6 +641,8 @@ interface FieldDefineOption {
     deleting?: FieldSpecific;
     /** 是否为固定值 */
     immutable?: boolean;
+    /** 固定值 */
+    fixedValue?: any;
     /** 文本查询 */
     text?: boolean;
     /** 排序顺序，绝对值表示在排序列表中的顺序，负数表示逆序排序, 0 表示不排序 */
@@ -1844,7 +1847,7 @@ declare function toPrimaries(model: any, documents: any): string | string[];
 /**
  * @typedef {object} Scene.Define
  * @property {string} table
- * @property {[column: string, field?: string, value?: any][]} fields
+ * @property {{column: string, field?: string, fixedValue?: any, [v: string]: any}[]} fields
  */
 /** @import {FieldDefine, Fields, TableDefine,} from './types/table' */
 declare class Scene {
@@ -1864,7 +1867,12 @@ declare class Scene {
 declare namespace Scene {
     type Define = {
         table: string;
-        fields: [column: string, field?: string, value?: any][];
+        fields: {
+            column: string;
+            field?: string;
+            fixedValue?: any;
+            [v: string]: any;
+        }[];
     };
 }
 

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.4.1
+ * imodel v0.5.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
@@ -141,15 +141,23 @@ async function getSpecificValue(val) {
  * @param {Record<string, any>} data
  * @param {Fields} columns
  * @param {Record<string, string> | null} fieldColumns
+ * @param {Set<string>?} [ignore]
  * @returns {Promise<Record<string, any>>}
  */
-async function getInsertValue(data, columns, fieldColumns) {
+async function getInsertValue(data, columns, fieldColumns, ignore) {
   const insertValue = {};
   for (const [k, col] of fieldColumns ? Object.entries(fieldColumns) : Object.keys(columns).map(v => [v, v])) {
     const column = columns[col];
     if (!column) {
       continue;
     }
+    const {
+      fixedValue
+    } = column;
+    if (fixedValue !== void 0 && !ignore?.has(k)) {
+      insertValue[col] = fixedValue;
+      continue;
+    }
     const creating = await getSpecificValue(column.creating);
     if (creating !== void 0) {
       insertValue[col] = creating;
@@ -419,7 +427,8 @@ async function createSub(conn, env, fields, newList, list) {
     }
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const insertKeys = Object.entries(columns).map(v => v[0]);
-    const insertValues = await Promise.all(fieldValues.map(d => getInsertValue(d, columns, fieldColumns)));
+    const ignore = new Set(fieldColumns ? constraintEntries.map(([k]) => fieldColumns[k]) : constraintEntries.map(([k]) => k));
+    const insertValues = await Promise.all(fieldValues.map(d => getInsertValue(d, columns, fieldColumns, ignore)));
     const {
       table
     } = type;
@@ -502,7 +511,7 @@ function getPrimaryKeys(fieldsOrColumns) {
 /**
  * @param {Fields} fields
  * @param {Set<string>} parentFields
- * @param {Record<string, string | Constraint> | undefined} constraints
+ * @param {Record<string, Constraint> | undefined} constraints
  * @returns {[string, string][]?}
  */
 function getMapList(fields, parentFields, constraints) {
@@ -515,7 +524,12 @@ function getMapList(fields, parentFields, constraints) {
     if (!(k in fields)) {
       continue;
     }
-    const field = typeof v === 'string' ? v : v.field;
+    if (v.writeOnly) {
+      continue;
+    }
+    const {
+      field
+    } = v;
     if (typeof field !== 'string') {
       continue;
     }
@@ -531,34 +545,73 @@ function getMapList(fields, parentFields, constraints) {
 }
 
 /** @import { Constraint, Fields, FieldType } from '../../types' */
+/** @import { WhereValue } from '../../Where.mjs' */
 /**
  *
  * @param {Record<string, Constraint> | undefined} value
  * @param {Fields<keyof FieldType>} columns
- * @returns {[string, unknown][]}
+ * @param {Record<string, string>?} fieldColumns
+ * @returns {WhereValue[]}
  */
-function getValueEntries(value, columns) {
+function getValueWhere(value, columns, fieldColumns) {
   if (!value) {
     return [];
   }
+  const keys = new Set();
   /** @type {[string, unknown][]} */
   const where = [];
-  for (const [k, v] of Object.entries(value)) {
-    if (!(k in columns)) {
-      continue;
+  if (!fieldColumns) {
+    for (const [k, v] of Object.entries(value)) {
+      if (!(k in columns)) {
+        continue;
+      }
+      keys.add(k);
+      if (v.writeOnly) {
+        continue;
+      }
+      const {
+        value
+      } = v;
+      if (value === undefined) {
+        continue;
+      }
+      where.push([k, value]);
     }
-    if (!v || typeof v !== 'object') {
+  } else {
+    for (const [k, v] of Object.entries(value)) {
+      if (!(k in fieldColumns)) {
+        continue;
+      }
+      const key = fieldColumns[k];
+      keys.add(key);
+      if (v.writeOnly) {
+        continue;
+      }
+      const {
+        value
+      } = v;
+      if (value === undefined) {
+        continue;
+      }
+      where.push([key, value]);
+    }
+  }
+  for (const [k, {
+    fixedValue
+  }] of Object.entries(columns)) {
+    if (keys.has(k)) {
       continue;
     }
-    const {
-      value
-    } = v;
-    if (value === undefined) {
+    if (fixedValue === void 0) {
       continue;
     }
-    where.push([k, value]);
+    where.push([k, fixedValue]);
   }
-  return where;
+  return where.map(([k, v]) => ({
+    field: k,
+    operator: '=',
+    value: v
+  }));
 }
 
 /** @import { WhereValue } from '../../Where.mjs' */
@@ -566,30 +619,19 @@ function getValueEntries(value, columns) {
  *
  * @param {Record<string, string>[]} list
  * @param {[string, string][]} map
+ * @param {Record<string, string>?} fieldColumns
  * @returns {WhereValue}
  */
-function subList2where(list, map) {
+function subList2where(list, map, fieldColumns) {
   const valueKeys = map.map(([, v]) => v);
+  const field = fieldColumns ? map.map(([k]) => fieldColumns[k]) : map.map(([k]) => k);
+  const value = list.map(d => valueKeys.map(v => d[v]));
   return {
-    field: map.map(([k]) => k),
-    value: list.map(d => valueKeys.map(v => d[v]))
+    field,
+    value
   };
 }
 
-/** @import { WhereValue } from '../../Where.mjs' */
-/**
- *
- * @param {[string, unknown][]} value
- * @returns {WhereValue[]}
- */
-function valueEntries2where(value) {
-  return value.map(([k, v]) => ({
-    field: k,
-    operator: '=',
-    value: v
-  }));
-}
-
 /** @import { WhereValue } from '../../Where.mjs' */
 /**
  *
@@ -640,6 +682,30 @@ function where2column(where, fieldColumns) {
   }));
 }
 
+/** @import { Fields, FieldType } from '../../types' */
+/** @import { WhereValue } from '../../Where.mjs' */
+/**
+ *
+ * @param {Fields<keyof FieldType>} columns
+ * @param {Set<string>?} [ignore]
+ * @returns {Iterable<WhereValue>}
+ */
+function* getFixedValueWhere(columns, ignore) {
+  for (const [k, {
+    fixedValue
+  }] of Object.entries(columns)) {
+    if (ignore?.has(k)) {
+      continue;
+    }
+    if (fixedValue !== void 0) {
+      yield {
+        field: k,
+        value: fixedValue
+      };
+    }
+  }
+}
+
 /** @import { Environment, FieldDefine, IConnection, Queryable, TableDefine } from '../types' */
 /**
  *
@@ -671,8 +737,7 @@ async function deleteSub(conn, list, fields, baseFieldSet, env, hasResult) {
     if (!mapList) {
       continue;
     }
-    const value = getValueEntries(constraints, columns);
-    const where = where2column([subList2where(list, mapList), ...valueEntries2where(value)], fieldColumns);
+    const where = [subList2where(list, mapList, fieldColumns), ...getValueWhere(constraints, columns, fieldColumns)];
     const {
       table
     } = type;
@@ -714,6 +779,7 @@ async function deleteMany(conn, queryable, env) {
   } = queryable;
   const [columns, fieldColumns, tableFields] = toColumns(fields);
   const where = where2column(queryable.options.where, fieldColumns);
+  where.push(...getFixedValueWhere(columns));
   if (!tableFields.length) {
     return table && typeof table === 'object' ? table.delete(env, conn, columns, where) : conn.delete(env, table || '', columns, where);
   }
@@ -787,11 +853,18 @@ async function getSetValue$1(columns, fieldColumns, update, skip) {
       if (field.primary) {
         continue;
       }
+      const {
+        fixedValue
+      } = field;
+      if (fixedValue !== void 0) {
+        data[name] = fixedValue;
+        continue;
+      }
       const updating = await getSpecificValue(field.updating);
-      if (updating === void 0) {
+      if (updating !== void 0) {
+        data[name] = updating;
         continue;
       }
-      data[name] = updating;
     }
   }
   return data;
@@ -844,12 +917,18 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
   const commonValue = {};
   /** @type {[string, string][]} */
   const commonMapKeys = [];
+  /** @type {[string, string][]} */
+  const commonFilterKeys = [];
   for (const [k, {
     field,
-    value: val
+    value: val,
+    writeOnly
   }] of constraintEntries) {
     if (field) {
       commonMapKeys.push([k, field]);
+      if (!writeOnly) {
+        commonFilterKeys.push([k, field]);
+      }
     } else if (val !== undefined) {
       commonValue[k] = val;
     }
@@ -903,17 +982,6 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
     return;
   }
   const [columns, fieldColumns, tableFields, fields] = toColumns(type.fields);
-  /** @type {Record<string, any>} */
-  const commonValues = {};
-  for (const [k, v] of constraintEntries) {
-    const {
-      field,
-      value
-    } = v;
-    if (!field && value !== undefined) {
-      commonValues[k] = value;
-    }
-  }
   const oldList = oldListValues.flat();
   const newList = newListValues.flat();
   const primaryKeys = getPrimaryKeys(fields);
@@ -930,36 +998,39 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
   const needUpdate = [];
   /** @type {Record<string, any>[]} */
   const unmatched = [];
-  const aKeys = fieldKeys.filter(v => !(v in commonValues));
-  const pKeys = primaryKeys.filter(v => !(v in commonValues));
+  const aKeys = fieldKeys.filter(v => !(v in commonValue));
+  const pKeys = primaryKeys.filter(v => !(v in commonValue));
   classify(newList, needDelete, aKeys, unmatched, eq);
   classify(unmatched, needDelete, pKeys, needCreate, needUpdate);
   const {
     table
   } = type;
+  const ignore = new Set(fieldColumns ? constraintEntries.map(([k]) => fieldColumns[k]) : constraintEntries.map(([k]) => k));
   if (needDelete.length) {
     // 批量删除
     /** @type {WhereValue[]} */
-    const where = primaryKeys.filter(v => v in commonValues).map(k => ({
+    const fieldWhere = primaryKeys.filter(v => v in commonValue).map(k => ({
       field: k,
       operator: '=',
-      value: commonValues[k] ?? null
+      value: commonValue[k] ?? null
     }));
     if (pKeys.length === 1) {
       const [key] = pKeys;
-      where.push({
+      fieldWhere.push({
         field: key,
         operator: 'in',
         value: needDelete.map(v => v[key] ?? null)
       });
     } else if (pKeys.length) {
-      where.push({
+      fieldWhere.push({
         field: pKeys,
         operator: 'in',
         value: needDelete.map(v => pKeys.map(k => v[k] ?? null))
       });
     }
-    const promise = typeof table === 'object' ? table.deleteReturn(env, conn, columnKeys, columns, where2column(where, fieldColumns)) : conn.deleteReturn(env, columnKeys, table || '', columns, where2column(where, fieldColumns));
+    const where = where2column(fieldWhere, fieldColumns);
+    where.push(...getFixedValueWhere(columns, ignore));
+    const promise = typeof table === 'object' ? table.deleteReturn(env, conn, columnKeys, columns, where) : conn.deleteReturn(env, columnKeys, table || '', columns, where);
     promises.push(promise.then(list => deleteSub(conn, toFieldList(list, fieldColumns), tableFields, new Set(Object.keys(fieldColumns || columns)), env)));
   }
   /** @type {typeof updatedOldNewList} */
@@ -982,7 +1053,7 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
     }
     const setKeysColumn = Object.entries(columns).filter(([, v]) => !v.primary && !v.immutable).map(v => v[0]).filter(v => keysColumn.has(v));
     /** @type {WhereValue[]} */
-    const where = Object.entries(commonValues).filter(([k]) => primaryKeys.includes(k)).map(([k, v]) => ({
+    const fieldWhere = Object.entries(commonValue).filter(([k]) => primaryKeys.includes(k)).map(([k, v]) => ({
       field: k,
       operator: '=',
       value: v
@@ -995,13 +1066,15 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
         value[key] = old[key];
       }
     }
-    const list = (typeof table === 'object' ? table.updateManyReturn(env, conn, columns, updateColumn, field2column(pKeys, fieldColumns), setKeysColumn, toColumnList(needUpdate.map(v => v[0]), fieldColumns), where2column(where, fieldColumns), columnKeys) : conn.updateManyReturn(env, table || '', columns, updateColumn, field2column(pKeys, fieldColumns), setKeysColumn, toColumnList(needUpdate.map(v => v[0]), fieldColumns), where2column(where, fieldColumns), columnKeys)).then(l => toFieldList(l, fieldColumns));
+    const where = where2column(fieldWhere, fieldColumns);
+    where.push(...getFixedValueWhere(columns, ignore));
+    const list = (typeof table === 'object' ? table.updateManyReturn(env, conn, columns, updateColumn, field2column(pKeys, fieldColumns), setKeysColumn, toColumnList(needUpdate.map(v => v[0]), fieldColumns), where, columnKeys) : conn.updateManyReturn(env, table || '', columns, updateColumn, field2column(pKeys, fieldColumns), setKeysColumn, toColumnList(needUpdate.map(v => v[0]), fieldColumns), where, columnKeys)).then(l => toFieldList(l, fieldColumns));
     listPromises.push(list);
     subPromises.push(list.then(u => u.map((u, i) => [u, ...needUpdate[i]])));
   }
   // 批量新建
   if (needCreate.length) {
-    const subColumnData = await Promise.all(needCreate.map(d => getInsertValue(d, columns, fieldColumns)));
+    const subColumnData = await Promise.all(needCreate.map(d => getInsertValue(d, columns, fieldColumns, ignore)));
     const list = (typeof table === 'object' ? table.insert(env, conn, columns, subColumnData, Object.keys(columns)) : conn.insert(env, table || '', columns, subColumnData, Object.keys(columns))).then(l => toFieldList(l, fieldColumns));
     listPromises.push(list);
     promises.push(list.then(list => createSub(conn, env, tableFields, needCreate, list)));
@@ -1012,7 +1085,7 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
   const allList = Promise.all(listPromises).then(v => v.flat());
   promises.push(array ? allList.then(async values => {
     for (const [value] of updatedOldNewList) {
-      let data = values.filter(createFilter(value, commonMapKeys));
+      let data = values.filter(createFilter(value, commonFilterKeys));
       if (noField) {
         data = data.sort(({
           [noField]: a
@@ -1024,7 +1097,7 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
     }
   }) : allList.then(async values => {
     for (const [value] of updatedOldNewList) {
-      value[key] = values.find(createFilter(value, commonMapKeys)) || null;
+      value[key] = values.find(createFilter(value, commonFilterKeys)) || null;
     }
   }));
   await Promise.all(promises);
@@ -1077,19 +1150,21 @@ async function updateData (conn, model, data, newData, env) {
   const savedData = data;
   const has = keys.filter(v => v in fields && (typeof fields[v]?.type === 'string' || fields[v]?.type && !fields[v]?.type.table)).length;
   /** @type {WhereValue[]} */
-  const where = getPrimaryKeys(fields).map(k => ({
+  const fieldWhere = getPrimaryKeys(fields).map(k => ({
     field: k,
     operator: '=',
     value: savedData[k]
   }));
   const [columns, fieldColumns, tableFields] = toColumns(fields);
+  const where = where2column(fieldWhere, fieldColumns);
+  where.push(...getFixedValueWhere(columns));
   let list = [];
   if (!has) {
     list = [data];
   } else if (table && typeof table === 'object') {
-    list = toFieldList(await table.updateReturn(env, conn, Object.keys(columns), columns, await getSetValue$1(columns, fieldColumns, newData), where2column(where, fieldColumns)), fieldColumns);
+    list = toFieldList(await table.updateReturn(env, conn, Object.keys(columns), columns, await getSetValue$1(columns, fieldColumns, newData), where), fieldColumns);
   } else {
-    list = toFieldList(await conn.updateReturn(env, Object.keys(columns), table || '', columns, await getSetValue$1(columns, fieldColumns, newData), where2column(where, fieldColumns)), fieldColumns);
+    list = toFieldList(await conn.updateReturn(env, Object.keys(columns), table || '', columns, await getSetValue$1(columns, fieldColumns, newData), where), fieldColumns);
   }
   const oldList = [data];
   const newList = [newData];
@@ -1153,18 +1228,20 @@ async function pseudoDestroy (conn, tableDef, data, update, env) {
     fields
   } = tableDef;
   /** @type {WhereValue[]} */
-  const where = getPrimaryKeys(fields).map(k => ({
+  const fieldWhere = getPrimaryKeys(fields).map(k => ({
     field: k,
     operator: '=',
     value: data[k]
   }));
-  const [columns, fieldColumns] = toColumns(fields);
   const pseudo = tableDef.pseudo || '';
-  where.push({
+  fieldWhere.push({
     field: pseudo,
     operator: '=',
     value: 0
   });
+  const [columns, fieldColumns] = toColumns(fields);
+  const where = where2column(fieldWhere, fieldColumns);
+  where.push(...getFixedValueWhere(columns));
   const value = {
     ...update
   };
@@ -1172,7 +1249,7 @@ async function pseudoDestroy (conn, tableDef, data, update, env) {
   value[pseudo] = pseudoValue;
   const set = set2column(value, fieldColumns);
   await setDeleteTimestamp(columns, set);
-  const dataUpdated = table && typeof table === 'object' ? await table.updateReturn(env, conn, Object.keys(columns), columns, set, where2column(where, fieldColumns)) : await conn.updateReturn(env, Object.keys(columns), table || '', columns, set, where2column(where, fieldColumns));
+  const dataUpdated = table && typeof table === 'object' ? await table.updateReturn(env, conn, Object.keys(columns), columns, set, where) : await conn.updateReturn(env, Object.keys(columns), table || '', columns, set, where);
   return toFieldList(dataUpdated, fieldColumns)[0] || null;
 }
 
@@ -1196,6 +1273,7 @@ async function completelyDelete (conn, tableDef, data, env) {
     operator: '=',
     value: data[k]
   })), fieldColumns);
+  where.push(...getFixedValueWhere(columns));
   const list = toFieldList(table && typeof table === 'object' ? await table.deleteReturn(env, conn, Object.keys(columns), columns, where) : await conn.deleteReturn(env, Object.keys(columns), table || '', columns, where), fieldColumns);
   const baseFieldSet = new Set(Object.keys(fieldColumns || columns));
   const [deleted] = await deleteSub(conn, list, tableFields, baseFieldSet, env, true);
@@ -1308,8 +1386,7 @@ async function findSub(conn, list, fields, baseFieldSet, env) {
     if (!mapList) {
       continue;
     }
-    const value = getValueEntries(constraints, columns);
-    const where = where2column([subList2where(list, mapList), ...valueEntries2where(value)], fieldColumns);
+    const where = [subList2where(list, mapList, fieldColumns), ...getValueWhere(constraints, columns, fieldColumns)];
     const select = select2column(columns, fieldColumns);
     const {
       table
@@ -1351,21 +1428,23 @@ async function find(conn, p, env) {
     fields
   } = p;
   // @ts-ignore
+  const options = getOptions(p);
   const {
-    where,
     sort,
     offset,
     limit
-  } = getOptions(p);
+  } = options;
   const [columns, fieldColumns, tableFields] = toColumns(fields);
+  const where = where2column(options.where, fieldColumns);
+  where.push(...getFixedValueWhere(columns));
   const list = table && typeof table === 'object' ? await table.find(env, conn, columns, {
-    where: where2column(where, fieldColumns),
+    where,
     offset,
     limit,
     sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
     select: select2column(columns, fieldColumns)
   }) : await conn.find(env, table || '', columns, {
-    where: where2column(where, fieldColumns),
+    where,
     offset,
     limit,
     sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
@@ -1399,18 +1478,20 @@ async function first(conn, p, env) {
     fields
   } = p;
   // @ts-ignore
+  const options = getOptions(p);
   const {
-    where,
     sort
-  } = getOptions(p);
+  } = options;
   const [columns, fieldColumns, tableFields] = toColumns(fields);
+  const where = where2column(options.where, fieldColumns);
+  where.push(...getFixedValueWhere(columns));
   const list = table && typeof table === 'object' ? await table.find(env, conn, columns, {
-    where: where2column(where, fieldColumns),
+    where,
     limit: 1,
     sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
     select: select2column(columns, fieldColumns)
   }) : await conn.find(env, table || '', columns, {
-    where: where2column(where, fieldColumns),
+    where,
     limit: 1,
     sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
     select: select2column(columns, fieldColumns)
@@ -1438,10 +1519,10 @@ async function pseudoDeleteMany(conn, queryable, update, env) {
     table,
     fields
   } = queryable;
-  const {
-    where
-  } = getOptions(queryable);
+  const options = getOptions(queryable);
   const [columns, fieldColumns] = toColumns(fields);
+  const where = where2column(options.where, fieldColumns);
+  where.push(...getFixedValueWhere(columns));
   const value = typeof update !== 'object' ? {} : {
     ...update
   };
@@ -1450,7 +1531,7 @@ async function pseudoDeleteMany(conn, queryable, update, env) {
   value[pseudo] = pseudoValue;
   const set = set2column(value, fieldColumns);
   await setDeleteTimestamp(columns, set);
-  const list = table && typeof table === 'object' ? await table.updateReturn(env, conn, Object.keys(columns), columns, set, where2column(where, fieldColumns)) : await conn.updateReturn(env, Object.keys(columns), table || '', columns, set, where2column(where, fieldColumns));
+  const list = table && typeof table === 'object' ? await table.updateReturn(env, conn, Object.keys(columns), columns, set, where) : await conn.updateReturn(env, Object.keys(columns), table || '', columns, set, where);
   return list.length;
 }
 
@@ -1928,7 +2009,9 @@ class Connection {
   }, update, where, skip) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const conn = await this.#getConnection();
-    return table && typeof table === 'object' ? table.update(this.#env, conn, columns, await getSetValue$1(columns, fieldColumns, update, skip), where2column(where, fieldColumns)) : conn.update(this.#env, table || '', columns, await getSetValue$1(columns, fieldColumns, update, skip), where2column(where, fieldColumns));
+    const whereColumns = where2column(where, fieldColumns);
+    whereColumns.push(...getFixedValueWhere(columns));
+    return table && typeof table === 'object' ? table.update(this.#env, conn, columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns) : conn.update(this.#env, table || '', columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns);
   }
   /**
    * @template {Fields<MainFieldType>} T
@@ -1945,7 +2028,9 @@ class Connection {
   }, update, returning, where, skip) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const conn = await this.#getConnection();
-    const result = table && typeof table === 'object' ? await table.updateReturn(this.#env, conn, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), columns, await getSetValue$1(columns, fieldColumns, update, skip), where2column(where, fieldColumns)) : await conn.updateReturn(this.#env, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), table || '', columns, await getSetValue$1(columns, fieldColumns, update, skip), where2column(where, fieldColumns));
+    const whereColumns = where2column(where, fieldColumns);
+    whereColumns.push(...getFixedValueWhere(columns));
+    const result = table && typeof table === 'object' ? await table.updateReturn(this.#env, conn, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns) : await conn.updateReturn(this.#env, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), table || '', columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns);
     return toFieldList(result, fieldColumns);
   }
   /**
@@ -1998,7 +2083,9 @@ class Connection {
   }, where) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const conn = await this.#getConnection();
-    return table && typeof table === 'object' ? table.delete(this.#env, conn, columns, where2column(where, fieldColumns)) : conn.delete(this.#env, table || '', columns, where2column(where, fieldColumns));
+    const whereColumns = where2column(where, fieldColumns);
+    whereColumns.push(...getFixedValueWhere(columns));
+    return table && typeof table === 'object' ? table.delete(this.#env, conn, columns, whereColumns) : conn.delete(this.#env, table || '', columns, whereColumns);
   }
   /**
    * @template {Fields<MainFieldType>} T
@@ -2013,7 +2100,9 @@ class Connection {
   }, returning, where) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const conn = await this.#getConnection();
-    const result = table && typeof table === 'object' ? await table.deleteReturn(this.#env, conn, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), columns, where2column(where, fieldColumns)) : await conn.deleteReturn(this.#env, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), table || '', columns, where2column(where, fieldColumns));
+    const whereColumns = where2column(where, fieldColumns);
+    whereColumns.push(...getFixedValueWhere(columns));
+    const result = table && typeof table === 'object' ? await table.deleteReturn(this.#env, conn, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), columns, whereColumns) : await conn.deleteReturn(this.#env, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), table || '', columns, whereColumns);
     return toFieldList(result, fieldColumns);
   }
   /**
@@ -2028,6 +2117,7 @@ class Connection {
     } = queryable;
     const options = getOptions(queryable);
     const where = where2column(options.where, fieldColumns);
+    where.push(...getFixedValueWhere(columns));
     const conn = await this.#getConnection();
     return table && typeof table === 'object' ? table.count(this.#env, conn, columns, where) : conn.count(this.#env, table || '', columns, where);
   }
@@ -2046,6 +2136,7 @@ class Connection {
       limit
     } = options;
     const where = where2column(options.where, fieldColumns);
+    where.push(...getFixedValueWhere(columns));
     const conn = await this.#getConnection();
     const select = select2column(columns, fieldColumns, options.select);
     const {
@@ -5078,7 +5169,7 @@ defGetter('indexes', function () {
 /**
  * @typedef {object} Scene.Define
  * @property {string} table
- * @property {[column: string, field?: string, value?: any][]} fields
+ * @property {{column: string, field?: string, fixedValue?: any, [v: string]: any}[]} fields
  */
 /** @import {FieldDefine, Fields, TableDefine,} from './types/table' */
 class Scene {
@@ -5103,24 +5194,37 @@ class Scene {
     const allFields = new Map(Object.entries(sceneFields));
     /** @type {Record<string, FieldDefine>} */
     const fields = {};
-    for (const [column, field, value] of table.fields) {
-      if (field) {
-        const define = allFields.get(field);
-        allFields.delete(field);
-        if (!define) {
-          throw new Error();
-        }
-        if (!define.type) {
-          throw new Error();
-        }
-        if (typeof define.type !== 'string' && define.type.table) {
-          throw new Error();
-        }
-        fields[field] = {
-          ...define,
+    for (const {
+      column,
+      field,
+      fixedValue,
+      ...p
+    } of table.fields) {
+      let define = field && allFields.get(field) || null;
+      if (!define?.type || typeof define.type !== 'string' && define.type?.table) {
+        fields[`__${column}`] = {
+          ...p,
+          fixedValue,
+          type: p.type,
+          array: p.array,
+          nullable: p.nullable,
+          primary: p.primary,
+          size: p.size,
+          scale: p.scale,
           column
         };
+        continue;
+      }
+      if (field) {
+        allFields.delete(field);
       }
+      fields[field || `__${column}`] = {
+        ...p,
+        ...define,
+        nullable: p.nullable,
+        primary: p.primary,
+        column
+      };
     }
     for (const [name, define] of allFields) {
       if (!define.type) {
@@ -5132,7 +5236,8 @@ class Scene {
       if (typeof define.type === 'string') {
         throw new Error();
       }
-      if (typeof define.type === 'function') {
+      if (define.type.table && typeof define.type.table === 'string') {
+        // @ts-ignore
         fields[name] = {
           ...define,
           type: this.#getModel(define.type)

package/migrate.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.4.1
+ * imodel v0.5.0
  * (c) 2019-2025 undefined
  * @license undefined
  */

package/migrate.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.4.1
+ * imodel v0.5.0
  * (c) 2019-2025 undefined
  * @license undefined
  */

package/package.json

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