ripple 0.2.84 → 0.2.86

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is an elegant TypeScript UI framework",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.2.84",
+  "version": "0.2.86",
   "type": "module",
   "module": "src/runtime/index-client.js",
   "main": "src/runtime/index-client.js",

package/src/compiler/utils.js

@@ -379,7 +379,6 @@ export function is_component_level_function(context) {
 }
 
 export function is_ripple_track_call(callee, context) {
-<<<<<<< Updated upstream
   return (
     (callee.type === 'Identifier' && (callee.name === 'track' || callee.name === 'trackSplit')) ||
     (callee.type === 'MemberExpression' &&
@@ -389,17 +388,6 @@ export function is_ripple_track_call(callee, context) {
       !callee.computed &&
       is_ripple_import(callee, context))
   );
-=======
-	return (
-		(callee.type === 'Identifier' && callee.name === 'track') ||
-		(callee.type === 'MemberExpression' &&
-			callee.object.type === 'Identifier' &&
-			callee.property.type === 'Identifier' &&
-			callee.property.name === 'track' &&
-			!callee.computed &&
-			is_ripple_import(callee, context))
-	);
->>>>>>> Stashed changes
 }
 
 export function is_inside_call_expression(context) {

package/src/runtime/internal/client/runtime.js

@@ -1,5 +1,4 @@
 /** @import { Block, Component, Dependency, Derived, Tracked } from '#client' */
-/** @import { TrackOptions } from '#public' */
 
 import {
 	destroy_block,
@@ -289,8 +288,8 @@ export function derived(fn, block, get, set) {
 
 /**
  * @param {any} v
- * @param {Function | undefined} get
- * @param {Function | undefined} set
+ * @param {(value: any) => any | undefined} get
+ * @param {(next: any, prev: any) => any | undefined} set
  * @param {Block} b
  * @returns {Tracked | Derived}
  */
@@ -800,7 +799,7 @@ export function set(tracked, value, block) {
 
 		var set = tracked.a.set;
 		if (set) {
-			value = set(value);
+			value = set(value, old_value);
 		}
 
 		tracked.v = value;

package/tests/client/basic.test.ripple

@@ -1498,6 +1498,27 @@ describe('basic client', () => {
 		expect(countDiv.textContent).toBe('3');
 	});
 
+	it('passes in next and prev to track set function', () => {
+		let logs = [];
+
+		component App() {
+			let count = track(0, v => v, (next, prev) => {
+				logs.push(prev, next);
+				return next;
+			});
+
+			<button onClick={() => { @count++ }}>{'Increment'}</button>
+		}
+
+		render(App);
+
+		const button = container.querySelector('button');
+		button.click();
+		flushSync();
+
+		expect(logs).toEqual([0, 1]);
+	});
+
 	it('works as a reactive TrackedArray when constructed using # syntactic sugar', () => {
 		component App() {
 			const array = #[1, 2, 3];

package/types/index.d.ts

@@ -86,7 +86,7 @@ type RestKeys<T, K extends readonly (keyof T)[]> = Expand<Omit<T, K[number]>>;
 type SplitResult<T extends Props, K extends readonly (keyof T)[]> =
   [...PickKeys<T, K>, Tracked<RestKeys<T, K>>];
 
-export declare function track<V>(value?: V | (() => V), get?: (v: V) => V, set?: (v: V) => V): Tracked<V>;
+export declare function track<V>(value?: V | (() => V), get?: (v: V) => V, set?: (next: V, prev: V) => V): Tracked<V>;
 
 export declare function trackSplit<V extends Props, const K extends readonly (keyof V)[]>(
 	value: V,