manyfest 1.0.18 → 1.0.20

package/debug/Harness.js

@@ -1,15 +1,15 @@
 let libManyfest = require(`../source/Manyfest.js`);
 
-let animalManyfest = new libManyfest(
-    {
-        "Scope": "Animal",
-        "Descriptors":
-            {
-                "IDAnimal": { "Name":"Database ID", "Description":"The unique integer-based database identifier for an Animal record.", "DataType":"Integer" },
-                "Name": { "Description":"The animal's colloquial species name (e.g. Rabbit, Dog, Bear, Mongoose)." },
-                "Type": { "Description":"Whether or not the animal is wild, domesticated, agricultural, in a research lab or a part of a zoo.." }
-            }
-    });
+let animalManyfest = new libManyfest()
+    // {
+    //     "Scope": "Animal",
+    //     "Descriptors":
+    //         {
+    //             "IDAnimal": { "Name":"Database ID", "Description":"The unique integer-based database identifier for an Animal record.", "DataType":"Integer" },
+    //             "Name": { "Description":"The animal's colloquial species name (e.g. Rabbit, Dog, Bear, Mongoose)." },
+    //             "Type": { "Description":"Whether or not the animal is wild, domesticated, agricultural, in a research lab or a part of a zoo.." }
+    //         }
+    // });
 
 // Make up a cute and furry test creature
 let testAnimal = {IDAnimal:8675309, Name:'BatBrains', Type:'Lab', Color:'Brown'};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manyfest",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "JSON Object Manifest for Data Description and Parsing",
   "main": "source/Manyfest.js",
   "scripts": {
@@ -63,8 +63,7 @@
     "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
-    "elucidator": "^1.0.7",
-    "precedent": "^1.0.9"
+    "precedent": "^1.0.11"
   },
   "author": "steven velozo <steven@velozo.com>",
   "license": "MIT",

package/source/Manyfest-Browser-Shim.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 

package/source/Manyfest-HashTranslation.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');

package/source/Manyfest-LogToConsole.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 

package/source/Manyfest-ObjectAddress-CheckAddressExists.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');

package/source/Manyfest-ObjectAddress-DeleteValue.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');
@@ -38,48 +37,10 @@ class ManyfestObjectAddressResolverDeleteValue
 		this.elucidatorSolverState = {};
 
 		this.cleanWrapCharacters = fCleanWrapCharacters;
-	}
-
-	checkFilters(pAddress, pRecord)
-	{
-		let tmpPrecedent = new libPrecedent();
-		// If we don't copy the string, precedent takes it out for good.
-		// TODO: Consider adding a "don't replace" option for precedent
-		let tmpAddress = pAddress;
-
-		if (!this.elucidatorSolver)
-		{
-			// Again, manage against circular dependencies
-			let libElucidator = require('elucidator');
-			this.elucidatorSolver = new libElucidator({}, this.logInfo, this.logError);
-		}
-
-		if (this.elucidatorSolver)
-		{
-			// This allows the magic filtration with elucidator configuration
-			// TODO: We could pass more state in (e.g. parent address, object, etc.)
-			// TODO: Discuss this metaprogramming AT LENGTH
-			let tmpFilterState = (
-				{
-					Record: pRecord,
-					keepRecord: true
-				});
+		this.precedent = new libPrecedent();
 
-			// This is about as complex as it gets.
-			// TODO: Optimize this so it is only initialized once.
-			// TODO: That means figuring out a healthy pattern for passing in state to this
-			tmpPrecedent.addPattern('<<~~', '~~>>',
-				(pInstructionHash) =>
-				{
-					// This is for internal config on the solution steps.  Right now config is not shared across steps.
-					if (this.elucidatorSolverState.hasOwnProperty(pInstructionHash))
-					{
-						tmpFilterState.SolutionState = this.elucidatorSolverState[pInstructionHash];
-					}
-					this.elucidatorSolver.solveInternalOperation('Custom', pInstructionHash, tmpFilterState);
-				});
-			tmpPrecedent.addPattern('<<~?', '?~>>',
-				(pMagicSearchExpression) =>
+		this.precedent.addPattern('<<~?', '?~>>',
+			(pMagicSearchExpression, pData) =>
 				{
 					if (typeof(pMagicSearchExpression) !== 'string')
 					{
@@ -93,48 +54,56 @@ class ManyfestObjectAddressResolverDeleteValue
 					let tmpSearchComparator = tmpMagicComparisonPatternSet[1];
 					let tmpSearchValue = tmpMagicComparisonPatternSet[2];
 
-					tmpFilterState.ComparisonState = (
-						{
-							SearchAddress: tmpSearchAddress,
-							Comparator: tmpSearchComparator,
-							SearchTerm: tmpSearchValue
-						});
-
-					this.elucidatorSolver.solveOperation(
-						{
-							"Description":
-							{
-								"Operation": "Simple_If",
-								"Synopsis": "Test for "
-							},
-							"Steps":
-							[
-								{
-									"Namespace": "Logic",
-									"Instruction": "if",
-
-									"InputHashAddressMap":
-										{
-											// This is ... dynamically assigning the address in the instruction
-											// The complexity is astounding.
-											"leftValue": `Record.${tmpSearchAddress}`,
-											"rightValue": "ComparisonState.SearchTerm",
-											"comparator": "ComparisonState.Comparator"
-										},
-									"OutputHashAddressMap": { "truthinessResult":"keepRecord" }
-								}
-							]
-						}, tmpFilterState);
+					switch(tmpSearchComparator)
+					{
+						case '!=':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) != tmpSearchValue);
+							break;
+						case '<':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) < tmpSearchValue);
+							break;
+						case '>':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) > tmpSearchValue);
+							break;
+						case '<=':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) <= tmpSearchValue);
+							break;
+						case '>=':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) >= tmpSearchValue);
+							break;
+						case '===':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) == tmpSearchValue);
+							break;
+						case '==':
+						default:
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) == tmpSearchValue);
+							break;
+					}
 				});
-			tmpPrecedent.parseString(tmpAddress);
+	}
 
-			// It is expected that the operation will mutate this to some truthy value
-			return tmpFilterState.keepRecord;
-		}
-		else
-		{
-			return true;
-		}
+	// TODO: Dry me
+	checkFilters(pAddress, pRecord)
+	{
+		let tmpPrecedent = new libPrecedent();
+		// If we don't copy the string, precedent takes it out for good.
+		// TODO: Consider adding a "don't replace" option for precedent
+		let tmpAddress = pAddress;
+
+		// This allows the magic filtration with elucidator configuration
+		// TODO: We could pass more state in (e.g. parent address, object, etc.)
+		// TODO: Discuss this metaprogramming AT LENGTH
+		let tmpFilterState = (
+			{
+				Record: pRecord,
+				KeepRecord: true
+			});
+
+			// This is about as complex as it gets.
+
+		this.precedent.parseString(tmpAddress, tmpFilterState);
+
+		return tmpFilterState.KeepRecord;
 	}
 
 	// Delete the value of an element at an address

package/source/Manyfest-ObjectAddress-GetValue.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');
@@ -38,48 +37,11 @@ class ManyfestObjectAddressResolverGetValue
 		this.elucidatorSolverState = {};
 
 		this.cleanWrapCharacters = fCleanWrapCharacters;
-	}
-
-	checkFilters(pAddress, pRecord)
-	{
-		let tmpPrecedent = new libPrecedent();
-		// If we don't copy the string, precedent takes it out for good.
-		// TODO: Consider adding a "don't replace" option for precedent
-		let tmpAddress = pAddress;
 
-		if (!this.elucidatorSolver)
-		{
-			// Again, manage against circular dependencies
-			let libElucidator = require('elucidator');
-			this.elucidatorSolver = new libElucidator({}, this.logInfo, this.logError);
-		}
+		this.precedent = new libPrecedent();
 
-		if (this.elucidatorSolver)
-		{
-			// This allows the magic filtration with elucidator configuration
-			// TODO: We could pass more state in (e.g. parent address, object, etc.)
-			// TODO: Discuss this metaprogramming AT LENGTH
-			let tmpFilterState = (
-				{
-					Record: pRecord,
-					keepRecord: true
-				});
-
-			// This is about as complex as it gets.
-			// TODO: Optimize this so it is only initialized once.
-			// TODO: That means figuring out a healthy pattern for passing in state to this
-			tmpPrecedent.addPattern('<<~~', '~~>>',
-				(pInstructionHash) =>
-				{
-					// This is for internal config on the solution steps.  Right now config is not shared across steps.
-					if (this.elucidatorSolverState.hasOwnProperty(pInstructionHash))
-					{
-						tmpFilterState.SolutionState = this.elucidatorSolverState[pInstructionHash];
-					}
-					this.elucidatorSolver.solveInternalOperation('Custom', pInstructionHash, tmpFilterState);
-				});
-			tmpPrecedent.addPattern('<<~?', '?~>>',
-				(pMagicSearchExpression) =>
+		this.precedent.addPattern('<<~?', '?~>>',
+			(pMagicSearchExpression, pData) =>
 				{
 					if (typeof(pMagicSearchExpression) !== 'string')
 					{
@@ -93,48 +55,55 @@ class ManyfestObjectAddressResolverGetValue
 					let tmpSearchComparator = tmpMagicComparisonPatternSet[1];
 					let tmpSearchValue = tmpMagicComparisonPatternSet[2];
 
-					tmpFilterState.ComparisonState = (
-						{
-							SearchAddress: tmpSearchAddress,
-							Comparator: tmpSearchComparator,
-							SearchTerm: tmpSearchValue
-						});
-
-					this.elucidatorSolver.solveOperation(
-						{
-							"Description":
-							{
-								"Operation": "Simple_If",
-								"Synopsis": "Test for "
-							},
-							"Steps":
-							[
-								{
-									"Namespace": "Logic",
-									"Instruction": "if",
-
-									"InputHashAddressMap":
-										{
-											// This is ... dynamically assigning the address in the instruction
-											// The complexity is astounding.
-											"leftValue": `Record.${tmpSearchAddress}`,
-											"rightValue": "ComparisonState.SearchTerm",
-											"comparator": "ComparisonState.Comparator"
-										},
-									"OutputHashAddressMap": { "truthinessResult":"keepRecord" }
-								}
-							]
-						}, tmpFilterState);
+					switch(tmpSearchComparator)
+					{
+						case '!=':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) != tmpSearchValue);
+							break;
+						case '<':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) < tmpSearchValue);
+							break;
+						case '>':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) > tmpSearchValue);
+							break;
+						case '<=':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) <= tmpSearchValue);
+							break;
+						case '>=':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) >= tmpSearchValue);
+							break;
+						case '===':
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) == tmpSearchValue);
+							break;
+						case '==':
+						default:
+							pData.KeepRecord = (this.getValueAtAddress(pData.Record, tmpSearchAddress) == tmpSearchValue);
+							break;
+					}
 				});
-			tmpPrecedent.parseString(tmpAddress);
+	}
 
-			// It is expected that the operation will mutate this to some truthy value
-			return tmpFilterState.keepRecord;
-		}
-		else
-		{
-			return true;
-		}
+	checkFilters(pAddress, pRecord)
+	{
+		let tmpPrecedent = new libPrecedent();
+		// If we don't copy the string, precedent takes it out for good.
+		// TODO: Consider adding a "don't replace" option for precedent
+		let tmpAddress = pAddress;
+
+		// This allows the magic filtration with elucidator configuration
+		// TODO: We could pass more state in (e.g. parent address, object, etc.)
+		// TODO: Discuss this metaprogramming AT LENGTH
+		let tmpFilterState = (
+			{
+				Record: pRecord,
+				KeepRecord: true
+			});
+
+			// This is about as complex as it gets.
+
+		this.precedent.parseString(tmpAddress, tmpFilterState);
+
+		return tmpFilterState.KeepRecord;
 	}
 
 	// Get the value of an element at an address

package/source/Manyfest-ObjectAddress-SetValue.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');

package/source/Manyfest-ObjectAddressGeneration.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');

package/source/Manyfest-SchemaManipulation.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');

package/source/Manyfest.js

@@ -1,5 +1,4 @@
 /**
-* @license MIT
 * @author <steven@velozo.com>
 */
 let libSimpleLog = require('./Manyfest-LogToConsole.js');
@@ -14,6 +13,8 @@ let libObjectAddressDeleteValue = require('./Manyfest-ObjectAddress-DeleteValue.
 let libObjectAddressGeneration = require('./Manyfest-ObjectAddressGeneration.js');
 let libSchemaManipulation = require('./Manyfest-SchemaManipulation.js');
 
+const _DefaultConfiguration = { Scope:'Default', Descriptors: {} }
+
 
 /**
 * Manyfest object address-based descriptions and manipulations.
@@ -130,72 +131,44 @@ class Manyfest
 		if (typeof(pManifest) !== 'object')
 		{
 			this.logError(`(${this.scope}) Error loading manifest; expecting an object but parameter was type ${typeof(pManifest)}.`);
-			return false;
 		}
 
-		if (pManifest.hasOwnProperty('Scope'))
+		let tmpManifest = (typeof(pManifest) == 'object') ? pManifest : {};
+
+		if (tmpManifest.hasOwnProperty('Scope'))
 		{
-			if (typeof(pManifest.Scope) === 'string')
+			if (typeof(tmpManifest.Scope) === 'string')
 			{
-				this.scope = pManifest.Scope;
+				this.scope = tmpManifest.Scope;
 			}
 			else
 			{
-				this.logError(`(${this.scope}) Error loading scope from manifest; expecting a string but property was type ${typeof(pManifest.Scope)}.`, pManifest);
+				this.logError(`(${this.scope}) Error loading scope from manifest; expecting a string but property was type ${typeof(tmpManifest.Scope)}.`, tmpManifest);
 			}
 		}
 		else
 		{
-			this.logError(`(${this.scope}) Error loading scope from manifest object.  Property "Scope" does not exist in the root of the object.`, pManifest);
+			this.logError(`(${this.scope}) Error loading scope from manifest object.  Property "Scope" does not exist in the root of the object.`, tmpManifest);
 		}
 
-		if (pManifest.hasOwnProperty('Descriptors'))
+		if (tmpManifest.hasOwnProperty('Descriptors'))
 		{
-			if (typeof(pManifest.Descriptors) === 'object')
+			if (typeof(tmpManifest.Descriptors) === 'object')
 			{
-				let tmpDescriptionAddresses = Object.keys(pManifest.Descriptors);
+				let tmpDescriptionAddresses = Object.keys(tmpManifest.Descriptors);
 				for (let i = 0; i < tmpDescriptionAddresses.length; i++)
 				{
-					this.addDescriptor(tmpDescriptionAddresses[i], pManifest.Descriptors[tmpDescriptionAddresses[i]]);
+					this.addDescriptor(tmpDescriptionAddresses[i], tmpManifest.Descriptors[tmpDescriptionAddresses[i]]);
 				}
 			}
 			else
 			{
-				this.logError(`(${this.scope}) Error loading description object from manifest object.  Expecting an object in 'Manifest.Descriptors' but the property was type ${typeof(pManifest.Descriptors)}.`, pManifest);
+				this.logError(`(${this.scope}) Error loading description object from manifest object.  Expecting an object in 'Manifest.Descriptors' but the property was type ${typeof(tmpManifest.Descriptors)}.`, tmpManifest);
 			}
 		}
 		else
 		{
-			this.logError(`(${this.scope}) Error loading object description from manifest object.  Property "Descriptors" does not exist in the root of the Manifest object.`, pManifest);
-		}
-
-		// This seems like it would create a circular dependency issue but it only goes as deep as the schema defines Solvers
-		if ((pManifest.hasOwnProperty('Solvers')) && (typeof(pManifest.Solvers) == 'object'))
-		{
-			// There are elucidator solvers passed-in, so we will create one to filter data.
-			let libElucidator = require('elucidator');
-			// WARNING THESE CAN MUTATE THE DATA
-				// The pattern for the solver is: {<~~SolverName~~>} anywhere in a property.
-				//   Yes, this means your Javascript elements can't have my self-styled jellyfish brackets in them.
-				//   This does, though, mean we can filter at multiple layers safely.
-				//   Because these can be put at any address
-			// The solver themselves:
-				//   They are passed-in an object, and the current record is in the Record subobject.
-				//   Basic operations can just write to the root object but...
-				//   IF YOU PERMUTE THE Record SUBOBJECT YOU CAN AFFECT RECURSION
-			// This is mostly meant for if statements to filter.
-				//   Basically on aggregation, if a filter is set it will set "keep record" to true and let the solver decide differently.
-			this.dataSolvers = new libElucidator(pManifest.Solvers, this.logInfo, this.logError);
-
-			// Load the solver state in so each instruction can have internal config
-			// TODO: Should this just be a part of the lower layer pattern?
-			let tmpSolverKeys = Object.keys(pManifest.Solvers)
-			for (let i = 0; i < tmpSolverKeys.length; i++)
-			{
-				this.dataSolverState[tmpSolverKeys] = pManifest.Solvers[tmpSolverKeys[i]];
-			}
-
-			this.setElucidatorSolvers(this.dataSolvers, this.dataSolverState);
+			this.logError(`(${this.scope}) Error loading object description from manifest object.  Property "Descriptors" does not exist in the root of the Manifest object.`, tmpManifest);
 		}
 	}
 

package/test/Manyfest_Embedded_Solvers_tests.js

@@ -62,61 +62,6 @@ suite
 						fTestComplete();
 					}
 				);
-				test
-				(
-					'We should be able to access sets of properties from objects with schema.',
-					(fTestComplete)=>
-					{
-						let _Manyfest = new libManyfest(
-							{
-								Scope:'Archive.org',
-								Descriptors:
-									{
-										'files[]': {Name:'Files', Hash:'FileSet'},
-										'files[].size': {Name:'FileSizes', Hash:'FileSizes'},
-                                        'files[]<<~~ThumbnailFilesOnly~~>>': {Name:'Thumbnail Files', Hash:'ThumbnailFiles'},
-										'metadata.creator': {Name:'Creator', Hash:'Creator'},
-										'metadata{}': {Name:'Metadata', Hash:'Metadata'}
-									},
-                                Solvers:
-                                    {
-                                        'ThumbnailFilesOnly':
-                                            {
-                                                "Description":
-                                                {
-                                                    "Operation": "ThumbnailFilesOnly",
-                                                    "Synopsis": "Filter files down to just thumbnails"
-                                                },
-												"Config": { "SearchTerm": "Thumbnail" },
-                                                "Steps":
-                                                [
-                                                    {
-                                                        "Namespace": "Logic",
-                                                        "Instruction": "if",
-
-														"InputHashAddressMap":
-                                                            {
-                                                                "leftValue": "Record.format",
-                                                                "rightValue": "SolutionState.Config.SearchTerm",
-                                                                "comparator": "=="
-                                                            },
-                                                        "OutputHashAddressMap": { "truthinessResult":"keepRecord" }
-                                                    }
-                                                ]
-                                            }
-                                    }
-							});
-						let tmpThumbnailFiles = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'ThumbnailFiles');
-						Expect(tmpThumbnailFiles).to.be.an('array');
-						// There are 7 thumbnail files in the set.
-						Expect(tmpThumbnailFiles.length).to.equal(7);
-						let tmpFiles = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'FileSet');
-						Expect(tmpFiles).to.be.an('array');
-						// There are 7 thumbnail files in the set.
-						Expect(tmpFiles.length).to.equal(17);
-						fTestComplete();
-					}
-				);
 			}
 		);
 	}