Update dependencies to use jsonpath-plus and refactor JSONPath handling

Author: Christoffer Haglund

js/package-lock.json

@@ -29,11 +29,10 @@
 	},
 	"dependencies": {
 		"fast-json-patch": "^3.1.1",
-		"jsonpath": "^1.1.1"
+		"jsonpath-plus": "^10.4.0"
 	},
 	"devDependencies": {
 		"@types/chai": "^4.3.4",
-		"@types/jsonpath": "^0.2.0",
 		"@types/mocha": "^10.0.1",
 		"chai": "^4.3.7",
 		"mocha": "^10.2.0",

js/package.json

@@ -1,5 +1,5 @@
 import jsonpatch, { Operation } from 'fast-json-patch'
-import jp from 'jsonpath'
+import { JSONPath } from 'jsonpath-plus'
 
 // Export to help dependencies because this is used in our interface.
 export { Operation } from 'fast-json-patch'
@@ -101,10 +101,14 @@ export class Basin<T> {
 			delete cursor.d
 		}
 
-		const expressions = jp.parse(cursor.jsonPath!)
-		for (const expression of expressions) {
-			if (expression.expression.type !== 'root') {
-				this._keys.set(label, expression.expression.value)
+		if (!cursor.jsonPath!.startsWith('$')) {
+		 	cursor.jsonPath = '$.' + cursor.jsonPath
+		}
+
+		const pathArray = JSONPath.toPathArray(cursor.jsonPath!)
+		for (const segment of pathArray) {
+			if (segment !== '$') {
+				this._keys.set(label, segment)
 				break
 			}
 		}
@@ -123,9 +127,9 @@ export class Basin<T> {
 		const jsonPath = cursor.jsonPath!
 		if (typeof position !== 'number') {
 			// Set the value.
-			jp.value(this.items, jsonPath, value)
+			jpValue(this.items, jsonPath, value)
 		} else {
-			jp.apply(this.items, jsonPath, (currentValue: string) => {
+			jpApply(this.items, jsonPath, (currentValue: string) => {
 				if (Array.isArray(currentValue)) {
 					if (cursor.deleteCount !== undefined) {
 						// Delete
@@ -156,4 +160,32 @@ export class Basin<T> {
 		const key = this._keys.get(cursorLabel)!
 		return this.items[key]
 	}
+}
+
+function jpValue(obj: any, path: string, value: any): void {
+	const results: any[] = JSONPath({ path, json: obj, resultType: 'all' })
+	if (results.length > 0) {
+		results[0].parent[results[0].parentProperty] = value
+	} else {
+		// Path doesn't exist yet — create intermediate objects and set the value.
+		const pathArray = JSONPath.toPathArray(path)
+		let current = obj
+		for (let i = 1; i < pathArray.length - 1; i++) {
+			const key = pathArray[i]
+			if (current[key] === undefined) {
+				current[key] = {}
+			}
+			current = current[key]
+		}
+		if (pathArray.length > 1) {
+			current[pathArray[pathArray.length - 1]] = value
+		}
+	}
+}
+
+function jpApply(obj: any, path: string, fn: (value: any) => any): void {
+	const results: any[] = JSONPath({ path, json: obj, resultType: 'all' })
+	for (const result of results) {
+		result.parent[result.parentProperty] = fn(result.value)
+	}
 }