sveltekit-ui 1.0.11 → 1.0.13

package/dist/Components/ContentInput/index.svelte.js

@@ -36,38 +36,50 @@ export function create_content_input_manager(config) {
   let paste_astc_markdown_finish_button_manager = $state(null)
   let location_to_add_element = $state(null)
   let content_manager = $state(null)
-  let content_overall_manager = $state(null)
   let attributes_input = $state(null)
   let focused_selector_id = $state(null)
+  let definition_stack = $state([])
 
-  let loops = $derived(set_closurable(config?.loops, null))
-  let variables = $derived(set_closurable(config?.variables, null))
-  let variables_data_type = $derived(set_closurable(config?.variables_data_type, null) ?? json_to_data_type(variables))
   let mapkit_js_token = $derived(set_closurable(config?.mapkit_js_token, null))
 
-  function increase_loops_on_path(path) {
-    let cleaned_path = null
-    if (Array.isArray(path)) {
-      cleaned_path = []
-      for (let path_item of path) {
-        if (Array.isArray(path_item)) {
-          if (path_item?.[0] == "loops" && typeof path_item?.[1] == "number") {
-            cleaned_path.push(["loops", path_item?.[1] + 1])
-          } else {
-            cleaned_path.push(increase_loops_on_path(path_item))
+  function pass_event_down(input) {
+    if (typeof content_manager?.pass_event_down == "function") {
+      content_manager?.pass_event_down(input)
+    }
+  }
+
+  function get_defined_at_selector_id(selector_id) {
+    function traverse(input) {
+      let defined = {}
+      if (input?.type_id == selector_id) {
+        return { defined, is_found_selector_id: true }
+      } else if (input?.type_id == "loop") {
+        defined[input?.attributes?.iter_identifier] = { type: "text_literal" }
+      }
+      if (Array.isArray(input?.children)) {
+        for (let child of input?.children) {
+          let res = traverse(child)
+          defined = { ...defined, ...res?.defined }
+          if (res?.is_found_selector_id) {
+            break
           }
-        } else {
-          cleaned_path.push(path_item)
         }
       }
+      return { defined }
     }
-    return cleaned_path
+    return traverse(versions?.[selected_version_index])?.defined
   }
 
-  function pass_event_down(input) {
-    if (typeof content_manager?.pass_event_down == "function") {
-      content_manager?.pass_event_down(input)
-    }
+  function get_defined_options(selector_id) {
+    const defined_at_selector_id = get_defined_at_selector_id(selector_id)
+    const defined_data_type = json_to_data_type(Object.assign({}, ...[...definition_stack].reverse()))
+    return Object.entries({ ...(defined_data_type?.properties || {}), ...defined_at_selector_id }).map(
+      ([key, val]) => ({
+        key,
+        name: key,
+        data_type: val,
+      })
+    )
   }
 
   function set_selected_version(version_index) {
@@ -79,20 +91,13 @@ export function create_content_input_manager(config) {
       on_event: config?.on_event,
       storage_path: storage_path,
       mapkit_js_token: mapkit_js_token,
-      variables: () => variables,
-      loops: () => loops,
-    })
-    content_overall_manager = create_content_overall_manager()
-  }
-
-  function create_content_overall_manager() {
-    return {
+      definition_stack: definition_stack,
       get focused_selector_id() {
         return focused_selector_id
       },
       set_focused_selector_id,
       open_edit_element_attributes_popover,
-    }
+    })
   }
 
   function prep_element(element) {
@@ -123,7 +128,6 @@ export function create_content_input_manager(config) {
     })
     function open_edit_attributes_popover() {
       attributes_input.init({
-        variables_data_type: () => variables_data_type,
         storage: storage,
         storage_default_folder_path: storage_default_folder_path,
         storage_path: storage_path,
@@ -133,8 +137,8 @@ export function create_content_input_manager(config) {
         content_type: element?.type_id,
         selector_id: element?.selector_id,
         val: element?.attributes,
+        get_defined_options: () => get_defined_options(element?.selector_id),
         on_finish: (input) => {
-          console.log("on_finish_attribute", input)
           attributes_input.popover_manager.close()
           set_element_attributes(element?.selector_id, input)
         },
@@ -387,7 +391,6 @@ export function create_content_input_manager(config) {
   }
 
   function add_version(version) {
-    // let new_version = version ? version : convert_prepped_to_version(selected_version_prepped)
     versions = [deep_copy(version), ...versions.slice(selected_version_index)]
     selected_version_index = 0
     set_selected_version(0)
@@ -396,25 +399,6 @@ export function create_content_input_manager(config) {
     }
   }
 
-  // function convert_prepped_to_version(version_prepped) {
-  //   let element = version_prepped?.element
-  //   let cleaned_children = []
-  //   if (Array.isArray(element?.children)) {
-  //     for (let child of element?.children) {
-  //       if (Array.isArray(child)) {
-  //         let sub_children = []
-  //         for (let sub_child of child) {
-  //           sub_children.push(convert_prepped_to_version(sub_child))
-  //         }
-  //         cleaned_children.push(convert_prepped_to_version(sub_children))
-  //       } else {
-  //         cleaned_children.push(convert_prepped_to_version(child))
-  //       }
-  //     }
-  //   }
-  //   return { ...element, children: cleaned_children }
-  // }
-
   function copy_markdown() {
     copy_to_clipboard(astc_to_markdown(selected_version_prepped?.element))
   }
@@ -861,6 +845,7 @@ export function create_content_input_manager(config) {
   }
 
   function init(config) {
+    definition_stack = config?.definition_stack ?? []
     versions = [config?.val]
     storage = config?.storage
     storage_default_folder_path = config?.storage_default_folder_path
@@ -952,10 +937,10 @@ export function create_content_input_manager(config) {
       },
     })
     attributes_input = create_attributes_input_manager({
-      variables_data_type: () => variables_data_type,
       storage: storage,
       storage_default_folder_path: storage_default_folder_path,
       storage_path: storage_path,
+      get_defined_options: get_defined_options,
     })
     set_selected_version(0)
   }
@@ -967,12 +952,6 @@ export function create_content_input_manager(config) {
     get val() {
       return versions?.[selected_version_index]
     },
-    get variables_data_type() {
-      return variables_data_type
-    },
-    get variables() {
-      return variables
-    },
     get versions_len() {
       return versions_len
     },
@@ -1021,9 +1000,6 @@ export function create_content_input_manager(config) {
     get content_manager() {
       return content_manager
     },
-    get content_overall_manager() {
-      return content_overall_manager
-    },
     get attributes_input() {
       return attributes_input
     },

package/dist/Components/DataTypeInput/index.svelte.js

@@ -542,9 +542,6 @@ export function create_data_type_input_manager(config) {
     get guess_from_variables_button_manager() {
       return guess_from_variables_button_manager
     },
-    get data_sample() {
-      return data_sample
-    },
     get type_options() {
       return type_options
     },

package/dist/Components/IconInput/index.svelte

@@ -9,7 +9,7 @@
 </script>
 
 {#snippet selected_icon()}
-  <div style="display: flex; gap: 1rem; align-items: center;">
+  <div style="display: flex; gap: 1rem; align-items: center; color: var(--g2-t);">
     {manager?.icon_options.find((h) => h.key == (manager?.is_icon_only ? manager?.val : manager?.val?.icon))?.name ??
       (manager?.is_icon_only ? manager?.val : manager?.val?.icon) ??
       "Select Icon"}

package/dist/Components/TableAdvanced/ColumnInput/index.svelte.js

@@ -10,9 +10,8 @@ import { create_data_type_input_manager } from "../../DataTypeInput/index.svelte
 import {
   set_closurable,
   node_types,
-  deep_copy,
   variables_data_type_remaining_to_astc,
-  set_content_variables,
+  set_definition_stack,
   astc_element,
 } from "../../../client/index.js"
 
@@ -49,13 +48,10 @@ export function create_column_input_manager(config) {
   let delete_column_cancel_button_manager = $state(null)
 
   let rows_data_from_variable_path = $derived(set_closurable(config?.rows_data_from_variable_path, null))
-  let variables = $derived(set_closurable(config?.variables, null))
-  let variables_data_type = $derived(set_closurable(config?.variables_data_type, null))
   let columns = $derived(set_closurable(config?.columns, null))
   let columns_length = $derived(Object.keys(columns || {}).length)
-  let row_data_type = $derived(set_closurable(config?.row_data_type, null))
   let column_id = $derived(set_closurable(config?.column_id, null))
-  let loops = $derived(set_closurable(config?.loops, null))
+  let definition_stack = $derived(set_closurable(config?.definition_stack, null))
   let is_column_update = $derived(set_closurable(config?.is_column_update, true))
   let column_input_options = $derived(set_closurable(config?.column_input_options, null))
 
@@ -68,46 +64,6 @@ export function create_column_input_manager(config) {
       : null
   )
 
-  let variables_data_type_with_this_col = $derived(get_variables_data_type_with_this_col())
-  function get_variables_data_type_with_this_col() {
-    if (
-      column_id_text_input_manager?.val &&
-      !column_id_text_warning &&
-      column_is_db_column_checkbox_manager?.val &&
-      column_db_data_type_input_manager?.val
-    ) {
-      const path_to_set = [...rows_data_from_variable_path]
-      let variables_data_type_combined_loc = $state(
-        deep_copy({
-          type: "object_literal",
-          properties: {
-            variables: variables_data_type,
-            loops: { type: "loop" },
-          },
-        })
-      )
-      let target = variables_data_type_combined_loc
-      for (let i = 0; i < path_to_set.length; i++) {
-        if (target?.type === "loop") {
-          target = target.items
-        } else if (target?.type === "object_literal") {
-          if (!target.properties) {
-            target.properties = {}
-          }
-          target = target.properties[path_to_set[i]]
-        }
-        if (target === undefined) {
-          break
-        }
-      }
-      if (target?.items?.type === "object_literal" && target?.items?.properties) {
-        target.items.properties[column_id_text_input_manager?.val] = column_db_data_type_input_manager?.val
-      }
-      return variables_data_type_combined_loc?.properties?.variables
-    }
-    return variables_data_type
-  }
-
   let column_data_postgres_type = $derived(
     column_db_data_type_input_manager?.val?.type == "array_uniform_literal" &&
       column_db_data_type_input_manager?.val?.items?.type == "text_literal"
@@ -158,24 +114,20 @@ export function create_column_input_manager(config) {
       val: config?.val?.header_content ?? null,
       storage: null,
       storage_default_folder_path: null,
-      variables_data_type: () => variables_data_type_with_this_col,
-      variables: () => variables,
-      loops: () => loops,
+      definition_stack: definition_stack,
       on_event: (input) => {
-        console.log("set_content_variables_tbd400", input)
-        // set_content_variables(input)
+        console.log("set_definition_stack_tbd400", input)
+        set_definition_stack(input)
       },
     })
     body_content_input_manager = create_content_input_manager({
       val: config?.val?.body_content ?? null,
       storage: config?.storage,
       storage_default_folder_path: null,
-      variables_data_type: () => variables_data_type_with_this_col,
-      variables: () => variables,
-      loops: () => [0, ...(Array.isArray(loops) ? loops : [])],
+      definition_stack: () => definition_stack,
       on_event: (input) => {
-        console.log("set_content_variables_tbd401")
-        // set_content_variables(input)
+        console.log("set_definition_stack_tbd33")
+        set_definition_stack(input)
       },
     })
     column_description_text_input_manager = create_text_input_manager({
@@ -234,23 +186,23 @@ export function create_column_input_manager(config) {
       val: config?.val?.is_db_column ?? column_input_options?.is_db_column?.default_value ?? false,
     })
     column_db_data_type_input_manager = create_data_type_input_manager({
-      data_sample: () => variables,
+      // data_sample: () => variables,
       table_options: config?.table_options,
-      val: config?.val?.db_data_type ?? row_data_type?.properties?.[column_id_text_input_manager?.val],
+      val: config?.val?.db_data_type,
       on_finish: (input) => {
-        let default_content_input_astc = variables_data_type_remaining_to_astc(input, "input", ["variables"])
+        let default_content_input_astc = variables_data_type_remaining_to_astc(input, "input", ["rows"])
         column_default_value_content_manager = create_content_manager({
           val: default_content_input_astc,
           table_options: config?.table_options,
           on_search_table_row_ids: config?.on_search_table_row_ids,
-          variables: () => default_value,
+          definition_stack: () => definition_stack,
           on_event: (input) => {
-            const res = set_content_variables(
+            const res = set_definition_stack(
               input,
-              { variables: default_value },
+              definition_stack,
               column_default_value_content_manager?.pass_event_down
             )
-            default_value = res?.variables
+            definition_stack = res?.definition_stack
             return res
           },
         })
@@ -325,7 +277,7 @@ export function create_column_input_manager(config) {
           let guessed_column_display_content = variables_data_type_remaining_to_astc(
             column_db_data_type_input_manager?.val,
             "display",
-            ["variables", "rows", ["loops", 0], column_id_text_input_manager.val]
+            ["rows", ["row_i"], column_id_text_input_manager.val]
           )
           console.log("guessed_column_display_content", guessed_column_display_content)
           body_content_input_manager.add_version(guessed_column_display_content)

package/dist/Components/TableAdvanced/SortByInput/index.svelte.js

@@ -91,7 +91,8 @@ export function create_sort_by_input_manager(config) {
         })
         let data_row_variable_path_input_manager = create_variable_path_input_manager({
           is_popover: false,
-          variables_data_type: () => row_data_type,
+          defined_data_type: row_data_type,
+          get_defined_options: config?.get_defined_options,
           val: sorts?.[i]?.data_row_variable_path ?? null,
         })
         sorts_prepped_loc.push({