normalize styles, rename function

withastro · Jan 19, 2024 · 6a4c673 · 6a4c673
1 parent 7ad0eef
commit 6a4c673
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/packages/markdown/remark/src/shiki.ts b/packages/markdown/remark/src/shiki.ts
@@ -62,10 +62,8 @@ export async function createShikiHighlighter({
 								node.tagName = 'code';
 							}
 
-							const classValue = normalizeMaybeArray(node.properties.class) ?? '';
-
-							// Cast to string as shikiji will always pass them as strings instead of any other types
-							const styleValue = (node.properties.style as string) ?? '';
+							const classValue = normalizePropAsString(node.properties.class) ?? '';
+							const styleValue = normalizePropAsString(node.properties.style) ?? '';
 
 							// Replace "shiki" class naming with "astro-code"
 							node.properties.class = classValue.replace(/shiki/g, 'astro-code');
@@ -131,7 +129,7 @@ export async function createShikiHighlighter({
 	};
 }
 
-function normalizeMaybeArray(value: Properties[string]): string | null {
+function normalizePropAsString(value: Properties[string]): string | null {
 	return Array.isArray(value) ? value.join(' ') : (value as string | null);
 }