@sdeverywhere/check-core 0.1.7 → 0.1.9

package/dist/index.js

@@ -4479,16 +4479,21 @@ function handleRenames(origCurrentBundle, renamedDatasetKeys) {
     return {
       modelSpec: origBundleModelR.modelSpec,
       getDatasetsForScenario: (scenarioSpec, datasetKeys) => __async(null, null, function* () {
-        const rightKeys = datasetKeys.map(rightKeyForLeftKey);
-        const result = yield origBundleModelR.getDatasetsForScenario(scenarioSpec, rightKeys);
-        const mapWithRightKeys = result.datasetMap;
-        const mapWithLeftKeys = /* @__PURE__ */ new Map();
-        for (const [rightKey, dataset] of mapWithRightKeys.entries()) {
+        const rightKeySet = /* @__PURE__ */ new Set();
+        for (const key of datasetKeys) {
+          rightKeySet.add(rightKeyForLeftKey(key));
+        }
+        const result = yield origBundleModelR.getDatasetsForScenario(scenarioSpec, [...rightKeySet]);
+        const resultMap = /* @__PURE__ */ new Map();
+        for (const [rightKey, dataset] of result.datasetMap.entries()) {
+          resultMap.set(rightKey, dataset);
           const leftKey = leftKeyForRightKey(rightKey);
-          mapWithLeftKeys.set(leftKey, dataset);
+          if (leftKey !== rightKey) {
+            resultMap.set(leftKey, dataset);
+          }
         }
         return {
-          datasetMap: mapWithLeftKeys,
+          datasetMap: resultMap,
           modelRunTime: result.modelRunTime
         };
       }),
@@ -5315,10 +5320,31 @@ var SuiteRunner = class {
       }
       this.stopped = true;
     }
+    this.removeIdleListener();
+  }
+  /**
+   * Remove the idle listener from the task queue, if one is registered.
+   */
+  removeIdleListener() {
+    if (this.idleListener) {
+      this.taskQueue.removeIdleListener(this.idleListener);
+      this.idleListener = void 0;
+    }
   }
   start(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     (_b = (_a = this.callbacks).onProgress) == null ? void 0 : _b.call(_a, 0);
+    this.idleListener = (error) => {
+      var _a2, _b2;
+      if (error) {
+        this.removeIdleListener();
+        if (!this.stopped) {
+          this.stopped = true;
+          (_b2 = (_a2 = this.callbacks).onError) == null ? void 0 : _b2.call(_a2, error);
+        }
+      }
+    };
+    this.taskQueue.onIdle(this.idleListener);
     const modelSpecR = this.config.check.bundle.modelSpec;
     const dataPlanner = new DataPlanner(modelSpecR.outputVars.size);
     const refDataPlanner = new DataPlanner(modelSpecR.outputVars.size);
@@ -5357,25 +5383,22 @@ var SuiteRunner = class {
       });
       return;
     }
-    const buildReport = (error) => {
-      var _a2, _b2, _c2, _d2;
-      if (error) {
-        (_b2 = (_a2 = this.callbacks).onError) == null ? void 0 : _b2.call(_a2, error);
-      } else {
-        const checkReport = buildCheckReport2();
-        let comparisonReport;
-        if (this.config.comparison) {
-          comparisonReport = {
-            testReports: buildComparisonTestReports(),
-            perfReportL: this.perfStatsL.toReport(),
-            perfReportR: this.perfStatsR.toReport()
-          };
-        }
-        (_d2 = (_c2 = this.callbacks).onComplete) == null ? void 0 : _d2.call(_c2, {
-          checkReport,
-          comparisonReport
-        });
+    const buildReport = () => {
+      var _a2, _b2;
+      this.removeIdleListener();
+      const checkReport = buildCheckReport2();
+      let comparisonReport;
+      if (this.config.comparison) {
+        comparisonReport = {
+          testReports: buildComparisonTestReports(),
+          perfReportL: this.perfStatsL.toReport(),
+          perfReportR: this.perfStatsR.toReport()
+        };
       }
+      (_b2 = (_a2 = this.callbacks).onComplete) == null ? void 0 : _b2.call(_a2, {
+        checkReport,
+        comparisonReport
+      });
     };
     let tasksCompleted = 0;
     let dataTaskId = 1;