manyfest 1.0.35 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manyfest",
-    "version": "1.0.35",
+    "version": "1.0.36",
     "description": "JSON Object Manifest for Data Description and Parsing",
     "main": "source/Manyfest.js",
     "scripts": {
@@ -47,7 +47,7 @@
         "fable-serviceproviderbase": "^3.0.13"
     },
     "devDependencies": {
-        "quackage": "^1.0.29"
+        "quackage": "^1.0.30"
     },
     "author": "steven velozo <steven@velozo.com>",
     "license": "MIT",

package/source/Manyfest-ObjectAddress-CheckAddressExists.js

@@ -201,7 +201,25 @@ class ManyfestObjectAddressResolverCheckAddressExists
 				if ((tmpFunctionArguments.length == 0) || (tmpFunctionArguments[0] == ''))
 				{
 					// No arguments... just call the function (bound to the scope of the object it is contained withing)
-					return this.checkAddressExists(pObject[tmpFunctionAddress].apply(pObject), tmpNewAddress, tmpRootObject);
+					if (tmpFunctionAddress in pObject)
+					{
+						try
+						{
+							return this.checkAddressExists(pObject[tmpFunctionAddress].apply(pObject), tmpNewAddress, tmpRootObject);
+						}
+						catch(pError)
+						{
+							// The function call failed, so the address doesn't exist
+							libSimpleLog.log(`Error calling function ${tmpFunctionAddress} (address [${pAddress}]): ${pError.message}`);
+							return false;
+						}
+					}
+					else
+					{
+						// The function doesn't exist, so the address doesn't exist
+						libSimpleLog.log(`Function ${tmpFunctionAddress} does not exist (address [${pAddress}])`);
+						return false;
+					}
 				}
 				else
 				{
@@ -217,7 +235,26 @@ class ManyfestObjectAddressResolverCheckAddressExists
 						tmpArgumentValues.push(this.getObjectValueClass.getValueAtAddress(tmpRootObject, tmpFunctionArguments[i]));
 					}
 
-					return this.checkAddressExists(pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues), tmpNewAddress, tmpRootObject);
+					//return this.checkAddressExists(pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues), tmpNewAddress, tmpRootObject);
+					if (tmpFunctionAddress in pObject)
+					{
+						try
+						{
+							return this.checkAddressExists(pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues), tmpNewAddress, tmpRootObject);
+						}
+						catch(pError)
+						{
+							// The function call failed, so the address doesn't exist
+							libSimpleLog.log(`Error calling function ${tmpFunctionAddress} (address [${pAddress}]): ${pError.message}`);
+							return false;
+						}
+					}
+					else
+					{
+						// The function doesn't exist, so the address doesn't exist
+						libSimpleLog.log(`Function ${tmpFunctionAddress} does not exist (address [${pAddress}])`);
+						return false;
+					}
 				}
 			}
 			// Boxed elements look like this:

package/source/Manyfest-ObjectAddress-GetValue.js

@@ -152,7 +152,25 @@ class ManyfestObjectAddressResolverGetValue
 				if ((tmpFunctionArguments.length == 0) || (tmpFunctionArguments[0] == ''))
 				{
 					// No arguments... just call the function (bound to the scope of the object it is contained withing)
-					return pObject[tmpFunctionAddress].apply(pObject);
+					if (tmpFunctionAddress in pObject)
+					{
+						try
+						{
+							return pObject[tmpFunctionAddress].apply(pObject);
+						}
+						catch(pError)
+						{
+							// The function call failed, so the address doesn't exist
+							console.log(`Error in getValueAtAddress calling function ${tmpFunctionAddress} (address [${pAddress}]): ${pError.message}`);
+							return false;
+						}
+					}
+					else
+					{
+						// The function doesn't exist, so the address doesn't exist
+						console.log(`Function ${tmpFunctionAddress} does not exist (address [${pAddress}])`);
+						return false;
+					}
 				}
 				else
 				{
@@ -185,7 +203,25 @@ class ManyfestObjectAddressResolverGetValue
 						}
 					}
 
-					return pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues);
+					if (tmpFunctionAddress in pObject)
+					{
+						try
+						{
+							return pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues);
+						}
+						catch(pError)
+						{
+							// The function call failed, so the address doesn't exist
+							console.log(`Error in getValueAtAddress calling function ${tmpFunctionAddress} (address [${pAddress}]): ${pError.message}`);
+							return false;
+						}
+					}
+					else
+					{
+						// The function doesn't exist, so the address doesn't exist
+						console.log(`Function ${tmpFunctionAddress} does not exist (address [${pAddress}])`);
+						return false;
+					}
 				}
 			}
 			// Boxed elements look like this:
@@ -350,7 +386,25 @@ class ManyfestObjectAddressResolverGetValue
 				if ((tmpFunctionArguments.length == 0) || (tmpFunctionArguments[0] == ''))
 				{
 					// No arguments... just call the function (bound to the scope of the object it is contained withing)
-					return this.getValueAtAddress(pObject[tmpFunctionAddress].apply(pObject), tmpNewAddress, tmpParentAddress, tmpRootObject);
+					if (tmpFunctionAddress in pObject)
+					{
+						try
+						{
+							return this.getValueAtAddress(pObject[tmpFunctionAddress].apply(pObject), tmpNewAddress, tmpParentAddress, tmpRootObject);
+						}
+						catch(pError)
+						{
+							// The function call failed, so the address doesn't exist
+							console.log(`Error in getValueAtAddress calling function ${tmpFunctionAddress} (address [${pAddress}]): ${pError.message}`);
+							return false;
+						}
+					}
+					else
+					{
+						// The function doesn't exist, so the address doesn't exist
+						console.log(`Function ${tmpFunctionAddress} does not exist (address [${pAddress}])`);
+						return false;
+					}
 				}
 				else
 				{
@@ -383,7 +437,25 @@ class ManyfestObjectAddressResolverGetValue
 						}
 					}
 
-					return this.getValueAtAddress(pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues), tmpNewAddress, tmpParentAddress, tmpRootObject);
+					if (tmpFunctionAddress in pObject)
+					{
+						try
+						{
+							return this.getValueAtAddress(pObject[tmpFunctionAddress].apply(pObject, tmpArgumentValues), tmpNewAddress, tmpParentAddress, tmpRootObject);
+						}
+						catch(pError)
+						{
+							// The function call failed, so the address doesn't exist
+							console.log(`Error in getValueAtAddress calling function ${tmpFunctionAddress} (address [${pAddress}]): ${pError.message}`);
+							return false;
+						}
+					}
+					else
+					{
+						// The function doesn't exist, so the address doesn't exist
+						console.log(`Function ${tmpFunctionAddress} does not exist (address [${pAddress}])`);
+						return false;
+					}
 				}
 			}
 			// Boxed elements look like this:

package/test/Manyfest_Object_ReadSets_tests.js

@@ -44,6 +44,8 @@ suite
 						let tmpFileSet = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'FileSet');
 						Expect(Array.isArray(tmpFileSet)).to.equal(true);
 						let tmpFileSizes = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'FileSizes');
+						Expect(Object.keys(tmpFileSizes).length).to.equal(17);
+						let tmpQuantities = _Manyfest.getValueByHash({cores:[100,300,45,10,1]}, 'cores[]');
 						fTestComplete();
 					}
 				);

package/test/Manyfest_Object_Read_tests.js

@@ -240,6 +240,7 @@ suite
 										{
 											return { Cost: 1.00, Name: 'Beanie Baby', Stores: ['Aberdeen', 'Seattle', 'Tacoma'] }
 										},
+										"BrokenObject": function() { throw new Error('This is a thrown error message!'); },
 										"FormatOutput": function () { return `My magic value is: ${this.Value}`; }
 									},
 								"Manyfest":
@@ -279,6 +280,8 @@ suite
 							.to.equal(1);
 
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.SillyObject().Stores[0]')).to.equal('Aberdeen');
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.SillyFUNCTIONNOTFOUND().Stores[0]')).to.equal(false);
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.BrokenObject().Stores[0]')).to.equal(false);
 
 						fTestComplete();
 					}