Merge pull request #91 from dittowords/reed/dit-5759-component-folder…

…-dev-ids-do-not-handle-emojis-well

DIT-5759: component folder dev IDs properly exclude emojis

lib/pull.ts

@@ -436,7 +436,10 @@ async function downloadAndSave(
 
             const nameExt = getFormatExtension(format);
             const nameBase = "components";
-            const nameFolder = `__${componentFolder.name}`;
+
+            // we need to clean the folder name by itself first, otherwise we can
+            // end up with "empty" words and weird hyphenation.
+            const nameFolder = `__${cleanFileName(componentFolder.name)}`;
             const namePostfix = `__${variantApiId || "base"}`;
 
             const fileName = cleanFileName(

lib/utils/cleanFileName.test.ts

@@ -0,0 +1,11 @@
+import { cleanFileName } from "./cleanFileName";
+
+describe("cleanFileName tests", () => {
+  it("correctly cleans emojis", () => {
+    const folderName = "👍Good Folder";
+    expect(cleanFileName(folderName)).toEqual("good-folder");
+
+    const fileName = "👍 Good Folder";
+    expect(cleanFileName(fileName)).toEqual("good-folder");
+  });
+});

lib/utils/cleanFileName.ts

@@ -1,6 +1,8 @@
 export function cleanFileName(fileName: string): string {
-  return fileName
-    .replace(/\s{1,}/g, "-")
-    .replace(/[^a-zA-Z0-9-_.]/g, "")
-    .toLowerCase();
+  let parts = fileName.split(/\s{1,}/g);
+  parts = parts.map((part) =>
+    part.replace(/[^a-zA-Z0-9-_.]/g, "").toLowerCase()
+  );
+  parts = parts.filter((part) => part !== "");
+  return parts.join("-");
 }