imodel 0.5.0 → 0.5.1

package/index.d.mts

@@ -1,12 +1,14 @@
 /*!
- * imodel v0.5.0
+ * imodel v0.5.1
  * (c) 2019-2025 undefined
  * @license undefined
  */
 
 declare const now: unique symbol;
-declare const uuid: unique symbol;
-declare const increment$1: unique symbol;
+/** @type {typeof now} now */
+declare const uuid: symbol;
+/** @type {typeof uuid} uuid */
+declare const increment$1: typeof uuid;
 declare const decrement$1: unique symbol;
 declare const multiply$1: unique symbol;
 declare const divide$1: unique symbol;
@@ -541,9 +543,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 | typeof uuid | (string | number | bigint | boolean)[];
 declare namespace SetValue {
-    type Increment = {
-        [increment$1]: number | bigint;
-    };
+    type Increment = {};
     type Decrement = {
         [decrement$1]: number | bigint;
     };
@@ -639,6 +639,8 @@ interface FieldDefineOption {
     updating?: FieldSpecific;
     /** 伪删除时，自定义数据 */
     deleting?: FieldSpecific;
+    /** 是否为可创建 */
+    uncreatable?: boolean;
     /** 是否为固定值 */
     immutable?: boolean;
     /** 固定值 */
@@ -824,6 +826,7 @@ interface IConnection<E extends object = object> {
     transaction<R>(environment: Environment<E>, fn: (t: E) => R | PromiseLike<R>): PromiseLike<R>;
 }
 interface Skip {
+    uncreatable?: boolean;
     immutable?: boolean;
     specific?: boolean;
 }
@@ -965,9 +968,10 @@ declare class Connection<E extends {} = {}> {
      * @param {TableDefine} model
      * @param {T} data
      * @param {Record<string, any>?} [newData]
+     * @param {Skip} [skip]
      * @returns {Promise<(T extends Save ? T : object)?>}
      */
-    save<T>(model: TableDefine, data: T, newData?: Record<string, any> | null): Promise<(T extends Save ? T : object) | null>;
+    save<T>(model: TableDefine, data: T, newData?: Record<string, any> | null, skip?: Skip): Promise<(T extends Save ? T : object) | null>;
     /**
      *
      * @template T
@@ -1469,6 +1473,10 @@ declare function column(column?: string): FieldDecorator<any>;
  */
 declare function primary(primary?: number): FieldDecorator<any>;
 
+/** @import { FieldDecorator } from './index.mjs' */
+/** @returns {FieldDecorator<any>} */
+declare function uncreatable(): FieldDecorator<any>;
+
 /** @import { FieldDecorator } from './index.mjs' */
 /** @returns {FieldDecorator<any>} */
 declare function immutable(): FieldDecorator<any>;
@@ -1513,6 +1521,28 @@ declare function sort(sort: number): FieldDecorator<any>;
  */
 declare function pseudo(pseudo: string): ClassDecorator;
 
+/**
+ * @template T
+ * @overload
+ * @param {now} value
+ * @returns {FieldDecorator<string | Date>}
+ */
+declare function defaultValue<T>(value: symbol): FieldDecorator<string | Date>;
+/**
+ * @template T
+ * @overload
+ * @param {uuid} value
+ * @returns {FieldDecorator<string>}
+ */
+declare function defaultValue<T>(value: symbol): FieldDecorator<string>;
+/**
+ * @template T
+ * @overload
+ * @param {T} value
+ * @returns {FieldDecorator<T>}
+ */
+declare function defaultValue<T>(value: T): FieldDecorator<T>;
+
 /**
  *
  * @overload
@@ -2241,4 +2271,4 @@ declare function field<T extends MainFieldType>(type: T, options: {
 declare function setDevelopment(d?: boolean): void;
 declare let isDevelopment: boolean;
 
-export { Build, type ClassDecorator, type Column, type ColumnOptions, Connection, type Constraint, Create, type DBColumn, type DBIndex, type DBTable, Destroy, type Environment, type FieldDecorator, type FieldDefine, type FieldDefineOption, type FieldDefineType, type FieldSpecific, type FieldSpecificValue, type FieldType, type FieldTypeDefine, type FieldValue, type Fields, type FindArg, type FindRange, type GetName, type IConnection, type Index, type IndexInfo, type IndexOptions, type Join, type JoinType, type MainFieldType, type MaybePromise, Model, type Options, PseudoDestroy, Query, type QueryOptions, type Queryable, Save, Scene, Select, SetValue, type Skip, Submodel, type Support, type TableDefine, type TableType, type ToFieldType, type ToType, type TransactionFn, type VirtualTable, Where, type WhereItem, type WhereLike, type WhereOr, type WhereRaw, type WhereValue, type Wheres, column, 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, uuid, values, withDeleted };
+export { Build, type ClassDecorator, type Column, type ColumnOptions, Connection, type Constraint, Create, type DBColumn, type DBIndex, type DBTable, Destroy, type Environment, type FieldDecorator, type FieldDefine, type FieldDefineOption, type FieldDefineType, type FieldSpecific, type FieldSpecificValue, type FieldType, type FieldTypeDefine, type FieldValue, type Fields, type FindArg, type FindRange, type GetName, type IConnection, type Index, type IndexInfo, type IndexOptions, type Join, type JoinType, type MainFieldType, type MaybePromise, Model, type Options, PseudoDestroy, Query, type QueryOptions, type Queryable, Save, Scene, Select, SetValue, type Skip, Submodel, type Support, type TableDefine, type TableType, type ToFieldType, type ToType, type TransactionFn, type VirtualTable, Where, type WhereItem, type WhereLike, type WhereOr, type WhereRaw, type WhereValue, type Wheres, column, creating, decrement, defaultValue, 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, uncreatable, undeleted, updating, uuid, values, withDeleted };

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.5.0
+ * imodel v0.5.1
  * (c) 2019-2025 undefined
  * @license undefined
  */
@@ -52,7 +52,9 @@ function isPseudo(model) {
 }
 
 const now = Symbol();
+/** @type {typeof now} now */
 const uuid = Symbol();
+/** @type {typeof uuid} uuid */
 const increment$1 = Symbol();
 const decrement$1 = Symbol();
 const multiply$1 = Symbol();
@@ -135,16 +137,19 @@ async function getSpecificValue(val) {
   return value;
 }
 
-/** @import { Fields } from '../../types' */
+/** @import { Fields, Skip } from '../../types' */
 /**
  *
  * @param {Record<string, any>} data
  * @param {Fields} columns
  * @param {Record<string, string> | null} fieldColumns
+ * @param {Skip?} [skip]
  * @param {Set<string>?} [ignore]
  * @returns {Promise<Record<string, any>>}
  */
-async function getInsertValue(data, columns, fieldColumns, ignore) {
+async function getInsertValue(data, columns, fieldColumns, skip, ignore) {
+  const skipSpecific = skip?.specific;
+  const skipCreatable = skip?.uncreatable;
   const insertValue = {};
   for (const [k, col] of fieldColumns ? Object.entries(fieldColumns) : Object.keys(columns).map(v => [v, v])) {
     const column = columns[col];
@@ -158,18 +163,20 @@ async function getInsertValue(data, columns, fieldColumns, ignore) {
       insertValue[col] = fixedValue;
       continue;
     }
-    const creating = await getSpecificValue(column.creating);
-    if (creating !== void 0) {
-      insertValue[col] = creating;
-      continue;
-    }
-    const updating = await getSpecificValue(column.updating);
-    if (updating !== void 0) {
-      insertValue[col] = updating;
-      continue;
+    if (!skipSpecific) {
+      const creating = await getSpecificValue(column.creating);
+      if (creating !== void 0) {
+        insertValue[col] = creating;
+        continue;
+      }
+      const updating = await getSpecificValue(column.updating);
+      if (updating !== void 0) {
+        insertValue[col] = updating;
+        continue;
+      }
     }
     const val = data[k];
-    if (val !== undefined) {
+    if (!skipCreatable && !column.uncreatable && val !== undefined) {
       insertValue[col] = val;
       continue;
     }
@@ -317,7 +324,7 @@ function toFieldList(list, fieldColumns) {
   return list.map(it => Object.fromEntries(map.map(([k, v]) => [k, it[v]])));
 }
 
-/** @import { Environment, FieldDefine, Fields, IConnection, TableDefine } from '../types' */
+/** @import { Environment, FieldDefine, Fields, IConnection, Skip, TableDefine } from '../types' */
 /**
  *
  * @param {any} p
@@ -353,9 +360,10 @@ function defaultMap(value, others) {
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {Record<string, any>[]} newList
  * @param {Record<string, any>[]} list
+ * @param {Skip?} [skip]
  * @returns {Promise<Record<string, any>[]>}
  */
-async function createSub(conn, env, fields, newList, list) {
+async function createSub(conn, env, fields, newList, list, skip) {
   // TODO: 可创建字段过滤
   if (!list.length) {
     return list;
@@ -428,12 +436,12 @@ async function createSub(conn, env, fields, newList, list) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const insertKeys = Object.entries(columns).map(v => v[0]);
     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 insertValues = await Promise.all(fieldValues.map(d => getInsertValue(d, columns, fieldColumns, skip, ignore)));
     const {
       table
     } = type;
     const result = (table && typeof table === 'object' ? table.insert(env, conn, columns, insertValues, insertKeys) : conn.insert(env, table || '', columns, insertValues, insertKeys)).then(r => toFieldList(r, fieldColumns));
-    promises.push(result.then(r => createSub(conn, env, tableFields, fieldValues, r)));
+    promises.push(result.then(r => createSub(conn, env, tableFields, fieldValues, r, skip)));
     promises.push(array ? result.then(values => {
       for (const [value] of allList) {
         value[key] = values.filter(createFilter(value, commonKeys));
@@ -453,10 +461,11 @@ async function createSub(conn, env, fields, newList, list) {
  * @param {Environment} env
  * @param {TableDefine} model
  * @param {any} p
- * @param {(a,b) => object} mapDo
+ * @param {Skip?} [skip]
+ * @param {(a,b) => object} [mapDo]
  * @returns {Promise<any>}
  */
-async function create(conn, env, model, p, mapDo = defaultMap) {
+async function create(conn, env, model, p, skip, mapDo = defaultMap) {
   const {
     table,
     fields
@@ -478,7 +487,7 @@ async function create(conn, env, model, p, mapDo = defaultMap) {
     records.push(data);
   }
   const [columns, fieldColumns, tableFields] = toColumns(fields);
-  const insertValues = await Promise.all(records.map(d => getInsertValue(d, columns, fieldColumns)));
+  const insertValues = await Promise.all(records.map(d => getInsertValue(d, columns, fieldColumns, skip)));
   let insertKeys = [];
   if (!insertKeys.length && !isArray) {
     insertKeys = Object.entries(insertValues[0]).filter(([k, v]) => v !== undefined && k in columns).map(([k]) => k);
@@ -487,7 +496,7 @@ async function create(conn, env, model, p, mapDo = defaultMap) {
     insertKeys = Object.entries(columns).map(([k]) => k);
   }
   const list = toFieldList(table && typeof table === 'object' ? await table.insert(env, conn, columns, insertValues, insertKeys) : await conn.insert(env, table || '', columns, insertValues, insertKeys), fieldColumns);
-  await createSub(conn, env, tableFields, records, list);
+  await createSub(conn, env, tableFields, records, list, skip);
   const value = list.map((v, i) => mapDo(v, getOtherValues(records[i], fields)));
   return isArray ? value : value[0];
 }
@@ -871,7 +880,7 @@ async function getSetValue$1(columns, fieldColumns, update, skip) {
 }
 
 /* eslint-disable no-labels */
-/** @import { Constraint, Environment, FieldDefine, IConnection, TableDefine } from '../types' */
+/** @import { Constraint, Environment, FieldDefine, IConnection, Skip, TableDefine } from '../types' */
 /** @import { WhereValue } from '../Where.mjs' */
 /**
  *
@@ -906,9 +915,10 @@ function classify(newList, oldList, keys, notFound, found) {
  * @param {TableDefine} type
  * @param {boolean} array
  * @param {Record<string, Constraint>?} [constraints]
+ * @param {Skip} [skip]
  * @returns
  */
-async function updateItem(conn, env, updatedOldNewList, key, type, array, constraints) {
+async function updateItem(conn, env, updatedOldNewList, key, type, array, constraints, skip) {
   /** @type {any[]} */
   const promises = [];
   const constraintEntries = Object.entries(constraints || {});
@@ -1074,14 +1084,14 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
   }
   // 批量新建
   if (needCreate.length) {
-    const subColumnData = await Promise.all(needCreate.map(d => getInsertValue(d, columns, fieldColumns, ignore)));
+    const subColumnData = await Promise.all(needCreate.map(d => getInsertValue(d, columns, fieldColumns, skip, 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)));
+    promises.push(list.then(list => createSub(conn, env, tableFields, needCreate, list, skip)));
   }
   promises.push(Promise.all(subPromises).then(
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
-  v => updateSub(conn, tableFields, v.flat(), env)));
+  v => updateSub(conn, tableFields, v.flat(), env, skip)));
   const allList = Promise.all(listPromises).then(v => v.flat());
   promises.push(array ? allList.then(async values => {
     for (const [value] of updatedOldNewList) {
@@ -1108,9 +1118,10 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {[Record<string, any>, Record<string, any>, Record<string, any>][]} list
  * @param {Environment} env
+ * @param {Skip} [skip]
  * @returns
  */
-async function updateSub(conn, fields, list, env) {
+async function updateSub(conn, fields, list, env, skip) {
   if (!list.length) {
     return;
   }
@@ -1125,7 +1136,7 @@ async function updateSub(conn, fields, list, env) {
     if (immutable) {
       continue;
     }
-    promises.push(updateItem(conn, env, list, key, type, array, constraints));
+    promises.push(updateItem(conn, env, list, key, type, array, constraints, skip));
   }
   await Promise.all(promises);
 }
@@ -1136,9 +1147,10 @@ async function updateSub(conn, fields, list, env) {
  * @param {Record<string, any>} data
  * @param {Record<string, any>} newData
  * @param {Environment} env
+ * @param {Skip} [skip]
  * @returns
  */
-async function updateData (conn, model, data, newData, env) {
+async function updateData (conn, model, data, newData, env, skip) {
   const keys = Object.keys(newData);
   if (!keys.length) {
     return false;
@@ -1170,7 +1182,7 @@ async function updateData (conn, 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, tableFields, updatedOldNewList, env);
+  await updateSub(conn, tableFields, updatedOldNewList, env, skip);
   return list[0];
 }
 
@@ -1806,20 +1818,21 @@ class Connection {
    * @template {TableDefine} T
    * @param {T} model
    * @param {object | object[]} p
+   * @param {Skip} [skip]
    * @returns {Promise<object[] | (T extends Build<infer R> ? R : object)>}
    */
-  async create(model, p) {
+  async create(model, p, skip) {
     if (Array.isArray(p) || typeof model[Create] !== 'function') {
       const modelBuild = model[Build];
       const md = typeof modelBuild === 'function' ? modelBuild.bind(model) : undefined;
       const conn = await this.#getConnection();
-      return create(conn, this.#env, model, p, md);
+      return create(conn, this.#env, model, p, skip, md);
     }
     // @ts-ignore
     const m = /** @type {Create} */model;
     return m[Create](this, p, async data => {
       const conn = await this.#getConnection();
-      return create(conn, this.#env, model, data);
+      return create(conn, this.#env, model, data, skip);
     }, model);
   }
   /**
@@ -1847,27 +1860,28 @@ class Connection {
    * @param {TableDefine} model
    * @param {T} data
    * @param {Record<string, any>?} [newData]
+   * @param {Skip} [skip]
    * @returns {Promise<(T extends Save ? T : object)?>}
    */
-  async save(model, data, newData) {
+  async save(model, data, newData, skip) {
     if (typeof data[Save] !== 'function') {
       const conn = await this.#getConnection();
       if (newData) {
         /** @type {any} */
         const doc = data;
         // @ts-ignore
-        return updateData(conn, model, doc, newData, this.#env);
+        return updateData(conn, model, doc, newData, this.#env, skip);
       }
-      return create(conn, this.#env, model, data);
+      return create(conn, this.#env, model, data, skip);
     }
     const r = /** @type {Save}*/data;
     // @ts-ignore
     return r[Save](this, async (doc, newData) => {
       const conn = await this.#getConnection();
       if (newData) {
-        return updateData(conn, model, doc, newData, this.#env);
+        return updateData(conn, model, doc, newData, this.#env, skip);
       }
-      return create(conn, this.#env, model, doc);
+      return create(conn, this.#env, model, doc, skip);
     }, newData || null, model);
   }
   /**
@@ -1979,7 +1993,9 @@ class Connection {
   }, data, keys) {
     const [columns, fieldColumns] = toColumns(fields);
     const isArray = Array.isArray(data);
-    const insertValues = (isArray ? data : [data]).map(d => getInsertValue(d, columns, fieldColumns));
+    const insertValues = (isArray ? data : [data]).map(d => getInsertValue(d, columns, fieldColumns, {
+      uncreatable: true
+    }));
     if (!insertValues.length) {
       throw new Error();
     }
@@ -2586,6 +2602,7 @@ function submodel(type, constraints, p1, p2) {
     unique,
     index,
     primary,
+    uncreatable,
     immutable,
     text,
     sort,
@@ -2597,6 +2614,7 @@ function submodel(type, constraints, p1, p2) {
     type,
     array,
     nullable: false,
+    uncreatable,
     immutable
   };
   /**
@@ -2815,6 +2833,7 @@ function field$1(type, p1, p2) {
     unique,
     index,
     primary,
+    uncreatable,
     immutable,
     text,
     sort,
@@ -2831,6 +2850,7 @@ function field$1(type, p1, p2) {
     index,
     unique: Boolean(unique),
     primary,
+    uncreatable,
     immutable,
     text,
     sort
@@ -2980,6 +3000,12 @@ function primary(primary) {
   return (_, ctx) => setProp(ctx, 'primary', primary || 1);
 }
 
+/** @import { FieldDecorator } from './index.mjs' */
+/** @returns {FieldDecorator<any>} */
+function uncreatable() {
+  return (_, ctx) => setProp(ctx, 'uncreatable', true);
+}
+
 /** @import { FieldDecorator } from './index.mjs' */
 /** @returns {FieldDecorator<any>} */
 function immutable() {
@@ -3125,6 +3151,35 @@ function pseudo(pseudo) {
   };
 }
 
+/** @import { now, uuid } from '../values.mjs' */
+/** @import { FieldDecorator } from './index.mjs' */
+/**
+ * @template T
+ * @overload
+ * @param {now} value
+ * @returns {FieldDecorator<string | Date>}
+ */
+/**
+ * @template T
+ * @overload
+ * @param {uuid} value
+ * @returns {FieldDecorator<string>}
+ */
+/**
+ * @template T
+ * @overload
+ * @param {T} value
+ * @returns {FieldDecorator<T>}
+ */
+/**
+ * @template T
+ * @param {T} value
+ * @returns {FieldDecorator<any>}
+ */
+function defaultValue(value) {
+  return (_, ctx) => setProp(ctx, 'default', value);
+}
+
 /** @typedef {{toWhereValue(): WhereValue[][]}} WhereLike */
 /** @typedef {WhereLike | Record<string, any> | (WhereLike | Record<string, any>)[]} Wheres */
 /**
@@ -5432,6 +5487,7 @@ function field(type, {
   default: def,
   index,
   primary,
+  uncreatable,
   immutable,
   text,
   sort,
@@ -5445,10 +5501,11 @@ function field(type, {
     default: def,
     index,
     primary,
+    uncreatable,
     immutable,
     text,
     sort
   };
 }
 
-export { Build, Connection, Create, Destroy, Model, PseudoDestroy, Query, Save, Scene, Submodel, Where, column, 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, uuid, values, withDeleted };
+export { Build, Connection, Create, Destroy, Model, PseudoDestroy, Query, Save, Scene, Submodel, Where, column, creating, decrement, defaultValue, 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, uncreatable, undeleted, updating, uuid, values, withDeleted };

package/migrate.d.mts

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

package/migrate.mjs

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

package/package.json

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