From 32cebaf6bf8a620f7ca98e519454d8a510ffb909 Mon Sep 17 00:00:00 2001
From: arnold <arnold9525@gmail.com>
Date: Thu, 9 Feb 2023 17:10:09 +0100
Subject: [PATCH 1/5] test: add more test scenarios

---
 tests/Primitives.test.ts | 27 ++++++++++++++++++++++++++-
 tests/Product.ts         | 15 +++++++++++++++
 tests/Video.ts           | 19 +++++++++++++++++++
 tests/VideoId.ts         |  3 +++
 tests/VideoName.ts       |  3 +++
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 tests/Product.ts
 create mode 100644 tests/Video.ts
 create mode 100644 tests/VideoId.ts
 create mode 100644 tests/VideoName.ts

diff --git a/tests/Primitives.test.ts b/tests/Primitives.test.ts
index 57ae183..196e383 100644
--- a/tests/Primitives.test.ts
+++ b/tests/Primitives.test.ts
@@ -1,10 +1,12 @@
 import { expectTypeOf } from "expect-type";
 
-import { Primitives } from "../src/Primitives";
+import { Primitives } from "../src";
 import { Course } from "./Course";
 import { DeliveryInfo } from "./DeliveryInfo";
 import { Learner } from "./Learner";
+import { Product } from "./Product";
 import { User } from "./User";
+import { Video } from "./Video";
 
 describe("Primitives", () => {
   it("should ensure to only return primitive properties excluding methods", () => {
@@ -52,4 +54,27 @@ describe("Primitives", () => {
 
     expectTypeOf<actualPrimitives>().toEqualTypeOf<expectedPrimitives>();
   });
+
+  it("should get primitive type in case it is not a value object", () => {
+    type actualPrimitives = Primitives<Product>;
+
+    type expectedPrimitives = {
+      readonly active: boolean;
+      readonly createdAt: Date;
+    };
+
+    expectTypeOf<actualPrimitives>().toEqualTypeOf<expectedPrimitives>();
+  });
+
+  it("should infer the optional properties", () => {
+    type actualPrimitives = Primitives<Video>;
+
+    type expectedPrimitives = {
+      readonly id: string;
+      readonly name: string | undefined;
+      readonly duration: number | undefined;
+    };
+
+    expectTypeOf<actualPrimitives>().toEqualTypeOf<expectedPrimitives>();
+  });
 });
diff --git a/tests/Product.ts b/tests/Product.ts
new file mode 100644
index 0000000..874d18a
--- /dev/null
+++ b/tests/Product.ts
@@ -0,0 +1,15 @@
+import { Primitives } from "../src";
+
+export class Product {
+  constructor(
+    public readonly active: boolean,
+    public readonly createdAt: Date
+  ) {}
+
+  toPrimitives(): Primitives<Product> {
+    return {
+      active: this.active,
+      createdAt: this.createdAt,
+    };
+  }
+}
diff --git a/tests/Video.ts b/tests/Video.ts
new file mode 100644
index 0000000..570cfde
--- /dev/null
+++ b/tests/Video.ts
@@ -0,0 +1,19 @@
+import { Primitives } from "../src";
+import { VideoId } from "./VideoId";
+import { VideoName } from "./VideoName";
+
+export class Video {
+  public constructor(
+    public readonly id: VideoId,
+    public readonly name: VideoName | undefined,
+    public readonly duration: number | undefined
+  ) {}
+
+  public toPrimitives(): Primitives<Video> {
+    return {
+      id: this.id.value,
+      name: this.name?.value,
+      duration: this.duration,
+    };
+  }
+}
diff --git a/tests/VideoId.ts b/tests/VideoId.ts
new file mode 100644
index 0000000..0f8f7bc
--- /dev/null
+++ b/tests/VideoId.ts
@@ -0,0 +1,3 @@
+import { StringValueObject } from "./StringValueObject";
+
+export class VideoId extends StringValueObject {}
diff --git a/tests/VideoName.ts b/tests/VideoName.ts
new file mode 100644
index 0000000..13a9629
--- /dev/null
+++ b/tests/VideoName.ts
@@ -0,0 +1,3 @@
+import { StringValueObject } from "./StringValueObject";
+
+export class VideoName extends StringValueObject {}

From fa689b0846e3fbbbc8ea99d9d2a09d09f5279443 Mon Sep 17 00:00:00 2001
From: arnold <arnold9525@gmail.com>
Date: Thu, 9 Feb 2023 17:13:02 +0100
Subject: [PATCH 2/5] feat: add support to more types

---
 .gitignore        |  3 ++-
 package-lock.json |  4 ++--
 src/Primitives.ts | 28 ++++++++++++++++------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04c01ba..2576880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
-dist/
\ No newline at end of file
+dist/
+.idea/
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f781f37..d6799df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@codelytv/primitives-type",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@codelytv/primitives-type",
-      "version": "1.0.3",
+      "version": "1.0.5",
       "license": "GPL-3.0",
       "devDependencies": {
         "@types/jest": "^27.5.2",
diff --git a/src/Primitives.ts b/src/Primitives.ts
index 6fa06e8..e51d9c5 100644
--- a/src/Primitives.ts
+++ b/src/Primitives.ts
@@ -7,16 +7,20 @@ type MethodsAndProperties<T> = { [key in keyof T]: T[key] };
 
 type Properties<T> = Omit<MethodsAndProperties<T>, Methods<T>>;
 
-type ValueObjectValue<T> = {
-  [key in keyof T]: T[key] extends { value: unknown }
-    ? Pick<T[key], "value">["value"]
-    : T[key] extends Array<{ value: unknown }>
-    ? Pick<T[key][number], "value">["value"][]
-    : T[key] extends Array<Object>
-    ? Primitives<T[key][number]>[]
-    : T[key] extends Object
-    ? Primitives<T[key]>
-    : T[key];
-};
+type PrimitiveTypes = string | number | boolean | Date | undefined | null;
+
+type ValueObjectValue<T> = T extends PrimitiveTypes
+  ? T
+  : T extends { value: infer U }
+  ? U
+  : T extends Array<{ value: infer U }>
+  ? U[]
+  : T extends Array<infer U>
+  ? Array<ValueObjectValue<U>>
+  : T extends { [K in keyof Properties<T>]: infer U }
+  ? { [K in keyof Properties<T>]: ValueObjectValue<U> }
+  : never;
 
-export type Primitives<T> = ValueObjectValue<Properties<T>>;
+export type Primitives<T> = {
+  [key in keyof Properties<T>]: ValueObjectValue<T[key]>;
+};

From 44612405e48bdad58de1a157cc9c64b9653fbf2e Mon Sep 17 00:00:00 2001
From: arnold <arnold9525@gmail.com>
Date: Thu, 9 Feb 2023 17:28:13 +0100
Subject: [PATCH 3/5] restore: restore last version

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d6799df..f781f37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@codelytv/primitives-type",
-  "version": "1.0.5",
+  "version": "1.0.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@codelytv/primitives-type",
-      "version": "1.0.5",
+      "version": "1.0.3",
       "license": "GPL-3.0",
       "devDependencies": {
         "@types/jest": "^27.5.2",

From 9e39cc3b25420e3a0a1a64f0ce7f004beaa7ff91 Mon Sep 17 00:00:00 2001
From: arnold <arnold9525@gmail.com>
Date: Thu, 30 Mar 2023 15:19:30 +0200
Subject: [PATCH 4/5] refactor: types are inferred from all properties of an
 object

---
 package-lock.json        | 4 ++--
 package.json             | 2 +-
 src/Primitives.ts        | 2 +-
 tests/Address.ts         | 7 ++++++-
 tests/Primitives.test.ts | 2 ++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f781f37..2e18332 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@codelytv/primitives-type",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@codelytv/primitives-type",
-      "version": "1.0.3",
+      "version": "1.0.6",
       "license": "GPL-3.0",
       "devDependencies": {
         "@types/jest": "^27.5.2",
diff --git a/package.json b/package.json
index 1d89aba..f65e143 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codelytv/primitives-type",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Type entity primitives from value objects",
   "keywords": [
     "typescript",
diff --git a/src/Primitives.ts b/src/Primitives.ts
index e51d9c5..d620f2a 100644
--- a/src/Primitives.ts
+++ b/src/Primitives.ts
@@ -18,7 +18,7 @@ type ValueObjectValue<T> = T extends PrimitiveTypes
   : T extends Array<infer U>
   ? Array<ValueObjectValue<U>>
   : T extends { [K in keyof Properties<T>]: infer U }
-  ? { [K in keyof Properties<T>]: ValueObjectValue<U> }
+  ? { [K in keyof Properties<T>]: ValueObjectValue<Properties<T>[K]> }
   : never;
 
 export type Primitives<T> = {
diff --git a/tests/Address.ts b/tests/Address.ts
index 3559ecc..7d21a05 100644
--- a/tests/Address.ts
+++ b/tests/Address.ts
@@ -3,12 +3,17 @@ import { City } from "./City";
 import { Street } from "./Street";
 
 export class Address {
-  constructor(readonly street: Street, readonly city: City) {}
+  constructor(
+    readonly street: Street,
+    readonly city: City,
+    readonly number: number
+  ) {}
 
   toPrimitives(): Primitives<Address> {
     return {
       street: this.street.value,
       city: this.city.value,
+      number: this.number,
     };
   }
 }
diff --git a/tests/Primitives.test.ts b/tests/Primitives.test.ts
index 196e383..a8fcdb4 100644
--- a/tests/Primitives.test.ts
+++ b/tests/Primitives.test.ts
@@ -36,6 +36,7 @@ describe("Primitives", () => {
       readonly address: {
         readonly city: string;
         readonly street: string;
+        readonly number: number;
       };
     };
 
@@ -49,6 +50,7 @@ describe("Primitives", () => {
       readonly addresses: {
         readonly city: string;
         readonly street: string;
+        readonly number: number;
       }[];
     };
 

From c34f27cae36a03d1ca7fbcbf2b1903a3c373fd98 Mon Sep 17 00:00:00 2001
From: arnold <arnold9525@gmail.com>
Date: Thu, 30 Mar 2023 15:21:07 +0200
Subject: [PATCH 5/5] refactor: shortened importation

---
 tests/Address.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Address.ts b/tests/Address.ts
index 7d21a05..580ee23 100644
--- a/tests/Address.ts
+++ b/tests/Address.ts
@@ -1,4 +1,4 @@
-import { Primitives } from "../src/Primitives";
+import { Primitives } from "../src";
 import { City } from "./City";
 import { Street } from "./Street";