ripple 0.2.44 → 0.2.46

package/src/compiler/utils.js

@@ -19,7 +19,7 @@ const VOID_ELEMENT_NAMES = [
 	'param',
 	'source',
 	'track',
-	'wbr'
+	'wbr',
 ];
 
 /**
@@ -374,6 +374,30 @@ export function is_inside_component(context, includes_functions = false) {
 	return false;
 }
 
+export function is_component_level_function(context) {
+	for (let i = context.path.length - 1; i >= 0; i -= 1) {
+		const context_node = context.path[i];
+		const type = context_node.type;
+
+		if (type === 'BlockStatement') {
+			if (context_node.body.find((n) => n.type === 'Component')) {
+				return true;
+			}
+			debugger
+			
+		}
+
+		if (
+			type === 'FunctionExpression' ||
+			type === 'ArrowFunctionExpression' ||
+			type === 'FunctionDeclaration'
+		) {
+			return false;
+		}
+	}
+	return true;
+}
+
 export function is_inside_call_expression(context) {
 	for (let i = context.path.length - 1; i >= 0; i -= 1) {
 		const context_node = context.path[i];
@@ -452,7 +476,7 @@ export function is_ripple_import(callee, context) {
 	return false;
 }
 
-export function is_declared_within_component(node, context) {
+export function is_declared_function_within_component(node, context) {
 	const component = context.path.find((n) => n.type === 'Component');
 
 	if (node.type === 'Identifier' && component) {
@@ -460,6 +484,14 @@ export function is_declared_within_component(node, context) {
 		const component_scope = context.state.scopes.get(component);
 
 		if (binding !== null && component_scope !== null) {
+			if (
+				binding.declaration_kind !== 'function' &&
+				binding.initial?.type !== 'FunctionDeclaration' &&
+				binding.initial?.type !== 'ArrowFunctionExpression' &&
+				binding.initial?.type !== 'FunctionExpression'
+			) {
+				return false;
+			}
 			let scope = binding.scope;
 
 			while (scope !== null) {
@@ -564,19 +596,21 @@ export function build_assignment(operator, left, right, context) {
 	const transform = binding.transform;
 
 	// reassignment
-	if (
-		(object === left || (left.type === 'MemberExpression' && left.computed && operator === '=')) &&
-		transform?.assign
-	) {
-		let value = /** @type {Expression} */ (
-			context.visit(build_assignment_value(operator, left, right))
-		);
+	if (object === left || (left.type === 'MemberExpression' && left.computed && operator === '=')) {
+		const assign_fn = transform?.assign || transform?.assign_tracked;
+		if (assign_fn) {
+			let value = /** @type {Expression} */ (
+				context.visit(build_assignment_value(operator, left, right))
+			);
 
-		return transform.assign(
-			object,
-			value,
-			left.type === 'MemberExpression' && left.computed ? context.visit(left.property) : undefined,
-		);
+			return assign_fn(
+				object,
+				value,
+				left.type === 'MemberExpression' && left.computed
+					? context.visit(left.property)
+					: undefined,
+			);
+		}
 	}
 
 	// mutation

package/src/runtime/array.js

@@ -1,8 +1,11 @@
-import { TRACKED_OBJECT, ARRAY_SET_INDEX_AT } from './internal/client/constants.js';
+import { TRACKED_OBJECT, ARRAY_SET_INDEX_AT, MAX_ARRAY_LENGTH } from './internal/client/constants.js';
 import { get, safe_scope, set, tracked } from './internal/client/runtime.js';
 import { is_ripple_array } from './internal/client/utils.js';
 /** @import { Block, Tracked } from '#client' */
 
+/** @type {unique symbol} */
+const INIT_AFTER_NEW = Symbol();
+
 /** @type {(symbol | string | any)[]} */
 const introspect_methods = [
 	'concat',
@@ -36,7 +39,7 @@ const introspect_methods = [
 	'with',
 ];
 
-let init = false;
+let is_proto_set = false;
 
 /**
  * @template T
@@ -45,6 +48,8 @@ let init = false;
 export class RippleArray extends Array {
 	/** @type {Array<Tracked>} */
 	#tracked_elements = [];
+	/** @type {Tracked} */
+	// @ts-expect-error
 	#tracked_index;
 
     /**
@@ -55,11 +60,11 @@ export class RippleArray extends Array {
      * @returns {RippleArray<U>}
      */
 	static from(arrayLike, mapFn, thisArg) {
-		return new RippleArray(...(
-			mapFn ?
+		var arr = mapFn ?
 			Array.from(arrayLike, mapFn, thisArg)
-        	: Array.from(arrayLike)
-		));
+        	: Array.from(arrayLike);
+
+		return get_instance_from_static(arr);
 	}
 
     /**
@@ -70,11 +75,30 @@ export class RippleArray extends Array {
      * @returns {Promise<RippleArray<U>>}
      */
 	static async fromAsync(arrayLike, mapFn, thisArg) {
-		return new RippleArray(...(
-			mapFn ?
+		var block = safe_scope();
+		// create empty array to get the right scope
+		var result = new RippleArray();
+
+		var arr = mapFn ?
 			await Array.fromAsync(arrayLike, mapFn, thisArg)
 			: await Array.fromAsync(arrayLike)
-		));
+
+		var first = get_first_if_length(arr);
+
+		if (first) {
+			result[0] = first;
+		} else {
+			result.length = arr.length;
+			for (let i = 0; i < arr.length; i++) {
+				if (i in arr) {
+					result[i] = arr[i];
+				}
+			}
+		}
+
+		result[INIT_AFTER_NEW](block);
+
+		return result
 	}
 
     /**
@@ -83,7 +107,9 @@ export class RippleArray extends Array {
      * @returns {RippleArray<U>}
      */
 	static of(...elements) {
-		return new RippleArray(...elements);
+		var arr = Array.of(...elements);
+
+		return get_instance_from_static(arr);
 	}
 
 	/**
@@ -92,24 +118,33 @@ export class RippleArray extends Array {
 	constructor(...elements) {
 		super(...elements);
 
-		var block = safe_scope();
-		var tracked_elements = this.#tracked_elements;
+		this[INIT_AFTER_NEW]();
 
-		for (var i = 0; i < this.length; i++) {
-			if (!(i in this)) {
-				continue;
+		if (!is_proto_set) {
+			is_proto_set = true;
+			this.#set_proto();
+		}
+	}
+
+	[INIT_AFTER_NEW](block = safe_scope()) {
+		if (this.length !== 0) {
+			var tracked_elements = this.#tracked_elements;
+			for (var i = 0; i < this.length; i++) {
+				if (!(i in this)) {
+					continue;
+				}
+				tracked_elements[i] = tracked(this[i], block);
 			}
-			tracked_elements[i] = tracked(this[i], block);
 		}
-		this.#tracked_index = tracked(this.length, block);
 
-		if (!init) {
-			init = true;
-			this.#init();
+		if (!this.#tracked_index) {
+			this.#tracked_index = tracked(this.length, block);
+		} else if (this.#tracked_index.v !== this.length) {
+			set(this.#tracked_index, this.length, block);
 		}
 	}
 
-	#init() {
+	#set_proto() {
 		var proto = RippleArray.prototype;
 		var array_proto = Array.prototype;
 
@@ -138,7 +173,7 @@ export class RippleArray extends Array {
 				// the caller reruns on length changes
 				this.$length;
 				// the caller reruns on element changes
-				get_all_elements(this);
+				establish_trackable_deps(this);
 				return result;
 			};
 		}
@@ -564,14 +599,72 @@ export class RippleArray extends Array {
 export function get_all_elements(array) {
 	/** @type {Tracked[]} */
 	var tracked_elements = /** @type {Tracked[]} */ (array[TRACKED_OBJECT]);
-	var arr = [];
+	// pre-allocate to support holey arrays
+	var result = new Array(array.length);
+
+	for (var i = 0; i < array.length; i++) {
+		if (tracked_elements[i] !== undefined) {
+			get(tracked_elements[i]);
+		}
+
+		if (i in array) {
+			result[i] = array[i];
+		}
+	}
+
+	return result;
+}
+
+/**
+ * @template T
+ * @param {RippleArray<T>} array
+ * @returns {void}
+ */
+function establish_trackable_deps (array) {
+	var tracked_elements = array[TRACKED_OBJECT];
 
 	for (var i = 0; i < tracked_elements.length; i++) {
 		if (tracked_elements[i] !== undefined) {
 			get(tracked_elements[i]);
 		}
-		arr.push(array[i]);
+	}
+}
+
+/**
+ * @template T
+ * @param {T[]} array
+ * @returns {RippleArray<T>}
+ */
+function get_instance_from_static(array) {
+	/** @type RippleArray<T> */
+	var result;
+	/** @type {T | void} */
+	var first = get_first_if_length(array);
+
+	if (first) {
+		result = new RippleArray();
+		result[0] = first;
+		result[INIT_AFTER_NEW]();
+	} else {
+		result = new RippleArray(...array);
 	}
 
-	return arr;
+	return result;
+}
+
+/**
+ * @template T
+ * @param {T[]} array
+ * @returns {T | void}
+ */
+function get_first_if_length (array) {
+	var first = array[0];
+
+	if (
+		array.length === 1 && (0 in array) && Number.isInteger(first)
+		&& /** @type {number} */ (first) >= 0
+		&& /** @type {number} */ (first) <= MAX_ARRAY_LENGTH
+	) {
+		return first;
+	}
 }

package/src/runtime/index.js

@@ -36,7 +36,7 @@ export function mount(component, options) {
 
 export { create_context as createContext } from './internal/client/context.js';
 
-export { flush_sync as flushSync, untrack, deferred } from './internal/client/runtime.js';
+export { flush_sync as flushSync, untrack, deferred, tracked } from './internal/client/runtime.js';
 
 export { RippleArray } from './array.js';
 

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

@@ -1,5 +1,5 @@
 import { TRACKED_OBJECT } from './constants';
-import { get_property } from './runtime';
+import { old_get_property } from './runtime';
 
 const array_proto = Array.prototype;
 
@@ -21,7 +21,7 @@ export function array_reduce(array, callback, initial_value) {
 	let accumulator = initial_value;
 
 	for (let i = 0; i < array.length; i++) {
-		accumulator = callback(accumulator, get_property(array, i), i, array);
+		accumulator = callback(accumulator, old_get_property(array, i), i, array);
 	}
 
 	return accumulator;
@@ -45,7 +45,7 @@ export function array_join(array, separator) {
 		if (i > 0 && separator !== undefined) {
 			result += separator;
 		}
-		result += String(get_property(array, i));
+		result += String(old_get_property(array, i));
 	}
 
 	return result;
@@ -68,7 +68,7 @@ export function array_map(array, callback) {
 	const result = [];
 	for (let i = 0; i < array.length; i++) {
 		if (i in array) {
-			result[i] = callback(get_property(array, i), i, array);
+			result[i] = callback(old_get_property(array, i), i, array);
 		}
 	}
 
@@ -91,7 +91,7 @@ export function array_filter(array, callback) {
 	const result = [];
 	for (let i = 0; i < array.length; i++) {
 		if (i in array) {
-			const value = get_property(array, i);
+			const value = old_get_property(array, i);
 			if (callback(value, i, array)) {
 				result.push(value);
 			}
@@ -116,7 +116,7 @@ export function array_forEach(array, callback) {
 
 	for (let i = 0; i < array.length; i++) {
 		if (i in array) {
-			callback(get_property(array, i), i, array);
+			callback(old_get_property(array, i), i, array);
 		}
 	}
 }
@@ -135,7 +135,7 @@ export function array_includes(array, value) {
 	}
 
 	for (let i = 0; i < array.length; i++) {
-		if (i in array && get_property(array, i) === value) {
+		if (i in array && old_get_property(array, i) === value) {
 			return true;
 		}
 	}
@@ -157,7 +157,7 @@ export function array_indexOf(array, value) {
 	}
 
 	for (let i = 0; i < array.length; i++) {
-		if (i in array && get_property(array, i) === value) {
+		if (i in array && old_get_property(array, i) === value) {
 			return i;
 		}
 	}
@@ -179,7 +179,7 @@ export function array_lastIndexOf(array, value) {
 	}
 
 	for (let i = array.length - 1; i >= 0; i--) {
-		if (i in array && get_property(array, i) === value) {
+		if (i in array && old_get_property(array, i) === value) {
 			return i;
 		}
 	}
@@ -201,7 +201,7 @@ export function array_every(array, callback) {
   }
 
   for (let i = 0; i < array.length; i++) {
-    if (i in array && !callback(get_property(array, i), i, array)) {
+    if (i in array && !callback(old_get_property(array, i), i, array)) {
       return false;
     }
   }
@@ -223,7 +223,7 @@ export function array_some(array, callback) {
   }
 
   for (let i = 0; i < array.length; i++) {
-    if (i in array && callback(get_property(array, i), i, array)) {
+    if (i in array && callback(old_get_property(array, i), i, array)) {
       return true;
     }
   }
@@ -249,7 +249,7 @@ export function array_toString(array) {
       result += ',';
     }
     if (i in array) {
-      result += String(get_property(array, i));
+      result += String(old_get_property(array, i));
     }
   }
 
@@ -272,7 +272,7 @@ export function array_toSorted(array, compare_fn) {
   const result = [];
   for (let i = 0; i < array.length; i++) {
     if (i in array) {
-      result.push(get_property(array, i));
+      result.push(old_get_property(array, i));
     }
   }
 
@@ -297,7 +297,7 @@ export function array_toSpliced(array, start, delete_count, ...items) {
   const result = [];
   for (let i = 0; i < array.length; i++) {
     if (i in array) {
-      result.push(get_property(array, i));
+      result.push(old_get_property(array, i));
     }
   }
 
@@ -321,7 +321,7 @@ export function array_values(array) {
   const result = [];
   for (let i = 0; i < array.length; i++) {
     if (i in array) {
-      result.push(get_property(array, i));
+      result.push(old_get_property(array, i));
     }
   }
 
@@ -344,7 +344,7 @@ export function array_entries(array) {
 	const result = [];
 	for (let i = 0; i < array.length; i++) {
 		if (i in array) {
-			result.push([i, get_property(array, i)]);
+			result.push([i, old_get_property(array, i)]);
 		}
 	}
 

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

@@ -22,7 +22,6 @@ import {
 	run_block,
 	run_teardown,
 	schedule_update,
-	set_property,
 } from './runtime';
 import { suspend } from './try';
 

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

@@ -19,8 +19,11 @@ export var DESTROYED = 1 << 17;
 export var LOGIC_BLOCK = FOR_BLOCK | IF_BLOCK | TRY_BLOCK;
 
 export var UNINITIALIZED = Symbol();
-export var TRACKED_OBJECT = Symbol();
+/** @type {unique symbol} */
+export const TRACKED_OBJECT = Symbol();
 export var SPREAD_OBJECT = Symbol();
 export var COMPUTED_PROPERTY = Symbol();
 export var REF_PROP = 'ref';
-export var ARRAY_SET_INDEX_AT = Symbol();
+/** @type {unique symbol} */
+export const ARRAY_SET_INDEX_AT = Symbol();
+export const MAX_ARRAY_LENGTH = 2**32 - 1;

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

@@ -29,10 +29,14 @@ export {
 	computed_property,
 	call_property,
 	get_property,
+	old_get_property,
+	old_set_property,
 	set_property,
 	update,
 	update_pre,
+	old_update_property,
 	update_property,
+	old_update_pre_property,
 	update_pre_property,
 	object_values,
 	object_entries,

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

@@ -2,7 +2,7 @@ import { branch, destroy_block, render } from './blocks';
 import { UNINITIALIZED } from './constants';
 import { handle_root_events } from './events';
 import { create_text } from './operations';
-import { get_property } from './runtime';
+import { old_get_property } from './runtime';
 
 export function Portal(_, props) {
 	let $target = UNINITIALIZED;
@@ -11,8 +11,8 @@ export function Portal(_, props) {
 	var anchor = null;
 
 	render(() => {
-		if ($target === ($target = get_property(props, '$target'))) return;
-		if (children === (children = get_property(props, 'children'))) return;
+		if ($target === ($target = old_get_property(props, '$target'))) return;
+		if (children === (children = old_get_property(props, 'children'))) return;
 
 		if (b !== null) {
 			destroy_block(b);

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

@@ -260,6 +260,7 @@ export function run_block(block) {
  * @returns {Tracked}
  */
 export function tracked(v, b) {
+	// TODO: now we expose tracked, we should likely block access in DEV somehow
 	return {
 		b,
 		c: 0,
@@ -430,7 +431,7 @@ export function deferred(fn) {
 		var value = fn();
 
 		res[0] = value;
-		set_property(res, 0, value, block);
+		old_set_property(res, 0, value, block);
 
 		if (prev_value !== UNINITIALIZED) {
 			if ((t.f & DEFERRED) === 0) {
@@ -869,7 +870,7 @@ export function computed_property(fn) {
 export function call_property(obj, property, chain_obj, chain_prop, ...args) {
 	// don't swallow errors if either the object or property is nullish,
 	// respect optional chaining as provided
-	if(!chain_obj && !chain_prop) {
+	if (!chain_obj && !chain_prop) {
 		return obj[property].call(obj, ...args);
 	} else if (chain_obj && chain_prop) {
 		return obj?.[property]?.call(obj, ...args);
@@ -887,6 +888,20 @@ export function call_property(obj, property, chain_obj, chain_prop, ...args) {
  * @returns {any}
  */
 export function get_property(obj, property, chain = false) {
+	if (chain && obj == null) {
+		return undefined;
+	}
+	var tracked = obj[property];
+	return get(tracked);
+}
+
+/**
+ * @param {any} obj
+ * @param {string | number | symbol} property
+ * @param {boolean} [chain=false]
+ * @returns {any}
+ */
+export function old_get_property(obj, property, chain = false) {
 	if (chain && obj == null) {
 		return undefined;
 	}
@@ -902,7 +917,7 @@ export function get_property(obj, property, chain = false) {
 	} else if (SPREAD_OBJECT in obj) {
 		var spread_fn = obj[SPREAD_OBJECT];
 		var properties = spread_fn();
-		return get_property(properties, property, chain);
+		return old_get_property(properties, property, chain);
 	} else if (is_ripple_array(obj)) {
 		obj.$length;
 	}
@@ -910,6 +925,11 @@ export function get_property(obj, property, chain = false) {
 	return value;
 }
 
+export function set_property(obj, property, value, block) {
+	var tracked = obj[property];
+	set(tracked, value, block);
+}
+
 /**
  * @param {any} obj
  * @param {string | number | symbol} property
@@ -917,7 +937,7 @@ export function get_property(obj, property, chain = false) {
  * @param {Block} block
  * @returns {any}
  */
-export function set_property(obj, property, value, block) {
+export function old_set_property(obj, property, value, block) {
 	var tracked_properties = obj[TRACKED_OBJECT];
 	var rip_arr = is_ripple_array(obj);
 	var tracked = !(rip_arr && property === 'length') ? tracked_properties?.[property] : undefined;
@@ -954,9 +974,7 @@ export function set_property(obj, property, value, block) {
 export function update(tracked, block, d = 1) {
 	var value = get(tracked);
 	var result = d === 1 ? value++ : value--;
-
 	set(tracked, value, block);
-
 	return result;
 }
 
@@ -987,9 +1005,15 @@ export function decrement(tracked, block) {
 export function update_pre(tracked, block, d = 1) {
 	var value = get(tracked);
 	var new_value = d === 1 ? ++value : --value;
-
 	set(tracked, new_value, block);
+	return new_value;
+}
 
+export function update_property(obj, property, block, d = 1) {
+	var tracked = obj[property];
+	var value = get(tracked);
+	var new_value = d === 1 ? value++ : value++;
+	set(tracked, value, block);
 	return new_value;
 }
 
@@ -1000,7 +1024,7 @@ export function update_pre(tracked, block, d = 1) {
  * @param {number} [d]
  * @returns {number}
  */
-export function update_property(obj, property, block, d = 1) {
+export function old_update_property(obj, property, block, d = 1) {
 	var tracked_properties = obj[TRACKED_OBJECT];
 	var tracked = tracked_properties?.[property];
 	var tracked_exists = tracked !== undefined;
@@ -1018,11 +1042,19 @@ export function update_property(obj, property, block, d = 1) {
 		}
 	}
 
-	obj[property] = value
+	obj[property] = value;
 
 	return value;
 }
 
+export function update_pre_property(obj, property, block, d = 1) {
+	var tracked = obj[property];
+	var value = get(tracked);
+	var new_value = d === 1 ? ++value : --value;
+	set(tracked, new_value, block);
+	return new_value;
+}
+
 /**
  * @param {any} obj
  * @param {string | number | symbol} property
@@ -1030,19 +1062,19 @@ export function update_property(obj, property, block, d = 1) {
  * @param {number} [d]
  * @returns {number}
  */
-export function update_pre_property(obj, property, block, d = 1) {
+export function old_update_pre_property(obj, property, block, d = 1) {
 	var tracked_properties = obj[TRACKED_OBJECT];
 	var tracked = tracked_properties?.[property];
 	var tracked_exists = tracked !== undefined;
 	var value = tracked_exists ? get(tracked) : obj[property];
 
 	if (d === 1) {
-		++value
+		++value;
 		if (tracked_exists) {
 			increment(tracked, block);
 		}
 	} else {
-		--value
+		--value;
 		if (tracked_exists) {
 			decrement(tracked, block);
 		}
@@ -1091,7 +1123,7 @@ export function object_values(obj) {
 	var values = [];
 
 	for (var i = 0; i < keys.length; i++) {
-		values.push(get_property(obj, keys[i]));
+		values.push(old_get_property(obj, keys[i]));
 	}
 
 	return values;
@@ -1111,7 +1143,7 @@ export function object_entries(obj) {
 
 	for (var i = 0; i < keys.length; i++) {
 		var key = keys[i];
-		entries.push([key, get_property(obj, key)]);
+		entries.push([key, old_get_property(obj, key)]);
 	}
 
 	return entries;
@@ -1128,7 +1160,7 @@ export function spread_object(obj) {
 
 	for (var i = 0; i < keys.length; i++) {
 		var key = keys[i];
-		values[key] = get_property(obj, key);
+		values[key] = old_get_property(obj, key);
 	}
 
 	return values;