adding items to stacks of a specifc identifier now uses a regular exp…

…ression
DevSnicket · Jan 4, 2019 · 60c0546 · 60c0546
1 parent 215e279
commit 60c0546
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -84,5 +84,5 @@
 		"lint": "npx eslint .",
 		"test": "npx jest --runInBand"
 	},
-	"version": "1.9.0"
+	"version": "2.0.0"
 }
diff --git a/stacking/createOrAddToStacksToItemsWithIdentifier/bin.js b/stacking/createOrAddToStacksToItemsWithIdentifier/bin.js
@@ -7,13 +7,14 @@ const
 callWithProcessStandardStreamsOfYaml(
 	({
 		commaSeparatedLevels,
+		identifierPattern,
 		items,
-		toIdentifier,
 	}) =>
 		createOrAddToStacksToItemsWithIdentifier({
+			identifierPattern:
+				new RegExp(identifierPattern),
 			identifiersInNewStack:
 				parseCommaSeparated(commaSeparatedLevels),
 			items,
-			toIdentifier,
 		}),
 );
diff --git a/...ateOrAddToStacksToItemsWithIdentifier/getIdentifiersInNewStackWhenParentAncestor/index.js b/...ateOrAddToStacksToItemsWithIdentifier/getIdentifiersInNewStackWhenParentAncestor/index.js
@@ -2,7 +2,7 @@ module.exports =
 	({
 		ancestors,
 		identifiersInNewStack,
-		parentIdentifier,
+		parentIdentifierPattern,
 	}) => {
 		return (
 			hasParentWithIdentifier()
@@ -14,14 +14,28 @@ module.exports =
 
 		function hasParentWithIdentifier(
 		) {
+			return (
+				isParentIdentifierMatch(
+					getParentIdentifier(),
+				)
+			);
+		}
+
+		function getParentIdentifier() {
 			return (
 				ancestors.length
 				&&
-				getParent().id === parentIdentifier
+				ancestors[ancestors.length - 1].id
 			);
 		}
 
-		function getParent() {
-			return ancestors[ancestors.length - 1];
+		function isParentIdentifierMatch(
+			identifier,
+		) {
+			return (
+				identifier
+				&&
+				identifier.match(parentIdentifierPattern)
+			);
 		}
 	};
diff --git a/...eateOrAddToStacksToItemsWithIdentifier/getIdentifiersInNewStackWhenParentAncestor/test.js b/...eateOrAddToStacksToItemsWithIdentifier/getIdentifiersInNewStackWhenParentAncestor/test.js
@@ -33,7 +33,7 @@ test.each(
 			getIdentifiersInNewStackWhenParentAncestor({
 				ancestors,
 				identifiersInNewStack,
-				parentIdentifier: "addToParent",
+				parentIdentifierPattern: "addToParent",
 			}),
 		)
 		.toBe(

diff --git a/stacking/createOrAddToStacksToItemsWithIdentifier/index.js b/stacking/createOrAddToStacksToItemsWithIdentifier/index.js
@@ -5,9 +5,9 @@ const
 
 module.exports =
 	({
+		identifierPattern,
 		identifiersInNewStack,
 		items,
-		toIdentifier,
 	}) =>
 		replaceItemsAndInItems({
 			identifierOrItemOrLevelOrStack:
@@ -25,7 +25,7 @@ module.exports =
 							getIdentifiersInNewStackWhenParentAncestor({
 								ancestors,
 								identifiersInNewStack,
-								parentIdentifier: toIdentifier,
+								parentIdentifierPattern: identifierPattern,
 							}),
 					}),
 		});
diff --git a/stacking/createOrAddToStacksToItemsWithIdentifier/test.js b/stacking/createOrAddToStacksToItemsWithIdentifier/test.js
@@ -5,6 +5,8 @@ test(
 	() =>
 		expect(
 			createOrAddToStacksToItemsWithIdentifier({
+				identifierPattern:
+					"^parent",
 				identifiersInNewStack:
 					[
 						[ "child 1" ],
@@ -20,8 +22,6 @@ test(
 								items: [ "child 1", "child 2" ],
 							},
 					},
-				toIdentifier:
-					"parent",
 			}),
 		)
 		.toEqual(