better names for interop properties

sokra · sokra · commit 87fdb61c0aaf · 2018-01-05T22:35:54.000+01:00
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -42,8 +42,8 @@ const getExternalImport = (importedModule, info, exportName, asCall, strictHarmo
 			if(exportName === "default") {
 				return info.name;
 			} else if(exportName === true) {
-				info.interopUsed = true;
-				return info.interopName;
+				info.interopNamespaceObjectUsed = true;
+				return info.interopNamespaceObjectName;
 			} else {
 				break;
 			}
@@ -58,15 +58,15 @@ const getExternalImport = (importedModule, info, exportName, asCall, strictHarmo
 				if(exportName === "default") {
 					return info.name;
 				} else if(exportName === true) {
-					info.interopUsed = true;
-					return info.interopName;
+					info.interopNamespaceObjectUsed = true;
+					return info.interopNamespaceObjectName;
 				} else {
 					return "/* non-default import from non-esm module */undefined";
 				}
 			} else {
 				if(exportName === "default") {
-					info.interop2Used = true;
-					return asCall ? `${info.interop2Name}()` : `${info.interop2Name}.a`;
+					info.interopDefaultAccessUsed = true;
+					return asCall ? `${info.interopDefaultAccessName}()` : `${info.interopDefaultAccessName}.a`;
 				} else if(exportName === true) {
 					return info.name;
 				} else {
@@ -428,10 +428,10 @@ class ConcatenatedModule extends Module {
 						module: info.module,
 						index: idx,
 						name: undefined,
-						interopUsed: false,
-						interopName: undefined,
-						interop2Used: false,
-						interop2Name: undefined
+						interopNamespaceObjectUsed: false,
+						interopNamespaceObjectName: undefined,
+						interopDefaultAccessUsed: false,
+						interopDefaultAccessName: undefined
 					};
 				default:
 					throw new Error(`Unsupported concatenation entry type ${info.type}`);
@@ -608,12 +608,12 @@ class ConcatenatedModule extends Module {
 						if(info.module.buildMeta.exportsType === "named" || !info.module.buildMeta.exportsType) {
 							const externalNameInterop = this.findNewName("namespaceObject", allUsedNames, null, info.module.readableIdentifier(requestShortener));
 							allUsedNames.add(externalNameInterop);
-							info.interopName = externalNameInterop;
+							info.interopNamespaceObjectName = externalNameInterop;
 						}
 						if(!info.module.buildMeta.exportsType) {
 							const externalNameInterop = this.findNewName("default", allUsedNames, null, info.module.readableIdentifier(requestShortener));
 							allUsedNames.add(externalNameInterop);
-							info.interop2Name = externalNameInterop;
+							info.interopDefaultAccessName = externalNameInterop;
 						}
 						break;
 					}
@@ -673,15 +673,15 @@ class ConcatenatedModule extends Module {
 				case "external":
 					result.add(`\n// EXTERNAL MODULE: ${info.module.readableIdentifier(requestShortener)}\n`);
 					result.add(`var ${info.name} = __webpack_require__(${JSON.stringify(info.module.id)});\n`);
-					if(info.interopUsed) {
+					if(info.interopNamespaceObjectUsed) {
 						if(info.module.buildMeta.exportsType === "named") {
-							result.add(`var ${info.interopName} = /*#__PURE__*/Object.assign({ /* fake namespace object */ }, ${info.name}, { "default": ${info.name} });\n`);
+							result.add(`var ${info.interopNamespaceObjectName} = /*#__PURE__*/Object.assign({ /* fake namespace object */ }, ${info.name}, { "default": ${info.name} });\n`);
 						} else if(!info.module.buildMeta.exportsType) {
-							result.add(`var ${info.interopName} = /*#__PURE__*/{ /* fake namespace object */ "default": ${info.name} };\n`);
+							result.add(`var ${info.interopNamespaceObjectName} = /*#__PURE__*/{ /* fake namespace object */ "default": ${info.name} };\n`);
 						}
 					}
-					if(info.interop2Used) {
-						result.add(`var ${info.interop2Name} = /*#__PURE__*/__webpack_require__.n(${info.name});\n`);
+					if(info.interopDefaultAccessUsed) {
+						result.add(`var ${info.interopDefaultAccessName} = /*#__PURE__*/__webpack_require__.n(${info.name});\n`);
 					}
 					break;
 				default:
