data: move sorting & generic functions out of #wiki-data

11 files changed, 12 insertions, 14 deletions

diff --git a/src/data/composite/things/album/withTrackSections.js b/src/data/composite/things/album/withTrackSections.js
index 679a09f..0a1ebeb 100644
--- a/src/data/composite/things/album/withTrackSections.js
+++ b/src/data/composite/things/album/withTrackSections.js
@@ -1,8 +1,7 @@
 import {input, templateCompositeFrom} from '#composite';
 import find from '#find';
-import {empty, stitchArrays} from '#sugar';
+import {empty, filterMultipleArrays, stitchArrays} from '#sugar';
 import {isTrackSectionList} from '#validators';
-import {filterMultipleArrays} from '#wiki-data';
 
 import {exitWithoutDependency, exitWithoutUpdateValue}
   from '#composite/control-flow';
diff --git a/src/data/composite/things/track/inferredAdditionalNameList.js b/src/data/composite/things/track/inferredAdditionalNameList.js
index 9cf158c..58e8d2a 100644
--- a/src/data/composite/things/track/inferredAdditionalNameList.js
+++ b/src/data/composite/things/track/inferredAdditionalNameList.js
@@ -4,7 +4,7 @@
 // shares the same name differing from this one's.
 
 import {input, templateCompositeFrom} from '#composite';
-import {chunkByProperties} from '#wiki-data';
+import {chunkByProperties} from '#sugar';
 
 import {exitWithoutDependency} from '#composite/control-flow';
 import {withFilteredList, withPropertyFromList} from '#composite/data';
diff --git a/src/data/composite/wiki-data/withResolvedContribs.js b/src/data/composite/wiki-data/withResolvedContribs.js
index eda2416..77b0f96 100644
--- a/src/data/composite/wiki-data/withResolvedContribs.js
+++ b/src/data/composite/wiki-data/withResolvedContribs.js
@@ -5,9 +5,8 @@
 
 import {input, templateCompositeFrom} from '#composite';
 import find from '#find';
-import {stitchArrays} from '#sugar';
+import {filterMultipleArrays, stitchArrays} from '#sugar';
 import {is, isContributionList} from '#validators';
-import {filterMultipleArrays} from '#wiki-data';
 
 import {
   raiseOutputWithoutDependency,
diff --git a/src/data/composite/wiki-data/withThingsSortedAlphabetically.js b/src/data/composite/wiki-data/withThingsSortedAlphabetically.js
index d2487e4..5e85fa6 100644
--- a/src/data/composite/wiki-data/withThingsSortedAlphabetically.js
+++ b/src/data/composite/wiki-data/withThingsSortedAlphabetically.js
@@ -5,8 +5,8 @@
 // a list so same-name entries are beside each other.
 
 import {input, templateCompositeFrom} from '#composite';
+import {compareCaseLessSensitive, normalizeName} from '#sort';
 import {validateWikiData} from '#validators';
-import {compareCaseLessSensitive, normalizeName} from '#wiki-data';
 
 import {raiseOutputWithoutDependency} from '#composite/control-flow';
 import {withMappedList, withSortedList, withPropertiesFromList}
diff --git a/src/data/things/album.js b/src/data/things/album.js
index d92dd43..01a232d 100644
--- a/src/data/things/album.js
+++ b/src/data/things/album.js
@@ -5,11 +5,10 @@ import * as path from 'node:path';
 import {input} from '#composite';
 import find from '#find';
 import {traverse} from '#node-utils';
+import {sortAlbumsTracksChronologically, sortChronologically} from '#sort';
 import {empty} from '#sugar';
 import Thing from '#thing';
 import {isDate} from '#validators';
-import {sortAlbumsTracksChronologically, sortChronologically}
-  from '#wiki-data';
 import {parseAdditionalFiles, parseContributors, parseDate, parseDimensions}
   from '#yaml';
 
diff --git a/src/data/things/art-tag.js b/src/data/things/art-tag.js
index 69fbb52..3149b31 100644
--- a/src/data/things/art-tag.js
+++ b/src/data/things/art-tag.js
@@ -1,9 +1,9 @@
 export const ART_TAG_DATA_FILE = 'tags.yaml';
 
 import {input} from '#composite';
+import {sortAlphabetically, sortAlbumsTracksChronologically} from '#sort';
 import Thing from '#thing';
 import {isName} from '#validators';
-import {sortAlphabetically, sortAlbumsTracksChronologically} from '#wiki-data';
 
 import {exposeUpdateValueOrContinue} from '#composite/control-flow';
 
diff --git a/src/data/things/artist.js b/src/data/things/artist.js
index 6e61c28..73acba6 100644
--- a/src/data/things/artist.js
+++ b/src/data/things/artist.js
@@ -6,10 +6,11 @@ import CacheableObject from '#cacheable-object';
 import {colors} from '#cli';
 import {input} from '#composite';
 import find from '#find';
+import {sortAlphabetically} from '#sort';
 import {stitchArrays, unique} from '#sugar';
 import Thing from '#thing';
 import {isName, validateArrayItems} from '#validators';
-import {getKebabCase, sortAlphabetically} from '#wiki-data';
+import {getKebabCase} from '#wiki-data';
 
 import {withReverseContributionList} from '#composite/wiki-data';
 
diff --git a/src/data/things/flash.js b/src/data/things/flash.js
index 4823f72..81de327 100644
--- a/src/data/things/flash.js
+++ b/src/data/things/flash.js
@@ -2,9 +2,9 @@ export const FLASH_DATA_FILE = 'flashes.yaml';
 
 import {input} from '#composite';
 import find from '#find';
+import {sortFlashesChronologically} from '#sort';
 import Thing from '#thing';
 import {anyOf, isColor, isDirectory, isNumber, isString} from '#validators';
-import {sortFlashesChronologically} from '#wiki-data';
 import {parseDate, parseContributors} from '#yaml';
 
 import {exposeDependency, exposeUpdateValueOrContinue}
diff --git a/src/data/things/news-entry.js b/src/data/things/news-entry.js
index cb8e364..43d1638 100644
--- a/src/data/things/news-entry.js
+++ b/src/data/things/news-entry.js
@@ -1,7 +1,7 @@
 export const NEWS_DATA_FILE = 'news.yaml';
 
+import {sortChronologically} from '#sort';
 import Thing from '#thing';
-import {sortChronologically} from '#wiki-data';
 import {parseDate} from '#yaml';
 
 import {contentString, directory, name, simpleDate}
diff --git a/src/data/things/static-page.js b/src/data/things/static-page.js
index 69cbfa1..0327497 100644
--- a/src/data/things/static-page.js
+++ b/src/data/things/static-page.js
@@ -3,9 +3,9 @@ export const DATA_STATIC_PAGE_DIRECTORY = 'static-page';
 import * as path from 'node:path';
 
 import {traverse} from '#node-utils';
+import {sortAlphabetically} from '#sort';
 import Thing from '#thing';
 import {isName} from '#validators';
-import {sortAlphabetically} from '#wiki-data';
 
 import {contentString, directory, name, simpleString}
   from '#composite/wiki-properties';
diff --git a/src/data/yaml.js b/src/data/yaml.js
index 100e07b..0f73bdf 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -10,11 +10,11 @@ import yaml from 'js-yaml';
 import {colors, ENABLE_COLOR, logInfo, logWarn} from '#cli';
 import {reportDuplicateDirectories, filterReferenceErrors}
   from '#data-checks';
+import {sortByName} from '#sort';
 import {atOffset, empty, filterProperties, typeAppearance, withEntries}
   from '#sugar';
 import Thing from '#thing';
 import thingConstructors from '#things';
-import {sortByName} from '#wiki-data';
 
 import {
   annotateErrorWithFile,