[accel-record] marge arrays in Mix

koyopro · Jan 6, 2025 · 089e8bb · 089e8bb
1 parent e64a9af
commit 089e8bb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/.changeset/silly-apples-tie.md b/.changeset/silly-apples-tie.md
@@ -0,0 +1,6 @@
+---
+"accel-record-core": patch
+"accel-record": patch
+---
+
+Merge arrays in Mix()
diff --git a/packages/accel-record-core/src/utils.ts b/packages/accel-record-core/src/utils.ts
@@ -84,7 +84,15 @@ const assign = (target: object, source: object, key: string) => {
   const desc = Object.getOwnPropertyDescriptor(source, key);
   const targetDesc = findMethod(target, key);
 
-  if (typeof targetDesc?.value == "function" && typeof desc?.value == "function") {
+  if (Array.isArray(targetDesc?.value) && Array.isArray(desc?.value)) {
+    // merge arrays
+    Object.defineProperty(target, key, {
+      value: [...targetDesc.value, ...desc.value],
+      enumerable: targetDesc.enumerable,
+      writable: true,
+      configurable: true,
+    });
+  } else if (typeof targetDesc?.value == "function" && typeof desc?.value == "function") {
     // already has a method, so we need to wrap it
     Object.defineProperty(target, key, {
       value: function (this: any, ...args: any[]) {

diff --git a/tests/models/mix.test.ts b/tests/models/mix.test.ts
@@ -3,6 +3,8 @@ import { Mix } from "accel-record-core";
 class A {
   static a = "a";
 
+  static validations = ["a"];
+
   a = "a";
   errors: string[] = [];
 
@@ -24,6 +26,8 @@ class AB extends Mix(A, B) {}
 class C {
   static c = "c";
 
+  static validations = ["c"];
+
   c = "c";
 
   validate<T extends A>(this: T) {
@@ -41,6 +45,8 @@ test("mix", () => {
   expect(ABC.a).toBe("a");
   expect(ABC.c).toBe("c");
 
+  expect(ABC.validations).toEqual(["a", "c"]);
+
   const ab = new AB();
   expect(ab.a).toBe("a");
   expect(ab.aa).toBe("aa");