refactor: invert some conditionals for better readability

src/index.ts

@@ -154,26 +154,24 @@ const typescript: PluginImpl<RPT2Options> = (options) =>
 
 			// TODO: use module resolution cache
 			const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);
+			let resolved = result.resolvedModule?.resolvedFileName;
 
-			if (result.resolvedModule && result.resolvedModule.resolvedFileName)
-			{
-				if (filter(result.resolvedModule.resolvedFileName))
-					cache().setDependency(result.resolvedModule.resolvedFileName, importer);
+			if (!resolved)
+				return;
 
-				if (result.resolvedModule.resolvedFileName.endsWith(".d.ts"))
+			if (filter(resolved))
+				cache().setDependency(resolved, importer);
+
+			if (resolved.endsWith(".d.ts"))
 				return;
 
-				const resolved = pluginOptions.rollupCommonJSResolveHack
-					? resolve.sync(result.resolvedModule.resolvedFileName)
-					: result.resolvedModule.resolvedFileName;
+			if (pluginOptions.rollupCommonJSResolveHack)
+				resolved = resolve.sync(resolved);
 
 			context.debug(() => `${blue("resolving")} '${importee}' imported by '${importer}'`);
 			context.debug(() => `    to '${resolved}'`);
 
-				return pathNormalize(resolved);
-			}
-
-			return;
+			return pathNormalize(resolved); // use host OS separators to fix Windows issue: https://github.com/ezolenko/rollup-plugin-typescript2/pull/251
 		},
 
 		load(id)
@@ -229,8 +227,9 @@ const typescript: PluginImpl<RPT2Options> = (options) =>
 				printDiagnostics(contextWrapper, diagnostics, parsedConfig.options.pretty === true);
 			}
 
-			if (result)
-			{
+			if (!result)
+				return undefined;
+
 			if (result.references)
 				result.references.map(normalize).map(allImportedFiles.add, allImportedFiles);
 
@@ -259,9 +258,6 @@ const typescript: PluginImpl<RPT2Options> = (options) =>
 			}
 
 			return transformResult;
-			}
-
-			return undefined;
 		},
 
 		generateBundle(bundleOptions)
@@ -330,18 +326,15 @@ const typescript: PluginImpl<RPT2Options> = (options) =>
 				if (fileName.includes("?")) // HACK for rollup-plugin-vue, it creates virtual modules in form 'file.vue?rollup-plugin-vue=script.ts'
 					fileName = fileName.split("?", 1) + extension;
 
-				// If 'useTsconfigDeclarationDir' is given in the
-				// plugin options, directly write to the path provided
-				// by Typescript's LanguageService (which may not be
-				// under Rollup's output directory, and thus can't be
-				// emitted as an asset).
+				// If 'useTsconfigDeclarationDir' is in plugin options, directly write to 'declarationDir'.
+				// This may not be under Rollup's output directory, and thus can't be emitted as an asset.
 				if (pluginOptions.useTsconfigDeclarationDir)
 				{
 					context.debug(() => `${blue("emitting declarations")} for '${key}' to '${fileName}'`);
 					tsModule.sys.writeFile(fileName, entry.text, entry.writeByteOrderMark);
+					return;
 				}
-				else
-				{
+
 				// don't mutate the entry because generateBundle gets called multiple times
 				let entryText = entry.text
 				const declarationDir = (_output.file ? dirname(_output.file) : _output.dir) as string;
@@ -367,7 +360,6 @@ const typescript: PluginImpl<RPT2Options> = (options) =>
 					source: entryText,
 					fileName: relativePath,
 				});
-				}
 			};
 
 			Object.keys(declarations).forEach((key) =>

src/tscache.ts

@@ -70,7 +70,7 @@ export function getAllReferences(importer: string, snapshot: tsTypes.IScriptSnap
 	return _.compact(info.referencedFiles.concat(info.importedFiles).map((reference) =>
 	{
 		const resolved = tsModule.nodeModuleNameResolver(reference.fileName, importer, options, tsModule.sys);
-		return resolved.resolvedModule ? resolved.resolvedModule.resolvedFileName : undefined;
+		return resolved.resolvedModule?.resolvedFileName;
 	}));
 }