data, yaml: save() -> connect(), Thing.wikiData & friends

HOLY GUACAMOLE

3 files changed, 2 insertions, 27 deletions

diff --git a/src/data/composite/things/track-section/index.js b/src/data/composite/things/track-section/index.js
index f11a2ab5..1da49ea4 100644
--- a/src/data/composite/things/track-section/index.js
+++ b/src/data/composite/things/track-section/index.js
@@ -1,3 +1,2 @@
-export {default as withAlbum} from './withAlbum.js';
 export {default as withContinueCountingFrom} from './withContinueCountingFrom.js';
 export {default as withStartCountingFrom} from './withStartCountingFrom.js';
diff --git a/src/data/composite/things/track-section/withAlbum.js b/src/data/composite/things/track-section/withAlbum.js
deleted file mode 100644
index e257062e..00000000
--- a/src/data/composite/things/track-section/withAlbum.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Gets the track section's album.
-
-import {templateCompositeFrom} from '#composite';
-
-import {withUniqueReferencingThing} from '#composite/wiki-data';
-import {soupyReverse} from '#composite/wiki-properties';
-
-export default templateCompositeFrom({
-  annotation: `withAlbum`,
-
-  outputs: ['#album'],
-
-  steps: () => [
-    withUniqueReferencingThing({
-      reverse: soupyReverse.input('albumsWhoseTrackSectionsInclude'),
-    }).outputs({
-      ['#uniqueReferencingThing']: '#album',
-    }),
-  ],
-});
diff --git a/src/data/composite/things/track-section/withStartCountingFrom.js b/src/data/composite/things/track-section/withStartCountingFrom.js
index ef345327..20e18edb 100644
--- a/src/data/composite/things/track-section/withStartCountingFrom.js
+++ b/src/data/composite/things/track-section/withStartCountingFrom.js
@@ -3,8 +3,6 @@ import {input, templateCompositeFrom} from '#composite';
 import {raiseOutputWithoutDependency} from '#composite/control-flow';
 import {withNearbyItemFromList, withPropertyFromObject} from '#composite/data';
 
-import withAlbum from './withAlbum.js';
-
 export default templateCompositeFrom({
   annotation: `withStartCountingFrom`,
 
@@ -29,15 +27,13 @@ export default templateCompositeFrom({
           : continuation.raiseOutput({'#startCountingFrom': from})),
     },
 
-    withAlbum(),
-
     raiseOutputWithoutDependency({
-      dependency: '#album',
+      dependency: 'album',
       output: input.value({'#startCountingFrom': 1}),
     }),
 
     withPropertyFromObject({
-      object: '#album',
+      object: 'album',
       property: input.value('trackSections'),
     }),