manyfest 1.0.9 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manyfest",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "JSON Object Manifest for Data Description and Parsing",
   "main": "source/Manyfest.js",
   "scripts": {

package/source/Manyfest-ObjectAddressResolver.js

@@ -249,6 +249,13 @@ class ManyfestObjectAddressResolver
 		// 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
@@ -263,7 +270,7 @@ class ManyfestObjectAddressResolver
 			// 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('{<~~', '~~>}', 
+			tmpPrecedent.addPattern('<<~~', '~~>>',
 				(pInstructionHash) => 
 				{
 					// This is for internal config on the solution steps.  Right now config is not shared across steps.
@@ -273,7 +280,54 @@ class ManyfestObjectAddressResolver
 					}
 					this.elucidatorSolver.solveInternalOperation('Custom', pInstructionHash, tmpFilterState);
 				});
-			
+			tmpPrecedent.addPattern('<<~?', '?~>>',
+				(pMagicSearchExpression) => 
+				{
+					if (typeof(pMagicSearchExpression) !== 'string')
+					{
+						return false;
+					}
+					// This expects a comma separated expression:
+					//     Some.Address.In.The.Object,==,Search Term to Match
+					let tmpMagicComparisonPatternSet = pMagicSearchExpression.split(',');
+
+					let tmpSearchAddress = tmpMagicComparisonPatternSet[0];
+					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);
+				});
 			tmpPrecedent.parseString(tmpAddress);
 
 			// It is expected that the operation will mutate this to some truthy value

package/test/Manyfest_Embedded_Solvers_tests.js

@@ -25,6 +25,43 @@ suite
 			'Set Filtration',
 			()=>
 			{
+				test
+				(
+					'Magic filters should be magic.',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest(
+							{
+								Scope:'Archive.org',
+								Descriptors:
+									{
+										'files[]': {Name:'Files', Hash:'FileSet'},
+                                        'files[]<<~?format,==,Thumbnail?~>>': {Name:'Thumbnail Files', Hash:'ThumbnailFiles'},
+                                        'files[]<<~?format,==,Metadata?~>>': {Name:'Metadata Files', Hash:'MetadataFiles'},
+										'metadata.creator': {Name:'Creator', Hash:'Creator'}
+									}
+							});
+
+						// Grab magic filtered thumbnails
+						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);
+
+						// Grab magic filtered etadataFiles
+						let tmpMetadataFiles = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'MetadataFiles');
+						Expect(tmpMetadataFiles).to.be.an('array');
+						// There are 3 metadata files in the set.
+						Expect(tmpMetadataFiles.length).to.equal(3);
+
+						let tmpFiles = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'FileSet');
+						Expect(tmpFiles).to.be.an('array');
+						// There are 17 total files in the set.
+						Expect(tmpFiles.length).to.equal(17);
+
+						fTestComplete();
+					}
+				);
 				test
 				(
 					'We should be able to access sets of properties from objects with schema.',
@@ -37,7 +74,7 @@ suite
 									{
 										'files[]': {Name:'Files', Hash:'FileSet'},
 										'files[].size': {Name:'FileSizes', Hash:'FileSizes'},
-                                        'files[]{<~~ThumbnailFilesOnly~~>}': {Name:'Thumbnail Files', Hash:'ThumbnailFiles'},
+                                        'files[]<<~~ThumbnailFilesOnly~~>>': {Name:'Thumbnail Files', Hash:'ThumbnailFiles'},
 										'metadata.creator': {Name:'Creator', Hash:'Creator'},
 										'metadata{}': {Name:'Metadata', Hash:'Metadata'}
 									},