imodel 0.1.0 → 0.3.0

package/migrate.d.mts

@@ -1,10 +1,10 @@
 /*!
- * imodel v0.1.0
+ * imodel v0.3.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
 
-import { TransactionFn, Connection, IndexOptions, ColumnOptions, Column, Index, TableDefine } from 'imodel';
+import { TransactionFn, Connection, IndexOptions, FieldType, ColumnOptions, Column, Index, TableDefine } from 'imodel';
 
 /**
  *
@@ -185,7 +185,7 @@ declare class MigrationType implements Migrator$4 {
 }
 type Migrator$4 = Migrator;
 
-/** @import { IndexOptions, ColumnOptions } from 'imodel' */
+/** @import { IndexOptions, ColumnOptions, FieldType } from 'imodel' */
 /**
  * @abstract
  */
@@ -200,11 +200,11 @@ declare class TableAdder {
     /**
      * @abstract
      * @param {string} name
-     * @param {string} type
+     * @param {keyof FieldType} type
      * @param {ColumnOptions<any>} [options]
      * @returns {this}
      */
-    field(name: string, type: string, options?: ColumnOptions<any>): this;
+    field(name: string, type: keyof FieldType, options?: ColumnOptions<any>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<string>} [options]
@@ -223,12 +223,6 @@ declare class TableAdder {
      * @returns {this}
      */
     text(name: string, options?: ColumnOptions<string>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<never>} [options]
-     * @returns {this}
-     */
-    id(name: string, options?: ColumnOptions<never>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<number | bigint>} [options]
@@ -241,42 +235,12 @@ declare class TableAdder {
      * @returns {this}
      */
     i32(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    i52(name: string, options?: ColumnOptions<number | bigint>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<number | bigint>} [options]
      * @returns {this}
      */
     i64(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    u16(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    u32(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    u52(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    u64(name: string, options?: ColumnOptions<number | bigint>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<number | bigint>} [options]
@@ -307,12 +271,6 @@ declare class TableAdder {
      * @returns {this}
      */
     money(name: string, options?: ColumnOptions<number | bigint>): this;
-    /**
-     * @param {string} name
-     * @param {ColumnOptions<number | bigint>} [options]
-     * @returns {this}
-     */
-    bin(name: string, options?: ColumnOptions<number | bigint>): this;
     /**
      * @param {string} name
      * @param {ColumnOptions<never>} [options]
@@ -385,6 +343,12 @@ declare class TableAdder {
      * @returns {this}
      */
     object(name: string, options?: ColumnOptions<object>): this;
+    /**
+     * @param {string} name
+     * @param {ColumnOptions<object>} [options]
+     * @returns {this}
+     */
+    json(name: string, options?: ColumnOptions<object>): this;
     /**
      * @returns {this}
      */
@@ -651,13 +615,6 @@ declare function sqlite3(...list: (Migrator | Migrator[])[]): MigrationType;
  * @returns
  */
 declare function table(table: string | TableDefine): TableCreator;
-/**
- *
- * @param {string} ta
- * @param {string} tb
- * @returns
- */
-declare function joinTable(ta: string, tb: string): TableCreator;
 
 type Migrator = {
     tables: (revert?: boolean | undefined) => Iterable<string>;
@@ -665,4 +622,4 @@ type Migrator = {
     down: (connection: Connection, echoDescription: Echo) => PromiseLike<void> | void;
 };
 
-export { Echo, type MigrationDef, type MigrationDefine, type MigrationPromise, type MigrationValue, type Migrator, _default as auto, _default$1 as createEcho, customize, down, create as exec, joinTable, mysql, postgres, revert, sqlite, sqlite3, table, type, up };
+export { Echo, type MigrationDef, type MigrationDefine, type MigrationPromise, type MigrationValue, type Migrator, _default as auto, _default$1 as createEcho, customize, down, create as exec, mysql, postgres, revert, sqlite, sqlite3, table, type, up };

package/migrate.mjs

@@ -1,10 +1,10 @@
 /*!
- * imodel v0.1.0
+ * imodel v0.3.0
  * (c) 2019-2025 undefined
  * @license undefined
  */
 
-import { Query, define } from 'imodel';
+import { now, Query, define } from 'imodel';
 
 /** @import { Connection } from 'imodel' */
 /** @typedef {import('./index.mjs').Migrator} Migrator */
@@ -55,7 +55,7 @@ class Reverter {
   }
 }
 
-/** @import { IndexOptions, ColumnOptions } from 'imodel' */
+/** @import { IndexOptions, ColumnOptions, FieldType } from 'imodel' */
 /**
  * @abstract
  */
@@ -72,7 +72,7 @@ class TableAdder {
   /**
    * @abstract
    * @param {string} name
-   * @param {string} type
+   * @param {keyof FieldType} type
    * @param {ColumnOptions<any>} [options]
    * @returns {this}
    */
@@ -103,14 +103,6 @@ class TableAdder {
   text(name, options) {
     return this.field(name, 'text', options);
   }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<never>} [options]
-   * @returns {this}
-   */
-  id(name, options) {
-    return this.field(name, 'id', options);
-  }
   /**
    * @param {string} name
    * @param {ColumnOptions<number | bigint>} [options]
@@ -127,14 +119,6 @@ class TableAdder {
   i32(name, options) {
     return this.field(name, 'i32', options);
   }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  i52(name, options) {
-    return this.field(name, 'i52', options);
-  }
   /**
    * @param {string} name
    * @param {ColumnOptions<number | bigint>} [options]
@@ -143,38 +127,6 @@ class TableAdder {
   i64(name, options) {
     return this.field(name, 'i64', options);
   }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  u16(name, options) {
-    return this.field(name, 'u16', options);
-  }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  u32(name, options) {
-    return this.field(name, 'u32', options);
-  }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  u52(name, options) {
-    return this.field(name, 'u52', options);
-  }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  u64(name, options) {
-    return this.field(name, 'u64', options);
-  }
   /**
    * @param {string} name
    * @param {ColumnOptions<number | bigint>} [options]
@@ -215,14 +167,6 @@ class TableAdder {
   money(name, options) {
     return this.field(name, 'money', options);
   }
-  /**
-   * @param {string} name
-   * @param {ColumnOptions<number | bigint>} [options]
-   * @returns {this}
-   */
-  bin(name, options) {
-    return this.field(name, 'bin', options);
-  }
   /**
    * @param {string} name
    * @param {ColumnOptions<never>} [options]
@@ -319,7 +263,7 @@ class TableAdder {
    * @returns {this}
    */
   uuid(name, options) {
-    return this.field(name, 'bool', options);
+    return this.field(name, 'uuid', options);
   }
   /**
    * @param {string} name
@@ -327,7 +271,15 @@ class TableAdder {
    * @returns {this}
    */
   object(name, options) {
-    return this.field(name, 'bool', options);
+    return this.field(name, 'object', options);
+  }
+  /**
+   * @param {string} name
+   * @param {ColumnOptions<object>} [options]
+   * @returns {this}
+   */
+  json(name, options) {
+    return this.field(name, 'json', options);
   }
   /**
    * @returns {this}
@@ -335,7 +287,7 @@ class TableAdder {
   createTime() {
     return this.field('createOn', 'timestamp', {
       nullable: true,
-      timestampCreating: true
+      creating: now
     });
   }
   /**
@@ -344,7 +296,7 @@ class TableAdder {
   updateTime() {
     return this.field('updateOn', 'timestamp', {
       nullable: true,
-      timestampUpdating: true
+      updating: now
     });
   }
   /**
@@ -352,7 +304,8 @@ class TableAdder {
    */
   deleteTime() {
     return this.field('deleteOn', 'timestamp', {
-      nullable: true
+      nullable: true,
+      deleting: now
     });
   }
 }
@@ -903,7 +856,7 @@ class TableCreator extends TableAdder {
       if (!type.table) {
         this.field(name, 'object', {
           ...field,
-          primary: false
+          primary: 0
         });
         continue;
       }
@@ -1219,13 +1172,13 @@ async function create(connection, migrations, log, revert) {
 /** @typedef {MigrationDef | PromiseLike<MigrationDef>} MigrationPromise */
 /** @typedef {MigrationPromise | (() => MigrationPromise)} MigrationDefine */
 const TableMigration = Query.table('__table_migrations', {
-  no: define('i64', {
+  group: define('string', {
     nullable: false,
-    primary: true
+    primary: 1
   }),
-  group: define('string', {
+  no: define('i64', {
     nullable: false,
-    primary: true
+    primary: 2
   })
 });
 const tableMigrationsMigrator = new TableCreator(TableMigration);
@@ -1530,14 +1483,5 @@ function sqlite3(...list) {
 function table(table) {
   return new TableCreator(table);
 }
-/**
- *
- * @param {string} ta
- * @param {string} tb
- * @returns
- */
-function joinTable(ta, tb) {
-  return new TableCreator(`${ta}_${tb}`).id(`${ta}_id`).id(`${tb}_id`);
-}
 
-export { auto, createEcho, customize, down, create as exec, joinTable, mysql, postgres, revert, sqlite, sqlite3, table, type, up };
+export { auto, createEcho, customize, down, create as exec, mysql, postgres, revert, sqlite, sqlite3, table, type, up };

package/package.json

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