From 5457b88f8d3d234af0b08d15f3c6249f6649aac3 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Fri, 16 Feb 2024 10:16:36 -0400
Subject: data: move sorting & generic functions out of #wiki-data

---
 src/data/composite/things/album/withTrackSections.js           | 3 +--
 src/data/composite/things/track/inferredAdditionalNameList.js  | 2 +-
 src/data/composite/wiki-data/withResolvedContribs.js           | 3 +--
 src/data/composite/wiki-data/withThingsSortedAlphabetically.js | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/data/composite')

diff --git a/src/data/composite/things/album/withTrackSections.js b/src/data/composite/things/album/withTrackSections.js
index 679a09fd..0a1ebebc 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 9cf158c6..58e8d2a1 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 eda24160..77b0f96d 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 d2487e42..5e85fa6a 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}
-- 
cgit 1.3.0-6-gf8a5