@8ms/helpers 2.3.4 → 2.3.5

package/.github/generate-exports.js

@@ -3,13 +3,18 @@ import fs from 'fs';
 import path from 'path';
 import {fileURLToPath} from 'url';
 
-const __dirname   = path.dirname(fileURLToPath(import.meta.url));
-const projectRoot = path.join(__dirname, '..');
-const srcRoot     = path.join(projectRoot, 'src');
-const packageJson = JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'));
+const __filename = fileURLToPath(import.meta.url);
+const __dirname  = path.dirname(__filename);
 
-const excludeDirs = new Set(['node_modules', 'scripts', 'jest', 'src', '.git', '.github', '.idea']);
+const projectRoot     = path.join(__dirname, '..');
+const packageJsonPath = path.join(projectRoot, 'package.json');
+const srcRoot         = path.join(projectRoot, 'src');
 
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+
+const excludeDirs = ['node_modules', 'scripts', 'jest', '.git', '.github', '.idea', 'tests', 'test'];
+
+// Build exports object
 const exports = {
 	'.': {
 		types:   './index.d.ts',
@@ -19,51 +24,88 @@ const exports = {
 	}
 };
 
-const importExportRegex = /((?:import|export)\s+(?:type\s+)?(?:[\s\S]*?from\s+)?['"])(\.{1,2}\/[^'"]+?)(['"])/g;
-
-function scan(baseDir, relativePath = '')
+// Fix ESM exports in a src index.ts file by appending .js to bare relative imports
+function fixIndexFile(filePath)
 {
-	for(const entry of fs.readdirSync(baseDir, {withFileTypes: true}))
+	const content = fs.readFileSync(filePath, 'utf8');
+
+	const updated = content.replace(
+		/^(export \* from ["'])(\.\/[^"'.]+)(["'];?)$/gm,
+		(_, prefix, specifier, suffix) => `${prefix}${specifier}.js${suffix}`
+	);
+
+	if(updated !== content)
 	{
-		const fullPath       = path.join(baseDir, entry.name);
-		const newRelativePath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
+		fs.writeFileSync(filePath, updated, 'utf8');
+		console.log(`Fixed: ${path.relative(projectRoot, filePath)}`);
+	}
+}
 
+// Recursively scan src for index.ts files to fix
+function fixSrcIndexFiles(dir)
+{
+	const entries = fs.readdirSync(dir, {withFileTypes: true});
+
+	for(const entry of entries)
+	{
 		if(entry.isDirectory())
 		{
-			if(excludeDirs.has(entry.name) || entry.name.startsWith('.')) continue;
-
-			if(fs.existsSync(path.join(fullPath, 'index.js')))
+			if(!excludeDirs.includes(entry.name) && !entry.name.startsWith('.'))
 			{
-				const jsPath = `./${newRelativePath}/index.js`;
-				const config = {types: `./${newRelativePath}/index.d.ts`, import: jsPath, require: jsPath, default: jsPath};
-
-				exports[`./${newRelativePath}`]            = config;
-				exports[`./${newRelativePath}/index.js`]  = config;
-				exports[`./${newRelativePath}/index.d.ts`] = {types: config.types, default: config.types};
+				fixSrcIndexFiles(path.join(dir, entry.name));
 			}
+		}
+		else if(entry.name === 'index.ts')
+		{
+			fixIndexFile(path.join(dir, entry.name));
+		}
+	}
+}
+
+// Recursively find all compiled directories with index.js files (outside src)
+function findIndexDirs(baseDir, relativePath = '')
+{
+	const entries = fs.readdirSync(baseDir, {withFileTypes: true});
 
-			scan(fullPath, newRelativePath);
+	for(const entry of entries)
+	{
+		if(!entry.isDirectory() || excludeDirs.includes(entry.name) || entry.name.startsWith('.'))
+		{
+			continue;
 		}
-		else if(entry.isFile() && !entry.name.endsWith('.d.ts') && (entry.name.endsWith('.ts') || entry.name.endsWith('.tsx')))
+
+		const fullPath        = path.join(baseDir, entry.name);
+		const newRelativePath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
+		const indexJsPath     = path.join(fullPath, 'index.js');
+
+		if(fs.existsSync(indexJsPath))
 		{
-			const original = fs.readFileSync(fullPath, 'utf8');
-			const updated  = original.replace(importExportRegex, (match, prefix, specifier, suffix) =>
-				path.extname(specifier) ? match : `${prefix}${specifier}.js${suffix}`
-			);
+			const exportConfig = {
+				types:   `./${newRelativePath}/index.d.ts`,
+				import:  `./${newRelativePath}/index.js`,
+				require: `./${newRelativePath}/index.js`,
+				default: `./${newRelativePath}/index.js`
+			};
 
-			if(updated !== original)
-			{
-				fs.writeFileSync(fullPath, updated, 'utf8');
-				console.log(`Fixed extensions in: ${path.relative(projectRoot, fullPath)}`);
-			}
+			exports[`./${newRelativePath}`]          = exportConfig;
+			exports[`./${newRelativePath}/index.js`] = exportConfig;
+
+			exports[`./${newRelativePath}/index.d.ts`] = {
+				types:   `./${newRelativePath}/index.d.ts`,
+				default: `./${newRelativePath}/index.d.ts`
+			};
 		}
+
+		findIndexDirs(fullPath, newRelativePath);
 	}
 }
 
-scan(projectRoot);
-scan(srcRoot);
+fixSrcIndexFiles(srcRoot);
+
+findIndexDirs(projectRoot);
 
 packageJson.exports = exports;
-fs.writeFileSync(path.join(projectRoot, 'package.json'), JSON.stringify(packageJson, null, '\t') + '\n', 'utf8');
+
+fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, '\t') + '\n', 'utf8');
 
 console.log(`Generated exports for ${Object.keys(exports).length} entries`);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "2.3.4",
+	"version": "2.3.5",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"