From 638ea2e12ef2aed575a43d44704b35a9b9fd5569 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 19 Oct 2022 13:51:36 +0300 Subject: [PATCH] Clean public interface of a normalize composite Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../normalize-composite.ts | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.ts b/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.ts index f785a18a19..08411bad55 100644 --- a/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.ts +++ b/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.ts @@ -4,17 +4,21 @@ */ import type { Composite } from "../get-composite"; -export const normalizeComposite = ( - composite: Composite, - previousPath: string[] = [], -): (readonly [path: string, composite: Composite])[] => { - const currentPath = [...previousPath, composite.id]; +export const normalizeComposite = (composite: Composite) => { + const _normalizeComposite = ( + composite: Composite, + previousPath: string[] = [], + ): (readonly [path: string, composite: Composite])[] => { + const currentPath = [...previousPath, composite.id]; - const pathAndCompositeTuple = [currentPath.join("."), composite] as const; + const pathAndCompositeTuple = [currentPath.join("."), composite] as const; - return [ - pathAndCompositeTuple, + return [ + pathAndCompositeTuple, - ...composite.children.flatMap((x) => normalizeComposite(x, currentPath)), - ]; + ...composite.children.flatMap((x) => _normalizeComposite(x, currentPath)), + ]; + }; + + return _normalizeComposite(composite); };