dry

Author: raju-opti

scripts/add-platform-exports.js

@@ -16,26 +16,11 @@
 const fs = require('fs');
 const path = require('path');
 const ts = require('typescript');
-const { minimatch } = require('minimatch');
-const { extractPlatformsFromAST, getValidPlatforms } = require('./platform-utils');
+const { extractPlatformsFromFile, findSourceFiles } = require('./platform-utils');
 
 const WORKSPACE_ROOT = path.join(__dirname, '..');
 const PLATFORMS = ['browser', 'node', 'react_native'];
 
-// Load configuration
-const configPath = path.join(WORKSPACE_ROOT, '.platform-isolation.config.js');
-const config = fs.existsSync(configPath) 
-  ? require(configPath)
-  : {
-      include: ['lib/**/*.ts', 'lib/**/*.js'],
-      exclude: [
-        '**/*.spec.ts', '**/*.test.ts', '**/*.tests.ts',
-        '**/*.test.js', '**/*.spec.js', '**/*.tests.js',
-        '**/*.umdtests.js', '**/*.test-d.ts', '**/*.gen.ts',
-        '**/*.d.ts', '**/__mocks__/**', '**/tests/**'
-      ]
-    };
-
 function getPlatformFromFilename(filename) {
   const platforms = [];
   for (const platform of PLATFORMS) {
@@ -46,15 +31,6 @@ function getPlatformFromFilename(filename) {
   return platforms.length > 0 ? platforms : null;
 }
 
-/**
- * Check if file matches any pattern using minimatch
- */
-function matchesPattern(filePath, patterns) {
-  const relativePath = path.relative(WORKSPACE_ROOT, filePath).replace(/\\/g, '/');
-  
-  return patterns.some(pattern => minimatch(relativePath, pattern));
-}
-
 /**
  * Calculate relative import path for Platform type
  */
@@ -284,15 +260,8 @@ function addPlatformExport(content, platforms) {
 function processFile(filePath) {
   let content = fs.readFileSync(filePath, 'utf-8');
 
-  // Get valid platforms for validation
-  const validPlatforms = getValidPlatforms();
-  
-  // Use TypeScript parser to check for existing __platforms
-  const result = extractPlatformsFromAST(
-    ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true),
-    filePath,
-    validPlatforms // Validate platform values
-  );
+  // Use extractPlatformsFromFile which validates platform values
+  const result = extractPlatformsFromFile(filePath);
 
   // Extract platforms and error info from result
   const existingPlatforms = result.success ? result.platforms : null;
@@ -363,45 +332,10 @@ function processFile(filePath) {
   return { skipped: true, reason: 'no changes needed' };
 }
 
-/**
- * Recursively find all files matching include patterns and not matching exclude patterns
- */
-function findSourceFiles(dir, files = []) {
-  const entries = fs.readdirSync(dir, { withFileTypes: true });
-  
-  for (const entry of entries) {
-    const fullPath = path.join(dir, entry.name);
-    
-    if (entry.isDirectory()) {
-      // Check if this directory path could potentially contain files matching include patterns
-      // Use minimatch with partial mode to test if pattern could match files under this directory
-      const relativePath = path.relative(WORKSPACE_ROOT, fullPath).replace(/\\/g, '/');
-      const couldMatch = config.include.some(pattern => {
-        return minimatch(relativePath, pattern, { partial: true });
-      });
-      
-      if (couldMatch) {
-        findSourceFiles(fullPath, files);
-      }
-    } else if (entry.isFile()) {
-      // Check if file matches include patterns
-      if (matchesPattern(fullPath, config.include)) {
-        // Check if file is NOT excluded
-        if (!matchesPattern(fullPath, config.exclude)) {
-          files.push(fullPath);
-        }
-      }
-    }
-  }
-  
-  return files;
-}
-
 function main() {
   console.log('🔧 Processing __platforms exports...\n');
-  console.log(`📋 Configuration: ${path.relative(WORKSPACE_ROOT, configPath) || '.platform-isolation.config.js'}\n`);
 
-  const files = findSourceFiles(WORKSPACE_ROOT);
+  const files = findSourceFiles();
   let added = 0;
   let moved = 0;
   let fixed = 0;

scripts/platform-utils.js

@@ -27,13 +27,45 @@
 const fs = require('fs');
 const path = require('path');
 const ts = require('typescript');
+const { minimatch } = require('minimatch');
 
 // Cache for valid platforms
 let validPlatformsCache = null;
 
 // Cache for file platforms
 const filePlatformCache = new Map();
 
+// Cache for config
+let configCache = null;
+
+/**
+ * Load platform isolation configuration
+ * 
+ * @returns {Object} Configuration object with include/exclude patterns
+ */
+function loadConfig() {
+  if (configCache) {
+    return configCache;
+  }
+
+  const workspaceRoot = path.join(__dirname, '..');
+  const configPath = path.join(workspaceRoot, '.platform-isolation.config.js');
+  
+  configCache = fs.existsSync(configPath) 
+    ? require(configPath)
+    : {
+        include: ['lib/**/*.ts', 'lib/**/*.js'],
+        exclude: [
+          '**/*.spec.ts', '**/*.test.ts', '**/*.tests.ts',
+          '**/*.test.js', '**/*.spec.js', '**/*.tests.js',
+          '**/*.umdtests.js', '**/*.test-d.ts', '**/*.gen.ts',
+          '**/*.d.ts', '**/__mocks__/**', '**/tests/**'
+        ]
+      };
+  
+  return configCache;
+}
+
 /**
  * Extract valid platform values from Platform type definition in platform_support.ts
  * Parses: type Platform = 'browser' | 'node' | 'react_native' | '__universal__';
@@ -267,8 +299,56 @@ function extractPlatformsFromFile(absolutePath) {
   return result;
 }
 
+/**
+ * Find all source files matching include/exclude patterns from config
+ * 
+ * @returns {string[]} Array of absolute file paths
+ */
+function findSourceFiles() {
+  const workspaceRoot = path.join(__dirname, '..');
+  const config = loadConfig();
+  
+  /**
+   * Check if file matches any pattern using minimatch
+   */
+  function matchesPattern(filePath, patterns, options = {}) {
+    const relativePath = path.relative(workspaceRoot, filePath).replace(/\\/g, '/');
+    return patterns.some(pattern => minimatch(relativePath, pattern, options));
+  }
+  
+  /**
+   * Recursively find all files matching include patterns and not matching exclude patterns
+   */
+  function findFilesRecursive(dir, files = []) {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+      
+      if (entry.isDirectory()) {
+        // Check if this directory path could potentially contain files matching include patterns
+        if (matchesPattern(fullPath, config.include, { partial: true })) {
+          findFilesRecursive(fullPath, files);
+        }
+      } else if (entry.isFile()) {
+        // Check if file matches include patterns and is NOT excluded
+        if (matchesPattern(fullPath, config.include)
+             && !matchesPattern(fullPath, config.exclude)) {
+          files.push(fullPath);
+        }
+      }
+    }
+    
+    return files;
+  }
+  
+  return findFilesRecursive(workspaceRoot);
+}
+
 module.exports = {
   getValidPlatforms,
   extractPlatformsFromAST,
   extractPlatformsFromFile,
+  findSourceFiles,
+  loadConfig,
 };

scripts/validate-platform-isolation-ts.js

@@ -42,7 +42,7 @@ const fs = require('fs');
 const path = require('path');
 const ts = require('typescript');
 const { minimatch } = require('minimatch');
-const { getValidPlatforms, extractPlatformsFromFile } = require('./platform-utils');
+const { getValidPlatforms, extractPlatformsFromFile, findSourceFiles, loadConfig } = require('./platform-utils');
 
 const WORKSPACE_ROOT = path.join(__dirname, '..');
 
@@ -56,18 +56,8 @@ const compilerOptions = ts.convertCompilerOptionsFromJson(
 ).options;
 
 // Load configuration
+const config = loadConfig();
 const configPath = path.join(WORKSPACE_ROOT, '.platform-isolation.config.js');
-const config = fs.existsSync(configPath) 
-  ? require(configPath)
-  : {
-      include: ['lib/**/*.ts', 'lib/**/*.js'],
-      exclude: [
-        '**/*.spec.ts', '**/*.test.ts', '**/*.tests.ts',
-        '**/*.test.js', '**/*.spec.js', '**/*.tests.js',
-        '**/*.umdtests.js', '**/*.test-d.ts', '**/*.gen.ts',
-        '**/*.d.ts', '**/__mocks__/**', '**/tests/**'
-      ]
-    };
 
 // Track files with errrors in __platforms export
 const fileErrors = new Map();
@@ -371,31 +361,7 @@ function reportPlatformErrors(errorsByType, validPlatforms) {
   return hasErrors;
 }
 
-/**
- * Recursively find all files matching include patterns and not matching exclude patterns
- */
-function findSourceFiles(dir, files = []) {
-  const entries = fs.readdirSync(dir, { withFileTypes: true });
-  
-  for (const entry of entries) {
-    const fullPath = path.join(dir, entry.name);
-    
-    if (entry.isDirectory()) {
-      // Check if this directory path could potentially contain files matching include patterns
-      if (matchesPattern(fullPath, config.include, { partial: true })) {
-        findSourceFiles(fullPath, files);
-      }
-    } else if (entry.isFile()) {
-      // Check if file matches include patterns and is NOT excluded
-      if (matchesPattern(fullPath, config.include)
-           && !matchesPattern(fullPath, config.exclude)) {
-        files.push(fullPath);
-      }
-    }
-  }
-  
-  return files;
-}
+
 
 /**
  * Main validation function
@@ -404,7 +370,7 @@ function main() {
   console.log('🔍 Validating platform isolation...\n');
   console.log(`📋 Configuration: ${path.relative(WORKSPACE_ROOT, configPath) || '.platform-isolation.config.js'}\n`);
 
-  const files = findSourceFiles(WORKSPACE_ROOT);
+  const files = findSourceFiles();
 
   // Load valid platforms first
   const validPlatforms = getValidPlatforms();