Merge pull request #384 from BJJLangedijk/main

feat(Typography): prevent camelCasing typography values

Author: nado1001

src/index.ts

@@ -40,7 +40,7 @@ const formatTokens = (
   const result = {}
   Object.keys(allTokenObj).forEach((key) => {
     const keys = key.split('.').filter((k) => k !== type)
-    makeSdObject(result, keys, allTokenObj[key])
+    makeSdObject(result, keys, allTokenObj[key], keys[0] !== 'typography')
   })
 
   return JSON.stringify(result, null, 2)

src/tests/utils.test.ts

@@ -75,4 +75,40 @@ describe('makeSdObject function', () => {
       }
     })
   })
+
+  it('should camelCase values when setCasing is not given', () => {
+    const obj: { [key: string]: string } = {
+      'foo.foo-bar': 'bar',
+    }
+
+    const result = {}
+    Object.keys(obj).forEach((key) => {
+      const keys = key.split('.').filter((k) => k !== 'colors')
+      makeSdObject(result, keys, obj[key])
+    })
+
+    expect(result).toEqual({
+      foo: {
+        fooBar: 'bar'
+      }
+    })
+  })
+
+  it('should not camelCase when setCasing is set to false', () => {
+    const obj: { [key: string]: string } = {
+      'typography.foo-bar': 'bar',
+    }
+
+    const result = {}
+    Object.keys(obj).forEach((key) => {
+      const keys = key.split('.').filter((k) => k !== 'colors')
+      makeSdObject(result, keys, obj[key], false)
+    })
+
+    expect(result).toEqual({
+      typography: {
+        'foo-bar': 'bar'
+      }
+    })
+  })
 })

src/utils.ts

@@ -8,11 +8,17 @@ export const addHyphen = (str: string) => {
 export const makeSdObject = <T extends readonly string[]>(
   obj: SdObjType<{ [key: string]: any }>,
   keys: T,
-  value: string
+  value: string,
+  setCasing = true
 ): void => {
   const lastIndex = keys.length - 1
   for (let i = 0; i < lastIndex; ++i) {
-    const key = camelCase(keys[i])
+    let key = keys[i];
+
+    if (setCasing) {
+      key = camelCase(keys[i]);
+    }
+
     if (!(key in obj)) {
       obj[key] = {}
     }
@@ -21,6 +27,10 @@ export const makeSdObject = <T extends readonly string[]>(
 
   // https://v2.tailwindcss.com/docs/upgrading-to-v2#update-default-theme-keys-to-default
   if (keys[lastIndex] === 'DEFAULT') {
+    setCasing = false;
+  }
+
+  if (!setCasing) {
     obj[keys[lastIndex]] = value
   } else {
     obj[camelCase(keys[lastIndex])] = value