fix($target): fluent api method target() does not split target and language level

marcobusemann · nchanged · commit 812fa63282c5 · 2018-09-12T15:00:10.000+02:00
A target can be specified by init() or using the fluent api method target(). The first one splitts
target and language level for further processing. The later one does not split them. This leads to
warnings for packages requireing a browser target.

1376
diff --git a/src/core/Bundle.ts b/src/core/Bundle.ts
@@ -14,6 +14,7 @@ import { PackageAbstraction } from "../quantum/core/PackageAbstraction";
 import { EventEmitter } from "../EventEmitter";
 import { ExtensionOverrides } from "./ExtensionOverrides";
 import { QuantumBit } from "../quantum/plugin/QuantumBit";
+import { CombinedTargetAndLanguageLevel } from './CombinedTargetAndLanguageLevel';
 
 type WatchFilterFn = (path: string) => boolean
 export interface HMROptions {
@@ -201,7 +202,10 @@ export class Bundle {
 	}
 
 	public target(target: string): Bundle {
-		this.context.target = target;
+		const combination = new CombinedTargetAndLanguageLevel(target);
+		this.context.target = combination.target();
+		this.context.forcedLanguageLevel = combination.languageLevel();
+		this.context.languageLevel = combination.languageLevelOrDefault();
 		return this;
 	}
 
diff --git a/src/core/CombinedTargetAndLanguageLevel.ts b/src/core/CombinedTargetAndLanguageLevel.ts
@@ -0,0 +1,28 @@
+import { ScriptTarget } from './File';
+
+export class CombinedTargetAndLanguageLevel {
+
+	constructor(private combination: string) {
+		this.combination = this.combination || "browser";
+	}
+
+	target(): string {
+		const [target,] = this.splittedCombination();
+		return target;
+	}
+
+	languageLevel(): ScriptTarget {
+		const [, languageLevel] = this.splittedCombination();
+		const level = languageLevel && Object.keys(ScriptTarget).find(t => t.toLowerCase() === languageLevel);
+		return level ? ScriptTarget[level] : undefined;
+	}
+
+	languageLevelOrDefault(defaultLanguageLevel: ScriptTarget = ScriptTarget.ES2016) {
+		const languageLevel = this.languageLevel();
+		return languageLevel ? languageLevel : defaultLanguageLevel;
+	}
+
+	private splittedCombination() {
+		return this.combination.toLowerCase().split("@");
+	}
+}
diff --git a/src/core/FuseBox.ts b/src/core/FuseBox.ts
@@ -17,6 +17,7 @@ import { Bundle } from "./Bundle";
 import { File, ScriptTarget } from "./File";
 import { ExtensionOverrides } from "./ExtensionOverrides";
 import { TypescriptConfig } from "./TypescriptConfig";
+import { CombinedTargetAndLanguageLevel } from './CombinedTargetAndLanguageLevel';
 
 const appRoot = require("app-root-path");
 
@@ -115,14 +116,10 @@ export class FuseBox {
 		}
 
 		// setting targets
-		opts.target = opts.target || "browser";
-		const [target, languageLevel] = opts.target.toLowerCase().split("@");
-		this.context.target = target;
-		const level = languageLevel && Object.keys(ScriptTarget).find(t => t.toLowerCase() === languageLevel);
-		if (level) {
-			this.context.forcedLanguageLevel = ScriptTarget[level];
-		}
-		this.context.languageLevel = ScriptTarget[level] || ScriptTarget.ES2016;
+		const combination = new CombinedTargetAndLanguageLevel(opts.target);
+		this.context.target = combination.target();
+		this.context.forcedLanguageLevel = combination.languageLevel();
+		this.context.languageLevel = combination.languageLevelOrDefault();
 
 		if (opts.polyfillNonStandardDefaultUsage !== undefined) {
 			this.context.deprecation(
diff --git a/src/tests/CombinedTargetAndLanguageLevel.test.ts b/src/tests/CombinedTargetAndLanguageLevel.test.ts
@@ -0,0 +1,41 @@
+import { should } from "fuse-test-runner";
+import { CombinedTargetAndLanguageLevel } from '../core/CombinedTargetAndLanguageLevel';
+import { ScriptTarget } from '../core/File';
+
+const TARGET_BROWSER = "browser";
+const TARGET_DUMMY = "asd";
+
+export class CombinedTargetAndLanguageLevelTest {
+
+	"Should default to browser target"() {
+		const combination = new CombinedTargetAndLanguageLevel(null);
+		should(combination.target()).equal(TARGET_BROWSER);
+	}
+
+	"Should detect target without language level"() {
+		const combination = new CombinedTargetAndLanguageLevel(TARGET_DUMMY);
+		should(combination.target()).equal(TARGET_DUMMY);
+	}
+
+	"Should provide undefined for missing language level"() {
+		const combination = new CombinedTargetAndLanguageLevel(TARGET_DUMMY);
+		should(combination.languageLevel()).beUndefined();
+	}
+
+	"Should detect target and language level"() {
+		const combination = new CombinedTargetAndLanguageLevel(`${TARGET_DUMMY}@es5`);
+		should(combination.target()).equal(TARGET_DUMMY);
+		should(combination.languageLevel()).equal(ScriptTarget.ES5);
+	}
+
+	"Should default to language level es2016"() {
+		const combination = new CombinedTargetAndLanguageLevel(TARGET_DUMMY);
+		should(combination.languageLevelOrDefault()).equal(ScriptTarget.ES2016);
+	}
+
+	"Should detect target and language level (for default variant)"() {
+		const combination = new CombinedTargetAndLanguageLevel(`${TARGET_DUMMY}@es5`);
+		should(combination.target()).equal(TARGET_DUMMY);
+		should(combination.languageLevelOrDefault()).equal(ScriptTarget.ES5);
+	}
+}
