@entur/typography 2.0.0-beta.1 → 2.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entur/typography",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "license": "SEE LICENSE IN README.md",
   "type": "module",
   "main": "./dist/typography.cjs.js",
@@ -58,7 +58,6 @@
     "migrate": "./scripts/migrate-typography.js"
   },
   "peerDependencies": {
-    "glob": "^11.0.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
@@ -69,6 +68,9 @@
     "classnames": "^2.5.1",
     "modern-normalize": "^3.0.1"
   },
+  "optionalDependencies": {
+    "glob": "^11.0.3"
+  },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^10.4.9",
@@ -82,5 +84,5 @@
     "vite": "^7.1.3",
     "vite-plugin-dts": "^4.5.4"
   },
-  "gitHead": "4ca471ab86d5b40be5a87eb41b352bf37b476db2"
+  "gitHead": "c975e3a16aa66dd5413cc2ac10a3ab96a8211cf1"
 }

package/scripts/migrate-typography.js

@@ -65,31 +65,23 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-// Check if glob is available
+// Try to use glob if available, fallback to Node.js built-ins
 let glob;
-try {
-  const globModule = await import('glob');
-  glob = globModule.default || globModule;
-} catch (error) {
-  console.error(
-    '❌ Error: The "glob" package is required to run this migration script.',
-  );
-  console.error('');
-  console.error('Please install it first:');
-  console.error('  npm install glob');
-  console.error('  yarn add glob');
-  console.error('  pnpm add glob');
-  console.error('');
-  console.error('Then run the migration:');
-  console.error('  npx @entur/typography@latest migrate');
-  console.error('  yarn dlx @entur/typography@latest migrate');
-  console.error('');
-  console.error('📚 For more information, see:');
-  console.error(
-    '  https://linje.entur.no/komponenter/ressurser/typography-migration',
-  );
-  console.error('');
-  process.exit(1);
+let useGlob = false;
+
+// Initialize glob detection
+async function initializeGlob() {
+  try {
+    const globModule = await import('glob');
+    glob = globModule.default || globModule;
+    useGlob = true;
+    console.log('📦 Using glob package for pattern matching');
+  } catch (error) {
+    console.log('📁 Using Node.js built-ins for file discovery');
+    console.log(
+      '   (Install glob for better pattern matching: npm install glob or yarn add glob)',
+    );
+  }
 }
 
 // Configuration
@@ -944,15 +936,23 @@ function updateComponents(content) {
 /**
  * Find files matching the given pattern in allowed directories
  *
- * This function uses efficient glob patterns and data structures:
- * - Single glob call with brace expansion instead of multiple calls
- * - Set-based extension filtering for O(1) lookups
- * - No array concatenation in loops
+ * Uses glob if available for better pattern matching, falls back to Node.js built-ins
  *
- * @param {string} pattern - Glob pattern to match (e.g., '*.{ts,tsx,js,jsx}')
+ * @param {string} pattern - File pattern to match (e.g., '*.{ts,tsx,js,jsx}')
  * @returns {string[]} Array of matching file paths
  */
 function findFiles(pattern) {
+  if (useGlob) {
+    return findFilesWithGlob(pattern);
+  } else {
+    return findFilesWithNode(pattern);
+  }
+}
+
+/**
+ * Find files using glob package (preferred method)
+ */
+function findFilesWithGlob(pattern) {
   const allFiles = [];
 
   // Process directory patterns
@@ -1000,6 +1000,88 @@ function findFiles(pattern) {
   return uniqueFiles;
 }
 
+/**
+ * Find files using Node.js built-ins (fallback method)
+ */
+function findFilesWithNode(pattern) {
+  const allFiles = [];
+
+  // Parse the pattern to extract extensions
+  const extensions = pattern.match(/\*\.\{([^}]+)\}/);
+  const fileExtensions = extensions
+    ? extensions[1].split(',').map(ext => `.${ext.trim()}`)
+    : ['.ts', '.tsx', '.js', '.jsx', '.scss', '.css'];
+
+  const extensionSet = new Set(fileExtensions);
+
+  // Helper function to check if a path should be ignored
+  function shouldIgnore(filePath) {
+    return BLOCKED_DIRECTORIES.some(blockedPattern => {
+      // Simple pattern matching for common blocked directories
+      if (blockedPattern.includes('**')) {
+        const basePattern = blockedPattern.replace('/**', '');
+        return filePath.includes(basePattern);
+      }
+      return filePath.includes(blockedPattern);
+    });
+  }
+
+  // Helper function to recursively find files
+  function findFilesRecursive(dir, relativePath = '') {
+    try {
+      const items = fs.readdirSync(dir, { withFileTypes: true });
+
+      for (const item of items) {
+        const itemPath = path.join(dir, item.name);
+        const relativeItemPath = path.join(relativePath, item.name);
+
+        // Skip if this path should be ignored
+        if (shouldIgnore(relativeItemPath)) {
+          continue;
+        }
+
+        if (item.isDirectory()) {
+          // Recursively search subdirectories
+          findFilesRecursive(itemPath, relativeItemPath);
+        } else if (item.isFile()) {
+          // Check if file has matching extension
+          const ext = path.extname(item.name).toLowerCase();
+          if (extensionSet.has(ext)) {
+            allFiles.push(relativeItemPath);
+          }
+        }
+      }
+    } catch (error) {
+      // Skip directories that can't be read (permissions, etc.)
+      console.warn(
+        `Warning: Could not read directory ${dir}: ${error.message}`,
+      );
+    }
+  }
+
+  // Process each allowed directory
+  for (const allowedDir of ALLOWED_DIRECTORIES) {
+    if (allowedDir.includes('**')) {
+      // Directory pattern (e.g., src/**)
+      const baseDir = allowedDir.replace('/**', '');
+      const fullPath = path.resolve(baseDir);
+
+      if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
+        findFilesRecursive(fullPath, baseDir);
+      }
+    } else {
+      // File pattern (e.g., *.jsx) - not supported in this implementation
+      // as it would require more complex pattern matching
+      console.warn(
+        `Warning: File pattern "${allowedDir}" not supported in Node.js-only mode. Use directory patterns like "src/**" instead.`,
+      );
+    }
+  }
+
+  // Remove duplicates and return
+  return [...new Set(allFiles)];
+}
+
 function updateImportsAndComponents(content) {
   let updatedContent = content;
   let changes = 0;
@@ -1288,6 +1370,9 @@ function showNextSteps() {
 }
 
 async function main() {
+  // Initialize glob detection
+  await initializeGlob();
+
   // Show help if requested
   if (process.argv.includes('--help') || process.argv.includes('-h')) {
     console.log('🎨 Typography Migration Script');
@@ -1298,18 +1383,12 @@ async function main() {
     console.log('  npx @entur/typography@latest migrate [options]');
     console.log('  yarn dlx @entur/typography@latest migrate [options]');
     console.log('');
-    console.log('  # Direct execution (requires glob package)');
+    console.log('  # Direct execution (uses Node.js built-ins, glob optional)');
     console.log('  node scripts/migrate-typography.js [options]');
     console.log('');
     console.log('  # Local development');
     console.log('  npm run migrate');
     console.log('');
-    console.log('📋 Prerequisites:');
-    console.log('  - Install glob package: npm install glob');
-    console.log(
-      '  - Or use npx/yarn dlx which handles dependencies automatically',
-    );
-    console.log('');
     console.log('Options:');
     console.log(
       '  --dry-run        Show what would be changed without modifying files',