From 2b0a5231170049bc4fd7f44009c9f32b1404d5a5 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Fri, 16 Feb 2024 09:04:25 -0400 Subject: data, yaml: move two functions into new #data-checks import Due to import time shenanigans, these are provided bindFind and getAllFindSpecs externally. Sorry!! --- src/upd8.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/upd8.js') diff --git a/src/upd8.js b/src/upd8.js index af3d107..04c0ce2 100755 --- a/src/upd8.js +++ b/src/upd8.js @@ -40,12 +40,17 @@ import wrap from 'word-wrap'; import CacheableObject from '#cacheable-object'; import {displayCompositeCacheAnalysis} from '#composite'; +import {filterReferenceErrors, reportDuplicateDirectories} + from '#data-checks'; +import {bindFind, getAllFindSpecs} from '#find'; import {processLanguageFile, watchLanguageFile, internalDefaultStringsFile} from '#language'; import {isMain, traverse} from '#node-utils'; import {empty, showAggregate, withEntries} from '#sugar'; import {generateURLs, urlSpec} from '#urls'; import {sortByName} from '#wiki-data'; +import {linkWikiDataArrays, loadAndProcessDataDocuments, sortWikiDataArrays} + from '#yaml'; import { colors, @@ -67,14 +72,6 @@ import genThumbs, { verifyImagePaths, } from '#thumbs'; -import { - filterReferenceErrors, - linkWikiDataArrays, - loadAndProcessDataDocuments, - reportDuplicateDirectories, - sortWikiDataArrays, -} from '#yaml'; - import FileSizePreloader from './file-size-preloader.js'; import {listingSpec, listingTargetSpec} from './listing-spec.js'; import * as buildModes from './write/build-modes/index.js'; @@ -1118,7 +1115,7 @@ async function main() { }); try { - reportDuplicateDirectories(wikiData); + reportDuplicateDirectories(wikiData, {getAllFindSpecs}); logInfo`No duplicate directories found - nice!`; Object.assign(stepStatusSummary.reportDuplicateDirectories, { @@ -1151,7 +1148,8 @@ async function main() { timeStart: Date.now(), }); - const filterReferenceErrorsAggregate = filterReferenceErrors(wikiData); + const filterReferenceErrorsAggregate = + filterReferenceErrors(wikiData, {bindFind}); try { filterReferenceErrorsAggregate.close(); -- cgit 1.3.0-6-gf8a5