feat: Dealing with empty arrays and empty tuple types #4

kakasoo · Jan 26, 2025 · 45ce3a8 · 45ce3a8
1 parent 6f95218
commit 45ce3a8
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 5 deletions.
diff --git a/src/functions/DeepStrictObjectKeys.ts b/src/functions/DeepStrictObjectKeys.ts
@@ -12,7 +12,6 @@ export function deepStrictObjectKeys<
     new Set(
       Object.entries(target).flatMap(([key, value]) => {
         if (target instanceof Array) {
-          console.log('value: ', value);
           return deepStrictObjectKeys(value, joiner).map((el) => `${joiner.array}.${el}`);
         } else if (target !== null && typeof target === 'object') {
           return deepStrictObjectKeys(value, joiner).flatMap((el) => `${joiner.object}.${el}`);

diff --git a/src/types/DeepStrictObjectKeys.ts b/src/types/DeepStrictObjectKeys.ts
@@ -4,8 +4,6 @@ import type { IsAny } from './IsAny';
 import type { IsUnion } from './IsUnion';
 import type { ValueType } from './ValueType';
 
-type a = DeepStrictObjectKeys.Infer<{ a: Date }>;
-
 namespace DeepStrictObjectKeys {
   export type Infer<
     Target extends object,
@@ -69,5 +67,9 @@ export type DeepStrictObjectKeys<
   DeepStrictUnbrand<Target> extends Array<infer Element>
     ? Element extends object
       ? `${Joiner['array']}.${DeepStrictObjectKeys<Element, Joiner, IsSafe>}`
-      : `${Joiner['array']}.${keyof Element extends string ? keyof Element : never}`
-    : DeepStrictObjectKeys.Infer<DeepStrictUnbrand<Target>, Joiner, IsSafe>;
+      : `${Joiner['array']}`
+    : DeepStrictUnbrand<Target> extends readonly (infer Element)[] // TODO: support tuple types
+      ? Element extends object
+        ? `${Joiner['array']}.${DeepStrictObjectKeys<Element, Joiner, IsSafe>}`
+        : `${Joiner['array']}`
+      : DeepStrictObjectKeys.Infer<DeepStrictUnbrand<Target>, Joiner, IsSafe>;
diff --git a/test/types/DeepStrictObjectKeys.ts b/test/types/DeepStrictObjectKeys.ts
@@ -3,6 +3,34 @@ import test, { describe } from 'node:test';
 import typia, { tags } from 'typia';
 import { DeepStrictObjectKeys, Equal } from '../../src';
 
+describe('empty array', () => {
+  test('normal: isNotSafe', () => {
+    type Question = DeepStrictObjectKeys<
+      [],
+      {
+        array: '[*]';
+        object: '.';
+      },
+      false
+    >;
+    type Answer = Equal<Question, never>;
+    ok(typia.random<Answer>());
+  });
+
+  test('normal: isNotSafe', () => {
+    type Question = DeepStrictObjectKeys<
+      [],
+      {
+        array: '[*]';
+        object: '.';
+      },
+      true
+    >;
+    type Answer = Equal<Question, never>;
+    ok(typia.random<Answer>());
+  });
+});
+
 describe('Date props', () => {
   test('normal: isNotSafe', () => {
     type Question = DeepStrictObjectKeys<
@@ -578,3 +606,59 @@ describe('a key in a two-dimensional array', () => {
     ok(typia.random<Answer>());
   });
 });
+
+describe('readonly empty array. (tuple)', () => {
+  test('normal: isNotSafe', () => {
+    type Question = DeepStrictObjectKeys<
+      readonly [],
+      {
+        array: '[*]';
+        object: '.';
+      },
+      false
+    >;
+    type Answer = Equal<Question, never>;
+    ok(typia.random<Answer>());
+  });
+
+  test('normal: isSafe', () => {
+    type Question = DeepStrictObjectKeys<
+      readonly [],
+      {
+        array: '[*]';
+        object: '.';
+      },
+      true
+    >;
+    type Answer = Equal<Question, never>;
+    ok(typia.random<Answer>());
+  });
+});
+
+describe('readonly not empty array. (tuple)', () => {
+  test('normal: isNotSafe', () => {
+    type Question = DeepStrictObjectKeys<
+      readonly [1],
+      {
+        array: '[*]';
+        object: '.';
+      },
+      false
+    >;
+    type Answer = Equal<Question, '[*]'>;
+    ok(typia.random<Answer>());
+  });
+
+  test('normal: isSafe', () => {
+    type Question = DeepStrictObjectKeys<
+      readonly [1],
+      {
+        array: '[*]';
+        object: '.';
+      },
+      true
+    >;
+    type Answer = Equal<Question, '[*]'>;
+    ok(typia.random<Answer>());
+  });
+});