« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--data-tests/index.js3
-rw-r--r--src/data/checks.js1
-rw-r--r--src/data/yaml.js3
-rwxr-xr-xsrc/upd8.js4
4 files changed, 7 insertions, 4 deletions
diff --git a/data-tests/index.js b/data-tests/index.js
index 3901db07..91fd7f4d 100644
--- a/data-tests/index.js
+++ b/data-tests/index.js
@@ -4,7 +4,7 @@ import {fileURLToPath} from 'node:url';
 import chokidar from 'chokidar';
 
 import {colors, logError, logInfo, logWarn, parseOptions} from '#cli';
-import {bindFind, getAllFindSpecs} from '#find';
+import find, {bindFind, getAllFindSpecs} from '#find';
 import {isMain} from '#node-utils';
 import {getContextAssignments} from '#repl';
 import {bindOpts, showAggregate} from '#sugar';
@@ -33,6 +33,7 @@ async function main() {
   const watcher = chokidar.watch(metaDirname);
 
   const wikiData = await quickLoadAllFromYAML(dataPath, {
+    find,
     bindFind,
     getAllFindSpecs,
 
diff --git a/src/data/checks.js b/src/data/checks.js
index 8c8e7a5d..cbc4ce0b 100644
--- a/src/data/checks.js
+++ b/src/data/checks.js
@@ -172,6 +172,7 @@ function getFieldPropertyMessage(yamlDocumentSpec, property) {
 // any errors). At the same time, we remove errored references from the thing's
 // data array.
 export function filterReferenceErrors(wikiData, {
+  find,
   bindFind,
 }) {
   const referenceSpec = [
diff --git a/src/data/yaml.js b/src/data/yaml.js
index 725f4f3a..b2143625 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -1314,6 +1314,7 @@ export function sortWikiDataArrays(dataSteps, wikiData) {
 // where reporting info about data loading isn't as relevant as during the
 // main wiki build process.
 export async function quickLoadAllFromYAML(dataPath, {
+  find,
   bindFind,
   getAllFindSpecs,
 
@@ -1350,7 +1351,7 @@ export async function quickLoadAllFromYAML(dataPath, {
   }
 
   try {
-    filterReferenceErrors(wikiData, {bindFind}).close();
+    filterReferenceErrors(wikiData, {find, bindFind}).close();
     logInfo`No reference errors found. (complete data)`;
   } catch (error) {
     showAggregate(error);
diff --git a/src/upd8.js b/src/upd8.js
index 609a758d..49c3217f 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -43,7 +43,7 @@ import wrap from 'word-wrap';
 import {mapAggregate, showAggregate} from '#aggregate';
 import CacheableObject from '#cacheable-object';
 import {displayCompositeCacheAnalysis} from '#composite';
-import {bindFind, getAllFindSpecs} from '#find';
+import find, {bindFind, getAllFindSpecs} from '#find';
 import {processLanguageFile, watchLanguageFile, internalDefaultStringsFile}
   from '#language';
 import {isMain, traverse} from '#node-utils';
@@ -1626,7 +1626,7 @@ async function main() {
     });
 
     const filterReferenceErrorsAggregate =
-      filterReferenceErrors(wikiData, {bindFind});
+      filterReferenceErrors(wikiData, {find, bindFind});
 
     try {
       filterReferenceErrorsAggregate.close();