fix: only run simple optimizations before facet nodes are moved (#6453)

Co-authored-by: GitHub Actions Bot <vega-actions-bot@users.noreply.github.com>

examples/compiled/facet_bullet.vg.json

@@ -80,12 +80,7 @@
       ]
     },
     {
-      "name": "row_domain",
-      "source": "data_0",
-      "transform": [{"type": "aggregate", "groupby": ["title"]}]
-    },
-    {
-      "name": "data_2",
+      "name": "data_1",
       "source": "data_0",
       "transform": [
         {
@@ -95,7 +90,7 @@
       ]
     },
     {
-      "name": "data_3",
+      "name": "data_2",
       "source": "data_0",
       "transform": [
         {
@@ -105,7 +100,7 @@
       ]
     },
     {
-      "name": "data_4",
+      "name": "data_3",
       "source": "data_0",
       "transform": [
         {
@@ -115,7 +110,7 @@
       ]
     },
     {
-      "name": "data_5",
+      "name": "data_4",
       "source": "data_0",
       "transform": [
         {
@@ -125,7 +120,7 @@
       ]
     },
     {
-      "name": "data_6",
+      "name": "data_5",
       "source": "data_0",
       "transform": [
         {
@@ -135,14 +130,19 @@
       ]
     },
     {
-      "name": "data_7",
+      "name": "data_6",
       "source": "data_0",
       "transform": [
         {
           "type": "filter",
           "expr": "isValid(datum[\"markers.0\"]) && isFinite(+datum[\"markers.0\"])"
         }
       ]
+    },
+    {
+      "name": "row_domain",
+      "source": "data_0",
+      "transform": [{"type": "aggregate", "groupby": ["title"]}]
     }
   ],
   "signals": [

examples/compiled/facet_independent_scale_layer_broken.vg.json

@@ -14,13 +14,6 @@
           "type": "formula",
           "expr": "datum.sex == 2 ? 'Female' : 'Male'",
           "as": "gender"
-        },
-        {
-          "type": "aggregate",
-          "groupby": ["age", "gender"],
-          "ops": ["sum"],
-          "fields": ["people"],
-          "as": ["sum_people"]
         }
       ]
     },
@@ -38,8 +31,21 @@
       ]
     },
     {
-      "name": "data_2",
+      "name": "data_1",
       "source": "source_0",
+      "transform": [
+        {
+          "type": "aggregate",
+          "groupby": ["age", "gender"],
+          "ops": ["sum"],
+          "fields": ["people"],
+          "as": ["sum_people"]
+        }
+      ]
+    },
+    {
+      "name": "data_2",
+      "source": "data_1",
       "transform": [
         {
           "type": "filter",
@@ -126,6 +132,19 @@
         {
           "source": "facet",
           "name": "data_0",
+          "transform": [
+            {
+              "type": "aggregate",
+              "groupby": ["age", "gender"],
+              "ops": ["sum"],
+              "fields": ["people"],
+              "as": ["sum_people"]
+            }
+          ]
+        },
+        {
+          "name": "data_1",
+          "source": "data_0",
           "transform": [
             {
               "type": "filter",
@@ -149,7 +168,7 @@
           "from": {
             "facet": {
               "name": "faceted_path_child_layer_0_main",
-              "data": "facet",
+              "data": "data_0",
               "groupby": ["gender"]
             }
           },
@@ -186,7 +205,7 @@
           "name": "child_layer_1_marks",
           "type": "symbol",
           "style": ["point"],
-          "from": {"data": "data_0"},
+          "from": {"data": "data_1"},
           "encode": {
             "update": {
               "fill": {"value": "transparent"},
@@ -207,8 +226,8 @@
           "type": "point",
           "domain": {
             "fields": [
-              {"data": "facet", "field": "age"},
-              {"data": "data_0", "field": "age"}
+              {"data": "data_0", "field": "age"},
+              {"data": "data_1", "field": "age"}
             ],
             "sort": true
           },
@@ -251,7 +270,7 @@
       "type": "linear",
       "domain": {
         "fields": [
-          {"data": "source_0", "field": "sum_people"},
+          {"data": "data_1", "field": "sum_people"},
           {"data": "data_2", "field": "sum_people"}
         ]
       },
@@ -264,7 +283,7 @@
       "type": "ordinal",
       "domain": {
         "fields": [
-          {"data": "source_0", "field": "gender"},
+          {"data": "data_1", "field": "gender"},
           {"data": "data_2", "field": "gender"}
         ],
         "sort": true