imodel 0.2.0 → 0.3.0

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.2.0
+ * imodel v0.3.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
@@ -88,7 +88,7 @@ function toBaseFields(fields) {
       allFields[k] = {
         ...v,
         type: 'object',
-        primary: false
+        primary: 0
       };
     }
   }
@@ -199,9 +199,6 @@ async function getSetNewValue(fields, update, skip) {
         return;
       }
     }
-    if (field.serial && field.type === 'id') {
-      return;
-    }
     return true;
   }));
 }
@@ -313,7 +310,7 @@ function separateFields(fields) {
       base[k] = {
         ...v,
         type: 'object',
-        primary: false
+        primary: 0
       };
     } else {
       // @ts-ignore
@@ -374,14 +371,13 @@ function defaultMap(value, others) {
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {Environment} env
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {Record<string, any>[]} newList
  * @param {Record<string, any>[]} list
  * @returns {Promise<Record<string, any>[]>}
  */
-async function createSub(conn, getName, env, fields, newList, list) {
+async function createSub(conn, env, fields, newList, list) {
   // TODO: 可创建字段过滤
   if (!list.length) {
     return list;
@@ -452,13 +448,13 @@ async function createSub(conn, getName, env, fields, newList, list) {
       continue;
     }
     const [baseFields, tableFields] = separateFields(fields);
-    const insertKeys = Object.entries(baseFields).filter(([, o]) => !o.serial || o.type !== 'id').map(v => v[0]);
+    const insertKeys = Object.entries(baseFields).map(v => v[0]);
     const insertValues = await Promise.all(fieldValues.map(d => getInsertValue(d, fields)));
     const {
       table
     } = type;
-    const result = table && typeof table === 'object' ? table.insert(env, conn, '', baseFields, insertValues, insertKeys) : conn.insert(env, getName(table), baseFields, insertValues, insertKeys);
-    promises.push(result.then(r => createSub(conn, getName, env, tableFields, fieldValues, r)));
+    const result = table && typeof table === 'object' ? table.insert(env, conn, '', baseFields, insertValues, insertKeys) : conn.insert(env, table || '', baseFields, insertValues, insertKeys);
+    promises.push(result.then(r => createSub(conn, env, tableFields, fieldValues, r)));
     promises.push(array ? result.then(values => {
       for (const [value] of allList) {
         value[key] = values.filter(createFilter(value, commonKeys));
@@ -475,14 +471,13 @@ async function createSub(conn, getName, env, fields, newList, list) {
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {Environment} env
  * @param {TableDefine} model
  * @param {any} p
  * @param {(a,b) => object} mapDo
  * @returns {Promise<any>}
  */
-async function create(conn, getName, env, model, p, mapDo = defaultMap) {
+async function create(conn, env, model, p, mapDo = defaultMap) {
   const {
     table,
     fields
@@ -510,10 +505,10 @@ async function create(conn, getName, env, model, p, mapDo = defaultMap) {
     insertKeys = Object.entries(insertValues[0]).filter(([k, v]) => v !== undefined && k in baseFields).map(([k]) => k);
   }
   if (!insertKeys.length) {
-    insertKeys = Object.entries(baseFields).filter(([, o]) => !o.serial || o.type !== 'id').map(([k]) => k);
+    insertKeys = Object.entries(baseFields).map(([k]) => k);
   }
-  const list = table && typeof table === 'object' ? await table.insert(env, conn, '', baseFields, insertValues, insertKeys) : await conn.insert(env, getName(table), baseFields, insertValues, insertKeys);
-  await createSub(conn, getName, env, tableFields, records, list);
+  const list = table && typeof table === 'object' ? await table.insert(env, conn, '', baseFields, insertValues, insertKeys) : await conn.insert(env, table || '', baseFields, insertValues, insertKeys);
+  await createSub(conn, env, tableFields, records, list);
   const value = list.map((v, i) => mapDo(v, getOtherValues(records[i], fields)));
   return isArray ? value : value[0];
 }
@@ -530,10 +525,6 @@ function getPrimaryKeys(fields) {
   if (primaryKeys.length) {
     return primaryKeys.map(([k]) => k);
   }
-  const idKeys = list.filter(([v, o]) => o.serial && o.type === 'id');
-  if (idKeys.length) {
-    return idKeys.map(([k]) => k);
-  }
   return [list[0][0]];
 }
 
@@ -633,7 +624,6 @@ function valueEntries2where(value) {
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {any[]} list
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {Fields<keyof FieldType>} baseFields
@@ -641,7 +631,7 @@ function valueEntries2where(value) {
  * @param {boolean} [hasResult]
  * @returns
  */
-async function deleteSub(conn, getName, list, fields, baseFields, env, hasResult) {
+async function deleteSub(conn, list, fields, baseFields, env, hasResult) {
   if (!list.length) {
     return list;
   }
@@ -668,7 +658,7 @@ async function deleteSub(conn, getName, list, fields, baseFields, env, hasResult
     } = type;
     /** @type {MatchArg} */
     const argv = {
-      table: typeof table === 'string' ? getName(table) : '',
+      table: typeof table === 'string' ? table : '',
       fields: subfields,
       where
     };
@@ -678,7 +668,7 @@ async function deleteSub(conn, getName, list, fields, baseFields, env, hasResult
       continue;
     }
     const result = table && typeof table === 'object' ? table.deleteReturn(env, conn, argv, Object.keys(subfields)) : conn.deleteReturn(env, argv, Object.keys(subfields));
-    promises.push(result.then(l => deleteSub(conn, getName, l, tableFields, subfields, env, hasResult)));
+    promises.push(result.then(l => deleteSub(conn, l, tableFields, subfields, env, hasResult)));
     constraintEntries.find(([k, v]) => v.noField)?.[0];
     promises.push(array ? result.then(subList => {
       for (const item of list) {
@@ -697,12 +687,11 @@ async function deleteSub(conn, getName, list, fields, baseFields, env, hasResult
 // TODO: 嵌套
 /**
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {Queryable} queryable
  * @param {Environment} env
  * @returns {Promise<number>}
  */
-async function deleteMany(conn, getName, queryable, env) {
+async function deleteMany(conn, queryable, env) {
   const {
     table,
     fields
@@ -717,7 +706,7 @@ async function deleteMany(conn, getName, queryable, env) {
       fields: baseFields,
       where
     }) : conn.delete(env, {
-      table: getName(table),
+      table: table || '',
       fields: baseFields,
       where
     });
@@ -727,14 +716,14 @@ async function deleteMany(conn, getName, queryable, env) {
     fields: baseFields,
     where
   }, Object.keys(baseFields)) : await conn.deleteReturn(env, {
-    table: getName(table),
+    table: table || '',
     fields: baseFields,
     where
   }, Object.keys(baseFields));
   if (!list) {
     return 0;
   }
-  await deleteSub(conn, getName, list, tableFields, baseFields, env);
+  await deleteSub(conn, list, tableFields, baseFields, env);
   return list.length;
 }
 
@@ -771,7 +760,6 @@ function classify(newList, oldList, keys, notFound, found) {
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {Environment} env
  * @param {[Record<string, any>, Record<string, any>, Record<string, any>][]} updatedOldNewList
  * @param {string} key
@@ -780,7 +768,7 @@ function classify(newList, oldList, keys, notFound, found) {
  * @param {Record<string, Constraint>?} [constraints]
  * @returns
  */
-async function updateItem(conn, getName, env, updatedOldNewList, key, type, array, constraints) {
+async function updateItem(conn, env, updatedOldNewList, key, type, array, constraints) {
   /** @type {any[]} */
   const promises = [];
   const constraintEntries = Object.entries(constraints || {});
@@ -880,8 +868,9 @@ async function updateItem(conn, getName, env, updatedOldNewList, key, type, arra
   classify(newList, needDelete, aKeys, unmatched, eq);
   const pKeys = primaryKeys.filter(v => !(v in commonKeys));
   classify(unmatched, needDelete, pKeys, needCreate, needUpdate);
-  const tTable = type.table;
-  const table = tTable && typeof tTable === 'object' ? tTable : getName(tTable);
+  const {
+    table
+  } = type;
   if (needDelete.length) {
     // 批量删除
     /** @type {WhereValue[]} */
@@ -904,16 +893,16 @@ async function updateItem(conn, getName, env, updatedOldNewList, key, type, arra
         value: needDelete.map(v => pKeys.map(k => v[k] ?? null))
       });
     }
-    const promise = typeof table === 'string' ? conn.deleteReturn(env, {
-      table,
+    const promise = typeof table === 'object' ? table.deleteReturn(env, conn, {
+      table: '',
       fields: baseFields,
       where
-    }, Object.keys(baseFields)) : table.deleteReturn(env, conn, {
-      table: '',
+    }, Object.keys(baseFields)) : conn.deleteReturn(env, {
+      table: table || '',
       fields: baseFields,
       where
     }, Object.keys(baseFields));
-    promises.push(promise.then(list => deleteSub(conn, getName, list, tableFields, baseFields, env)));
+    promises.push(promise.then(list => deleteSub(conn, list, tableFields, baseFields, env)));
   }
   /** @type {typeof updatedOldNewList} */
   const list = eq.map(([n, o]) => [{
@@ -945,20 +934,20 @@ async function updateItem(conn, getName, env, updatedOldNewList, key, type, arra
         value[key] = old[key];
       }
     }
-    const list = typeof table === 'string' ? conn.updateManyReturn(env, table, baseFields, update, pKeys, setKeys, needUpdate.map(v => v[0]), where, Object.keys(baseFields)) : table.updateManyReturn(env, conn, '', baseFields, update, pKeys, setKeys, needUpdate.map(v => v[0]), where, Object.keys(baseFields));
+    const list = typeof table === 'object' ? table.updateManyReturn(env, conn, '', baseFields, update, pKeys, setKeys, needUpdate.map(v => v[0]), where, Object.keys(baseFields)) : conn.updateManyReturn(env, table || '', baseFields, update, pKeys, setKeys, needUpdate.map(v => v[0]), where, Object.keys(baseFields));
     listPromises.push(list);
     subPromises.push(list.then(u => u.map((u, i) => [u, ...needUpdate[i]])));
   }
   // 批量新建
   if (needCreate.length) {
     const key = Object.entries(baseFields);
-    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]));
+    const list = typeof table === 'object' ? table.insert(env, conn, '', baseFields, await Promise.all(needCreate.map(d => getInsertValue(d, baseFields))), key.map(v => v[0])) : conn.insert(env, table || '', baseFields, await Promise.all(needCreate.map(d => getInsertValue(d, baseFields))), key.map(v => v[0]));
     listPromises.push(list);
-    promises.push(list.then(list => createSub(conn, getName, env, tableFields, needCreate, list)));
+    promises.push(list.then(list => createSub(conn, env, tableFields, needCreate, list)));
   }
   promises.push(Promise.all(subPromises).then(
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
-  v => updateSub(conn, getName, tableFields, v.flat(), env)));
+  v => updateSub(conn, tableFields, v.flat(), env)));
   const allList = Promise.all(listPromises).then(v => v.flat());
   promises.push(array ? allList.then(async values => {
     for (const [value] of updatedOldNewList) {
@@ -982,13 +971,12 @@ async function updateItem(conn, getName, env, updatedOldNewList, key, type, arra
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {[Record<string, any>, Record<string, any>, Record<string, any>][]} list
  * @param {Environment} env
  * @returns
  */
-async function updateSub(conn, getName, fields, list, env) {
+async function updateSub(conn, fields, list, env) {
   if (!list.length) {
     return;
   }
@@ -1003,21 +991,20 @@ async function updateSub(conn, getName, fields, list, env) {
     if (immutable) {
       continue;
     }
-    promises.push(updateItem(conn, getName, env, list, key, type, array, constraints));
+    promises.push(updateItem(conn, env, list, key, type, array, constraints));
   }
   await Promise.all(promises);
 }
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {TableDefine} model
  * @param {Record<string, any>} data
  * @param {Record<string, any>} newData
  * @param {Environment} env
  * @returns
  */
-async function updateData (conn, getName, model, data, newData, env) {
+async function updateData (conn, model, data, newData, env) {
   const keys = Object.keys(newData);
   if (!keys.length) {
     return false;
@@ -1046,7 +1033,7 @@ async function updateData (conn, getName, model, data, newData, env) {
     }, await getSetNewValue(fields, newData), Object.keys(baseFields));
   } else {
     list = await conn.updateReturn(env, {
-      table: getName(table),
+      table: table || '',
       fields: baseFields,
       where
     }, await getSetNewValue(fields, newData), Object.keys(baseFields));
@@ -1055,7 +1042,7 @@ async function updateData (conn, getName, model, data, newData, env) {
   const newList = [newData];
   /** @type {[Record<string, any>, Record<string, any>, Record<string, any>][]} */
   const updatedOldNewList = list.map((v, k) => [v, oldList[k], newList[k]]);
-  await updateSub(conn, getName, tableFields, updatedOldNewList, env);
+  await updateSub(conn, tableFields, updatedOldNewList, env);
   return list[0];
 }
 
@@ -1086,14 +1073,13 @@ async function setDeleteTimestamp(fields, update) {
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {TableDefine} tableDef
  * @param {any} data
  * @param {Record<string, SetValue>} update
  * @param {Environment} env
  * @returns
  */
-async function pseudoDestroy (conn, getName, tableDef, data, update, env) {
+async function pseudoDestroy (conn, tableDef, data, update, env) {
   const {
     table,
     fields
@@ -1122,7 +1108,7 @@ async function pseudoDestroy (conn, getName, tableDef, data, update, env) {
     fields: baseFields,
     where
   }, value, Object.keys(baseFields)) : await conn.updateReturn(env, {
-    table: getName(table),
+    table: table || '',
     fields: baseFields,
     where
   }, value, Object.keys(baseFields));
@@ -1137,13 +1123,12 @@ async function pseudoDestroy (conn, getName, tableDef, data, update, env) {
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {TableDefine} tableDef
  * @param {any} data
  * @param {Environment} env
  * @returns
  */
-async function completelyDelete (conn, getName, tableDef, data, env) {
+async function completelyDelete (conn, tableDef, data, env) {
   const {
     table,
     fields
@@ -1160,11 +1145,11 @@ async function completelyDelete (conn, getName, tableDef, data, env) {
     fields: baseFields,
     where
   }, Object.keys(baseFields)) : await conn.deleteReturn(env, {
-    table: getName(table),
+    table: table || '',
     fields: baseFields,
     where
   }, Object.keys(baseFields));
-  const [deleted] = await deleteSub(conn, getName, list, tableFields, baseFields, env, true);
+  const [deleted] = await deleteSub(conn, list, tableFields, baseFields, env, true);
   return deleted || null;
 }
 
@@ -1209,14 +1194,13 @@ function getDefaultSort(fields, noField) {
 /**
  *
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {any[]} list
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {Fields<keyof FieldType>} baseFields
  * @param {Environment} env
  * @returns {Promise<any[]>}
  */
-async function findSub(conn, getName, list, fields, baseFields, env) {
+async function findSub(conn, list, fields, baseFields, env) {
   if (!list.length) {
     return list;
   }
@@ -1250,13 +1234,13 @@ async function findSub(conn, getName, list, fields, baseFields, env) {
       sort: getDefaultSort(subfields, noField),
       select: toSelect(subfields)
     }) : conn.select(env, {
-      table: getName(table),
+      table: table || '',
       fields: subfields,
       where,
       sort: getDefaultSort(subfields, noField),
       select: toSelect(subfields)
     });
-    promises.push(result.then(list => findSub(conn, getName, list, tableFields, subfields, env)));
+    promises.push(result.then(list => findSub(conn, list, tableFields, subfields, env)));
     promises.push(array ? result.then(subList => {
       for (const item of list) {
         item[key] = subList.filter(createFilter(item, mapList));
@@ -1273,12 +1257,11 @@ async function findSub(conn, getName, list, fields, baseFields, env) {
  *
  * @template {TableDefine} T
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {T} p
  * @param {Environment} env
  * @returns {Promise<any>}
  */
-async function find(conn, getName, p, env) {
+async function find(conn, p, env) {
   const {
     table,
     fields
@@ -1302,7 +1285,7 @@ async function find(conn, getName, p, env) {
     sort: sort?.length ? sort : getDefaultSort(baseFields),
     select: toSelect(baseFields)
   }) : await conn.select(env, {
-    table: getName(table),
+    table: table || '',
     fields: baseFields,
     alias,
     where,
@@ -1314,7 +1297,7 @@ async function find(conn, getName, p, env) {
   if (!list.length) {
     return [];
   }
-  await findSub(conn, getName, list, tableFields, baseFields, env);
+  await findSub(conn, list, tableFields, baseFields, env);
   if (typeof p[Build] !== 'function') {
     return list;
   }
@@ -1328,12 +1311,11 @@ async function find(conn, getName, p, env) {
  *
  * @template {TableDefine} T
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {T} p
  * @param {Environment} env
  * @returns {Promise<any>}
  */
-async function first(conn, getName, p, env) {
+async function first(conn, p, env) {
   const {
     table,
     fields
@@ -1354,7 +1336,7 @@ async function first(conn, getName, p, env) {
     sort: sort?.length ? sort : getDefaultSort(baseFields),
     select: toSelect(baseFields)
   }) : await conn.select(env, {
-    table: getName(table),
+    table: table || '',
     fields: baseFields,
     alias,
     where,
@@ -1362,7 +1344,7 @@ async function first(conn, getName, p, env) {
     sort: sort?.length ? sort : getDefaultSort(baseFields),
     select: toSelect(baseFields)
   });
-  const [item] = await findSub(conn, getName, list, tableFields, baseFields, env);
+  const [item] = await findSub(conn, list, tableFields, baseFields, env);
   if (!item) {
     return null;
   }
@@ -1375,12 +1357,11 @@ async function first(conn, getName, p, env) {
 /** @import { Environment, GetName, IConnection, Queryable } from '../types' */
 /**
  * @param {IConnection} conn
- * @param {GetName} getName
  * @param {Queryable} queryable
  * @param {Record<string, any> | boolean | undefined} update
  * @param {Environment} env
  */
-async function pseudoDeleteMany(conn, getName, queryable, update, env) {
+async function pseudoDeleteMany(conn, queryable, update, env) {
   const {
     table,
     fields
@@ -1401,7 +1382,7 @@ async function pseudoDeleteMany(conn, getName, queryable, update, env) {
     fields: baseFields,
     where
   }, value, Object.keys(baseFields)) : await conn.updateReturn(env, {
-    table: getName(table),
+    table: table || '',
     fields: baseFields,
     where
   }, value, Object.keys(baseFields));
@@ -1416,7 +1397,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, Skip, TableType } from '../types/connection' */
+/** @import { DBTable, GetName, Skip, TableType } from '../types/connection' */
 /**
  *
  * @param {Fields<keyof FieldType>} fields
@@ -1451,8 +1432,6 @@ function signal2promise(signal) {
     });
   });
 }
-/** @type {GetName} */
-const defGetName = s => s || '';
 /**
  * @template {{}} [E={}]
  */
@@ -1463,52 +1442,26 @@ class Connection {
   #getConnection;
   /** @type {E?} */
   #baseTransaction;
-  /** @type {Record<string, string>?} */
-  #names;
-  #getName = defGetName;
   /**
    *
    * @param {PromiseLike<IConnection<E>> | IConnection<E>} connection
    * @param {E?} [transaction]
-   * @param {Record<string, string>?} [names]
    */
-  constructor(connection, transaction = null, names = null) {
+  constructor(connection, transaction = null) {
     this.#baseTransaction = transaction;
     this.#getConnection = async () => connection;
-    let getName = defGetName;
-    if (names) {
-      this.#names = names;
-      const allNames = Object.assign(Object.create(null), names);
-      getName = n => allNames[n || ''] || n;
-    } else {
-      this.#names = null;
-    }
-    this.#getName = getName;
     this.#env = {
       isDevelopment,
       values,
-      transaction,
-      getName,
-      names: names && {
-        ...names
-      }
+      transaction
     };
   }
   /**
    *
-   * @param {object} [options]
-   * @param {Record<string, string>?} [options.names]
    * @returns {Connection<E>}
    */
-  clone({
-    names
-  } = {}) {
-    // eslint-disable-next-line no-nested-ternary
-    const newNames = this.#names ? names ? {
-      ...this.#names,
-      ...names
-    } : this.#names : names;
-    return new Connection(this.#getConnection(), this.#baseTransaction, newNames);
+  clone() {
+    return new Connection(this.#getConnection(), this.#baseTransaction);
   }
   /** @return {Promise<string>} */
   async dbType() {
@@ -1545,7 +1498,7 @@ class Connection {
    */
   async type(table) {
     const conn = await this.#getConnection();
-    return conn.type(this.#env, this.#getName(table));
+    return conn.type(this.#env, table);
   }
   /**
    * @template T
@@ -1615,13 +1568,13 @@ class Connection {
       const modelBuild = model[Build];
       const md = typeof modelBuild === 'function' ? modelBuild.bind(model) : undefined;
       const conn = await this.#getConnection();
-      return create(conn, this.#getName, this.#env, model, p, md);
+      return create(conn, this.#env, model, p, md);
     }
     // @ts-ignore
     const m = /** @type {Create} */model;
     return m[Create](this, p, async data => {
       const conn = await this.#getConnection();
-      return create(conn, this.#getName, this.#env, model, data);
+      return create(conn, this.#env, model, data);
     }, model);
   }
   /**
@@ -1632,7 +1585,7 @@ class Connection {
    */
   async find(sql) {
     const conn = await this.#getConnection();
-    return find(conn, this.#getName, sql, this.#env);
+    return find(conn, sql, this.#env);
   }
   /**
    *
@@ -1642,7 +1595,7 @@ class Connection {
    */
   async first(sql) {
     const conn = await this.#getConnection();
-    return first(conn, this.#getName, sql, this.#env);
+    return first(conn, sql, this.#env);
   }
   /**
    * @template T
@@ -1657,18 +1610,18 @@ class Connection {
       if (newData) {
         /** @type {any} */
         const doc = data;
-        return updateData(conn, this.#getName, model, doc, newData, this.#env);
+        return updateData(conn, model, doc, newData, this.#env);
       }
-      return create(conn, this.#getName, this.#env, model, data);
+      return create(conn, this.#env, model, data);
     }
     const r = /** @type {Save}*/data;
     // @ts-ignore
     return r[Save](this, async (doc, newData) => {
       const conn = await this.#getConnection();
       if (newData) {
-        return updateData(conn, this.#getName, model, doc, newData, this.#env);
+        return updateData(conn, model, doc, newData, this.#env);
       }
-      return create(conn, this.#getName, this.#env, model, doc);
+      return create(conn, this.#env, model, doc);
     }, newData || null, model);
   }
   /**
@@ -1681,13 +1634,13 @@ class Connection {
   async completelyDestroy(tableDef, data) {
     if (typeof data[Destroy] !== 'function') {
       const conn = await this.#getConnection();
-      return completelyDelete(conn, this.#getName, tableDef, data, this.#env);
+      return completelyDelete(conn, tableDef, data, this.#env);
     }
     const r = /** @type {Destroy} */data;
     // @ts-ignore
     return r[Destroy](this, async data => {
       const conn = await this.#getConnection();
-      return completelyDelete(conn, this.#getName, tableDef, data, this.#env);
+      return completelyDelete(conn, tableDef, data, this.#env);
     }, tableDef);
   }
   /**
@@ -1707,13 +1660,13 @@ class Connection {
     };
     if (typeof data[PseudoDestroy] !== 'function') {
       const conn = await this.#getConnection();
-      return pseudoDestroy(conn, this.#getName, tableDef, data, update, this.#env);
+      return pseudoDestroy(conn, tableDef, data, update, this.#env);
     }
     const r = /** @type {PseudoDestroy} */data;
     // @ts-ignore
     return r[PseudoDestroy](this, update, async data => {
       const conn = await this.#getConnection();
-      return pseudoDestroy(conn, this.#getName, tableDef, data, update, this.#env);
+      return pseudoDestroy(conn, tableDef, data, update, this.#env);
     }, tableDef);
   }
   /**
@@ -1762,9 +1715,9 @@ class Connection {
   async destroyMany(queryable, update) {
     const conn = await this.#getConnection();
     if (update === false || !isPseudo(queryable)) {
-      return deleteMany(conn, this.#getName, queryable, this.#env);
+      return deleteMany(conn, queryable, this.#env);
     }
-    return pseudoDeleteMany(conn, this.#getName, queryable, update, this.#env);
+    return pseudoDeleteMany(conn, queryable, update, this.#env);
   }
   /**
    * @template {object | object[]} T
@@ -1788,10 +1741,10 @@ class Connection {
       insertKeys = Object.entries(insertValues[0]).filter(([k, v]) => v !== undefined && k in baseFields).map(([k]) => k);
     }
     if (!insertKeys.length) {
-      insertKeys = Object.entries(baseFields).filter(([, o]) => !o.serial || o.type !== 'id').map(v => v[0]);
+      insertKeys = Object.entries(baseFields).map(v => v[0]);
     }
     const conn = await this.#getConnection();
-    const p = table && typeof table === 'object' ? await table.insert(this.#env, conn, '', baseFields, insertValues, insertKeys) : await conn.insert(this.#env, this.#getName(table), baseFields, insertValues, insertKeys);
+    const p = table && typeof table === 'object' ? await table.insert(this.#env, conn, '', baseFields, insertValues, insertKeys) : await conn.insert(this.#env, table || '', baseFields, insertValues, insertKeys);
     return isArray ? (/** @type {*}*/p) : p[0];
   }
   /**
@@ -1811,7 +1764,7 @@ class Connection {
       fields: toBaseFields(fields),
       where: where || undefined
     }, await getSetNewValue(fields, update, skip)) : conn.update(this.#env, {
-      table: this.#getName(table),
+      table: table || '',
       fields: toBaseFields(fields),
       where: where || undefined
     }, await getSetNewValue(fields, update, skip));
@@ -1836,7 +1789,7 @@ class Connection {
       fields: baseFields,
       where: where || undefined
     }, await getSetNewValue(fields, update, skip), returning?.length ? returning : Object.keys(baseFields)) : conn.updateReturn(this.#env, {
-      table: this.#getName(table),
+      table: table || '',
       fields: baseFields,
       where: where || undefined
     }, await getSetNewValue(fields, update, skip), returning?.length ? returning : Object.keys(baseFields));
@@ -1857,7 +1810,7 @@ class Connection {
     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, []);
+    return table && typeof table === 'object' ? table.updateMany(this.#env, conn, '', baseFields, update, whereFields, setFields, list, []) : conn.updateMany(this.#env, table || '', baseFields, update, whereFields, setFields, list, []);
   }
   /**
    * @template {Fields<MainFieldType>} T
@@ -1877,7 +1830,7 @@ class Connection {
     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));
+    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, table || '', baseFields, update, whereFields, setFields, list, [], returning?.length ? returning : Object.keys(baseFields));
   }
   /**
    * @param {TableDefine} tableDefine
@@ -1894,7 +1847,7 @@ class Connection {
       fields: toBaseFields(fields),
       where
     }) : conn.delete(this.#env, {
-      table: this.#getName(table),
+      table: table || '',
       fields: toBaseFields(fields),
       where
     });
@@ -1917,7 +1870,7 @@ class Connection {
       fields: baseFields,
       where
     }, returning?.length ? returning : Object.keys(baseFields)) : conn.deleteReturn(this.#env, {
-      table: this.#getName(table),
+      table: table || '',
       fields: baseFields,
       where
     }, returning?.length ? returning : Object.keys(baseFields));
@@ -1940,7 +1893,7 @@ class Connection {
       fields: toBaseFields(fields)
     }) : conn.count(this.#env, {
       ...options,
-      table: this.#getName(table),
+      table: table || '',
       fields: toBaseFields(fields)
     });
   }
@@ -1967,7 +1920,7 @@ class Connection {
       sort: sort?.length ? sort : getDefaultSort(fields)
     }) : conn.select(this.#env, {
       ...options,
-      table: this.#getName(table),
+      table: table || '',
       fields,
       select,
       sort: sort?.length ? sort : getDefaultSort(fields)
@@ -1982,7 +1935,7 @@ class Connection {
    */
   async addColumn(table, column, type, options) {
     const conn = await this.#getConnection();
-    return conn.addColumn(this.#env, this.#getName(table), column, type, setDefaultOptions(options));
+    return conn.addColumn(this.#env, table, column, type, setDefaultOptions(options));
   }
   /**
    * @param {string} table
@@ -1993,7 +1946,7 @@ class Connection {
    */
   async changeColumn(table, column, type, options) {
     const conn = await this.#getConnection();
-    return conn.changeColumn(this.#env, this.#getName(table), column, type, setDefaultOptions(options));
+    return conn.changeColumn(this.#env, table, column, type, setDefaultOptions(options));
   }
   /**
    * @param {string} table
@@ -2003,7 +1956,7 @@ class Connection {
    */
   async changeColumnNull(table, column, nullable) {
     const conn = await this.#getConnection();
-    return conn.changeColumnNull(this.#env, this.#getName(table), column, nullable);
+    return conn.changeColumnNull(this.#env, table, column, nullable);
   }
   /**
    * @param {string} table
@@ -2012,7 +1965,7 @@ class Connection {
    */
   async dropColumn(table, column) {
     const conn = await this.#getConnection();
-    return conn.dropColumn(this.#env, this.#getName(table), column);
+    return conn.dropColumn(this.#env, table, column);
   }
   /**
    * @param {string} table
@@ -2022,7 +1975,7 @@ class Connection {
    */
   async renameColumn(table, column, newName) {
     const conn = await this.#getConnection();
-    return conn.renameColumn(this.#env, this.#getName(table), column, newName);
+    return conn.renameColumn(this.#env, table, column, newName);
   }
   /**
    * @param {string} table
@@ -2033,7 +1986,7 @@ class Connection {
    */
   async addIndex(table, name, fields, options = {}) {
     const conn = await this.#getConnection();
-    return conn.addIndex(this.#env, this.#getName(table), name, fields, options);
+    return conn.addIndex(this.#env, table, name, fields, options);
   }
   /**
    * @param {string} table
@@ -2042,7 +1995,7 @@ class Connection {
    */
   async dropIndex(table, name) {
     const conn = await this.#getConnection();
-    return conn.dropIndex(this.#env, this.#getName(table), name);
+    return conn.dropIndex(this.#env, table, name);
   }
   /**
    * @param {string} table
@@ -2051,7 +2004,7 @@ class Connection {
    */
   async createTable(table, fields) {
     const conn = await this.#getConnection();
-    return conn.createTable(this.#env, this.#getName(table), fields.map(setDefaultOptions));
+    return conn.createTable(this.#env, table, fields.map(setDefaultOptions));
   }
   /**
    * @param {string} table
@@ -2059,7 +2012,7 @@ class Connection {
    */
   async dropTable(table) {
     const conn = await this.#getConnection();
-    return conn.dropTable(this.#env, this.#getName(table));
+    return conn.dropTable(this.#env, table);
   }
   /**
    * @param {string} table
@@ -2068,7 +2021,7 @@ class Connection {
    */
   async renameTable(table, newName) {
     const conn = await this.#getConnection();
-    return conn.renameTable(this.#env, this.#getName(table), newName);
+    return conn.renameTable(this.#env, table, newName);
   }
   /**
    * @param {string} view
@@ -2083,7 +2036,7 @@ class Connection {
     const fields = toBaseFields(queryable.fields);
     const options = getOptions(queryable);
     const select = toSelect(fields, options.select);
-    return conn.createView(this.#env, this.#getName(view), {
+    return conn.createView(this.#env, view, {
       ...options,
       table: typeof table === 'string' ? table : '',
       fields,
@@ -2096,7 +2049,7 @@ class Connection {
    */
   async dropView(view) {
     const conn = await this.#getConnection();
-    return conn.dropView(this.#env, this.#getName(view));
+    return conn.dropView(this.#env, view);
   }
   /**
    * @param {string} view
@@ -2111,7 +2064,7 @@ class Connection {
     const fields = toBaseFields(queryable.fields);
     const options = getOptions(queryable);
     const select = toSelect(fields, options.select);
-    return conn.createMaterializedView(this.#env, this.#getName(view), {
+    return conn.createMaterializedView(this.#env, view, {
       ...options,
       table: typeof table === 'string' ? table : '',
       fields,
@@ -2124,7 +2077,7 @@ class Connection {
    */
   async dropMaterializedView(view) {
     const conn = await this.#getConnection();
-    return conn.dropMaterializedView(this.#env, this.#getName(view));
+    return conn.dropMaterializedView(this.#env, view);
   }
   /** @type {AbortController[]} */
   #layers = [];
@@ -2194,6 +2147,30 @@ class Connection {
     }
     return false;
   }
+  /**
+   * @param {string} table
+   * @returns {Promise<DBTable?>}
+   */
+  async loadTable(table) {
+    const conn = await this.#getConnection();
+    return conn.loadTables(this.#env, [table]).then(v => v[0] || null);
+  }
+  /**
+   * @param {string[]} tables
+   * @returns {Promise<DBTable[]>}
+   */
+  async loadTables(tables) {
+    const conn = await this.#getConnection();
+    return conn.loadTables(this.#env, tables);
+  }
+  /**
+   * @param {DBTable[]} tables
+   * @returns {Promise<void>}
+   */
+  async syncTables(tables) {
+    const conn = await this.#getConnection();
+    return conn.syncTables(this.#env, tables);
+  }
   /**
    * @template T
    * @overload
@@ -2421,13 +2398,11 @@ function submodel(type, constraints, p1, p2) {
     array: _array,
     nullable,
     default: def,
-    precision,
     scale,
     size,
     unique,
     index,
     primary,
-    serial,
     immutable,
     text,
     sort,
@@ -2657,13 +2632,11 @@ function field$1(type, p1, p2) {
     array: _array,
     nullable,
     default: def,
-    precision,
     scale,
     size,
     unique,
     index,
     primary,
-    serial,
     immutable,
     text,
     sort,
@@ -2674,14 +2647,12 @@ function field$1(type, p1, p2) {
     type,
     array: Boolean(array),
     nullable: Boolean(nullable),
-    precision,
     scale,
     size,
     default: def,
     index,
     unique: Boolean(unique),
     primary,
-    serial,
     immutable,
     text,
     sort
@@ -2715,62 +2686,14 @@ function field$1(type, p1, p2) {
   };
 }
 
-/** @import { ToFieldType } from '../types' */
-/** @import { FieldDecorator } from './index.mjs' */
-/**
- * @param {object} [options]
- * @param {number?} [options.sort]
- * @returns {FieldDecorator<ToFieldType<'id'>>}
- */
-function id({
-  sort
-} = {}) {
-  const define = {
-    type: 'id',
-    index: true,
-    unique: true,
-    primary: true,
-    serial: true,
-    immutable: true,
-    sort
-  };
-  /**
-   *
-   * @param {*} _
-   * @param {ClassAccessorDecoratorContext} ctx
-   */
-  return (_, ctx) => {
-    const name = check(ctx);
-    const {
-      metadata
-    } = ctx;
-    const fields = metadata[fieldKey];
-    if (fields) {
-      fields[name] = define;
-    } else {
-      metadata[fieldKey] = Object.assign(Object.create(null), {
-        [name]: define
-      });
-    }
-    return {
-      get() {
-        return this.$get(name);
-      },
-      set(value) {
-        return this.$set(name, value);
-      }
-    };
-  };
-}
-
 /** @import { FieldDecorator } from './index.mjs' */
 /**
  *
  * @param {ClassAccessorDecoratorContext} ctx
- * @param {*} precision
+ * @param {*} size
  * @param {'timestampCreating' | 'timestampUpdating' | 'timestampDeleting'} prop
  */
-function defineTimestamp(ctx, precision, prop) {
+function defineTimestamp(ctx, size, prop) {
   const name = check(ctx);
   const {
     metadata
@@ -2780,7 +2703,7 @@ function defineTimestamp(ctx, precision, prop) {
     type: 'timestamp',
     array: false,
     nullable: true,
-    precision,
+    size,
     [prop]: true
   };
   if (fields) {
@@ -2800,25 +2723,25 @@ function defineTimestamp(ctx, precision, prop) {
   };
 }
 /**
- * @param {number} [precision]
+ * @param {number} [size]
  * @returns {FieldDecorator<Date?>}
  */
-function creating(precision) {
-  return (_, ctx) => defineTimestamp(ctx, precision, 'timestampCreating');
+function creating(size) {
+  return (_, ctx) => defineTimestamp(ctx, size, 'timestampCreating');
 }
 /**
- * @param {number} [precision]
+ * @param {number} [size]
  * @returns {FieldDecorator<Date?>}
  */
-function updating(precision) {
-  return (_, ctx) => defineTimestamp(ctx, precision, 'timestampUpdating');
+function updating(size) {
+  return (_, ctx) => defineTimestamp(ctx, size, 'timestampUpdating');
 }
 /**
- * @param {number} [precision]
+ * @param {number} [size]
  * @returns {FieldDecorator<Date?>}
  */
-function deleting(precision) {
-  return (_, ctx) => defineTimestamp(ctx, precision, 'timestampDeleting');
+function deleting(size) {
+  return (_, ctx) => defineTimestamp(ctx, size, 'timestampDeleting');
 }
 
 /**
@@ -2866,7 +2789,7 @@ function prop(prop, value) {
  * @returns {FieldDecorator<any>}
  */
 function primary(primary) {
-  return (_, ctx) => setProp(ctx, 'primary', primary || true);
+  return (_, ctx) => setProp(ctx, 'primary', primary || 1);
 }
 
 /** @import { FieldDecorator } from './index.mjs' */
@@ -3662,7 +3585,7 @@ function divide(value) {
   };
 }
 
-/** @import { Fields, Options, Queryable, Select } from './types' */
+/** @import { Fields, Options, Queryable, Select, VirtualTable } from './types' */
 /** @import { WhereValue, Wheres } from './Where.mjs' */
 /**
  *
@@ -3717,7 +3640,7 @@ function selectFn(fn, select, newSelect) {
  * @template {Fields} T
  * @template {object} [TB=object]
  * @typedef {object} QueryOptions
- * @property {string} table
+ * @property {string | VirtualTable} [table]
  * @property {T} fields
  * @property {string} [pseudo]
  * @property {((a: object, b?: object | boolean) => TB)?} [build]
@@ -3745,7 +3668,7 @@ class Query {
       pseudo
     });
   }
-  /** @readonly @type {string} */
+  /** @readonly @type {string | VirtualTable | undefined} */
 
   /** @readonly @type {T} */
 
@@ -4162,6 +4085,31 @@ class Query {
   }
 }
 
+/** @import { Fields, IndexInfo, FieldDefine } from './types' */
+/**
+ *
+ * @param {Fields} fields
+ * @returns
+ */
+function getPrimaryFields(fields) {
+  const idFields = Object.entries(fields).filter(([, v]) => v.primary).sort(([, a], [, b]) => Number(a.primary) - Number(b.primary)).map(([v]) => v);
+  return idFields;
+}
+/**
+ * @param {string[]} fields
+ * @param {Record<string, any>} data
+ */
+function toPrimary(fields, data) {
+  return fields.map(k => data[k]).join('$');
+} /**
+  * @param {{fields: Fields}} model
+  * @param {Record<string, any> | Record<string, any>[]} documents
+  */
+function toPrimaries(model, documents) {
+  const fields = getPrimaryFields(model.fields);
+  return Array.isArray(documents) ? documents.map(document => toPrimary(fields, document)) : toPrimary(fields, documents);
+}
+
 /* eslint-disable max-lines */
 /** @import { Fields, IndexInfo, FieldDefine } from './types' */
 /**
@@ -4659,6 +4607,13 @@ class Model {
     const fields = Object.getOwnPropertyNames(this.#model.fields);
     return fields.findIndex(f => changed.has(f)) >= 0;
   }
+  $primary() {
+    const fields = getPrimaryFields(this.$model.fields);
+    return toPrimary(fields, {
+      ...this.#data,
+      ...this.#newData
+    });
+  }
   /**
    * @param {Record<string, any>} values
    */
@@ -5121,7 +5076,6 @@ function field(type, {
   default: def,
   index,
   primary,
-  serial,
   immutable,
   text,
   sort,
@@ -5135,11 +5089,10 @@ function field(type, {
     default: def,
     index,
     primary,
-    serial,
     immutable,
     text,
     sort
   };
 }
 
-export { Build, Connection, Create, Destroy, Model, PseudoDestroy, Query, Save, Submodel, Where, 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, Connection, Create, Destroy, Model, PseudoDestroy, Query, Save, Submodel, Where, creating, decrement, field as define, deleted, deleting, divide, field$1 as field, getPrimaryFields, getPrimaryKeys, immutable, increment, index, isDevelopment, isPseudo, submodel as model, multiply, now, primary, prop, pseudo, setDevelopment, sort, submodel, toNot, toPrimaries, toPrimary, undeleted, updating, values, withDeleted };