Don't serialize "startNodes" if it's empty

This makes our snapshots and JSON less verbose.
KittyCAD · Oct 31, 2024 · e0b61c9 · e0b61c9
1 parent 3cae080
commit e0b61c9
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 48 deletions.
diff --git a/docs/kcl/std.json b/docs/kcl/std.json
@@ -93200,8 +93200,7 @@
             "NonCodeMeta": {
               "type": "object",
               "required": [
-                "nonCodeNodes",
-                "startNodes"
+                "nonCodeNodes"
               ],
               "properties": {
                 "nonCodeNodes": {
@@ -96944,8 +96943,7 @@
             "NonCodeMeta": {
               "type": "object",
               "required": [
-                "nonCodeNodes",
-                "startNodes"
+                "nonCodeNodes"
               ],
               "properties": {
                 "nonCodeNodes": {
@@ -100692,8 +100690,7 @@
           "NonCodeMeta": {
             "type": "object",
             "required": [
-              "nonCodeNodes",
-              "startNodes"
+              "nonCodeNodes"
             ],
             "properties": {
               "nonCodeNodes": {
@@ -130888,8 +130885,7 @@
             "NonCodeMeta": {
               "type": "object",
               "required": [
-                "nonCodeNodes",
-                "startNodes"
+                "nonCodeNodes"
               ],
               "properties": {
                 "nonCodeNodes": {
@@ -135023,8 +135019,7 @@
             "NonCodeMeta": {
               "type": "object",
               "required": [
-                "nonCodeNodes",
-                "startNodes"
+                "nonCodeNodes"
               ],
               "properties": {
                 "nonCodeNodes": {
@@ -138765,8 +138760,7 @@
           "NonCodeMeta": {
             "type": "object",
             "required": [
-              "nonCodeNodes",
-              "startNodes"
+              "nonCodeNodes"
             ],
             "properties": {
               "nonCodeNodes": {
@@ -142918,8 +142912,7 @@
             "NonCodeMeta": {
               "type": "object",
               "required": [
-                "nonCodeNodes",
-                "startNodes"
+                "nonCodeNodes"
               ],
               "properties": {
                 "nonCodeNodes": {
@@ -147053,8 +147046,7 @@
             "NonCodeMeta": {
               "type": "object",
               "required": [
-                "nonCodeNodes",
-                "startNodes"
+                "nonCodeNodes"
               ],
               "properties": {
                 "nonCodeNodes": {
@@ -150797,8 +150789,7 @@
             "NonCodeMeta": {
               "type": "object",
               "required": [
-                "nonCodeNodes",
-                "startNodes"
+                "nonCodeNodes"
               ],
               "properties": {
                 "nonCodeNodes": {
@@ -154539,8 +154530,7 @@
           "NonCodeMeta": {
             "type": "object",
             "required": [
-              "nonCodeNodes",
-              "startNodes"
+              "nonCodeNodes"
             ],
             "properties": {
               "nonCodeNodes": {

diff --git a/src/wasm-lib/kcl/src/ast/types.rs b/src/wasm-lib/kcl/src/ast/types.rs
@@ -1029,6 +1029,7 @@ pub enum NonCodeValue {
 #[serde(rename_all = "camelCase")]
 pub struct NonCodeMeta {
     pub non_code_nodes: HashMap<usize, NodeList<NonCodeNode>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub start_nodes: NodeList<NonCodeNode>,
 
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -1059,6 +1060,7 @@ impl<'de> Deserialize<'de> for NonCodeMeta {
         #[serde(rename_all = "camelCase")]
         struct NonCodeMetaHelper {
             non_code_nodes: HashMap<String, NodeList<NonCodeNode>>,
+            #[serde(default, skip_serializing_if = "Vec::is_empty")]
             start_nodes: NodeList<NonCodeNode>,
         }
 

diff --git a/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__aw.snap b/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__aw.snap
@@ -1,6 +1,7 @@
 ---
 source: kcl/src/parser/parser_impl.rs
 expression: actual
+snapshot_kind: text
 ---
 {
   "body": [
@@ -60,8 +61,7 @@ expression: actual
                     }
                   }
                 ]
-              },
-              "startNodes": []
+              }
             },
             "start": 14,
             "type": "ArrayExpression",

diff --git a/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ax.snap b/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ax.snap
@@ -1,6 +1,7 @@
 ---
 source: kcl/src/parser/parser_impl.rs
 expression: actual
+snapshot_kind: text
 ---
 {
   "body": [
@@ -60,8 +61,7 @@ expression: actual
                     }
                   }
                 ]
-              },
-              "startNodes": []
+              }
             },
             "start": 14,
             "type": "ArrayExpression",

diff --git a/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ay.snap b/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ay.snap
@@ -1,6 +1,7 @@
 ---
 source: kcl/src/parser/parser_impl.rs
 expression: actual
+snapshot_kind: text
 ---
 {
   "body": [
@@ -30,8 +31,7 @@ expression: actual
                     }
                   }
                 ]
-              },
-              "startNodes": []
+              }
             },
             "properties": [
               {

diff --git a/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__az.snap b/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__az.snap
@@ -1,6 +1,7 @@
 ---
 source: kcl/src/parser/parser_impl.rs
 expression: actual
+snapshot_kind: text
 ---
 {
   "body": [
@@ -30,8 +31,7 @@ expression: actual
                     }
                   }
                 ]
-              },
-              "startNodes": []
+              }
             },
             "properties": [
               {

diff --git a/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ba.snap b/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ba.snap
@@ -1,6 +1,7 @@
 ---
 source: kcl/src/parser/parser_impl.rs
 expression: actual
+snapshot_kind: text
 ---
 {
   "body": [
@@ -106,8 +107,7 @@ expression: actual
                     }
                   }
                 ]
-              },
-              "startNodes": []
+              }
             },
             "start": 19,
             "type": "PipeExpression",

diff --git a/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__f.snap b/src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__f.snap
@@ -1,6 +1,7 @@
 ---
 source: kcl/src/parser/parser_impl.rs
 expression: actual
+snapshot_kind: text
 ---
 {
   "body": [
@@ -48,8 +49,7 @@ expression: actual
           }
         }
       ]
-    },
-    "startNodes": []
+    }
   },
   "start": 0
 }
diff --git a/src/wasm-lib/kcl/tests/add_lots/ast.snap b/src/wasm-lib/kcl/tests/add_lots/ast.snap
@@ -3197,8 +3197,7 @@ snapshot_kind: text
             }
           }
         ]
-      },
-      "startNodes": []
+      }
     },
     "start": 0
   }

diff --git a/src/wasm-lib/kcl/tests/array_range_expr/ast.snap b/src/wasm-lib/kcl/tests/array_range_expr/ast.snap
@@ -848,8 +848,7 @@ snapshot_kind: text
             }
           }
         ]
-      },
-      "startNodes": []
+      }
     },
     "start": 0
   }

diff --git a/src/wasm-lib/kcl/tests/comparisons/ast.snap b/src/wasm-lib/kcl/tests/comparisons/ast.snap
@@ -651,8 +651,7 @@ snapshot_kind: text
             }
           }
         ]
-      },
-      "startNodes": []
+      }
     },
     "start": 0
   }

diff --git a/src/wasm-lib/kcl/tests/cube/ast.snap b/src/wasm-lib/kcl/tests/cube/ast.snap
@@ -664,8 +664,7 @@ snapshot_kind: text
                         }
                       }
                     ]
-                  },
-                  "startNodes": []
+                  }
                 },
                 "start": 30
               },
@@ -787,8 +786,7 @@ snapshot_kind: text
             }
           }
         ]
-      },
-      "startNodes": []
+      }
     },
     "start": 0
   }

diff --git a/src/wasm-lib/kcl/tests/cube/program_memory.snap b/src/wasm-lib/kcl/tests/cube/program_memory.snap
@@ -681,8 +681,7 @@ snapshot_kind: text
                       }
                     }
                   ]
-                },
-                "startNodes": []
+                }
               },
               "start": 30
             },

diff --git a/src/wasm-lib/kcl/tests/double_map_fn/ast.snap b/src/wasm-lib/kcl/tests/double_map_fn/ast.snap
@@ -226,8 +226,7 @@ snapshot_kind: text
             }
           }
         ]
-      },
-      "startNodes": []
+      }
     },
     "start": 0
   }

diff --git a/src/wasm-lib/kcl/tests/sketch_in_object/ast.snap b/src/wasm-lib/kcl/tests/sketch_in_object/ast.snap
@@ -837,8 +837,7 @@ snapshot_kind: text
             }
           }
         ]
-      },
-      "startNodes": []
+      }
     },
     "start": 0
   }