Fix type test for spacing

Author: garronej

src/lib/spacing.ts

@@ -20,47 +20,47 @@ export function spacing<
     params: Params
 ): (Params extends { topBottom: SpacingToken | number }
     ? Record<
-          `${"top" | "bottom"}${Capitalize<Kind>}`,
+          `${Kind}${"Top" | "Bottom"}`,
           Params["topBottom"] extends SpacingToken
               ? SpacingTokenByValue[Params["topBottom"]]
               : Params["topBottom"]
       >
     : {}) &
     (Params extends { rightLeft: SpacingToken | number }
         ? Record<
-              `${"right" | "left"}${Capitalize<Kind>}`,
+              `${Kind}${"Right" | "Left"}`,
               Params["rightLeft"] extends SpacingToken
                   ? SpacingTokenByValue[Params["rightLeft"]]
                   : Params["rightLeft"]
           >
         : {}) &
     (Params extends { top: SpacingToken | number }
         ? Record<
-              `top${Capitalize<Kind>}`,
+              `${Kind}Top`,
               Params["top"] extends SpacingToken
                   ? SpacingTokenByValue[Params["top"]]
                   : Params["top"]
           >
         : {}) &
     (Params extends { right: SpacingToken | number }
         ? Record<
-              `right${Capitalize<Kind>}`,
+              `${Kind}Right`,
               Params["right"] extends SpacingToken
                   ? SpacingTokenByValue[Params["right"]]
                   : Params["right"]
           >
         : {}) &
     (Params extends { bottom: SpacingToken | number }
         ? Record<
-              `bottom${Capitalize<Kind>}`,
+              `${Kind}Bottom`,
               Params["bottom"] extends SpacingToken
                   ? SpacingTokenByValue[Params["bottom"]]
                   : Params["bottom"]
           >
         : {}) &
     (Params extends { left: SpacingToken | number }
         ? Record<
-              `left${Capitalize<Kind>}`,
+              `${Kind}Left`,
               Params["left"] extends SpacingToken
                   ? SpacingTokenByValue[Params["left"]]
                   : Params["left"]

test/types/spacint.ts renamed to test/types/spacing.ts

@@ -3,52 +3,71 @@ import { assert } from "tsafe/assert";
 import { Equals } from "tsafe";
 
 {
-    const got = spacing("margin", { "topBottom": "1v" });
+    const got = spacing("margin", { "topBottom": 4 });
 
-    type Expected = Record<"topMargin" | "bottomMargin", "0.25rem">;
+    type Expected = {
+        marginTop: number;
+        marginBottom: number;
+    };
 
     assert<Equals<typeof got, Expected>>();
 }
 
 {
     const got = spacing("margin", { "topBottom": "1v" });
 
-    type Expected = Record<"topMargin" | "bottomMargin", "0.25rem">;
+    type Expected = {
+        marginTop: "0.25rem";
+        marginBottom: "0.25rem";
+    };
 
     assert<Equals<typeof got, Expected>>();
 }
 
 {
     const got = spacing("margin", { "topBottom": "1v", "rightLeft": 33 });
 
-    type Expected = Record<"topMargin" | "bottomMargin", "0.25rem"> &
-        Record<"leftMargin" | "rightMargin", number>;
+    type Expected = {
+        marginTop: "0.25rem";
+        marginBottom: "0.25rem";
+        marginLeft: number;
+        marginRight: number;
+    };
 
     assert<Equals<typeof got, Expected>>();
 }
 
 {
     const got = spacing("margin", { "topBottom": "1v", "rightLeft": 33 });
 
-    type Expected = Record<"topMargin" | "bottomMargin", "0.25rem"> &
-        Record<"leftMargin" | "rightMargin", number>;
+    type Expected = {
+        marginTop: "0.25rem";
+        marginBottom: "0.25rem";
+        marginLeft: number;
+        marginRight: number;
+    };
 
     assert<Equals<typeof got, Expected>>();
 }
 
 {
     const got = spacing("margin", { "bottom": "1v" });
 
-    type Expected = Record<"bottomMargin", "0.25rem">;
+    type Expected = {
+        marginBottom: "0.25rem";
+    };
 
     assert<Equals<typeof got, Expected>>();
 }
 
 {
     const got = spacing("padding", { "bottom": "1v", "rightLeft": 42 });
 
-    type Expected = Record<"rightPadding" | "leftPadding", number> &
-        Record<"bottomPadding", "0.25rem">;
+    type Expected = {
+        paddingRight: number;
+        paddingLeft: number;
+        paddingBottom: "0.25rem";
+    };
 
     assert<Equals<typeof got, Expected>>();
 }