cleanup and notes...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

pwiki/page.js

@@ -1255,6 +1255,18 @@ object.Constructor('Page', BasePage, {
 
 //---------------------------------------------------------------------
 
+var getCachedProp = function(obj, name){
+	var that = obj
+	var value = obj.cache ?
+		obj.cache[name]
+		: object.parentProperty(CachedPage.prototype, name).get.call(obj)
+	value instanceof Promise
+		&& value.then(function(value){
+			that.cache = {[name]: value} })
+	return value }
+var setCachedProp = function(obj, name, value){
+	return object.parentProperty(CachedPage.prototype, name).set.call(obj, value) }
+
 // XXX this is good enough on the front-side to think about making the 
 // 		cache persistent with a very large timeout (if set at all), but
 // 		we are not tracking changes on the store-side...
@@ -1304,7 +1316,6 @@ object.Constructor('CachedPage', Page, {
 			// 		miss creating a subtree (ex: /tree), while matching 
 			// 		/* to anything will give us lots of false positives...
 			if(key != path && deps.has(path)){
-				//console.log('CACHE: DROP:', key)
 				delete this.cachestore[key] } } },
 
 	checkCache: function(...paths){
@@ -1341,26 +1352,19 @@ object.Constructor('CachedPage', Page, {
 		this.cache = null
 		return object.parentCall(CachedPage.prototype.__delete__, this, ...arguments) },
 
-	get text(){
+	/* XXX do we need to cache .raw???
-		var that = this
+	//		...yes this makes things marginally faster but essentially 
-
+	//		copies the db into memory...
-		/* XXX
+	get raw(){
-		console.log(
+		return getCachedProp(this, 'raw') },
-			this.cache ? 
+	set raw(value){
-				'CACHED:' 
+		return setCachedProp(this, 'raw', value) },
-				: 'RENDER:', 
-			this.path)
 	//*/
 
-		var text = this.cache ?
+	get text(){
-			this.cache.text
+		return getCachedProp(this, 'text') },
-			: object.parentProperty(CachedPage.prototype, 'text').get.call(this)
-		text instanceof Promise
-			&& text.then(function(text){
-				that.cache = {text} })
-		return text },
 	set text(value){
-		object.parentProperty(CachedPage.prototype, 'text').set.call(this, value) },
+		return setCachedProp(this, 'text', value) },
 })
 
 

pwiki/store/base.js

@@ -663,7 +663,7 @@ module.MetaStore = {
 // XXX TEST...
 var CachedStore =
 module.CachedStore = {
-	//__proto__: FileStoreRO,
+	__proto__: MetaStore,
 	
 	// format:
 	// 	{

pwiki2.js

@@ -1,8 +1,6 @@
 /**********************************************************************
 * 
 *
-* XXX BUG: 
-* 			await pwiki.get('/* /path').text -> '' (wrong)
 * XXX NORMCACHE .normalize(..) cache normalized strings...
 * 		...seems to have little impact...
 * XXX MATCH limit candidates to actual page name matches -- this will