From c2949d3d359030fd57875fc1dd51462a28fd0f28 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Sun, 2 Sep 2018 04:00:45 +0300
Subject: [PATCH] more fixes...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 diff.js   | 10 ++++++----
 format.js | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/diff.js b/diff.js
index 40f8d2c..b3173bc 100644
--- a/diff.js
+++ b/diff.js
@@ -13,9 +13,11 @@ var object = require('ig-object')
 
 /*********************************************************************/
 
-var FORMAT_NAME = 'object-diff'
-var FORMAT_VERSION = '0.0.0'
+var FORMAT_NAME =
+module.FORMAT_NAME = 'object-diff'
 
+var FORMAT_VERSION =
+module.FORMAT_VERSION = '0.0.0'
 
 var MIN_TEXT_LENGTH = 100
 
@@ -2226,9 +2228,9 @@ var DiffClassPrototype = {
 var DiffPrototype = {
 	// system meta information...
 	get format(){
-		return this.constructor.format },
+		return this.constructor.types.format },
 	get version(){
-		return this.constructor.version },
+		return this.constructor.types.version },
 
 	// XXX is this the right thing to do???
 	// 		...the bad thing here is that this can be mutated from the 
diff --git a/format.js b/format.js
index eec7c34..3058727 100644
--- a/format.js
+++ b/format.js
@@ -62,10 +62,8 @@ var DIFF_OBJECT =
 module.DIFF_OBJECT = AND(
 	AT('format', diff.FORMAT_NAME),
 	//AT('version', STRING(/\d+\.\d+\.\d+/)),
-	AT('placeholders', AND(
-		// XXX must be unique ANY...
-		AT('NONE', ANY),
-		AT('EMPTY', ANY))),
+	AT('version', diff.FORMAT_VERSION),
+
 	AT('options', AND(
  		AT('tree_diff', OR(BOOL, null)),
  		AT('keep_none', OR(BOOL, null)),
@@ -75,6 +73,11 @@ module.DIFF_OBJECT = AND(
  		AT('EMPTY', OR(ANY, null)),
  		AT('no_length', OR(BOOL, null)),
  		AT('cmp', OR(FUNCTION, null)) )),
+	AT('placeholders', AND(
+		// XXX would be nice to store these and to use them to test later...
+		AT('NONE', ANY),
+		AT('EMPTY', ANY))),
+
 	AT('timestamp', NUMBER),
 	OR(
 		AND(