fable 3.1.10 → 3.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.1.10",
+  "version": "3.1.12",
   "description": "A service dependency injection, configuration and logging library.",
   "main": "source/Fable.js",
   "scripts": {

package/source/services/Fable-Service-DataFormat.js

@@ -819,6 +819,116 @@ class DataFormat extends libFableServiceProviderBase
 		return tmpString;
 	}
 
+	/**
+	 * Encodes a string using encodeURIComponent, returning the encoded string.
+	 * If the input is not a string, returns the input unchanged.
+	 *
+	 * @param {string} pString - The string to encode.
+	 * @returns {string|*} The encoded string, or the original input if it is not a string.
+	 */
+	stringEncodeURIComponent (pString)
+	{
+		if (typeof(pString) !== 'string')
+		{
+			return pString;
+		}
+
+		return encodeURIComponent(pString);
+	}
+
+	/**
+	 * Safely decodes a URI component string using decodeURIComponent.
+	 * If the input is not a string or decoding fails, returns the original input.
+	 *
+	 * @param {string} pString - The string to decode.
+	 * @returns {string} The decoded string, or the original input if decoding fails.
+	 */
+	stringDecodeURIComponent (pString)
+	{
+		if (typeof(pString) !== 'string')
+		{
+			return pString;
+		}
+
+		try
+		{
+			return decodeURIComponent(pString);
+		}
+		catch (e)
+		{
+			this.fable.Log.error(`Failed to decode URI component: ${pString}`, e);
+			return pString; // Return the original string if decoding fails
+		}
+	}
+
+	/**
+	 * Encodes a string so that it can be safely embedded in JavaScript code.
+	 * Escapes special characters such as quotes, backslashes, and newlines.
+	 *
+	 * @param {string} pString - The input string to encode.
+	 * @returns {string} The encoded string with special characters escaped.
+	 */
+	stringEncodeForJavascript (pString)
+	{
+		if (typeof(pString) !== 'string')
+		{
+			return pString;
+		}
+
+		return pString.replace(this._Regex_matcherJavascriptEncode, (pMatch) =>
+		{
+			switch (pMatch)
+			{
+				case '"':
+					return '\\"';
+				case '\'':
+					return '\\\'';
+				case '\\':
+					return '\\\\';
+				case '\n':
+					return '\\n';
+				case '\r':
+					return '\\r';
+				default:
+					return pMatch; // Return the original character if no encoding is needed
+			}
+		});
+	}
+
+	/**
+	 * Decodes a JavaScript-escaped string by replacing common escape sequences
+	 * (such as \" \\n \\r \\' and \\\\) with their actual character representations.
+	 *
+	 * @param {string} pString - The string to decode. If not a string, the input is returned as-is.
+	 * @returns {string} The decoded string with escape sequences replaced, or the original input if not a string.
+	 */
+	stringDecodeForJavascript (pString)
+	{
+		if (typeof(pString) !== 'string')
+		{
+			return pString;
+		}
+
+		return pString.replace(this._Regex_matcherJavascriptDecode, (pMatch) =>
+		{
+			switch (pMatch)
+			{
+				case '\\"':
+					return '"';
+				case '\\\'':
+					return '\'';
+				case '\\\\':
+					return '\\';
+				case '\\n':
+					return '\n';
+				case '\\r':
+					return '\r';
+				default:
+					return pMatch; // Return the original character if no decoding is needed
+			}
+		});
+	}
+
 	/**
 	 * Count the number of enclosures in a string based on the start and end characters.
 	 *

package/source/services/Fable-Service-Math.js

@@ -61,7 +61,9 @@ class FableServiceMath extends libFableServiceBase
 		}
 		catch (pError)
 		{
-			this.log.warn(`Error parsing number (type ${typeof (pValue)}): ${pError}`);
+			// TODO: This seems more correct -- we can add a silent or noisy parameter if we want this to export.
+			//       Reason: Currently this is absolutely obliterating logs in the data integrations from bad data sources.
+			//this.log.warn(`Error parsing number (type ${typeof (pValue)}): ${pError}`);
 			tmpNumber = (typeof (pNonNumberValue) === 'undefined') ? "0.0" : pNonNumberValue;
 		}
 

package/test/DataFormat-StringManipulation_tests.js

@@ -79,6 +79,59 @@ suite
 					}
 				)
 				test
+				(
+					'Encode and decode URI string components',
+					(fTestComplete)=>
+					{
+						let testFable = new libFable({LogStreams: false});
+						let _DataFormat = testFable.services.DataFormat;
+						Expect(_DataFormat.stringEncodeURIComponent('Dogs with guns'))
+							.to.equal('Dogs%20with%20guns');
+						Expect(_DataFormat.stringDecodeURIComponent('Dogs%20with%20guns'))
+							.to.equal('Dogs with guns');
+						Expect(_DataFormat.stringEncodeURIComponent('Dogs with guns & cats'))
+							.to.equal('Dogs%20with%20guns%20%26%20cats');
+						Expect(_DataFormat.stringDecodeURIComponent('Dogs%20with%20guns%20%26%20cats'))
+							.to.equal('Dogs with guns & cats');
+						Expect(_DataFormat.stringEncodeURIComponent('Dogs with guns & cats 12321'))
+							.to.equal('Dogs%20with%20guns%20%26%20cats%2012321');
+						Expect(_DataFormat.stringDecodeURIComponent('Dogs%20with%20guns%20%26%20cats%2012321'))
+							.to.equal('Dogs with guns & cats 12321');
+						Expect(_DataFormat.stringEncodeURIComponent('Dogs with guns & cats 12321!'))
+							.to.equal('Dogs%20with%20guns%20%26%20cats%2012321!');
+						Expect(_DataFormat.stringDecodeURIComponent('Dogs%20with%20guns%20%26%20cats%2012321%21'))
+							.to.equal('Dogs with guns & cats 12321!');
+						Expect(_DataFormat.stringDecodeURIComponent('Dogs%20with%20guns%20%26%20cats%2012321%21%40%23%24%25%5E%26*%28%29'))
+							.to.equal('Dogs with guns & cats 12321!@#$%^&*()');
+						return fTestComplete();
+					}
+				)
+				test
+				(
+					'Encode and decode javascript string components',
+					(fTestComplete)=>
+					{
+						let testFable = new libFable({LogStreams: false});
+						let _DataFormat = testFable.services.DataFormat;
+						Expect(_DataFormat.stringEncodeForJavascript('Dogs with guns'))
+							.to.equal('Dogs with guns');
+						Expect(_DataFormat.stringDecodeForJavascript('Dogs with guns'))
+							.to.equal('Dogs with guns');
+						Expect(_DataFormat.stringEncodeForJavascript('Dogs with guns & cats'))
+							.to.equal('Dogs with guns & cats');
+						Expect(_DataFormat.stringDecodeForJavascript('Dogs with guns & cats'))
+							.to.equal('Dogs with guns & cats');
+						Expect(_DataFormat.stringEncodeForJavascript(`Dogs with "guns" & \\\\cats 12321`))
+							.to.equal('Dogs with "guns" & \\\\cats 12321');
+						Expect(_DataFormat.stringDecodeForJavascript('Dogs with "guns" & 	cats 12321'))
+							.to.equal('Dogs with "guns" & \tcats 12321');
+						Expect(_DataFormat.stringEncodeForJavascript('Dogs with guns & \t cats 12321!'))
+							.to.equal('Dogs with guns & \t cats 12321!');
+
+						return fTestComplete();
+					}
+				)
+				test
 				(
 					'Capitalize each word in a string',
 					(fTestComplete)=>