litedbmodel 2.2.6 → 2.2.7

package/docs/api-guide.md

@@ -52,16 +52,16 @@ import { DBModel, model, column, hasMany, belongsTo, hasOne } from 'litedbmodel'
 @model('users')
 class UserModel extends DBModel {
   // Primary key (auto-increment)
-  @column({ primaryKey: true }) id?: number;
+  @column.number({ primaryKey: true }) id?: number;
   
   // UUID primary key (PostgreSQL: auto-casts to ::uuid)
   // @column.uuid({ primaryKey: true }) id?: string;
 
-  // Basic columns (types auto-inferred)
-  @column() name?: string;
-  @column() email?: string;
-  @column() is_active?: boolean;
-  @column() created_at?: Date;
+  // Basic columns — each states its type with a family
+  @column.text() name?: string;
+  @column.text() email?: string;
+  @column.boolean() is_active?: boolean;
+  @column.datetime() created_at?: string;
 
   // Array and JSON columns (explicit type required)
   @column.stringArray() tags?: string[];
@@ -85,11 +85,11 @@ export type User = UserModel;
 
 @model('posts')
 class PostModel extends DBModel {
-  @column({ primaryKey: true }) id?: number;
-  @column() author_id?: number;
-  @column() title?: string;
-  @column() content?: string;
-  @column() published_at?: Date;
+  @column.number({ primaryKey: true }) id?: number;
+  @column.number() author_id?: number;
+  @column.text() title?: string;
+  @column.text() content?: string;
+  @column.datetime() published_at?: string;
 
   @belongsTo(() => [Post.author_id, User.id])
   declare author: Promise<User | null>;
@@ -99,9 +99,9 @@ export type Post = PostModel;
 
 @model('profiles')
 class ProfileModel extends DBModel {
-  @column({ primaryKey: true }) id?: number;
-  @column() user_id?: number;
-  @column() bio?: string;
+  @column.number({ primaryKey: true }) id?: number;
+  @column.number() user_id?: number;
+  @column.text() bio?: string;
 }
 export const Profile = ProfileModel.asModel();
 export type Profile = ProfileModel;
@@ -341,7 +341,7 @@ See: [DBModel.execute](classes/DBModel.md#execute), [DBModel.query](classes/DBMo
 ```typescript
 @model('users')
 class User extends DBModel {
-  @column({ primaryKey: true }) id?: number;
+  @column.number({ primaryKey: true }) id?: number;
 
   // One-to-Many: User has many Posts
   @hasMany(() => [User.id, Post.author_id])
@@ -354,8 +354,8 @@ class User extends DBModel {
 
 @model('posts')
 class Post extends DBModel {
-  @column({ primaryKey: true }) id?: number;
-  @column() author_id?: number;
+  @column.number({ primaryKey: true }) id?: number;
+  @column.number() author_id?: number;
 
   // Many-to-One: Post belongs to User
   @belongsTo(() => [Post.author_id, User.id])

package/docs/architecture.md

@@ -73,9 +73,9 @@ graphddb と並ぶ SQL backend の consumer である。`` `src/scp/index.ts` ``
 ```ts
 @model('posts')
 export class PostModel extends DBModel {
-  @column({ primaryKey: true }) id!: number;
-  @column() author_id!: number;
-  @column() title!: string;
+  @column.number({ primaryKey: true }) id!: number;
+  @column.number() author_id!: number;
+  @column.text() title!: string;
 
   @belongsTo(() => [Post.author_id, User.id]) declare author: User | null;
 }

package/docs/sql-tagged-template.md

@@ -94,8 +94,8 @@ The `sql` tag eliminates manual `$1`/`$2` placeholder numbering and DB dialect d
 ```typescript
 @model('sales_report')
 class SalesReportModel extends DBModel {
-  @column() product_id?: number;
-  @column() total_revenue?: number;
+  @column.number() product_id?: number;
+  @column.number() total_revenue?: number;
 
   static forPeriod(startDate: string, endDate: string) {
     return this.withQuery(sql`
@@ -130,9 +130,9 @@ Use the `sql` tag for `QUERY` to get Column and table name references that are r
 ```typescript
 @model('user_activity')
 class UserActivityModel extends DBModel {
-  @column() user_id?: number;
-  @column() user_name?: string;
-  @column() total_posts?: number;
+  @column.number() user_id?: number;
+  @column.text() user_name?: string;
+  @column.number() total_posts?: number;
 
   static QUERY = sql`
     SELECT 

package/eslint-plugin/rules/require-declare-for-relations.js

@@ -1,6 +1,18 @@
 /**
- * @fileoverview Require 'declare' keyword for relation properties instead of '!' assertion
- * @description Relations use prototype getters. Using '!' creates instance properties that shadow getters.
+ * @fileoverview Require the relation declaration form the project's DECORATOR PROTOCOL allows.
+ * @description
+ * A relation is a prototype getter. How a class field interacts with it differs by protocol:
+ *
+ *  - **legacy decorators** (`experimentalDecorators: true`): `declare posts: …` emits no field, so the
+ *    getter is what the instance sees. `posts!: …` DOES emit a field under `useDefineForClassFields`
+ *    and shadows the getter — silently, with `undefined` reads. That is what this rule catches.
+ *  - **standard decorators** (TC39, the TypeScript 5 default): a decorated `declare` field is a
+ *    COMPILE ERROR (TS1206), so `posts!: …` is the only spelling — and litedbmodel removes the
+ *    shadowing field itself. Requiring `declare` there makes the project uncompilable, and the
+ *    autofix used to do exactly that.
+ *
+ * The protocol is read from the TypeScript program when type-aware linting is on; otherwise set it
+ * explicitly: `"litedbmodel/require-declare-for-relations": ["error", { "decorators": "standard" }]`.
  */
 
 "use strict";
@@ -15,11 +27,24 @@ module.exports = {
       recommended: true,
     },
     fixable: "code",
-    schema: [],
+    schema: [
+      {
+        type: "object",
+        properties: {
+          decorators: { enum: ["legacy", "standard", "auto"] },
+        },
+        additionalProperties: false,
+      },
+    ],
     messages: {
       useDeclare:
         "Relation property '{{name}}' should use 'declare' instead of '!' assertion. " +
-        "Class field declarations with '!' create instance properties that shadow the prototype getter.",
+        "Under legacy decorators a class field with '!' shadows the prototype getter, so the relation " +
+        "reads as undefined.",
+      useDefinite:
+        "Relation property '{{name}}' must use '!' instead of 'declare'. " +
+        "Standard (TC39) decorators reject a decorated 'declare' field (TS1206); litedbmodel removes " +
+        "the shadowing class field itself.",
     },
   },
 
@@ -27,6 +52,26 @@ module.exports = {
     const relationDecorators = new Set(["hasMany", "belongsTo", "hasOne"]);
     const sourceCode = context.getSourceCode();
 
+    /**
+     * Which decorator protocol this project compiles with. Read from the TypeScript program when
+     * type-aware linting makes it available — guessing wrong turns this rule into an autofix that
+     * breaks the build, so the answer comes from the compiler options, not from the source text.
+     */
+    function decoratorProtocol() {
+      const configured = (context.options && context.options[0] && context.options[0].decorators) || "auto";
+      if (configured !== "auto") return configured;
+      const services = sourceCode.parserServices || context.parserServices;
+      const program = services && services.program;
+      if (program && typeof program.getCompilerOptions === "function") {
+        return program.getCompilerOptions().experimentalDecorators ? "legacy" : "standard";
+      }
+      // No program to ask. `experimentalDecorators` is what this rule has always assumed, and it is
+      // still the only protocol where `declare` is required.
+      return "legacy";
+    }
+
+    const protocol = decoratorProtocol();
+
     /**
      * Check if a decorator is a relation decorator
      */
@@ -81,6 +126,16 @@ module.exports = {
           return;
         }
 
+        const propertyKeyName = node.key?.name || node.key?.value || "unknown";
+
+        // Standard decorators: `declare` does not compile on a decorated field, so `!` is correct.
+        if (protocol === "standard") {
+          if (node.declare === true) {
+            context.report({ node, messageId: "useDefinite", data: { name: propertyKeyName } });
+          }
+          return;
+        }
+
         // Check if using definite assignment assertion (!)
         // In TypeScript ESLint AST, this is represented as `definite: true`
         if (node.definite === true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "litedbmodel",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A lightweight TypeScript ORM for PostgreSQL, MySQL, and SQLite with Active Record pattern",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
@@ -105,14 +105,14 @@
     "@types/better-sqlite3": "^7.6.8",
     "@types/node": "^20.10.0",
     "@types/pg": "^8.10.9",
-    "@vitest/coverage-v8": "^4.1.7",
+    "@vitest/coverage-v8": "^4.1.11",
     "better-sqlite3": "^11.0.0",
-    "embedoc": "^0.9.1",
+    "embedoc": "^0.14.8",
     "esbuild": "^0.28.1",
     "eslint": "^9.39.4",
     "globals": "^17.6.0",
-    "js-yaml": "^4.3.0",
-    "mysql2": "^3.16.0",
+    "js-yaml": "^4.3.2",
+    "mysql2": "^3.24.4",
     "pg": "^8.11.3",
     "terser": "^5.44.1",
     "tsx": "^4.22.3",
@@ -120,7 +120,7 @@
     "typedoc-plugin-markdown": "^4.9.0",
     "typescript": "^5.3.0",
     "typescript-eslint": "^8.60.0",
-    "vitest": "^4.1.7"
+    "vitest": "^4.1.11"
   },
   "peerDependencies": {
     "better-sqlite3": "^9.0.0 || ^10.0.0 || ^11.0.0",
@@ -142,7 +142,8 @@
     "node": ">=18.0.0"
   },
   "overrides": {
-    "js-yaml": "^4.3.0",
+    "js-yaml": "^4.3.2",
+    "csv-parse": "^7.0.2",
     "linkify-it": "^5.0.2",
     "postcss": "^8.5.24",
     "brace-expansion": "^5.0.9"