Fix: Copy array/tuple-logic from DelimiterCasedPropertiesDeep to Came…

…lCasedPropertiesDeep to fix changing tuple-type to array-type
sindresorhus · Feb 21, 2024 · 5cc7cb5 · 5cc7cb5
1 parent e02f228
commit 5cc7cb5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/source/camel-cased-properties-deep.d.ts b/source/camel-cased-properties-deep.d.ts
@@ -46,9 +46,24 @@ const result: CamelCasedPropertiesDeep<UserWithFriends> = {
 */
 export type CamelCasedPropertiesDeep<Value, Options extends CamelCaseOptions = {preserveConsecutiveUppercase: true}> = Value extends Function
 	? Value
-	: Value extends Array<infer U>
-		? Array<CamelCasedPropertiesDeep<U, Options>>
-		: Value extends Set<infer U>
-			? Set<CamelCasedPropertiesDeep<U, Options>> : {
-				[K in keyof Value as CamelCase<K, Options>]: CamelCasedPropertiesDeep<Value[K], Options>;
-			};
+	: Value extends []
+		? []
+	// Tailing spread array
+		:	Value extends [infer U, ...infer V]
+			? [CamelCasedPropertiesDeep<U>, ...CamelCasedPropertiesDeep<V>]
+			: Value extends readonly [infer U, ...infer V]
+				? readonly [CamelCasedPropertiesDeep<U>, ...CamelCasedPropertiesDeep<V>]
+			// Leading spread array
+				: Value extends readonly [...infer U, infer V]
+					? [...CamelCasedPropertiesDeep<U>, CamelCasedPropertiesDeep<V>]
+					: Value extends readonly [...infer U, infer V]
+						? readonly [...CamelCasedPropertiesDeep<U>, CamelCasedPropertiesDeep<V>]
+					// Array
+						: Value extends Array<infer U>
+							? Array<CamelCasedPropertiesDeep<U>>
+							: Value extends ReadonlyArray<infer U>
+								? ReadonlyArray<CamelCasedPropertiesDeep<U>>
+								: Value extends Set<infer U>
+									? Set<CamelCasedPropertiesDeep<U, Options>> : {
+										[K in keyof Value as CamelCase<K, Options>]: CamelCasedPropertiesDeep<Value[K], Options>;
+									};
diff --git a/test-d/camel-cased-properties-deep.ts b/test-d/camel-cased-properties-deep.ts
@@ -19,6 +19,9 @@ expectType<{fooBAR: number; baz: {fooBAR: number; bARFoo: string}}>(baz);
 declare const biz: CamelCasedPropertiesDeep<bazBizDeep, {preserveConsecutiveUppercase: false}>;
 expectType<{fooBar: number; baz: {fooBar: number; barFoo: string}}>(biz);
 
+declare const tuple: CamelCasedPropertiesDeep<{tuple: [number, string, {D: string}]}>;
+expectType<{tuple: [number, string, {d: string}]}>(tuple);
+
 // Verify example
 type User = {
 	UserId: number;