From e64fe8bcf929fda6cfedc2c067f431b59e8e78a9 Mon Sep 17 00:00:00 2001
From: "Weng, Chia-Ling" <75072960+ChiaLingWeng@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:26:07 +0000
Subject: [PATCH 1/9] fix: layer with shared encoding ignore repeater

---
 src/normalize/core.ts | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index 545e24ff8a..70e9fc5a94 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -68,7 +68,6 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
       ...(spec.name ? {name: [params.repeaterPrefix, spec.name].filter(n => n).join('_')} : {}),
       ...(encoding ? {encoding} : {})
     };
-
     if (parentEncoding || parentProjection) {
       return this.mapUnitWithParentEncodingOrProjection(specWithReplacedEncoding, params);
     }
@@ -177,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-                (repeat.column ? `column_${varName(columnValue)}` : ''));
+              (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -225,14 +224,32 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
       encoding: replaceRepeaterInEncoding(encoding, params.repeater)
     });
 
-    return this.mapUnit(
-      {
-        ...spec,
-        ...(mergedProjection ? {projection: mergedProjection} : {}),
-        ...(mergedEncoding ? {encoding: mergedEncoding} : {})
-      },
-      {config}
-    );
+    if (isEmpty(encoding) && !isEmpty(params.repeater)) {
+      return this.mapUnit(
+        {
+          ...spec,
+          ...(mergedProjection ? {projection: mergedProjection} : {}),
+          ...(mergedEncoding ? {encoding: mergedEncoding} : {})
+        },
+        {
+          ...params,
+          config: config,
+          repeater: params.repeater
+        })
+    }
+    else {
+      return this.mapUnit(
+        {
+          ...spec,
+          ...(mergedProjection ? {projection: mergedProjection} : {}),
+          ...(mergedEncoding ? {encoding: mergedEncoding} : {})
+        },
+        {
+          config
+        }
+      );
+
+    }
   }
 
   private mapFacetedUnit(spec: FacetedUnitSpec<Field>, normParams: NormalizerParams): NormalizedFacetSpec {

From 7cbd21866ea3e49581495a3e8218715b99b0fc32 Mon Sep 17 00:00:00 2001
From: "Weng, Chia-Ling" <75072960+ChiaLingWeng@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:47:07 +0000
Subject: [PATCH 2/9] avoid undefined array error

---
 src/normalize/core.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index 70e9fc5a94..1e11667f09 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -211,6 +211,12 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
 
     return super.mapFacet(spec, params);
   }
+  private isEmpty(obj: any) {
+    if (obj == null) {
+      return true
+    }
+    return Object.keys(obj).length === 0
+  }
 
   private mapUnitWithParentEncodingOrProjection(
     spec: FacetedUnitSpec<Field>,
@@ -224,7 +230,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
       encoding: replaceRepeaterInEncoding(encoding, params.repeater)
     });
 
-    if (isEmpty(encoding) && !isEmpty(params.repeater)) {
+    if (this.isEmpty(encoding) && !this.isEmpty(params.repeater)) {
       return this.mapUnit(
         {
           ...spec,

From 74fb9c10ea78d3ff1b3f85873f95b367d5b3a90e Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <vega-actions-bot@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:50:47 +0000
Subject: [PATCH 3/9] style: auto-formatting [CI]

---
 src/normalize/core.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index 1e11667f09..6b2022ccb5 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -176,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-              (repeat.column ? `column_${varName(columnValue)}` : ''));
+                (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -213,9 +213,9 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
   }
   private isEmpty(obj: any) {
     if (obj == null) {
-      return true
+      return true;
     }
-    return Object.keys(obj).length === 0
+    return Object.keys(obj).length === 0;
   }
 
   private mapUnitWithParentEncodingOrProjection(
@@ -241,9 +241,9 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
           ...params,
           config: config,
           repeater: params.repeater
-        })
-    }
-    else {
+        }
+      );
+    } else {
       return this.mapUnit(
         {
           ...spec,
@@ -254,7 +254,6 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
           config
         }
       );
-
     }
   }
 

From 5a46f112a4baf2957819cd186a7609ec58c72d52 Mon Sep 17 00:00:00 2001
From: "Weng, Chia-Ling" <75072960+ChiaLingWeng@users.noreply.github.com>
Date: Fri, 2 Feb 2024 01:24:32 +0000
Subject: [PATCH 4/9] simplify condition statement

---
 src/normalize/core.ts | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index 6b2022ccb5..e0ce64586c 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -176,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-                (repeat.column ? `column_${varName(columnValue)}` : ''));
+              (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -211,6 +211,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
 
     return super.mapFacet(spec, params);
   }
+  //
   private isEmpty(obj: any) {
     if (obj == null) {
       return true;
@@ -229,32 +230,22 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
       parentEncoding,
       encoding: replaceRepeaterInEncoding(encoding, params.repeater)
     });
-
-    if (this.isEmpty(encoding) && !this.isEmpty(params.repeater)) {
-      return this.mapUnit(
-        {
-          ...spec,
-          ...(mergedProjection ? {projection: mergedProjection} : {}),
-          ...(mergedEncoding ? {encoding: mergedEncoding} : {})
-        },
-        {
+    return this.mapUnit(
+      {
+        ...spec,
+        ...(mergedProjection ? {projection: mergedProjection} : {}),
+        ...(mergedEncoding ? {encoding: mergedEncoding} : {})
+      },
+      this.isEmpty(encoding) && !this.isEmpty(params.repeater)
+        ? {
           ...params,
           config: config,
           repeater: params.repeater
         }
-      );
-    } else {
-      return this.mapUnit(
-        {
-          ...spec,
-          ...(mergedProjection ? {projection: mergedProjection} : {}),
-          ...(mergedEncoding ? {encoding: mergedEncoding} : {})
-        },
-        {
+        : {
           config
         }
-      );
-    }
+    );
   }
 
   private mapFacetedUnit(spec: FacetedUnitSpec<Field>, normParams: NormalizerParams): NormalizedFacetSpec {

From 6a02b0875223ecb47b2d8f5225d13ae751a910e9 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <vega-actions-bot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 01:26:51 +0000
Subject: [PATCH 5/9] style: auto-formatting [CI]

---
 src/normalize/core.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index e0ce64586c..8cb1d7fcf0 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -176,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-              (repeat.column ? `column_${varName(columnValue)}` : ''));
+                (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -238,13 +238,13 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
       },
       this.isEmpty(encoding) && !this.isEmpty(params.repeater)
         ? {
-          ...params,
-          config: config,
-          repeater: params.repeater
-        }
+            ...params,
+            config: config,
+            repeater: params.repeater
+          }
         : {
-          config
-        }
+            config
+          }
     );
   }
 

From 5128a05cd197b1081154f1532ed075aa7b3b6f33 Mon Sep 17 00:00:00 2001
From: "Weng, Chia-Ling" <75072960+ChiaLingWeng@users.noreply.github.com>
Date: Fri, 2 Feb 2024 03:52:10 +0000
Subject: [PATCH 6/9] move empty check outside class

---
 src/normalize/core.ts | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index 8cb1d7fcf0..b1d3d96258 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -176,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-                (repeat.column ? `column_${varName(columnValue)}` : ''));
+              (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -212,12 +212,6 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
     return super.mapFacet(spec, params);
   }
   //
-  private isEmpty(obj: any) {
-    if (obj == null) {
-      return true;
-    }
-    return Object.keys(obj).length === 0;
-  }
 
   private mapUnitWithParentEncodingOrProjection(
     spec: FacetedUnitSpec<Field>,
@@ -236,15 +230,15 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
         ...(mergedProjection ? {projection: mergedProjection} : {}),
         ...(mergedEncoding ? {encoding: mergedEncoding} : {})
       },
-      this.isEmpty(encoding) && !this.isEmpty(params.repeater)
+      emptyFlag(encoding) && !emptyFlag(params.repeater)
         ? {
-            ...params,
-            config: config,
-            repeater: params.repeater
-          }
+          ...params,
+          config: config,
+          repeater: params.repeater
+        }
         : {
-            config
-          }
+          config
+        }
     );
   }
 
@@ -411,3 +405,10 @@ function mergeProjection<ES extends ExprRef | SignalRef>(opt: {
   }
   return projection ?? parentProjection;
 }
+
+function emptyFlag(obj: any) {
+  if (obj == null) {
+    return true;
+  }
+  return Object.keys(obj).length === 0;
+}

From 1421933f3b95035b48482292db8030ec73209165 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <vega-actions-bot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 03:54:27 +0000
Subject: [PATCH 7/9] style: auto-formatting [CI]

---
 src/normalize/core.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index b1d3d96258..7c1c254d97 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -176,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-              (repeat.column ? `column_${varName(columnValue)}` : ''));
+                (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -232,13 +232,13 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
       },
       emptyFlag(encoding) && !emptyFlag(params.repeater)
         ? {
-          ...params,
-          config: config,
-          repeater: params.repeater
-        }
+            ...params,
+            config: config,
+            repeater: params.repeater
+          }
         : {
-          config
-        }
+            config
+          }
     );
   }
 

From 9d0c74531993431af8c551a8e9c7df205601dc25 Mon Sep 17 00:00:00 2001
From: "Weng, Chia-Ling" <75072960+ChiaLingWeng@users.noreply.github.com>
Date: Fri, 2 Feb 2024 05:03:10 +0000
Subject: [PATCH 8/9] use defined isEmpty func instead

---
 src/normalize/core.ts | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index 7c1c254d97..a415c4ee2d 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -176,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-                (repeat.column ? `column_${varName(columnValue)}` : ''));
+              (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -230,15 +230,15 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
         ...(mergedProjection ? {projection: mergedProjection} : {}),
         ...(mergedEncoding ? {encoding: mergedEncoding} : {})
       },
-      emptyFlag(encoding) && !emptyFlag(params.repeater)
+      isEmpty(encoding ?? {}) && !isEmpty(params.repeater ?? {})
         ? {
-            ...params,
-            config: config,
-            repeater: params.repeater
-          }
+          ...params,
+          config: config,
+          repeater: params.repeater
+        }
         : {
-            config
-          }
+          config
+        }
     );
   }
 
@@ -405,10 +405,3 @@ function mergeProjection<ES extends ExprRef | SignalRef>(opt: {
   }
   return projection ?? parentProjection;
 }
-
-function emptyFlag(obj: any) {
-  if (obj == null) {
-    return true;
-  }
-  return Object.keys(obj).length === 0;
-}

From 4f30bf26b0ec949e01e75a4b94093c0ff32a6ef5 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <vega-actions-bot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 05:05:33 +0000
Subject: [PATCH 9/9] style: auto-formatting [CI]

---
 src/normalize/core.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/normalize/core.ts b/src/normalize/core.ts
index a415c4ee2d..c26c2d4592 100644
--- a/src/normalize/core.ts
+++ b/src/normalize/core.ts
@@ -176,7 +176,7 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
             (isArray(repeat)
               ? `${varName(repeatValue)}`
               : (repeat.row ? `row_${varName(rowValue)}` : '') +
-              (repeat.column ? `column_${varName(columnValue)}` : ''));
+                (repeat.column ? `column_${varName(columnValue)}` : ''));
 
           const child = this.map(childSpec, {...params, repeater: childRepeater, repeaterPrefix: childName});
           child.name = childName;
@@ -232,13 +232,13 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec
       },
       isEmpty(encoding ?? {}) && !isEmpty(params.repeater ?? {})
         ? {
-          ...params,
-          config: config,
-          repeater: params.repeater
-        }
+            ...params,
+            config: config,
+            repeater: params.repeater
+          }
         : {
-          config
-        }
+            config
+          }
     );
   }