Bundle: Enhcance bundleMapQueue logic

* Fix bug where bundleMapQueue is not cleared after an error
* Fix linter errors
* Updated lookup logic for processing _availableBundleMapQueue to use .shift instead of .forEach

Signed-off-by: Georgi Tsaklev <[email protected]>

Author: morwoen

src/bundle/lookup.js

@@ -2,8 +2,7 @@ define([
 	"../core/likely_subtags",
 	"../core/remove_likely_subtags",
 	"../core/subtags",
-	"../util/array/for_each"
-], function( coreLikelySubtags, coreRemoveLikelySubtags, coreSubtags, arrayForEach ) {
+], function( coreLikelySubtags, coreRemoveLikelySubtags, coreSubtags ) {
 
 	/**
 	 * bundleLookup( minLanguageId )
@@ -18,20 +17,28 @@ define([
 		var availableBundleMap = Cldr._availableBundleMap,
 			availableBundleMapQueue = Cldr._availableBundleMapQueue;
 
-		if ( availableBundleMapQueue.length ) {
-			arrayForEach( availableBundleMapQueue, function( bundle ) {
+		if (availableBundleMapQueue.length) {
+			while (availableBundleMapQueue.length > 0) {
+				const bundle = availableBundleMapQueue.shift();
+				if (!bundle) {
+					break;
+				}
+
 				var existing, maxBundle, minBundle, subtags;
-				subtags = coreSubtags( bundle );
-				maxBundle = coreLikelySubtags( Cldr, cldr, subtags );
-				minBundle = coreRemoveLikelySubtags( Cldr, cldr, maxBundle );
-				minBundle = minBundle.join( Cldr.localeSep );
-				existing = availableBundleMap[ minBundle ];
-				if ( existing && existing.length < bundle.length ) {
+				subtags = coreSubtags(bundle);
+				maxBundle = coreLikelySubtags(Cldr, cldr, subtags);
+				if (typeof maxBundle === "undefined") {
+					throw new Error(`Could not find likelySubtags for ${bundle}`);
+				}
+
+				minBundle = coreRemoveLikelySubtags(Cldr, cldr, maxBundle);
+				minBundle = minBundle.join(Cldr.localeSep);
+				existing = availableBundleMap[minBundle];
+				if (existing && existing.length < bundle.length) {
 					return;
 				}
-				availableBundleMap[ minBundle ] = bundle;
-			});
-			Cldr._availableBundleMapQueue = [];
+				availableBundleMap[minBundle] = bundle;
+			}
 		}
 
 		return availableBundleMap[ minLanguageId ] || null;

test/unit/bundle/lookup.js

@@ -56,4 +56,51 @@ define([
 
 	});
 
+	it("should always favor the grandest parent", function() {
+		var sr;
+		Cldr.load({
+			main: { sr: {} }
+		});
+		expect(Cldr._availableBundleMapQueue).to.include.members(["sr"]);
+		sr = new Cldr("sr");
+		expect(Cldr._availableBundleMapQueue).to.eql([]);
+		expect(Cldr._availableBundleMap).to.contain.keys("sr");
+		expect(Cldr._availableBundleMap.sr).to.equal("sr");
+		expect(sr.attributes.bundle).to.equal("sr");
+		sr = new Cldr("sr-Cyrl");
+		expect(sr.attributes.bundle).to.equal("sr");
+		sr = new Cldr("sr-RS");
+		expect(sr.attributes.bundle).to.equal("sr");
+	});
+
+	it("should remove problematic bundle from the global _availableBundleMapQueue on failure", function() {
+		Cldr.load(
+			{
+				main: { bg: {} } // valid
+			},
+			{
+				main: { xx: {} } // invalid
+			},
+			{
+				main: { sr: {} } // valid
+			}
+		);
+
+		expect(Cldr._availableBundleMapQueue).to.eql(["bg", "xx", "sr"]);
+
+		expect(() => {
+			// triggers the loading of bundle queue
+			new Cldr("bg");
+		}).to.throw();
+
+		expect(Cldr._availableBundleMapQueue).to.eql(["sr"]);
+
+		// the invalid bundle has been removed so we can load bg
+		new Cldr("bg");
+
+		// and sr, which will now trigger the loading of the rest of the queue
+		new Cldr("sr");
+
+		expect(Cldr._availableBundleMapQueue).to.eql([]);
+	});
 });