solarite 0.2.4 → 0.3.1

package/src/solarite/watch3.js

@@ -1,189 +0,0 @@
-/**
- * Trying to be able to automatically watch primitive values.
- * TODO:
- * 1.  Have get() return Proxies for nested updates.
- * 2.  Override .map() for loops to capture changes.
- */
-
-
-// Example:
-/*
-class WatchExample extends Solarite {
-
-	constructor(items = []) {
-		super();
-
-		this.items = items;
-		watch(this, 'items');
-
-		this.name = 'George';
-		watch(this, 'name');
-
-		this.render();
-	}
-
-	render() {
-		r(this)`
-		<watch-example>
-			${() => this.name + '!'}
-
-			${this.items.map(item => r`
-				<div>${item.name}</div>
-			`)}
-			${() => this.items.length}
-		</watch-example>`;
-	}
-}
-customElements.define('watch-example', WatchExample);
-
-let a = new WatchExample();
-
-// Items is a Proxy.
-// Calling push() will trigger the map'd ExprPaths to add another at the end.
-// And the .length expression to update.
-// Because accessing .items returns a proxy.
-a.items.push({name: 'Fred'});
-*/
-
-
-import Globals from "./Globals.js";
-import Util from "../util/Util.js";
-
-let unusedArg = Symbol('unusedArg');
-
-/**
- * Custom map function triggers the get() Proxy.
- * @param array {Array}
- * @param callback {function}
- * @returns {*[]} */
-function map(array, callback) {
-	let result = [];
-	for (let i=0; i<array.length; i++)
-		result.push(callback(array[i], i, array));
-	return result;
-}
-
-
-/**
- *
- * @param root {HTMLElement}
- * @param field {string}
- * @param value {string|Symbol} */
-export default function watch3(root, field, value=unusedArg) {
-	// Store internal value used by get/set.
-	if (value !== unusedArg)
-		root[field] = value;
-	else
-		value = root[field];
-
-
-	// use a single object for both defineProperty and new Proxy's handler.
-	const handler = {
-		get(obj, prop, receiver) {
-
-			let result = (obj === receiver && field === prop)
-				? value // top-level value.
-				: Reflect.get(obj, prop, receiver); // avoid infinite recursion.
-
-			if (prop === 'map')
-
-				// Double function so the ExprPath calls it as a function,
-				// instead of it being evaluated immediately when the Templat eis created.
-				return (callback) => () => {
-					let rootNg = Globals.nodeGroups.get(root);
-					rootNg.mapCallbacks.set(obj, callback);
-					return map(new Proxy(obj, handler), callback);
-				}
-
-			// Track which ExprPath is using this variable.
-			if (Globals.currentExprPath) {
-				let [exprPath, exprFunction] = Globals.currentExprPath; // Set in ExprPath.applyExact()
-
-				let rootNg = Globals.nodeGroups.get(root);
-
-				// Init for field.
-				rootNg.watchedExprPaths[field] = rootNg.watchedExprPaths[field] || new Set();
-				rootNg.watchedExprPaths[field].add(exprPath);
-			}
-
-			if (result && typeof result === 'object')
-				return new Proxy(result, handler);
-
-			return result;
-		},
-
-
-		// TODO: Will fail for attribute w/ a value having multiple ExprPaths.
-		// TODO: This won't update a component's expressions.
-		set(obj, prop, val, receiver) {
-
-			// 1. Set the value.
-			if (obj === receiver && field === prop)
-				value = val; // top-level value.
-			else // avoid infinite recursion.
-				Reflect.set(obj, prop, val, receiver);
-
-			// 2. Add to the list of ExprPaths to re-render.
-			let rootNg = Globals.nodeGroups.get(root);
-			for (let exprPath of rootNg.watchedExprPaths[field]) {
-
-				// Update a single NodeGroup created by array.map()
-				if (Array.isArray(obj) && parseInt(prop) == prop) {
-					let exprsToRender = rootNg.exprsToRender.get(exprPath);
-
-					// If we're not re-rendering the whole thing.
-					if (exprsToRender !== true)
-						Util.mapAdd(rootNg.exprsToRender, exprPath, [obj, prop, val]);
-				}
-
-				// Reapply the whole expression.
-				else
-					rootNg.exprsToRender.set(exprPath, true);
-			}
-			return true;
-		}
-	}
-
-	Object.defineProperty(root, field, {
-		get: () => handler.get(root, field, root),
-		set: (val) => handler.set(root, field, val, root)
-	});
-}
-
-/**
- * TODO: Rename so we have watch.add() and watch.render() ?
- * @param root
- * @returns {*[]} */
-export function renderWatched(root) {
-	let rootNg = Globals.nodeGroups.get(root);
-	let modified = [];
-
-	for (let [exprPath, params] of rootNg.exprsToRender) {
-
-		// Reapply the whole expression.
-		if (params === true) {
-			exprPath.apply(exprPath.watchFunction);
-
-			// TODO: freeNodeGroups() could be skipped if applyExprs() never marked them as in-use.
-			exprPath.freeNodeGroups();
-
-			modified.push(...exprPath.getNodes());
-		}
-
-		// Update a single NodeGroup created by array.map()
-		else {
-			for (let row of params) {
-				let [obj, prop, value] = row;
-				let callback = rootNg.mapCallbacks.get(obj);
-				let template = callback(value);
-				exprPath.applyLoopItemUpdate(prop, template);
-
-				modified.push(...exprPath.nodeGroups[prop].getNodes());
-			}
-		}
-	}
-
-	rootNg.exprsToRender = new Map(); // clear
-
-	return modified;
-}

package/src/util/Util.js

@@ -1,113 +0,0 @@
-
-
- 
- /**
- * @typedef {Array|function(...*)} Callbacks
- * @property {function(function)} push
- * @property {function()} remove
- * @property {function()} pause
- * @property {function()} resume
- * */
-
-
-/**
- * A place for functions that have no other home. */
-var Util = {
-
-	/**
-	 * Create an array-like object that stores a group of callbacks.
-	 * Supports all array functions and properties like push() and .length.
-	 * Can be called directly.
-	 *
-	 * @param functions {function[]}
-	 * @return {Callbacks|function}
-	 *
-	 * @example
-	 * var c = Util.callback();
-	 * var f = () => console.log(3);
-	 * c.push(f);
-	 * c();
-	 * c.remove(f);
-	 * c();
-	 */
-	callback(...functions) {
-		var paused = false;
-
-		// Make it callable.  When we call it, call all callbacks() with the given args.
-		let result = async function(...args) {
-			let result2 = [];
-			if (!paused)
-				for (let i=0; i<result.length; i++)
-					result2.push(result[i](...args));
-			return await Promise.all(result2);
-		};
-		
-		// Make it iterable.
-		result[Symbol.iterator] = function() {
-			let index = 0;
-			return {
-				next: () => index < result.length
-					 ? {value: result[index++], done: false}
-					 : {done: true}
-			};
-		};
-
-		// Use properties from Array
-		for (let prop of Object.getOwnPropertyNames(Array.prototype))
-			if (prop !== 'length' && prop !== 'constructor')
-				result[prop] = Array.prototype[prop];
-
-		result.l = 0; // Internal length
-		Object.defineProperty(result, 'length', {
-			get() { return result.l },
-			set(val) { result.l = val}
-		});
-
-		// Add the remove() function.
-		result.remove = func => {
-			let idx = result.findIndex(item => item === func);
-			if (idx !== -1)
-				result.splice(idx, 1);
-		};
-		result.pause = () => paused = true;
-
-		result.resume = () => paused = false;
-
-		// Add initial functions
-		for (let f of functions)
-			result.push(f);
-
-		return result;
-	},
-
-	/**
-	 * @param map {Map|WeakMap|Object}
-	 * @param key
-	 * @param value */
-	mapAdd(map, key, value) {
-		let isMap = map instanceof Map || map instanceof WeakMap;
-		let result = isMap ? map.get(key) : map[key];
-		if (!result) {
-			result = [value];
-			if (isMap)
-				map.set(key, result);
-			else
-				map[key] = result;
-		}
-		else
-			result.push(value);
-	},
-
-	weakMemoize(obj, callback) {
-		let result = weakMemoizeInputs.get(obj);
-		if (!result) {
-			result = callback(obj);
-			weakMemoizeInputs.set(obj, result);
-		}
-		return result;
-	}
-};
-
-let weakMemoizeInputs = new WeakMap();
-
-export default Util;