@rokkit/core 1.0.0-next.44 → 1.0.0-next.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rokkit/core",
-  "version": "1.0.0-next.44",
+  "version": "1.0.0-next.47",
   "description": "Core components, actions and stores for svelte apps.",
   "author": "Jerry Thomas <me@jerrythomas.name>",
   "license": "MIT",
@@ -13,17 +13,18 @@
     "access": "public"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^2.4.3",
+    "@sveltejs/vite-plugin-svelte": "^2.4.5",
     "@testing-library/svelte": "^4.0.3",
-    "@vitest/coverage-v8": "^0.33.0",
-    "@vitest/ui": "~0.33.0",
+    "@types/ramda": "^0.29.3",
+    "@vitest/coverage-v8": "^0.34.4",
+    "@vitest/ui": "~0.34.4",
     "jsdom": "^22.1.0",
-    "svelte": "^4.1.1",
-    "typescript": "^5.1.6",
+    "svelte": "^4.2.0",
+    "typescript": "^5.2.2",
     "validators": "latest",
-    "vite": "^4.4.7",
-    "vitest": "~0.33.0",
-    "shared-config": "1.0.0-next.44"
+    "vite": "^4.4.9",
+    "vitest": "~0.34.4",
+    "shared-config": "1.0.0-next.47"
   },
   "files": [
     "src/**/*.js",

package/src/mapped-list.js

@@ -1,3 +1,4 @@
+import { defaultFields } from './constants'
 import { isExpanded, hasChildren, getAttribute } from './mapping'
 import { equals } from 'ramda'
 /**
@@ -11,7 +12,7 @@ import { equals } from 'ramda'
 export function findItemByValue(
 	value,
 	items,
-	fields,
+	fields = defaultFields,
 	attr = null,
 	position = []
 ) {
@@ -72,12 +73,11 @@ export function findItemByIndexArray(indices, items, fields) {
  * @returns
  */
 export function findNearestItemBefore(position, items, fields) {
-	if (position.length == 0) return null
 	if (items.length === 0) return null
-	if ((position ?? []).length === 0)
-		return { item: items[0], position: [0], fields }
+	if (position.length === 0) return { item: items[0], position: [0], fields }
 
 	let index = position[position.length - 1]
+	let result
 	if (index > 0) {
 		index -= 1
 		if (position.length == 1) {
@@ -89,10 +89,15 @@ export function findNearestItemBefore(position, items, fields) {
 			items,
 			fields
 		)
-		return findLastVisibleChild(sibling.item, sibling.position, sibling.fields)
+		result = findLastVisibleChild(
+			sibling.item,
+			sibling.position,
+			sibling.fields
+		)
 	} else {
-		return findItemByIndexArray(position.slice(0, -1), items, fields)
+		result = findItemByIndexArray(position.slice(0, -1), items, fields)
 	}
+	return result
 }
 
 /**
@@ -123,18 +128,18 @@ export function findLastVisibleChild(parent, position, fields) {
  */
 export function findNearestItemAfter(position, items, fields) {
 	if (items.length === 0) return null
-	if ((position ?? []).length === 0)
-		return { item: items[0], position: [0], fields }
+	if (position.length === 0) return { item: items[0], position: [0], fields }
 
 	let current = findItemByIndexArray(position, items, fields)
-
+	let result
 	if (isExpanded(current.item, current.fields)) {
-		return getFirstChild(current, position)
+		result = getFirstChild(current, position)
 	} else if (position.length === 1) {
-		return getNextSiblingAtRoot(position, items, fields)
+		result = getNextSiblingAtRoot(position, items, fields)
 	} else {
-		return getNextSiblingOrAncestor(position, items, fields)
+		result = getNextSiblingOrAncestor(position, items, fields)
 	}
+	return result
 }
 
 /**
@@ -179,7 +184,6 @@ function getNextSiblingAtRoot(position, items, fields) {
 function getNextSiblingOrAncestor(position, items, fields) {
 	let index = position[position.length - 1]
 	let parent = findItemByIndexArray(position.slice(0, -1), items, fields)
-
 	let children = parent.item[parent.fields.children]
 	if (index < children.length - 1) {
 		index += 1