Bundle: Enhcance bundleMapQueue logic (amend)

This amends commit b996f05.

Ref #70

src/bundle/lookup.js

@@ -1,6 +1,7 @@
 import coreLikelySubtags from "../core/likely_subtags";
 import coreRemoveLikelySubtags from "../core/remove_likely_subtags";
 import coreSubtags from "../core/subtags";
+import arrayForEach from "../util/array/for_each";
 
 /**
  * bundleLookup( minLanguageId )
@@ -16,27 +17,23 @@ export default function(Cldr, cldr, minLanguageId) {
     availableBundleMapQueue = Cldr._availableBundleMapQueue;
 
   if (availableBundleMapQueue.length) {
-    while (availableBundleMapQueue.length > 0) {
-      const bundle = availableBundleMapQueue.shift();
-      if (!bundle) {
-        break;
-      }
-
+    arrayForEach(availableBundleMapQueue, function(bundle, i) {
       var existing, maxBundle, minBundle, subtags;
       subtags = coreSubtags(bundle);
       maxBundle = coreLikelySubtags(Cldr, cldr, subtags);
-      if (typeof maxBundle === "undefined") {
+      if (maxBundle === undefined) {
+        availableBundleMapQueue.splice(i, 1);
         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 = [];
   }
 
   return availableBundleMap[minLanguageId] || null;

test/unit/bundle/lookup.js

@@ -76,7 +76,7 @@ describe("Bundle Lookup", function() {
       new Cldr("bg");
     }).to.throw();
 
-    expect(Cldr._availableBundleMapQueue).to.eql(["sr"]);
+    expect(Cldr._availableBundleMapQueue).to.eql(["bg", "sr"]);
 
     // the invalid bundle has been removed so we can load bg
     new Cldr("bg");