From 01a9d0421761d69791036a747c6174f226dd2270 Mon Sep 17 00:00:00 2001 From: naugtur Date: Tue, 5 Apr 2022 10:32:07 +0200 Subject: [PATCH] nicer looking search for non-empty export alternative --- packages/compartment-mapper/src/infer-exports.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/compartment-mapper/src/infer-exports.js b/packages/compartment-mapper/src/infer-exports.js index ffd26a7447..6c04bea8f1 100644 --- a/packages/compartment-mapper/src/infer-exports.js +++ b/packages/compartment-mapper/src/infer-exports.js @@ -36,12 +36,13 @@ function* interpretBrowserExports(name, exports) { */ function* interpretExports(name, exports, tags) { if (isArray(exports)) { - yield* interpretExports( - name, - // Find one that produces non-empty result, discard result and use again - exports.find(ex => !interpretExports(name, ex, tags).next().done), - tags, - ); + for (const section of exports) { + const results = [...interpretExports(name, section, tags)]; + if (results.length > 0) { + yield* results; + break; + } + } } if (typeof exports === 'string') { yield [name, relativize(exports)];