From ad779629a5d7c4f8981bad03610da2a9cf3ac030 Mon Sep 17 00:00:00 2001
From: Timothy Farrell <tim@thecookiejar.me>
Date: Sat, 31 Mar 2018 15:34:28 -0500
Subject: [PATCH] Clear up varname confusion.

---
 packages/frptools/package.json     | 2 +-
 packages/frptools/src/computed.js  | 6 +++---
 packages/frptools/src/container.js | 2 +-
 packages/frptools/src/property.js  | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/frptools/package.json b/packages/frptools/package.json
index 0ea70d4..e5911a5 100644
--- a/packages/frptools/package.json
+++ b/packages/frptools/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "frptools",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"description": "Observable Property and Computed data streams",
 	"main": "src/index.js",
 	"files": ["src"],
diff --git a/packages/frptools/src/computed.js b/packages/frptools/src/computed.js
index af24102..004635e 100644
--- a/packages/frptools/src/computed.js
+++ b/packages/frptools/src/computed.js
@@ -4,7 +4,7 @@ export function computed(fn, dependencies = [], hash = id) {
 	let subscribers = [];
 	let isDirty = true;
 	let val;
-	let id;
+	let oldId;
 
 	// Compute new value, call subscribers if changed.
 	const accessor = function _computed() {
@@ -12,8 +12,8 @@ export function computed(fn, dependencies = [], hash = id) {
 			const newVal = fn.apply(null, dependencies.map(runParam));
 			isDirty = false;
 			const newId = hash(newVal);
-			if (id !== newId) {
-				id = newId;
+			if (oldId !== newId) {
+				oldId = newId;
 				val = newVal;
 				accessor.fire(val);
 			}
diff --git a/packages/frptools/src/container.js b/packages/frptools/src/container.js
index 127750b..eac0aa4 100644
--- a/packages/frptools/src/container.js
+++ b/packages/frptools/src/container.js
@@ -1,4 +1,4 @@
-import { id, registerSubscriptions, registerFire } from './util.js';
+import { registerSubscriptions, registerFire } from './util.js';
 
 export function container(store, hash) {
 	let subscribers = [];
diff --git a/packages/frptools/src/property.js b/packages/frptools/src/property.js
index 491c039..4489d3e 100644
--- a/packages/frptools/src/property.js
+++ b/packages/frptools/src/property.js
@@ -2,12 +2,12 @@ import { id, registerSubscriptions, registerFire } from './util.js';
 
 export function prop(store, hash = id) {
 	let subscribers = [];
-	let id = hash(store);
+	let oldId = hash(store);
 
 	const accessor = function _prop(newVal) {
 		const newId = hash(newVal);
-		if (newVal !== undefined && id !== newId) {
-			id = newId;
+		if (newVal !== undefined && oldId !== newId) {
+			oldId = newId;
 			store = newVal;
 			accessor.fire(store);
 		}