@entur/typography 1.10.0-beta.11 → 1.10.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entur/typography",
-  "version": "1.10.0-beta.11",
+  "version": "1.10.0-beta.13",
   "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": "43d0a9514cbaeb6c8e319c4286bed9bd3ea21b22"
+  "gitHead": "c9b59ab0f79e2611a602951c89f4f2c8213e235f"
 }

package/scripts/migrate-typography.js

@@ -658,7 +658,26 @@ function updateImports(content) {
     let hasChanges = false;
     const uniqueComponents = new Set();
 
-    // Check each component in the import list
+    // First, collect all existing components that should be preserved
+    const existingComponents = importList
+      .split(',')
+      .map(comp => comp.trim())
+      .filter(comp => {
+        // Skip empty components
+        if (!comp) return false;
+
+        // Keep components that are:
+        // 1. Not in the migration mapping (old components), OR
+        // 2. Are the target components (new beta components)
+        const isOldComponent = Object.keys(COMPONENT_MAPPING).includes(comp);
+        const isTargetComponent = Object.values(COMPONENT_MAPPING).some(
+          mapping => mapping.component === comp,
+        );
+
+        return !isOldComponent || isTargetComponent;
+      });
+
+    // Then, update components that need migration
     Object.entries(COMPONENT_MAPPING).forEach(([oldComponent, mapping]) => {
       const componentRegex = new RegExp(`\\b${oldComponent}\\b`, 'g');
       if (componentRegex.test(updatedImportList)) {
@@ -673,8 +692,18 @@ function updateImports(content) {
 
     if (hasChanges) {
       changes++;
-      // Deduplicate components and create clean import statement
-      const finalImportList = Array.from(uniqueComponents).join(', ');
+      // Combine existing components with migrated components
+      const allComponents = [
+        ...existingComponents,
+        ...Array.from(uniqueComponents),
+      ];
+
+      // Filter out any empty components and deduplicate
+      const finalComponents = allComponents
+        .filter(comp => comp && comp.trim())
+        .filter((comp, index, arr) => arr.indexOf(comp) === index); // Remove duplicates
+
+      const finalImportList = finalComponents.join(', ');
       return `import {${finalImportList}} from '${BETA_IMPORT}'`;
     }