Merge pull request #52 from technote-space/release/next-v0.17.1

release: v0.18.0

Author: technote-space

CLAUDE.md

@@ -46,7 +46,7 @@ Input → fromInput() → Inner → toOutput() → Output (cached & frozen)
 #### Entity Pattern
 - **Base class**: `Entity<Props>`
 - **Factory methods**: `_create()` (with validation), `_reconstruct()` (skip validation), `_update()` (partial update)
-- **Property access**: Both `entity.get('prop')` and direct `entity.prop` via Proxy
+- **Property access**: `entity.get('prop')`
 - **Identity-based equality**: Must implement `equals()` method
 
 ### Code Organization
@@ -87,4 +87,4 @@ Input → fromInput() → Inner → toOutput() → Output (cached & frozen)
 1. Define props interface with Value Object properties
 2. Implement static factory methods with proper generics
 3. Implement `equals()` method based on business identity
-4. Add comprehensive tests covering creation, updates, and validation
+4. Add comprehensive tests covering creation, updates, and validation

README.md

@@ -129,10 +129,6 @@ name = 'New Name'; // エラー: Cannot assign to 'name' because it is a read-on
 
 Entity は識別子を持ち、ライフサイクルを通じて同一性を維持するオブジェクトを表現するための基本クラスです。
 
-Entity のプロパティへのアクセスは以下の2つの方法で行えます：
-1. `get` メソッドを使用: `entity.get('propertyName')`
-2. 直接プロパティとしてアクセス: `entity.propertyName`
-
 Entity を実装する際は、`_create`、`_reconstruct`、`_update` メソッドに対して、実装する Entity の型（例：`User`）をジェネリクスの型パラメータとして渡すことが重要です：
 ```typescript
 // 正しい使用法
@@ -199,16 +195,10 @@ const newStatus = new UserStatus('inactive');
 const updatedUser = user.update({ status: newStatus });
 
 // プロパティの取得
-// get メソッドを使用
 user.get('name').value; // 'John Doe'
 user.get('email').value; // '[email protected]'
 user.get('status')?.value; // undefined
 
-// 直接プロパティとしてアクセス（新機能）
-user.name.value; // 'John Doe'
-user.email.value; // '[email protected]'
-user.status?.value; // undefined
-
 // 比較
 user.equals(updatedUser); // true（email が同じため）
 user.equals(User.create(new UserName('Jane Doe'), new UserEmail('[email protected]'))); // false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/vo-entity-ts",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "",
   "keywords": [
     "ddd",

src/entity/index.spec.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import type { ValidationException } from '../exceptions/validation.js';
 import { Collection } from '../valueObject/collection.js';
+import type { ValidationError } from '../valueObject/index.js';
 import { Text } from '../valueObject/text.js';
 import { Entity } from './index.js';
 
@@ -12,6 +13,20 @@ class TestText extends Text {
   protected override getValidationMaxLength(): number | undefined {
     return 5;
   }
+
+  public override getErrors(
+    name: string,
+    prev?: Readonly<Text>,
+  ): ValidationError[] | undefined {
+    const results = super.getErrors(name);
+    const errors = results || [];
+
+    if (prev && this.value === prev.value) {
+      errors.push({ name, error: '前回と同じ値は使用できません' });
+    }
+
+    return errors.length ? errors : undefined;
+  }
 }
 
 class TestTextCollection extends Collection<TestText> {}
@@ -176,11 +191,9 @@ describe('Entity', () => {
 
       expect(test.get('text3')?.value).toBe('1');
       expect(test.get('text4')?.value).toBe('abcde');
-      expect(test.text3?.value).toBe('1');
-      expect(test.text4?.value).toBe('abcde');
-      expect(test.collection?.length).toBe(2);
-      expect(test.collection?.at(0)?.value).toBe('1');
-      expect(test.collection?.at(1)?.value).toBe('2');
+      expect(test.get('collection')?.length).toBe(2);
+      expect(test.get('collection')?.at(0)?.value).toBe('1');
+      expect(test.get('collection')?.at(1)?.value).toBe('2');
     });
 
     it('should throw error', () => {
@@ -208,10 +221,18 @@ describe('Entity', () => {
       expect(error?.message).toBe('バリデーションエラーが発生しました');
       expect(error?.errors).toEqual({
         text4: ['5文字より短く入力してください'],
+        'collection[0]': ['前回と同じ値は使用できません'],
         'collection[1]': ['5文字より短く入力してください'],
       });
     });
   });
+
+  describe('name', () => {
+    it('should return constructor name', () => {
+      const instance = TestEntity.create(new TestText(1), new TestText('1'));
+      expect(instance.constructor.name).toBe('TestEntity');
+    });
+  });
 });
 
 describe('getProps', () => {

src/entity/index.ts

@@ -26,24 +26,11 @@ type EntityObject<E extends Entity> = E extends Entity<infer Props>
           : undefined;
     }
   : never;
-export type EntityInstance<E extends Entity> = E & InferProps<E>;
 
 // biome-ignore lint/suspicious/noExplicitAny:
 export abstract class Entity<Props extends EntityPropsType = any> {
   protected constructor(private readonly props: Props) {
     Object.freeze(this.props);
-
-    // biome-ignore lint/correctness/noConstructorReturn:
-    return new Proxy(this, {
-      get(target, prop) {
-        // Handle property access for props
-        if (typeof prop === 'string' && prop in target.props) {
-          return target.props[prop];
-        }
-
-        return Reflect.get(target, prop);
-      },
-    });
   }
 
   public get<Key extends keyof Props>(key: Key): Props[Key] {
@@ -52,41 +39,45 @@ export abstract class Entity<Props extends EntityPropsType = any> {
 
   protected static _create<Instance extends Entity>(
     props: InferProps<Instance>,
-  ): EntityInstance<Instance> {
+  ): Instance {
     // biome-ignore lint/complexity/noThisInStatic:
     const instance = Reflect.construct(this, [props]) as Instance;
     instance.validate();
-    return instance as EntityInstance<Instance>;
+    return instance;
   }
 
   protected static _reconstruct<Instance extends Entity>(
     props: InferProps<Instance>,
-  ): EntityInstance<Instance> {
+  ): Instance {
     // biome-ignore lint/complexity/noThisInStatic:
-    return Reflect.construct(this, [props]) as EntityInstance<Instance>;
+    return Reflect.construct(this, [props]) as Instance;
   }
 
   protected static _update<Instance extends Entity>(
     target: Entity<InferProps<Instance>>,
     props: Partial<InferProps<Instance>>,
-  ): EntityInstance<Instance> {
+  ): Instance {
     // biome-ignore lint/complexity/noThisInStatic:
     const instance = Reflect.construct(this, [
       { ...target.props, ...props },
     ]) as Instance;
-    instance.validate(target);
-    return instance as EntityInstance<Instance>;
+    instance.validate(target, Object.keys(props));
+    return instance;
   }
 
   public abstract equals(other: Entity<Props>): boolean;
 
-  public getErrors(prev?: Entity<Props>): ValidationErrors {
+  public getErrors(
+    prev?: Entity<Props>,
+    targetKeys?: (keyof Props)[],
+  ): ValidationErrors {
     return Object.keys(this.props).reduce((acc, key) => {
       const member = this.props[key];
-      const prevValue: typeof member | undefined = prev
-        ? // biome-ignore lint/suspicious/noExplicitAny:
-          ((prev[key as keyof Entity] as any) ?? undefined)
-        : undefined;
+      const prevValue: typeof member | undefined =
+        prev && targetKeys?.includes(key)
+          ? // biome-ignore lint/suspicious/noExplicitAny:
+            ((prev.props[key as keyof Entity] as any) ?? undefined)
+          : undefined;
 
       if (member && member instanceof Collection) {
         const name = key.replace(/^_/, '');
@@ -95,9 +86,7 @@ export abstract class Entity<Props extends EntityPropsType = any> {
             v.getErrors(
               `${name}[${index}]`,
               // biome-ignore lint/suspicious/noExplicitAny:
-              (prevValue as Collection<ValueObject<any, any>>)?.find((p) =>
-                p.equals(v),
-              ),
+              (prevValue as Collection<ValueObject<any, any>>)?.at(index),
             ),
           )
           .filter((e): e is ValidationError[] => !!e)
@@ -132,9 +121,12 @@ export abstract class Entity<Props extends EntityPropsType = any> {
     }, {} as ValidationErrors);
   }
 
-  // biome-ignore lint/suspicious/noConfusingVoidType:
-  private validate(prev?: Entity<Props>): void | never {
-    const errors = this.getErrors(prev);
+  private validate(
+    prev?: Entity<Props>,
+    targetKeys?: (keyof Props)[],
+    // biome-ignore lint/suspicious/noConfusingVoidType:
+  ): void | never {
+    const errors = this.getErrors(prev, targetKeys);
     if (Object.keys(errors).length) {
       throw new ValidationException(errors);
     }

src/index.ts

@@ -14,7 +14,7 @@ export { Text } from './valueObject/text.js';
 export { Url } from './valueObject/url.js';
 export { Email } from './valueObject/email.js';
 
-export { Entity, type EntityInstance } from './entity/index.js';
+export { Entity } from './entity/index.js';
 export { Collection } from './valueObject/collection.js';
 
 export { Exception } from './exceptions/exception.js';