fix(dal): export default values correctly

A bit of code left over from the old system (where default values were
the attribute value for a prop at the schema variant context) was
grabbing the first attribute value and making it the default for props
if a component existed on export. This fixes it and fixes the export of
default values for strings.

Default values now can only be defined in the asset spec.

Co-Authored-By: Paul Stack <paul@systeminit.com>

lib/dal/src/pkg/export.rs

@@ -554,17 +554,16 @@ impl PkgExporter {
             builder: PropSpecBuilder,
             prop_id: PropId,
             parent_prop_id: Option<PropId>,
-            inside_map_or_array: bool,
         }
 
-        let mut stack: Vec<(PropId, Option<PropId>, bool)> = Vec::new();
+        let mut stack: Vec<(PropId, Option<PropId>)> = Vec::new();
         for child_tree_node in Prop::direct_child_prop_ids(ctx, root_prop.id()).await? {
-            stack.push((child_tree_node, None, false));
+            stack.push((child_tree_node, None));
         }
 
         let mut traversal_stack: Vec<TraversalStackEntry> = Vec::new();
 
-        while let Some((prop_id, parent_prop_id, inside_map_or_array)) = stack.pop() {
+        while let Some((prop_id, parent_prop_id)) = stack.pop() {
             let child_prop = Prop::get_by_id_or_error(ctx, prop_id).await?;
             let mut builder = PropSpec::builder();
 
@@ -608,16 +607,10 @@ impl PkgExporter {
                 builder,
                 prop_id,
                 parent_prop_id,
-                inside_map_or_array,
             });
 
             for child_tree_node in Prop::direct_child_prop_ids(ctx, child_prop.id).await? {
-                stack.push((
-                    child_tree_node,
-                    Some(prop_id),
-                    matches!(child_prop.kind, PropKind::Array | PropKind::Map)
-                        || inside_map_or_array,
-                ));
+                stack.push((child_tree_node, Some(prop_id)));
             }
         }
 
@@ -705,28 +698,6 @@ impl PkgExporter {
                 }
             }
 
-            // TODO: handle default values for complex types. We also cannot set default values for
-            // children of arrays and maps, at any depth (currently), since that requires tracking the
-            // key or index
-            if matches!(
-                entry.builder.get_kind(),
-                Some(PropSpecKind::String)
-                    | Some(PropSpecKind::Number)
-                    | Some(PropSpecKind::Boolean)
-            ) && !entry.inside_map_or_array
-            {
-                if let Some(av_id) = Prop::attribute_values_for_prop_id(ctx, entry.prop_id)
-                    .await?
-                    .pop()
-                {
-                    let av = AttributeValue::get_by_id(ctx, av_id).await?;
-                    if let Some(default_value) = av.value(ctx).await? {
-                        entry.builder.has_data(true);
-                        entry.builder.default_value(default_value);
-                    }
-                }
-            }
-
             let prop_spec = entry.builder.build()?;
 
             match entry.parent_prop_id {

lib/si-pkg/src/pkg/variant.rs

@@ -469,7 +469,7 @@ async fn create_prop_stack(
     builder.has_data(false);
 
     let default_value = match &spec {
-        SiPkgProp::Array { data, .. }
+        SiPkgProp::String { data, .. }
         | SiPkgProp::Boolean { data, .. }
         | SiPkgProp::Number { data, .. } => {
             data.as_ref().and_then(|data| data.default_value.to_owned())