Fix property keys in themes

noya-app · Jan 27, 2024 · 17e36d9 · 17e36d9
1 parent ab13e5f
commit 17e36d9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/packages/noya-compiler/src/__tests__/compile.test.ts b/packages/noya-compiler/src/__tests__/compile.test.ts
@@ -297,6 +297,22 @@ describe('theme', () => {
     imports: [],
   };
 
+  it('passthrough', () => {
+    const result = convertTransformer({ theme: 'foo' }, {}, emptyContext);
+
+    expect(print(result)).toEqual(`{}`);
+  });
+
+  it('special characters in key', () => {
+    const result = convertTransformer(
+      { theme: 'foo' },
+      { '&:foo-bar': 'baz' },
+      emptyContext,
+    );
+
+    expect(print(result)).toEqual(`{ "&:foo-bar": "baz" }`);
+  });
+
   it('access key', () => {
     const result = convertTransformer(
       { theme: 'foo' },

diff --git a/packages/noya-compiler/src/astBuilders.ts b/packages/noya-compiler/src/astBuilders.ts
@@ -32,7 +32,9 @@ export function createJsxElement(
   );
 }
 
-function createPropertyKey(key: string): ts.Identifier | ts.StringLiteral {
+export function createPropertyKey(
+  key: string,
+): ts.Identifier | ts.StringLiteral {
   if (isValidPropertyKey(key)) {
     return ts.factory.createIdentifier(key);
   } else {

diff --git a/packages/noya-compiler/src/compileTheme.ts b/packages/noya-compiler/src/compileTheme.ts
@@ -6,6 +6,7 @@ import {
 import ts from 'typescript';
 import {
   createExpressionCode,
+  createPropertyKey,
   generateImportDeclarations,
 } from './astBuilders';
 import { clean } from './clean';
@@ -105,7 +106,7 @@ export function convertTransformer(
 
         return [
           ts.factory.createPropertyAssignment(
-            ts.factory.createIdentifier(key),
+            createPropertyKey(key),
             expression,
           ),
         ];