cacheable-object, data: depend on computed values; initial compat

reaches live-dev-server serve with no errors and serves
homepage at all and apparently correctly

no page navigation performed
no full build performed

aimed for preserving existing logic
should be no subsequent changes to this commit (amend)

22 files changed, 39 insertions, 35 deletions

diff --git a/src/data/composite/data/helpers/property-from-helpers.js b/src/data/composite/data/helpers/property-from-helpers.js
index 3d1e12a5..00251f3b 100644
--- a/src/data/composite/data/helpers/property-from-helpers.js
+++ b/src/data/composite/data/helpers/property-from-helpers.js
@@ -2,7 +2,11 @@ export function getOutputName({property, from, prefix = null}) {
   if (property && prefix) {
     return `${prefix}.${property}`;
   } else if (property && from) {
-    return `${from}.${property}`;
+    if (from.startsWith('_')) {
+      return `${from.slice(1)}.${property}`;
+    } else {
+      return `${from}.${property}`;
+    }
   } else {
     if (!property) throw new Error(`guard property outside getOutputName(), c'mon`);
     if (!from) throw new Error(`guard from in getOutputName(), c'mon`);
diff --git a/src/data/composite/things/album/withCoverArtDate.js b/src/data/composite/things/album/withCoverArtDate.js
index 978f566a..c006fab9 100644
--- a/src/data/composite/things/album/withCoverArtDate.js
+++ b/src/data/composite/things/album/withCoverArtDate.js
@@ -10,7 +10,7 @@ export default templateCompositeFrom({
   inputs: {
     from: input({
       validate: isDate,
-      defaultDependency: 'coverArtDate',
+      defaultDependency: '_coverArtDate',
       acceptsNull: true,
     }),
   },
@@ -19,8 +19,8 @@ export default templateCompositeFrom({
 
   steps: () => [
     withHasArtwork({
-      contribs: 'coverArtistContribs',
-      artworks: 'coverArtworks',
+      contribs: '_coverArtistContribs',
+      artworks: '_coverArtworks',
     }),
 
     raiseOutputWithoutDependency({
diff --git a/src/data/composite/things/art-tag/withAllDescendantArtTags.js b/src/data/composite/things/art-tag/withAllDescendantArtTags.js
index 795f96cd..934999a3 100644
--- a/src/data/composite/things/art-tag/withAllDescendantArtTags.js
+++ b/src/data/composite/things/art-tag/withAllDescendantArtTags.js
@@ -18,13 +18,13 @@ export default templateCompositeFrom({
 
   steps: () => [
     raiseOutputWithoutDependency({
-      dependency: 'directDescendantArtTags',
+      dependency: '_directDescendantArtTags',
       mode: input.value('empty'),
       output: input.value({'#allDescendantArtTags': []})
     }),
 
     withResolvedReferenceList({
-      list: 'directDescendantArtTags',
+      list: '_directDescendantArtTags',
       find: soupyFind.input('artTag'),
     }),
 
diff --git a/src/data/composite/things/artwork/withArtTags.js b/src/data/composite/things/artwork/withArtTags.js
index 1fed3c31..1f605d68 100644
--- a/src/data/composite/things/artwork/withArtTags.js
+++ b/src/data/composite/things/artwork/withArtTags.js
@@ -16,7 +16,7 @@ export default templateCompositeFrom({
     from: input({
       type: 'array',
       acceptsNull: true,
-      defaultDependency: 'artTags',
+      defaultDependency: '_artTags',
     }),
   },
 
diff --git a/src/data/composite/things/artwork/withDate.js b/src/data/composite/things/artwork/withDate.js
index 5e05b814..4666ff1b 100644
--- a/src/data/composite/things/artwork/withDate.js
+++ b/src/data/composite/things/artwork/withDate.js
@@ -8,7 +8,7 @@ export default templateCompositeFrom({
 
   inputs: {
     from: input({
-      defaultDependency: 'date',
+      defaultDependency: '_date',
       acceptsNull: true,
     }),
   },
diff --git a/src/data/composite/things/content/withAnnotationParts.js b/src/data/composite/things/content/withAnnotationParts.js
index 0c5a0294..15eb74a5 100644
--- a/src/data/composite/things/content/withAnnotationParts.js
+++ b/src/data/composite/things/content/withAnnotationParts.js
@@ -19,12 +19,12 @@ export default templateCompositeFrom({
 
   steps: () => [
     raiseOutputWithoutDependency({
-      dependency: 'annotation',
+      dependency: '_annotation',
       output: input.value({'#annotationParts': []}),
     }),
 
     withContentNodes({
-      from: 'annotation',
+      from: '_annotation',
     }),
 
     splitContentNodesAround({
diff --git a/src/data/composite/things/contribution/withContainingReverseContributionList.js b/src/data/composite/things/contribution/withContainingReverseContributionList.js
index 175d6cbb..7f226ff1 100644
--- a/src/data/composite/things/contribution/withContainingReverseContributionList.js
+++ b/src/data/composite/things/contribution/withContainingReverseContributionList.js
@@ -16,7 +16,7 @@ export default templateCompositeFrom({
 
   inputs: {
     artistProperty: input({
-      defaultDependency: 'artistProperty',
+      defaultDependency: '_artistProperty',
       acceptsNull: true,
     }),
   },
diff --git a/src/data/composite/things/language/withStrings.js b/src/data/composite/things/language/withStrings.js
index 3b8d46b3..761e7506 100644
--- a/src/data/composite/things/language/withStrings.js
+++ b/src/data/composite/things/language/withStrings.js
@@ -9,7 +9,7 @@ export default templateCompositeFrom({
   annotation: `withStrings`,
 
   inputs: {
-    from: input({defaultDependency: 'strings'}),
+    from: input({defaultDependency: '_strings'}),
   },
 
   outputs: ['#strings'],
diff --git a/src/data/composite/things/track-section/withStartCountingFrom.js b/src/data/composite/things/track-section/withStartCountingFrom.js
index 20e18edb..6cf03802 100644
--- a/src/data/composite/things/track-section/withStartCountingFrom.js
+++ b/src/data/composite/things/track-section/withStartCountingFrom.js
@@ -9,7 +9,7 @@ export default templateCompositeFrom({
   inputs: {
     from: input({
       type: 'number',
-      defaultDependency: 'startCountingFrom',
+      defaultDependency: '_startCountingFrom',
       acceptsNull: true,
     }),
   },
diff --git a/src/data/composite/things/track/alwaysReferenceByDirectory.js b/src/data/composite/things/track/alwaysReferenceByDirectory.js
index a342d38b..7b72865b 100644
--- a/src/data/composite/things/track/alwaysReferenceByDirectory.js
+++ b/src/data/composite/things/track/alwaysReferenceByDirectory.js
@@ -40,7 +40,7 @@ export default templateCompositeFrom({
     }),
 
     exitWithoutDependency({
-      dependency: 'mainRelease',
+      dependency: '_mainRelease',
       value: input.value(false),
     }),
 
diff --git a/src/data/composite/things/track/withCoverArtistContribs.js b/src/data/composite/things/track/withCoverArtistContribs.js
index 9057cfeb..313d4552 100644
--- a/src/data/composite/things/track/withCoverArtistContribs.js
+++ b/src/data/composite/things/track/withCoverArtistContribs.js
@@ -18,7 +18,7 @@ export default templateCompositeFrom({
 
   inputs: {
     from: input({
-      defaultDependency: 'coverArtistContribs',
+      defaultDependency: '_coverArtistContribs',
       validate: isContributionList,
       acceptsNull: true,
     }),
diff --git a/src/data/composite/things/track/withHasUniqueCoverArt.js b/src/data/composite/things/track/withHasUniqueCoverArt.js
index 85d3b92a..c52abb98 100644
--- a/src/data/composite/things/track/withHasUniqueCoverArt.js
+++ b/src/data/composite/things/track/withHasUniqueCoverArt.js
@@ -37,7 +37,7 @@ export default templateCompositeFrom({
     },
 
     withResultOfAvailabilityCheck({
-      from: 'coverArtistContribs',
+      from: '_coverArtistContribs',
       mode: input.value('empty'),
     }),
 
@@ -76,13 +76,13 @@ export default templateCompositeFrom({
     },
 
     raiseOutputWithoutDependency({
-      dependency: 'trackArtworks',
+      dependency: '_trackArtworks',
       mode: input.value('empty'),
       output: input.value({'#hasUniqueCoverArt': false}),
     }),
 
     withPropertyFromList({
-      list: 'trackArtworks',
+      list: '_trackArtworks',
       property: input.value('artistContribs'),
       internal: input.value(true),
     }),
diff --git a/src/data/composite/things/track/withMainRelease.js b/src/data/composite/things/track/withMainRelease.js
index 67a312ae..fb1342ec 100644
--- a/src/data/composite/things/track/withMainRelease.js
+++ b/src/data/composite/things/track/withMainRelease.js
@@ -18,7 +18,7 @@ export default templateCompositeFrom({
 
   inputs: {
     from: input({
-      defaultDependency: 'mainRelease',
+      defaultDependency: '_mainRelease',
       acceptsNull: true,
     }),
 
diff --git a/src/data/composite/things/track/withMainReleaseTrack.js b/src/data/composite/things/track/withMainReleaseTrack.js
index 6371e895..70d55dd4 100644
--- a/src/data/composite/things/track/withMainReleaseTrack.js
+++ b/src/data/composite/things/track/withMainReleaseTrack.js
@@ -35,7 +35,7 @@ export default templateCompositeFrom({
 
   steps: () => [
     withResultOfAvailabilityCheck({
-      from: 'mainRelease',
+      from: '_mainRelease',
     }),
 
     {
@@ -85,10 +85,10 @@ export default templateCompositeFrom({
     },
 
     {
-      dependencies: ['name', 'directory'],
+      dependencies: ['name', '_directory'],
       compute: (continuation, {
         ['name']: ownName,
-        ['directory']: ownDirectory,
+        ['_directory']: ownDirectory,
       }) => {
         const ownNameKebabed = getKebabCase(ownName);
 
diff --git a/src/data/composite/things/track/withSuffixDirectoryFromAlbum.js b/src/data/composite/things/track/withSuffixDirectoryFromAlbum.js
index 047077fd..b9d8848d 100644
--- a/src/data/composite/things/track/withSuffixDirectoryFromAlbum.js
+++ b/src/data/composite/things/track/withSuffixDirectoryFromAlbum.js
@@ -8,7 +8,7 @@ export default templateCompositeFrom({
 
   inputs: {
     flagValue: input({
-      defaultDependency: 'suffixDirectoryFromAlbum',
+      defaultDependency: '_suffixDirectoryFromAlbum',
       acceptsNull: true,
     }),
   },
@@ -17,18 +17,18 @@ export default templateCompositeFrom({
 
   steps: () => [
     withResultOfAvailabilityCheck({
-      from: 'suffixDirectoryFromAlbum',
+      from: input('flagValue'),
     }),
 
     {
       dependencies: [
         '#availability',
-        'suffixDirectoryFromAlbum'
+        input('flagValue'),
       ],
 
       compute: (continuation, {
         ['#availability']: availability,
-        ['suffixDirectoryFromAlbum']: flagValue,
+        [input('flagValue')]: flagValue,
       }) =>
         (availability
           ? continuation.raiseOutput({['#suffixDirectoryFromAlbum']: flagValue})
diff --git a/src/data/composite/things/track/withTrackArtDate.js b/src/data/composite/things/track/withTrackArtDate.js
index 9b7b61c7..f524afb9 100644
--- a/src/data/composite/things/track/withTrackArtDate.js
+++ b/src/data/composite/things/track/withTrackArtDate.js
@@ -13,7 +13,7 @@ export default templateCompositeFrom({
   inputs: {
     from: input({
       validate: isDate,
-      defaultDependency: 'coverArtDate',
+      defaultDependency: '_coverArtDate',
       acceptsNull: true,
     }),
   },
diff --git a/src/data/composite/wiki-data/gobbleSoupyFind.js b/src/data/composite/wiki-data/gobbleSoupyFind.js
index aec3f5b1..98d5f5c9 100644
--- a/src/data/composite/wiki-data/gobbleSoupyFind.js
+++ b/src/data/composite/wiki-data/gobbleSoupyFind.js
@@ -30,7 +30,7 @@ export default templateCompositeFrom({
     },
 
     withPropertyFromObject({
-      object: 'find',
+      object: '_find',
       property: '#key',
     }).outputs({
       '#value': '#find',
diff --git a/src/data/composite/wiki-data/gobbleSoupyReverse.js b/src/data/composite/wiki-data/gobbleSoupyReverse.js
index 86a1061c..26052f28 100644
--- a/src/data/composite/wiki-data/gobbleSoupyReverse.js
+++ b/src/data/composite/wiki-data/gobbleSoupyReverse.js
@@ -30,7 +30,7 @@ export default templateCompositeFrom({
     },
 
     withPropertyFromObject({
-      object: 'reverse',
+      object: '_reverse',
       property: '#key',
     }).outputs({
       '#value': '#reverse',
diff --git a/src/data/composite/wiki-data/helpers/withSimpleDirectory.js b/src/data/composite/wiki-data/helpers/withSimpleDirectory.js
index 08ca3bfc..0b225847 100644
--- a/src/data/composite/wiki-data/helpers/withSimpleDirectory.js
+++ b/src/data/composite/wiki-data/helpers/withSimpleDirectory.js
@@ -15,7 +15,7 @@ export default templateCompositeFrom({
   inputs: {
     directory: input({
       validate: isDirectory,
-      defaultDependency: 'directory',
+      defaultDependency: '_directory',
       acceptsNull: true,
     }),
 
diff --git a/src/data/composite/wiki-data/withDirectory.js b/src/data/composite/wiki-data/withDirectory.js
index f3bedf2e..e7c3960e 100644
--- a/src/data/composite/wiki-data/withDirectory.js
+++ b/src/data/composite/wiki-data/withDirectory.js
@@ -17,13 +17,13 @@ export default templateCompositeFrom({
   inputs: {
     directory: input({
       validate: isDirectory,
-      defaultDependency: 'directory',
+      defaultDependency: '_directory',
       acceptsNull: true,
     }),
 
     name: input({
       validate: isName,
-      defaultDependency: 'name',
+      defaultDependency: '_name',
       acceptsNull: true,
     }),
 
diff --git a/src/data/composite/wiki-data/withResolvedContribs.js b/src/data/composite/wiki-data/withResolvedContribs.js
index 838c991f..60b5d4c6 100644
--- a/src/data/composite/wiki-data/withResolvedContribs.js
+++ b/src/data/composite/wiki-data/withResolvedContribs.js
@@ -110,7 +110,7 @@ export default templateCompositeFrom({
         '#thingProperty',
         input('artistProperty'),
         input.myself(),
-        'find',
+        '_find',
       ],
 
       compute: (continuation, {
@@ -118,7 +118,7 @@ export default templateCompositeFrom({
         ['#thingProperty']: thingProperty,
         [input('artistProperty')]: artistProperty,
         [input.myself()]: myself,
-        ['find']: find,
+        ['_find']: find,
       }) => continuation({
         ['#contributions']:
           details.map(details => {
diff --git a/src/data/composite/wiki-properties/referencedArtworkList.js b/src/data/composite/wiki-properties/referencedArtworkList.js
index 4f243493..278f063d 100644
--- a/src/data/composite/wiki-properties/referencedArtworkList.js
+++ b/src/data/composite/wiki-properties/referencedArtworkList.js
@@ -22,7 +22,7 @@ export default templateCompositeFrom({
     annotatedReferenceList({
       referenceType: input.value(['album', 'track']),
 
-      data: 'artworkData',
+      data: '_artworkData',
       find: '#find',
 
       thing: input.value('artwork'),