prefere explicit over generic

elbwalker · May 26, 2023 · fced79d · fced79d
1 parent 5345104
commit fced79d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/__tests__/html/walker.html b/src/__tests__/html/walker.html
@@ -126,6 +126,6 @@
     <p data-elb-generic="k:v"></p>
     <p data-elb-*="g:v"></p>
     <p data-elb-generic="o:v"></p>
-    <!-- <p data-elb-*="o:x"></p> -->
+    <p data-elb-*="o:x"></p>
   </div>
 </div>
diff --git a/src/__tests__/walker.test.ts b/src/__tests__/walker.test.ts
@@ -240,7 +240,7 @@ describe('Walker', () => {
     );
   });
 
-  test.only('Generic properties', () => {
+  test('Generic properties', () => {
     expect(getEvents(getElem('generic'), Walker.Trigger.Click)).toMatchObject([
       {
         entity: 'generic',

diff --git a/src/lib/walker.ts b/src/lib/walker.ts
@@ -209,20 +209,25 @@ function getEntity(
   )}],[${getElbAttributeName(prefix, '\\*')}]`;
 
   // Get matching properties from the element and its parents
-  let [data, context] = getThisAndParentProperties(
+  let [parentProps, context] = getThisAndParentProperties(
     origin || element,
     entitySelector,
     prefix,
     type,
   );
 
   // Get properties
+  let data: Walker.Properties = {};
+  let genericProps: Walker.Properties = {};
   element.querySelectorAll<HTMLElement>(entitySelector).forEach((child) => {
     // Eventually override closer peroperties
-    data = assign(data, getElbValues(prefix, child, '*')); // Generic
-    data = assign(data, getElbValues(prefix, child, type)); // Explicit
+    genericProps = assign(genericProps, getElbValues(prefix, child, '*'));
+    data = assign(data, getElbValues(prefix, child, type));
   });
 
+  // Merge properties with the hirarchy data > generic > parent
+  data = assign(parentProps, assign(genericProps, data));
+
   // Get nested entities
   const nested: Walker.Entities = [];
   element