@entur/typography 1.10.0-beta.7 → 1.10.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entur/typography",
-  "version": "1.10.0-beta.7",
+  "version": "1.10.0-beta.8",
   "license": "SEE LICENSE IN README.md",
   "main": "dist/index.js",
   "module": "dist/typography.esm.js",
@@ -42,5 +42,5 @@
   "devDependencies": {
     "dts-cli": "2.0.5"
   },
-  "gitHead": "26b5f016229bb0115d5f31ce51e15eafd015a870"
+  "gitHead": "75f853e86839313d80d1ea5aa89fb133f42102de"
 }

package/scripts/migrate-typography.js

@@ -558,15 +558,37 @@ function updateImports(content) {
     updatedContent = updatedContent.replace(pattern, `from '${BETA_IMPORT}'`);
   });
 
-  // Then, update destructured import names
-  Object.entries(COMPONENT_MAPPING).forEach(([oldComponent, mapping]) => {
-    // Simple approach: find and replace the component name in import statements
-    const importRegex = new RegExp(`\\b${oldComponent}\\b(?=\\s*[,}])`, 'g');
+  // Then, update destructured import names - only within @entur/typography imports
+  // Find all import statements from @entur/typography and update component names
+  const importRegex =
+    /import\s*{([^}]+)}\s*from\s*['"']@entur\/typography['"']/g;
+
+  updatedContent = updatedContent.replace(importRegex, (match, importList) => {
+    let updatedImportList = importList;
+    let hasChanges = false;
+    const uniqueComponents = new Set();
+
+    // Check each component in the import list
+    Object.entries(COMPONENT_MAPPING).forEach(([oldComponent, mapping]) => {
+      const componentRegex = new RegExp(`\\b${oldComponent}\\b`, 'g');
+      if (componentRegex.test(updatedImportList)) {
+        updatedImportList = updatedImportList.replace(
+          componentRegex,
+          mapping.component,
+        );
+        uniqueComponents.add(mapping.component);
+        hasChanges = true;
+      }
+    });
 
-    if (importRegex.test(updatedContent)) {
+    if (hasChanges) {
       changes++;
-      updatedContent = updatedContent.replace(importRegex, mapping.component);
+      // Deduplicate components and create clean import statement
+      const finalImportList = Array.from(uniqueComponents).join(', ');
+      return `import {${finalImportList}} from '${BETA_IMPORT}'`;
     }
+
+    return match;
   });
 
   return { content: updatedContent, changes };