getMappingValue data

elbwalker · Dec 17, 2024 · 589ee6d · 589ee6d
1 parent 3525485
commit 589ee6d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/packages/sources/node/src/lib/destination.ts b/packages/sources/node/src/lib/destination.ts
@@ -73,9 +73,7 @@ function resolveMappingData(
 ): Destination.Data {
   if (!data) return;
 
-  return Array.isArray(data)
-    ? data.map((item) => getMappingValue(event, item))
-    : getMappingValue(event, data);
+  return getMappingValue(event, data);
 }
 
 export async function destinationPush(

diff --git a/packages/sources/walkerjs/src/lib/destination.ts b/packages/sources/walkerjs/src/lib/destination.ts
@@ -98,9 +98,7 @@ function resolveMappingData(
 ): Destination.Data {
   if (!data) return;
 
-  return Array.isArray(data)
-    ? data.map((item) => getMappingValue(event, item))
-    : getMappingValue(event, data);
+  return getMappingValue(event, data);
 }
 
 export function destinationPush(

diff --git a/packages/types/src/mapping.ts b/packages/types/src/mapping.ts
@@ -26,6 +26,7 @@ export interface EventMapping {
   mappingKey?: string;
 }
 
+export type Data = Value | Values;
 export type Value = ValueType | Array<ValueType>;
 export type Values = Array<Value>;
 export type ValueType = string | ValueConfig;
@@ -47,8 +48,6 @@ export type Condition = (
   instance?: WalkerOS.Instance,
 ) => boolean;
 
-export type Data = Value | Values;
-
 export type Fn = (
   event: WalkerOS.PartialEvent,
   mapping: Value,

diff --git a/packages/utils/src/core/mapping.ts b/packages/utils/src/core/mapping.ts
@@ -1,7 +1,7 @@
 import type { Mapping, WalkerOS } from '@elbwalker/types';
 import { getGrantedConsent } from './consent';
 import { getByPath } from './byPath';
-import { isDefined, isObject } from './is';
+import { isArray, isDefined, isObject } from './is';
 import { castToProperty } from './property';
 
 export function getMappingEvent(
@@ -22,7 +22,7 @@ export function getMappingEvent(
       | Mapping.EventConfig<unknown>[],
   ) => {
     if (!eventMapping) return;
-    eventMapping = Array.isArray(eventMapping) ? eventMapping : [eventMapping];
+    eventMapping = isArray(eventMapping) ? eventMapping : [eventMapping];
 
     return eventMapping.find(
       (eventMapping) =>
@@ -51,6 +51,19 @@ export function getMappingEvent(
 }
 
 export function getMappingValue(
+  obj: WalkerOS.PartialEvent | WalkerOS.AnyObject,
+  data: Mapping.Data,
+  options: Mapping.Options = {},
+): WalkerOS.Property | undefined {
+  const mappings = isArray(data) ? data : [data];
+
+  for (const mapping of mappings) {
+    const result = processMappingValue(obj, mapping, options);
+    if (isDefined(result)) return result;
+  }
+}
+
+function processMappingValue(
   obj: WalkerOS.PartialEvent | WalkerOS.AnyObject,
   mapping: Mapping.Value,
   options: Mapping.Options = {},

diff --git a/website/src/components/organisms/destination.tsx b/website/src/components/organisms/destination.tsx
@@ -168,6 +168,7 @@ function resolveMappingData(
 ): Destination.Data {
   if (!data) return;
 
+  // @TODO update
   return Array.isArray(data)
     ? data.map((item) => getMappingValue(event, item))
     : getMappingValue(event, data);

diff --git a/website/src/components/templates/destination.tsx b/website/src/components/templates/destination.tsx
@@ -168,6 +168,7 @@ function resolveMappingData(
 ): Destination.Data {
   if (!data) return;
 
+  // @TODO update
   return Array.isArray(data)
     ? data.map((item) => getMappingValue(event, item))
     : getMappingValue(event, data);