1 files changed, 18 insertions, 8 deletions

diff --git a/src/upd8.js b/src/upd8.js
index 0bceea8d..7ffcc406 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -105,7 +105,8 @@ import {
   linkWikiDataArrays,
   loadYAMLDocumentsFromDataSteps,
   processThingsFromDataSteps,
-  saveThingsFromDataSteps,
+  connectThingsFromDataSteps,
+  makeWikiDataFromDataSteps,
   sortWikiDataArrays,
 } from '#yaml';
 
@@ -1499,7 +1500,8 @@ async function main() {
 
     let loadAggregate, loadResult;
     let processAggregate, processResult;
-    let saveAggregate, saveResult;
+    let connectAggregate;
+    let makeWikiDataResult;
 
     const dataSteps = getAllDataSteps();
 
@@ -1549,21 +1551,29 @@ async function main() {
     }
 
     try {
-      ({aggregate: saveAggregate, result: saveResult} =
-          saveThingsFromDataSteps(
+      ({aggregate: connectAggregate} =
+          connectThingsFromDataSteps(
             processResult,
             dataSteps));
 
-      saveAggregate.close();
-      saveAggregate = undefined;
+      connectAggregate.close();
     } catch (error) {
       return whoops(error, `finalizing data files`);
     }
 
+    try {
+      makeWikiDataResult =
+        makeWikiDataFromDataSteps(
+          processResult,
+          dataSteps);
+    } catch (error) {
+      return whoops(error, 'preparing wikiData object');
+    }
+
     yamlDataSteps = dataSteps;
     yamlDocumentProcessingAggregate = processAggregate;
 
-    Object.assign(wikiData, saveResult);
+    Object.assign(wikiData, makeWikiDataResult);
   }
 
   {
@@ -1798,7 +1808,7 @@ async function main() {
       if (!paragraph) console.log('');
       niceShowAggregate(aggregate);
 
-      if (aggregate.errors.find(err => err.message.toLowerCase().includes('duplicate'))) {
+      if (aggregate.errors?.find(err => err.message.toLowerCase().includes('duplicate'))) {
         logWarn`The above duplicate directories were detected while reviewing data files.`;
         logWarn`Since it's impossible to automatically determine which one's directory is`;
         logWarn`correct, the build can't continue. Specify unique 'Directory' fields in`;