imodel 0.15.0 → 0.15.1

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.15.0
+ * imodel v0.15.1
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -566,7 +566,7 @@ declare namespace SetValue {
 }
 
 interface VirtualTable<E extends object = object> {
-    insert(environment: Environment<E>, conn: IConnection<E>, columns: Record<string, DBColumn>, data: object[], key: string[]): PromiseLike<any[]>;
+    insert(environment: Environment<E>, conn: IConnection<E>, columns: Record<string, DBColumn>, data: object[], key: string[], ignoreConflict?: boolean): PromiseLike<any[]>;
     upsert(environment: Environment<E>, conn: IConnection<E>, columns: Record<string, DBColumn>, data: object[], key: string[], conflict: true | string[], conflictSet?: Record<string, SetValue>): PromiseLike<any[]>;
     update(environment: Environment<E>, conn: IConnection<E>, columns: Record<string, DBColumn>, update: Record<string, SetValue>, where?: WhereValue[] | null): PromiseLike<number>;
     updateReturn(environment: Environment<E>, conn: IConnection<E>, returning: string[], columns: Record<string, DBColumn>, update: Record<string, SetValue>, where?: WhereValue[] | null): PromiseLike<any[]>;
@@ -629,7 +629,7 @@ type MainFieldType = keyof FieldType | TableDefine | null;
 type ToFieldType<T> = T extends keyof FieldType ? FieldType[T] : unknown;
 type FieldSpecificValue = (string | number | bigint | boolean)[] | string | number | bigint | boolean | null | typeof now | typeof uuid;
 type FieldSpecific = FieldSpecificValue | {
-    value: FieldSpecificValue;
+    value?: FieldSpecificValue;
     computed?(): PromiseLike<FieldSpecificValue> | FieldSpecificValue;
 };
 interface FieldDefineOption {
@@ -821,7 +821,7 @@ interface IConnection<E extends object = object> {
      */
     query(environment: Environment<E>, ...values: any): PromiseLike<any[]>;
     type(environment: Environment<E>, table: string): PromiseLike<TableType | null>;
-    insert(environment: Environment<E>, table: string, columns: Record<string, DBColumn>, data: object[], key: string[]): PromiseLike<any[]>;
+    insert(environment: Environment<E>, table: string, columns: Record<string, DBColumn>, data: object[], key: string[], ignoreConflict?: boolean): PromiseLike<any[]>;
     upsert(environment: Environment<E>, table: string, columns: Record<string, DBColumn>, data: object[], key: string[], conflict: true | string[], conflictSet?: Record<string, SetValue>): PromiseLike<any[]>;
     update(environment: Environment<E>, table: string, columns: Record<string, DBColumn>, update: Record<string, SetValue>, where?: WhereValue[] | null): PromiseLike<number>;
     updateReturn(environment: Environment<E>, returning: string[], table: string, columns: Record<string, DBColumn>, update: Record<string, SetValue>, where?: WhereValue[] | null): PromiseLike<any[]>;
@@ -1534,12 +1534,33 @@ declare class Connection<E extends {} = {}> {
     destroyMany(queryable: Queryable, update?: Record<string, SetValue> | boolean): Promise<number>;
     /**
      * @template {object | object[]} T
+     * @overload
+     * @param {TableDefine} tableDefine
+     * @param {T} data
+     * @param {boolean} [ignoreConflict]
+     * @returns {Promise<T extends object[] ? object[] : object>}
+     */
+    insert<T extends unknown>(tableDefine: TableDefine, data: T, ignoreConflict?: boolean | undefined): Promise<T extends object[] ? object[] : object>;
+    /**
+     * @template {object | object[]} T
+     * @overload
      * @param {TableDefine} tableDefine
      * @param {T} data
      * @param {string[]} [keys]
+     * @param {boolean} [ignoreConflict]
+     * @returns {Promise<T extends object[] ? object[] : object>}
+     */
+    insert<T extends unknown>(tableDefine: TableDefine, data: T, keys?: string[] | undefined, ignoreConflict?: boolean | undefined): Promise<T extends object[] ? object[] : object>;
+    /**
+     * @template {object | object[]} T
+     * @overload
+     * @param {TableDefine} tableDefine
+     * @param {T} data
+     * @param {string[] | boolean} [keys]
+     * @param {boolean} [ignoreConflict]
      * @returns {Promise<T extends object[] ? object[] : object>}
      */
-    insert<T extends unknown>({ table, fields }: TableDefine, data: T, keys?: string[]): Promise<T extends object[] ? object[] : object>;
+    insert<T extends unknown>(tableDefine: TableDefine, data: T, keys?: boolean | string[] | undefined, ignoreConflict?: boolean | undefined): Promise<T extends object[] ? object[] : object>;
     /**
      * @template {object | object[]} T
      * @overload

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.15.0
+ * imodel v0.15.1
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -733,13 +733,10 @@ async function getSpecificValue(val) {
     computed,
     value
   } = val;
-  if (value === void 0) {
-    return;
-  }
   if (typeof computed === 'function') {
     const value = await computed();
     if (value !== void 0) {
-      return;
+      return value;
     }
   }
   return value;
@@ -2938,15 +2935,42 @@ class Connection {
   }
   /**
    * @template {object | object[]} T
+   * @overload
+   * @param {TableDefine} tableDefine
+   * @param {T} data
+   * @param {boolean} [ignoreConflict]
+   * @returns {Promise<T extends object[] ? object[] : object>}
+   */
+  /**
+   * @template {object | object[]} T
+   * @overload
    * @param {TableDefine} tableDefine
    * @param {T} data
    * @param {string[]} [keys]
+   * @param {boolean} [ignoreConflict]
+   * @returns {Promise<T extends object[] ? object[] : object>}
+   */
+  /**
+   * @template {object | object[]} T
+   * @overload
+   * @param {TableDefine} tableDefine
+   * @param {T} data
+   * @param {string[] | boolean} [keys]
+   * @param {boolean} [ignoreConflict]
+   * @returns {Promise<T extends object[] ? object[] : object>}
+   */
+  /**
+   * @template {object | object[]} T
+   * @param {TableDefine} tableDefine
+   * @param {T} data
+   * @param {string[] | boolean} [keys]
+   * @param {boolean} [ignoreConflict]
    * @returns {Promise<T extends object[] ? object[] : object>}
    */
   async insert({
     table,
     fields
-  }, data, keys) {
+  }, data, keys, ignoreConflict) {
     const [columns, fieldColumns] = toColumns(fields);
     const isArray = Array.isArray(data);
     const insertValues = (isArray ? data : [data]).map(d => getInsertValue(d, columns, fieldColumns, {
@@ -2955,15 +2979,17 @@ class Connection {
     if (!insertValues.length) {
       throw new Error();
     }
-    let insertKeys = fieldColumns ? [...new Set(keys || [])].map(k => fieldColumns[k]).filter(Boolean) : [...new Set(keys || [])].filter(k => k in columns);
+    const allKeys = Array.isArray(keys) ? [...new Set(keys || [])] : [];
+    let insertKeys = fieldColumns ? allKeys.map(k => fieldColumns[k]).filter(Boolean) : allKeys.filter(k => k in columns);
     if (!insertKeys.length && !isArray) {
       insertKeys = Object.entries(insertValues[0]).filter(([k, v]) => v !== undefined && k in columns).map(([k]) => k);
     }
     if (!insertKeys.length) {
       insertKeys = Object.entries(columns).map(v => v[0]);
     }
+    const ignore = Boolean(Array.isArray(keys) ? ignoreConflict : keys);
     const conn = await this.#getConnection();
-    const result = table && typeof table === 'object' ? await table.insert(this.#env, conn, columns, insertValues, insertKeys) : await conn.insert(this.#env, table || '', columns, insertValues, insertKeys);
+    const result = table && typeof table === 'object' ? await table.insert(this.#env, conn, columns, insertValues, insertKeys, ignore) : await conn.insert(this.#env, table || '', columns, insertValues, insertKeys, ignore);
     const list = toFieldList(result, fieldColumns);
     // @ts-ignore
     return isArray ? list : list[0];

package/migrate.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.15.0
+ * imodel v0.15.1
  * (c) 2019-2026 undefined
  * @license undefined
  */

package/migrate.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.15.0
+ * imodel v0.15.1
  * (c) 2019-2026 undefined
  * @license undefined
  */

package/package.json

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