@rokkit/states 1.0.0-next.112 → 1.0.0-next.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rokkit/states",
-  "version": "1.0.0-next.112",
+  "version": "1.0.0-next.114",
   "description": "Contains generic data manipulation functions that can be used in various components.",
   "author": "Jerry Thomas <me@jerrythomas.name>",
   "license": "MIT",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@lukeed/uuid": "^2.0.1",
-    "@rokkit/core": "1.0.0-next.111",
+    "@rokkit/core": "1.0.0-next.114",
     "d3-array": "^3.2.4",
     "d3-collection": "^1.0.7",
     "ramda": "^0.30.1",

package/src/derive.svelte.js

@@ -45,10 +45,10 @@ export function deriveLookupWithProxy(items, fields = defaultFields, path = [])
 		const proxy = new Proxy(item, fields)
 
 		lookup.set(key, proxy)
-		// console.log(key, proxy.value)
-		if (proxy.hasChildren) {
+		const children = proxy.value[proxy.fields.children] ?? []
+		if (children.length > 0) {
 			const childFields = getNestedFields(fields)
-			const childLookup = deriveLookupWithProxy(proxy.get('children'), childFields, itemPath)
+			const childLookup = deriveLookupWithProxy(children, childFields, itemPath)
 			for (const [childKey, childValue] of childLookup.entries()) {
 				lookup.set(childKey, childValue)
 			}

package/src/nested-controller.svelte.js

@@ -8,38 +8,11 @@ export class NestedController extends ListController {
 	 * @param {Object} [value]
 	 */
 	init(value) {
-		// this.createLookup(items)
 		if (value) {
 			this.ensureVisible(value)
 			this.moveToValue(value)
 		}
 	}
-	/**
-	 * @private
-	 * @param {Object[]} items
-	 * @param {number[]} [path]=[]
-	 */
-	createLookup(items, path = []) {
-		const depth = path.length
-		if (depth >= this.mappers.length) {
-			this.mappers.push(this.mappers[depth - 1].getChildMapper())
-		}
-		const fm = this.mappers[depth]
-
-		items.forEach((item, index) => {
-			const itemPath = [...path, index]
-			const key = getKeyFromPath(itemPath)
-
-			this.lookup.set(key, item)
-			if (fm.get('selected', item)) {
-				this.selectedKeys.add(key)
-			}
-
-			if (fm.hasChildren(item)) {
-				this.createLookup(fm.get('children', item), itemPath)
-			}
-		})
-	}
 
 	/**
 	 * Mark parents as expanded so that item is visible
@@ -48,7 +21,6 @@ export class NestedController extends ListController {
 	 */
 	ensureVisible(value) {
 		const result = this.lookup.entries().find((entry) => equals(entry[1].value, value))
-		// console.log(result)
 		const path = getPathFromKey(result[0])
 
 		for (let i = 1; i < path.length; i++) {
@@ -67,9 +39,6 @@ export class NestedController extends ListController {
 		if (!this.lookup.has(key)) return false
 		const proxy = this.lookup.get(key)
 		proxy.expanded = !proxy.expanded
-		// const item = this.lookup.get(key)
-		// const fields = this.fieldsFor(key)
-		// item[fields.expanded] = !item[this.fields.expanded]
 		return true
 	}
 
@@ -83,9 +52,6 @@ export class NestedController extends ListController {
 		if (!this.lookup.has(actualKey)) return false
 		const proxy = this.lookup.get(actualKey)
 		proxy.expanded = true
-		// const item = this.lookup.get(actualKey)
-		// const fields = this.fieldsFor(actualKey)
-		// item[fields.expanded] = true
 
 		return true
 	}
@@ -98,25 +64,8 @@ export class NestedController extends ListController {
 	collapse(key) {
 		const actualKey = key ?? this.focusedKey
 		if (!this.lookup.has(actualKey)) return false
-		// const item = this.lookup.get(actualKey)
-		// const fields = this.fieldsFor(actualKey)
-		// item[fields.expanded] = false
 		const proxy = this.lookup.get(actualKey)
 		proxy.expanded = false
 		return true
 	}
-
-	/**
-	 *
-	 * @param {*} key
-	 * @returns
-	 */
-	fieldsFor(key) {
-		const path = getPathFromKey(key)
-		let fields = this.fields
-		for (let i = 1; i < path.length; i++) {
-			fields = getNestedFields(fields)
-		}
-		return fields
-	}
 }

package/src/proxy.svelte.js

@@ -1,17 +1,39 @@
-import { defaultFields } from '@rokkit/core'
+import { defaultFields, id, toString, getNestedFields } from '@rokkit/core'
 import { isNil, has } from 'ramda'
 
 export class Proxy {
 	#original = null
-	#value = null
+	#value = $state(null)
 	#fields = null
+	#id = null
+
+	#children = $derived(this.#processChildren())
 
 	constructor(value, fields) {
 		this.fields = fields
 		this.#original = value
 		this.#value = typeof value === 'object' ? value : { [this.fields.text]: value }
+		this.id = typeof value === 'object' ? (this.get('id') ?? id()) : value
+	}
+
+	#processChildren() {
+		const children = this.#value[this.fields.children] ?? []
+		if (Array.isArray(children)) {
+			const fields = getNestedFields(this.fields)
+			return children.map((child) => new Proxy(child, fields))
+		}
+		return []
 	}
 
+	get id() {
+		return this.#id
+	}
+	set id(new_id) {
+		this.#id = typeof new_id === 'string' ? new_id : toString(new_id)
+	}
+	get children() {
+		return this.#children
+	}
 	get fields() {
 		return this.#fields
 	}
@@ -45,9 +67,9 @@ export class Proxy {
 	 *
 	 * @param {string} fieldName - Name of the field to get
 	 * @param {any} defaultValue - Default value to return if not found
-	 * @returns {any|null} - The attribute value or null if not found
+	 * @returns {any|undefined} - The attribute value or null if not found
 	 */
-	get(fieldName, defaultValue = null) {
+	get(fieldName, defaultValue) {
 		return this.has(fieldName) ? this.#value[this.fields[fieldName]] : defaultValue
 	}
 
@@ -61,12 +83,30 @@ export class Proxy {
 		return !isNil(mappedField) && has(mappedField, this.#value)
 	}
 
+	/**
+	 * Gets the appropriate snippet for rendering this item:
+	 * - Uses the 'snippet' field from the current item to find the snippet key
+	 * - Finds a matching snippet in the provided collection using this key
+	 * - Falls back to the defaultSnippet if:
+	 *   - No snippet key is configured for this item
+	 *   - The configured snippet key doesn't exist in the snippets collection
+	 * @param {Object} snippets
+	 * @param {import('svelte').Snippet|undefined} defaultSnippet
+	 * @returns {import('svelte').Snippet|undefined}
+	 */
+	getSnippet(snippets, defaultSnippet) {
+		const snippetKey = this.get('snippet')
+		const snippet = has(snippetKey, snippets) ? snippets[snippetKey] : undefined
+		return snippet ?? defaultSnippet
+	}
+
 	/**
 	 * Identifies if the item has children
 	 */
 	get hasChildren() {
 		return (
 			typeof this.#original === 'object' &&
+			has(this.fields.children, this.#value) &&
 			Array.isArray(this.#value[this.fields.children]) &&
 			this.#value[this.fields.children].length > 0
 		)