child items now supported by replace depends upon with hierarchies of…

… identifier separator

DevSnicket/eunice#36

package.json

@@ -89,5 +89,5 @@
 		"spellcheck": "find -type f \\( -name \"*.js\" -or -name \"*.md\" \\) ! -path \"./dist/*\" ! -path \"./dist/**/*\" ! -path \"./node_modules/**/*\" ! -path \"./test-coverage/**/*\" -exec npx cspell {} +",
 		"test": "npx jest --runInBand"
 	},
-	"version": "3.6.0"
+	"version": "3.6.1"
 }

replaceDependsUponWithHierarchiesOfIdentifierSeparator/index.js

@@ -9,20 +9,71 @@ module.exports =
 	}) =>
 		items
 		&&
-		getIdentifierOrReplaceItemOrItemsInLevelOrStack({
-			identifierOrItemOrLevelOrStack: items,
-			replaceItem:
-				({
+		withIdentifierSeparator(identifierSeparator)
+		.getIdentifierOrReplaceDependsUponInItemOrItemsInLevelOrStack(items);
+
+function withIdentifierSeparator(
+	identifierSeparator,
+) {
+	return { getIdentifierOrReplaceDependsUponInItemOrItemsInLevelOrStack };
+
+	function getIdentifierOrReplaceDependsUponInItemOrItemsInLevelOrStack(
+		identifierOrItemOrLevelOrStack,
+	) {
+		return (
+			getIdentifierOrReplaceItemOrItemsInLevelOrStack({
+				identifierOrItemOrLevelOrStack,
+				replaceItem: replaceInItem,
+			})
+		);
+	}
+
+	function replaceInItem({
+		dependsUpon,
+		items,
+		...restOfItem
+	}) {
+		return (
+			{
+				...replaceDependsUponAsProperty(
 					dependsUpon,
-					...restOfItem
-				}) => (
-					{
-						dependsUpon:
-							replaceDependsUpon({
-								dependsUpon,
-								identifierSeparator,
-							}),
-						...restOfItem,
-					}
 				),
-		});
+				...replaceInItemsAsProperty(
+					items,
+				),
+				...restOfItem,
+			}
+		);
+	}
+
+	function replaceDependsUponAsProperty(
+		dependsUpon,
+	) {
+		return (
+			dependsUpon
+			&&
+			{
+				dependsUpon:
+					replaceDependsUpon({
+						dependsUpon,
+						identifierSeparator,
+					}),
+			}
+		);
+	}
+
+	function replaceInItemsAsProperty(
+		items,
+	) {
+		return (
+			items
+			&&
+			{
+				items:
+					getIdentifierOrReplaceDependsUponInItemOrItemsInLevelOrStack(
+						items,
+					),
+			}
+		);
+	}
+}

replaceDependsUponWithHierarchiesOfIdentifierSeparator/test.js

@@ -31,6 +31,10 @@ test.each(
 			{ dependsUpon: "dependsUpon" },
 			{ dependsUpon: "dependsUpon" },
 		],
+		[
+			{ dependsUpon: {} },
+			{ dependsUpon: {} },
+		],
 		[
 			{
 				dependsUpon:
@@ -274,6 +278,29 @@ test.each(
 					},
 			},
 		],
+		[
+			{
+				id: "parent",
+				items:
+					{
+						dependsUpon: "dependsUponParent/dependsUponChild",
+						id: "child",
+					},
+			},
+			{
+				id: "parent",
+				items:
+					{
+						dependsUpon:
+							{
+								id: "dependsUponParent",
+								items: "dependsUponChild",
+							},
+						id:
+							"child",
+					},
+			},
+		],
 	],
 )(
 	"%j items returns %j",