fable 3.0.120 → 3.0.123

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.120",
+    "version": "3.0.123",
     "description": "Anentity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -64,7 +64,7 @@
         "fable-serviceproviderbase": "^3.0.13",
         "fable-settings": "^3.0.9",
         "fable-uuid": "^3.0.6",
-        "manyfest": "^1.0.29",
+        "manyfest": "^1.0.31",
         "simple-get": "^4.0.1"
     }
 }

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

@@ -481,6 +481,178 @@ class DataFormat extends libFableServiceProviderBase
 		return pString.substring(tmpStringSplitLocation + pMatch.length);
 	}
 
+	/**
+	 * Count the number of segments in a string, respecting enclosures
+	 * 
+	 * @param {string} pString 
+	 * @param {string} pSeparator 
+	 * @param {object} pEnclosureStartSymbolMap 
+	 * @param {object} pEnclosureEndSymbolMap 
+	 * @returns the count of segments in the string as a number
+	 */
+	stringCountSegments(pString, pSeparator, pEnclosureStartSymbolMap, pEnclosureEndSymbolMap)
+	{
+		let tmpString = (typeof(pString) == 'string') ? pString : '';
+
+		let tmpSeparator = (typeof(pSeparator) == 'string') ? pSeparator : '.';
+
+		let tmpEnclosureStartSymbolMap = (typeof(pEnclosureStartSymbolMap) == 'object') ? pEnclosureStart : { '{': 0, '[': 1, '(': 2 };
+		let tmpEnclosureEndSymbolMap = (typeof(pEnclosureEndSymbolMap) == 'object') ? pEnclosureEnd : { '}': 0, ']': 1, ')': 2 };
+
+		if (pString.length < 1)
+		{
+			return 0;
+		}
+
+		let tmpSegmentCount = 1;
+		let tmpEnclosureStack = [];
+
+		for (let i = 0; i < tmpString.length; i++)
+		{
+			// IF This is the start of a segment
+			if ((tmpString[i] == tmpSeparator)
+				// AND we are not in a nested portion of the string
+				&& (tmpEnclosureStack.length == 0))
+			{
+				// Increment the segment count
+				tmpSegmentCount++;
+			}
+			// IF This is the start of an enclosure
+			else if (tmpEnclosureStartSymbolMap.hasOwnProperty(tmpString[i]))
+			{
+				// Add it to the stack!
+				tmpEnclosureStack.push(tmpEnclosureStartSymbolMap[tmpString[i]]);
+			}
+			// IF This is the end of an enclosure
+			else if (tmpEnclosureEndSymbolMap.hasOwnProperty(tmpString[i])
+				// AND it matches the current nest level symbol
+				&& tmpEnclosureEndSymbolMap[tmpString[i]] == tmpEnclosureStack[tmpEnclosureStack.length - 1])
+			{
+				// Pop it off the stack!
+				tmpEnclosureStack.pop();
+			}
+		}
+
+		return tmpSegmentCount;
+	}
+
+	/**
+	 * Get all segments in a string, respecting enclosures
+	 * 
+	 * @param {string} pString 
+	 * @param {string} pSeparator 
+	 * @param {object} pEnclosureStartSymbolMap 
+	 * @param {object} pEnclosureEndSymbolMap 
+	 * @returns the first segment in the string as a string
+	 */
+	stringGetSegments(pString, pSeparator, pEnclosureStartSymbolMap, pEnclosureEndSymbolMap)
+	{
+		let tmpString = (typeof(pString) == 'string') ? pString : '';
+
+		let tmpSeparator = (typeof(pSeparator) == 'string') ? pSeparator : '.';
+
+		let tmpEnclosureStartSymbolMap = (typeof(pEnclosureStartSymbolMap) == 'object') ? pEnclosureStart : { '{': 0, '[': 1, '(': 2 };
+		let tmpEnclosureEndSymbolMap = (typeof(pEnclosureEndSymbolMap) == 'object') ? pEnclosureEnd : { '}': 0, ']': 1, ')': 2 };
+
+		let tmpCurrentSegmentStart = 0;
+		let tmpSegmentList = [];
+
+		if (pString.length < 1)
+		{
+			return tmpSegmentList;
+		}
+
+		let tmpEnclosureStack = [];
+
+		for (let i = 0; i < tmpString.length; i++)
+		{
+			// IF This is the start of a segment
+			if ((tmpString[i] == tmpSeparator)
+				// AND we are not in a nested portion of the string
+				&& (tmpEnclosureStack.length == 0))
+			{
+				// Return the segment
+				tmpSegmentList.push(tmpString.substring(tmpCurrentSegmentStart, i));
+				tmpCurrentSegmentStart = i+1;
+			}
+			// IF This is the start of an enclosure
+			else if (tmpEnclosureStartSymbolMap.hasOwnProperty(tmpString[i]))
+			{
+				// Add it to the stack!
+				tmpEnclosureStack.push(tmpEnclosureStartSymbolMap[tmpString[i]]);
+			}
+			// IF This is the end of an enclosure
+			else if (tmpEnclosureEndSymbolMap.hasOwnProperty(tmpString[i])
+				// AND it matches the current nest level symbol
+				&& tmpEnclosureEndSymbolMap[tmpString[i]] == tmpEnclosureStack[tmpEnclosureStack.length - 1])
+			{
+				// Pop it off the stack!
+				tmpEnclosureStack.pop();
+			}
+		}
+
+		if (tmpCurrentSegmentStart < tmpString.length)
+		{
+			tmpSegmentList.push(tmpString.substring(tmpCurrentSegmentStart));
+		}
+
+		return tmpSegmentList;
+	}
+
+	/**
+	 * Get the first segment in a string, respecting enclosures
+	 * 
+	 * @param {string} pString 
+	 * @param {string} pSeparator 
+	 * @param {object} pEnclosureStartSymbolMap 
+	 * @param {object} pEnclosureEndSymbolMap 
+	 * @returns the first segment in the string as a string
+	 */
+	stringGetFirstSegment(pString, pSeparator, pEnclosureStartSymbolMap, pEnclosureEndSymbolMap)
+	{
+		let tmpString = (typeof(pString) == 'string') ? pString : '';
+
+		let tmpSeparator = (typeof(pSeparator) == 'string') ? pSeparator : '.';
+
+		let tmpEnclosureStartSymbolMap = (typeof(pEnclosureStartSymbolMap) == 'object') ? pEnclosureStart : { '{': 0, '[': 1, '(': 2 };
+		let tmpEnclosureEndSymbolMap = (typeof(pEnclosureEndSymbolMap) == 'object') ? pEnclosureEnd : { '}': 0, ']': 1, ')': 2 };
+
+		if (pString.length < 1)
+		{
+			return 0;
+		}
+
+		let tmpEnclosureStack = [];
+
+		for (let i = 0; i < tmpString.length; i++)
+		{
+			// IF This is the start of a segment
+			if ((tmpString[i] == tmpSeparator)
+				// AND we are not in a nested portion of the string
+				&& (tmpEnclosureStack.length == 0))
+			{
+				// Return the segment
+				return tmpString.substring(0, i);
+			}
+			// IF This is the start of an enclosure
+			else if (tmpEnclosureStartSymbolMap.hasOwnProperty(tmpString[i]))
+			{
+				// Add it to the stack!
+				tmpEnclosureStack.push(tmpEnclosureStartSymbolMap[tmpString[i]]);
+			}
+			// IF This is the end of an enclosure
+			else if (tmpEnclosureEndSymbolMap.hasOwnProperty(tmpString[i])
+				// AND it matches the current nest level symbol
+				&& tmpEnclosureEndSymbolMap[tmpString[i]] == tmpEnclosureStack[tmpEnclosureStack.length - 1])
+			{
+				// Pop it off the stack!
+				tmpEnclosureStack.pop();
+			}
+		}
+
+		return tmpString;
+	}
+
 	/**
 	 * Count the number of enclosures in a string based on the start and end characters.
 	 *

package/test/DataFormat-StringTokenization_tests.js

@@ -126,6 +126,9 @@ suite
 						Expect(_DataFormat
 							.stringGetEnclosureValueByIndex('There [are (many) of these (things)', 0, '[', ']'))
 							.to.equal('are (many) of these (things)');
+						Expect(_DataFormat
+							.stringGetEnclosureValueByIndex('There (are (many) of these (things))', 0))
+							.to.equal('are (many) of these (things)');
 						return fTestComplete();
 					}
 				);
@@ -161,6 +164,84 @@ suite
 						return fTestComplete();
 					}
 				);
+				test
+				(
+					'Test counting segments and respecting enclosures',
+					(fTestComplete)=>
+					{
+						let testFable = new libFable({LogStreams: false});
+						let _DataFormat = testFable.services.DataFormat;
+						Expect(_DataFormat
+							.stringCountSegments('Dogs.are.cool'))
+							.to.equal(3);
+						Expect(_DataFormat
+							.stringCountSegments('Dogs.are.cool'))
+							.to.equal(3);
+						Expect(_DataFormat
+							.stringCountSegments('Dogs.are(.)cool'))
+							.to.equal(2);
+						Expect(_DataFormat
+							.stringCountSegments('Dogs.are(.[....])co.(.)ol'))
+							.to.equal(3);
+						Expect(_DataFormat
+							.stringCountSegments('Dogs.are(.[....]),co.(.)ol', ','))
+							.to.equal(2);
+						return fTestComplete();
+					}
+				);
+				test
+				(
+					'Get the first segment of a string',
+					(fTestComplete)=>
+					{
+						let testFable = new libFable({LogStreams: false});
+						let _DataFormat = testFable.services.DataFormat;
+						Expect(_DataFormat
+							.stringGetFirstSegment('Dogs.are.cool'))
+							.to.equal('Dogs');
+						Expect(_DataFormat
+							.stringGetFirstSegment('Dogs().are.cool'))
+							.to.equal('Dogs()');
+						Expect(_DataFormat
+							.stringGetFirstSegment('Dogs[This.That(),Equals(THEM)].are(.)cool'))
+							.to.equal('Dogs[This.That(),Equals(THEM)]');
+						Expect(_DataFormat
+							.stringGetFirstSegment('Dogs(.are(.[....])co.(.)ol'))
+							.to.equal('Dogs(.are(.[....])co.(.)ol');
+						Expect(_DataFormat
+							.stringGetFirstSegment('Dogs(.are(,[....])co.(.)ol', ','))
+							.to.equal('Dogs(.are(,[....])co.(.)ol');
+						Expect(_DataFormat
+							.stringGetFirstSegment('Dogs.are(,[....]),co.(.)ol', ','))
+							.to.equal('Dogs.are(,[....])');
+						return fTestComplete();
+					}
+				);
+				test
+				(
+					'Get all segments of a string',
+					(fTestComplete)=>
+					{
+						let testFable = new libFable({LogStreams: false});
+						let _DataFormat = testFable.services.DataFormat;
+						Expect(_DataFormat
+							.stringGetSegments('Dogs.are.cool')[1])
+							.to.equal('are');
+						Expect(_DataFormat
+							.stringGetSegments('Dogs().are.cool'))
+							.to.deep.equal(['Dogs()', 'are', 'cool']);
+						Expect(_DataFormat
+							.stringGetSegments('Dogs[This.That(),Equals(THEM)].are(.)cool'))
+							.to.deep.equal(['Dogs[This.That(),Equals(THEM)]', 'are(.)cool']);
+						Expect(_DataFormat
+							.stringGetSegments('Dogs(.are(.[....])co.(.)ol')[0])
+							.to.equal('Dogs(.are(.[....])co.(.)ol');
+						Expect(_DataFormat
+							.stringGetSegments('..Dogs.are(,[....]),co.(.)ol'))
+							.to.deep.equal(['','','Dogs','are(,[....]),co','(.)ol']);
+						return fTestComplete();
+					}
+				);
 			}
 		);
 	}