fix: Improve handling of default for package exports. (#127)

* Add default. * Fix tests. * Fix tests. * Run build.
milesj · May 19, 2022 · 08f5995 · 08f5995
1 parent 04ee133
commit 08f5995
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 32 deletions.
diff --git a/packages/babel-plugin-cjs-esm-interop/package.json b/packages/babel-plugin-cjs-esm-interop/package.json
@@ -47,11 +47,13 @@
     "./package.json": "./package.json",
     "./*": {
       "types": "./dts/*.d.ts",
-      "node": "./lib/*.js"
+      "node": "./lib/*.js",
+      "default": "./lib/*.js"
     },
     ".": {
       "types": "./dts/index.d.ts",
-      "node": "./lib/index.js"
+      "node": "./lib/index.js",
+      "default": "./lib/index.js"
     }
   }
 }
diff --git a/packages/babel-plugin-conditional-invariant/package.json b/packages/babel-plugin-conditional-invariant/package.json
@@ -44,11 +44,13 @@
     "./package.json": "./package.json",
     "./*": {
       "types": "./dts/*.d.ts",
-      "node": "./lib/*.js"
+      "node": "./lib/*.js",
+      "default": "./lib/*.js"
     },
     ".": {
       "types": "./dts/index.d.ts",
-      "node": "./lib/index.js"
+      "node": "./lib/index.js",
+      "default": "./lib/index.js"
     }
   }
 }
diff --git a/packages/babel-plugin-env-constants/package.json b/packages/babel-plugin-env-constants/package.json
@@ -44,11 +44,13 @@
     "./package.json": "./package.json",
     "./*": {
       "types": "./dts/*.d.ts",
-      "node": "./lib/*.js"
+      "node": "./lib/*.js",
+      "default": "./lib/*.js"
     },
     ".": {
       "types": "./dts/index.d.ts",
-      "node": "./lib/index.js"
+      "node": "./lib/index.js",
+      "default": "./lib/index.js"
     }
   }
 }
diff --git a/packages/packemon/src/CodeArtifact.ts b/packages/packemon/src/CodeArtifact.ts
@@ -201,6 +201,7 @@ export class CodeArtifact extends Artifact<CodeBuild> {
 
 	protected mapPackageExportsFromBuilds(outputName: string, exportMap: PackageExports) {
 		const paths: PackageExportPaths = {};
+		let defaultEntry = '';
 
 		this.builds.forEach(({ format }) => {
 			const entry = this.findEntryPoint([format], outputName);
@@ -226,18 +227,25 @@ export class CodeArtifact extends Artifact<CodeBuild> {
 					break;
 
 				case 'lib':
-					paths.default = entry;
+					defaultEntry = entry;
 					break;
 
 				default:
 					break;
 			}
 		});
 
-		// eslint-disable-next-line no-param-reassign
-		exportMap[outputName === 'index' ? '.' : `./${outputName}`] = {
+		const pathsMap = {
 			[this.platform === 'native' ? 'react-native' : this.platform]:
-				Object.keys(paths).length === 1 && paths.default ? paths.default : paths,
+				Object.keys(paths).length === 0 && defaultEntry ? defaultEntry : paths,
 		};
+
+		// Provide fallbacks if condition above is not
+		if (defaultEntry) {
+			pathsMap.default = defaultEntry;
+		}
+
+		// eslint-disable-next-line no-param-reassign
+		exportMap[outputName === 'index' ? '.' : `./${outputName}`] = pathsMap;
 	}
 }
diff --git a/packages/packemon/src/Package.ts b/packages/packemon/src/Package.ts
@@ -489,13 +489,17 @@ export class Package {
 
 		this.artifacts.forEach((artifact) => {
 			Object.entries(artifact.getPackageExports()).forEach(([path, conditions]) => {
+				if (!conditions) {
+					return;
+				}
+
 				if (!exportMap[path]) {
 					exportMap[path] = {};
 				} else if (typeof exportMap[path] === 'string') {
 					exportMap[path] = { default: exportMap[path] };
 				}
 
-				Object.assign(exportMap[path], conditions);
+				Object.assign(exportMap[path]!, conditions);
 			});
 		});
 

diff --git a/packages/packemon/src/helpers/sortExportConditions.ts b/packages/packemon/src/helpers/sortExportConditions.ts
@@ -11,8 +11,10 @@ const WEIGHTS = {
 	default: 100, // Default must be last
 };
 
-export function sortExportConditions<T extends PackageExportPaths | string>(paths: T): T {
-	if (typeof paths === 'string') {
+export function sortExportConditions<T extends PackageExportPaths | string | undefined>(
+	paths: T,
+): T {
+	if (!paths || typeof paths === 'string') {
 		return paths;
 	}
 

diff --git a/packages/packemon/src/helpers/sortExports.ts b/packages/packemon/src/helpers/sortExports.ts
@@ -15,5 +15,10 @@ export function sortExports(exportMap: PackageExports): PackageExports {
 		return diff === 0 ? d.length - a.length : diff;
 	});
 
-	return Object.fromEntries(paths.map((path) => [path, sortExportConditions(exportMap[path])]));
+	return Object.fromEntries(
+		paths.map((path) => [
+			path,
+			exportMap[path] === undefined ? undefined : sortExportConditions(exportMap[path]),
+		]),
+	);
 }
diff --git a/packages/packemon/src/types.ts b/packages/packemon/src/types.ts
@@ -109,7 +109,7 @@ export type PackageExportPaths = {
 	[K in PackageExportConditions]?: PackageExportPaths | string;
 };
 
-export type PackageExports = Record<string, PackageExportPaths | string>;
+export type PackageExports = Record<string, PackageExportPaths | string | undefined>;
 
 // BUILD
 

diff --git a/packages/packemon/tests/CodeArtifact.test.ts b/packages/packemon/tests/CodeArtifact.test.ts
@@ -216,6 +216,7 @@ describe('CodeArtifact', () => {
 			expect(artifact.getPackageExports()).toEqual({
 				'.': {
 					node: './lib/index.js',
+					default: './lib/index.js',
 				},
 			});
 		});
@@ -227,6 +228,7 @@ describe('CodeArtifact', () => {
 			expect(artifact.getPackageExports()).toEqual({
 				'.': {
 					node: './lib/node/index.js',
+					default: './lib/node/index.js',
 				},
 			});
 		});
@@ -238,6 +240,7 @@ describe('CodeArtifact', () => {
 			expect(artifact.getPackageExports()).toEqual({
 				'./sub': {
 					node: './lib/sub.js',
+					default: './lib/sub.js',
 				},
 			});
 		});
@@ -250,8 +253,8 @@ describe('CodeArtifact', () => {
 					node: {
 						import: './mjs/index.mjs',
 						require: './cjs/index.cjs',
-						default: './lib/index.js',
 					},
+					default: './lib/index.js',
 				},
 			});
 		});
@@ -277,6 +280,7 @@ describe('CodeArtifact', () => {
 			expect(artifact.getPackageExports()).toEqual({
 				'.': {
 					browser: './lib/index.js',
+					default: './lib/index.js',
 				},
 			});
 		});
@@ -288,6 +292,7 @@ describe('CodeArtifact', () => {
 			expect(artifact.getPackageExports()).toEqual({
 				'.': {
 					'react-native': './lib/index.js',
+					default: './lib/index.js',
 				},
 			});
 		});

diff --git a/packages/packemon/tests/Package.test.ts b/packages/packemon/tests/Package.test.ts
@@ -530,7 +530,7 @@ describe('Package', () => {
 				await pkg.build({ addExports: true }, config);
 
 				expect(pkg.packageJson.exports).toEqual({
-					'.': { node: './lib/index.js' },
+					'.': { node: './lib/index.js', default: './lib/index.js' },
 					'./package.json': './package.json',
 				});
 			});
@@ -547,8 +547,8 @@ describe('Package', () => {
 						node: {
 							import: './mjs/index.mjs',
 							require: './cjs/index.cjs',
-							default: './lib/index.js',
 						},
+						default: './lib/index.js',
 					},
 					'./package.json': './package.json',
 				});
@@ -574,6 +574,7 @@ describe('Package', () => {
 						node: './lib/node/index.js',
 						browser: './lib/browser/index.js',
 						'react-native': './lib/native/index.js',
+						default: './lib/native/index.js',
 					},
 					'./package.json': './package.json',
 				});
@@ -596,13 +597,12 @@ describe('Package', () => {
 						node: {
 							import: './mjs/index.mjs',
 							require: './cjs/index.cjs',
-							default: './lib/index.js',
 						},
 						browser: {
 							import: './esm/index.js',
 							module: './esm/index.js',
-							default: './lib/index.js',
 						},
+						default: './lib/index.js',
 					},
 					'./package.json': './package.json',
 				});
@@ -619,8 +619,8 @@ describe('Package', () => {
 				await pkg.build({ addExports: true }, config);
 
 				expect(pkg.packageJson.exports).toEqual({
-					'.': { node: './lib/index.js' },
-					'./client': { browser: './lib/client.js' },
+					'.': { node: './lib/index.js', default: './lib/index.js' },
+					'./client': { browser: './lib/client.js', default: './lib/client.js' },
 					'./package.json': './package.json',
 				});
 			});
@@ -643,15 +643,15 @@ describe('Package', () => {
 						node: {
 							import: './mjs/index.mjs',
 							require: './cjs/index.cjs',
-							default: './lib/index.js',
 						},
+						default: './lib/index.js',
 					},
 					'./client': {
 						browser: {
 							import: './esm/client.js',
 							module: './esm/client.js',
-							default: './lib/client.js',
 						},
+						default: './lib/client.js',
 					},
 					'./package.json': './package.json',
 				});
@@ -664,7 +664,7 @@ describe('Package', () => {
 				await pkg.build({ addExports: true }, config);
 
 				expect(pkg.packageJson.exports).toEqual({
-					'.': { node: './lib/index.js', types: './dts/index.d.ts' },
+					'.': { node: './lib/index.js', types: './dts/index.d.ts', default: './lib/index.js' },
 					'./package.json': './package.json',
 				});
 			});
@@ -679,7 +679,7 @@ describe('Package', () => {
 				await pkg.build({ addExports: true }, config);
 
 				expect(pkg.packageJson.exports).toEqual({
-					'.': { node: './lib/index.js' },
+					'.': { node: './lib/index.js', default: './lib/index.js' },
 					'./foo': './lib/foo.js',
 					'./package.json': './package.json',
 				});
@@ -868,13 +868,13 @@ describe('Package', () => {
 					exports: {
 						'./package.json': './package.json',
 						'.': { node: { import: './cjs/index-wrapper.mjs', require: './cjs/index.cjs' } },
-						'./bin': { node: './lib/bin.js' },
+						'./bin': { node: './lib/bin.js', default: './lib/bin.js' },
 						'./web': {
 							browser: {
 								import: './esm/web.js',
 								module: './esm/web.js',
-								default: './lib/web.js',
 							},
+							default: './lib/web.js',
 						},
 						'./import': { node: { import: './mjs/import.mjs' } },
 					},
@@ -917,10 +917,11 @@ describe('Package', () => {
 					bin: './lib/cli.js',
 					exports: {
 						'./package.json': './package.json',
-						'./bin': { node: './lib/cli.js' },
+						'./bin': { node: './lib/cli.js', default: './lib/cli.js' },
 						'./import': { node: { import: './mjs/web.mjs' } },
 						'./web': {
-							browser: { default: './lib/web.js', import: './esm/web.js', module: './esm/web.js' },
+							browser: { import: './esm/web.js', module: './esm/web.js' },
+							default: './lib/web.js',
 						},
 						'.': { node: { import: './cjs/node-wrapper.mjs', require: './cjs/node.cjs' } },
 					},
@@ -964,16 +965,17 @@ describe('Package', () => {
 					exports: {
 						'./package.json': './package.json',
 						'./*': {
-							browser: { import: './esm/*.js', module: './esm/*.js', default: './lib/*.js' },
+							browser: { import: './esm/*.js', module: './esm/*.js' },
 							node: { import: './mjs/*.mjs' },
+							default: './lib/*.js',
 						},
 						'.': {
 							browser: {
 								import: './esm/index.js',
 								module: './esm/index.js',
-								default: './lib/index.js',
 							},
 							node: { import: './mjs/index.mjs' },
+							default: './lib/index.js',
 						},
 					},
 				}),