Fix generating structures for names that end with the word components

CloudCannon · Jul 19, 2023 · ee65b3c · ee65b3c
1 parent d646c83
commit ee65b3c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
 
 ## Unreleased
 
+* Fixed an edge case generating structures for component names that end with the word `components`
+
 ## v3.6.4 (July 18, 2023)
 
 * Fixed `ENV_BOOKSHOP_LIVE` flag being undefined when live editing Astro components

diff --git a/javascript-modules/generate/lib/structure-builder.js b/javascript-modules/generate/lib/structure-builder.js
@@ -57,7 +57,7 @@ const cascadeEntries = ([key,]) => {
 }
 
 const getComponentBase = (componentPath) => {
-    return componentPath.replace(/^.*components\//, '').split(".")[0];
+    return componentPath.replace(/^.*?components\//, '').split(".")[0];
 }
 
 const getComponentKey = (componentPath) => {

diff --git a/javascript-modules/integration-tests/features/generate/structure_generation.feature b/javascript-modules/integration-tests/features/generate/structure_generation.feature
@@ -105,11 +105,32 @@ Feature: Bookshop Structure Generation
     Then stderr should be empty
     And stdout should contain "Added 1 structure from 1 Bookshop to 1 site."
     Then I should see "site/public/_cloudcannon/info.json" containing the values:
-      | path | value |
-      | _structures.content_blocks.id_key | "_bookshop_name" |
-      | _structures.content_blocks.values.0.value._bookshop_name | "card" |
-      | _structures.content_blocks.values.0.value.card_text | "" |
-      | _structures.content_blocks.values.0.value.color | "Blue" |
+      | path                                                     | value            |
+      | _structures.content_blocks.id_key                        | "_bookshop_name" |
+      | _structures.content_blocks.values.0.value._bookshop_name | "card"           |
+      | _structures.content_blocks.values.0.value.card_text      | ""               |
+      | _structures.content_blocks.values.0.value.color          | "Blue"           |
+
+  Scenario: Generating structures for complex component keys
+    Given a component-lib/components/section/section--heading-and-components/section--heading-and-components.bookshop.yml file containing:
+      """
+      spec:
+        structures:
+          - content_blocks
+
+      blueprint:
+        card_text: ""
+        color: Blue
+      """
+    When I run "npm start" in the . directory
+    Then stderr should be empty
+    And stdout should contain "Added 1 structure from 1 Bookshop to 1 site."
+    Then I should see "site/public/_cloudcannon/info.json" containing the values:
+      | path                                                     | value                                     |
+      | _structures.content_blocks.id_key                        | "_bookshop_name"                          |
+      | _structures.content_blocks.values.0.value._bookshop_name | "section/section--heading-and-components" |
+      | _structures.content_blocks.values.0.value.card_text      | ""                                        |
+      | _structures.content_blocks.values.0.value.color          | "Blue"                                    |
 
   Scenario: Generating structures carries through extra fields
     Given a component-lib/components/nested/card/card.bookshop.yml file containing: