fable 3.1.32 → 3.1.34

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

@@ -6,225 +6,225 @@ const libFableServiceProviderBase = require('fable-serviceproviderbase');
 */
 class DateManipulation extends libFableServiceProviderBase
 {
-    constructor(pFable, pOptions, pServiceHash)
-    {
-        super(pFable, pOptions, pServiceHash)
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		super(pFable, pOptions, pServiceHash)
 
-        this.serviceType = 'Dates';
+		this.serviceType = 'Dates';
 
-        this.dayJS = require('dayjs');
+		this.dayJS = require('dayjs');
 
-        // Include the `weekOfYear` plugin
-        this.plugin_weekOfYear = require('dayjs/plugin/weekOfYear');
-        this.dayJS.extend(this.plugin_weekOfYear);
-        // Include the `weekday` plugin
-        this.plugin_weekday = require('dayjs/plugin/weekday');
-        this.dayJS.extend(this.plugin_weekday);
-        // Include the `isoWeek` plugin
-        this.plugin_isoWeek = require('dayjs/plugin/isoWeek');
-        this.dayJS.extend(this.plugin_isoWeek);
-        // Include the `timezone` plugin
-        this.plugin_timezone = require('dayjs/plugin/timezone');
-        this.dayJS.extend(this.plugin_timezone);
-        // Include the `relativetime` plugin
-        this.plugin_relativetime = require('dayjs/plugin/relativeTime');
-        this.dayJS.extend(this.plugin_relativetime);
-        // Include the `utc` plugin
-        this.plugin_utc = require('dayjs/plugin/utc');
-        this.dayJS.extend(this.plugin_utc);
-        // Include the `advancedFormat` plugin
-        this.plugin_advancedFormat = require('dayjs/plugin/advancedFormat');
-        this.dayJS.extend(this.plugin_advancedFormat);
+		// Include the `weekOfYear` plugin
+		this.plugin_weekOfYear = require('dayjs/plugin/weekOfYear');
+		this.dayJS.extend(this.plugin_weekOfYear);
+		// Include the `weekday` plugin
+		this.plugin_weekday = require('dayjs/plugin/weekday');
+		this.dayJS.extend(this.plugin_weekday);
+		// Include the `isoWeek` plugin
+		this.plugin_isoWeek = require('dayjs/plugin/isoWeek');
+		this.dayJS.extend(this.plugin_isoWeek);
+		// Include the `timezone` plugin
+		this.plugin_timezone = require('dayjs/plugin/timezone');
+		this.dayJS.extend(this.plugin_timezone);
+		// Include the `relativetime` plugin
+		this.plugin_relativetime = require('dayjs/plugin/relativeTime');
+		this.dayJS.extend(this.plugin_relativetime);
+		// Include the `utc` plugin
+		this.plugin_utc = require('dayjs/plugin/utc');
+		this.dayJS.extend(this.plugin_utc);
+		// Include the `advancedFormat` plugin
+		this.plugin_advancedFormat = require('dayjs/plugin/advancedFormat');
+		this.dayJS.extend(this.plugin_advancedFormat);
 
-        // A developer can include locales if they want
-        // You would do the following:
-        // const localeDE = require('dayjs/locale/de');
-        // _Fable.Dates.dayJS.locale('de');
-    }
+		// A developer can include locales if they want
+		// You would do the following:
+		// const localeDE = require('dayjs/locale/de');
+		// _Fable.Dates.dayJS.locale('de');
+	}
 
-    /**
-     * Calculates the difference in milliseconds between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in milliseconds between the start and end dates. Returns NaN if the start date is invalid.
-     */
-    dateMillisecondDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'millisecond');
-    }
+	/**
+	 * Calculates the difference in milliseconds between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in milliseconds between the start and end dates. Returns NaN if the start date is invalid.
+	 */
+	dateMillisecondDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'millisecond');
+	}
 
-    /**
-     * Calculates the difference in seconds between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in seconds between the start and end dates. Returns NaN if the start date is invalid.
-     */
-    dateSecondDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'second');
-    }
+	/**
+	 * Calculates the difference in seconds between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in seconds between the start and end dates. Returns NaN if the start date is invalid.
+	 */
+	dateSecondDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'second');
+	}
 
-    /**
-     * Calculates the difference in minutes between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in minutes between the start and end dates. Returns NaN if the start date is invalid.
-     */
-    dateMinuteDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'minute');
-    }
+	/**
+	 * Calculates the difference in minutes between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in minutes between the start and end dates. Returns NaN if the start date is invalid.
+	 */
+	dateMinuteDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'minute');
+	}
 
-    /**
-     * Calculates the difference in hours between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in hours between the start and end dates. Returns NaN if the start date is invalid.
-     */
-    dateHourDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'hour');
-    }
+	/**
+	 * Calculates the difference in hours between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in hours between the start and end dates. Returns NaN if the start date is invalid.
+	 */
+	dateHourDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'hour');
+	}
 
-    /**
-     * Calculates the difference in days between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in days between the start and end dates. Returns NaN if the start date is invalid.
-     */
-    dateDayDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'day');
-    }
+	/**
+	 * Calculates the difference in days between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in days between the start and end dates. Returns NaN if the start date is invalid.
+	 */
+	dateDayDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'day');
+	}
 
-    /**
-     * Calculates the difference in weeks between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in weeks between the two dates. Returns NaN if the start date is invalid.
-     */
-    dateWeekDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'week');
-    }
+	/**
+	 * Calculates the difference in weeks between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in weeks between the two dates. Returns NaN if the start date is invalid.
+	 */
+	dateWeekDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'week');
+	}
 
-    /**
-     * Calculates the difference in months between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in months between the two dates. Returns NaN if the start date is invalid.
-     */
-    dateMonthDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'month');
-    }
+	/**
+	 * Calculates the difference in months between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in months between the two dates. Returns NaN if the start date is invalid.
+	 */
+	dateMonthDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'month');
+	}
 
-    /**
-     * Calculates the difference in years between two dates.
-     *
-     * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
-     * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
-     * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
-     * @returns {number} The difference in years between the two dates. Returns NaN if the start date is invalid.
-     */
-    dateYearDifference(pDateStart, pDateEnd, pRequireEndDate = false)
-    {
-        if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
-        {
-            return NaN;
-        }
-        if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
-        {
-            return NaN;
-        }
-        let tmpStartDate = this.dayJS(pDateStart);
-        let tmpEndDate = this.dayJS(pDateEnd);
-        return tmpEndDate.diff(tmpStartDate, 'year');
-    }
+	/**
+	 * Calculates the difference in years between two dates.
+	 *
+	 * @param {string|Date|number} pDateStart - The start date. Can be a string, Date object, or timestamp.
+	 * @param {string|Date|number} pDateEnd - The end date. Can be a string, Date object, or timestamp. Defaults to the current date if not provided.
+	 * @param {boolean} pRequireEndDate - If true, the end date must be provided; otherwise, it defaults to the current date.
+	 * @returns {number} The difference in years between the two dates. Returns NaN if the start date is invalid.
+	 */
+	dateYearDifference(pDateStart, pDateEnd, pRequireEndDate = false)
+	{
+		if ((pDateStart === undefined) || (pDateStart === null) || (pDateStart === ''))
+		{
+			return NaN;
+		}
+		if ((pRequireEndDate || (pRequireEndDate == 1) || (pRequireEndDate == '1')) && ((pDateEnd === undefined) || (pDateEnd === null) || (pDateEnd === '')))
+		{
+			return NaN;
+		}
+		let tmpStartDate = this.dayJS(pDateStart);
+		let tmpEndDate = this.dayJS(pDateEnd);
+		return tmpEndDate.diff(tmpStartDate, 'year');
+	}
 
 	dateAddMilliseconds(pDate, pAmount)
 	{
@@ -255,7 +255,7 @@ class DateManipulation extends libFableServiceProviderBase
 	{
 		return this.dateMath(pDate, pAmount, 'week', 'add');
 	}
-	
+
 	dateAddMonths(pDate, pAmount)
 	{
 		return this.dateMath(pDate, pAmount, 'month', 'add');
@@ -302,4 +302,4 @@ class DateManipulation extends libFableServiceProviderBase
 	}
 }
 
-module.exports = DateManipulation;
+module.exports = DateManipulation;

package/source/services/Fable-Service-EnvironmentData-Web.js

@@ -4,12 +4,12 @@ class FableServiceEnvironmentData extends libFableServiceBase
 {
 	constructor(pFable, pOptions, pServiceHash)
 	{
-        super(pFable, pOptions, pServiceHash);
+		super(pFable, pOptions, pServiceHash);
 
-        this.serviceType = 'EnvironmentData';
+		this.serviceType = 'EnvironmentData';
 
 		this.Environment = `web`;
 	}
 }
 
-module.exports = FableServiceEnvironmentData;
+module.exports = FableServiceEnvironmentData;

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

@@ -4,12 +4,12 @@ class FableServiceEnvironmentData extends libFableServiceBase
 {
 	constructor(pFable, pOptions, pServiceHash)
 	{
-        super(pFable, pOptions, pServiceHash);
+		super(pFable, pOptions, pServiceHash);
 
-        this.serviceType = 'EnvironmentData';
+		this.serviceType = 'EnvironmentData';
 
 		this.Environment = `node.js`;
 	}
 }
 
-module.exports = FableServiceEnvironmentData;
+module.exports = FableServiceEnvironmentData;

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ExpressionTokenizer-DirectiveMutation.js

@@ -0,0 +1,136 @@
+const libExpressionParserOperationBase = require('./Fable-Service-ExpressionParser-Base.js');
+
+class ExpressionTokenizerDirectiveMutation extends libExpressionParserOperationBase
+{
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		super(pFable, pOptions, pServiceHash);
+		this.serviceType = 'ExpressionParser-TokenizerDirectiveMutation';
+
+		this.directiveTypes = (
+			{
+				'SOLVE': { Name: 'Solve Expression', Code: 'SOLVE' },
+				'SERIES': { Name: 'Series', Code: 'SERIES', From: null, To: null, Step: null },
+				'MONTECARLO': { Name: 'Monte Carlo Simulation', Code: 'MONTECARLO', Iterations: null, Values: {} }
+			});
+
+		this.defaultDirective = this.directiveTypes.SOLVE;
+	}
+
+	parseSeriesDirective(pTokens)
+	{
+		// This isn't a fancy real parse it's just taking words and stealing values after them.
+		let tmpNewSeriesDirectiveDescription = Object.assign({}, this.directiveTypes.SERIES);
+
+		for (let i = 0; i < pTokens.length; i++)
+		{
+			let tmpToken = pTokens[i].toUpperCase();
+			switch(tmpToken)
+			{
+				case 'FROM':
+					if ((i + 1) < pTokens.length)
+					{
+						tmpNewSeriesDirectiveDescription.From = pTokens[i + 1];
+					}
+					break;
+
+				case 'TO':
+					if ((i + 1) < pTokens.length)
+					{
+						tmpNewSeriesDirectiveDescription.To = pTokens[i + 1];
+					}
+					break;
+
+				case 'STEP':
+					if ((i + 1) < pTokens.length)
+					{
+						tmpNewSeriesDirectiveDescription.Step = pTokens[i + 1];
+					}
+					break;
+
+				default:
+					// Ignore other tokens
+					break;
+			}
+		}
+
+		return tmpNewSeriesDirectiveDescription;
+	}
+
+	parseDirectives(pResultObject)
+	{
+		let tmpResults = (typeof(pResultObject) === 'object') ? pResultObject : { ExpressionParserLog: [] };
+
+		tmpResults.SolverDirectives = this.defaultDirective;
+		tmpResults.SolverDirectiveTokens = [];
+
+		if (tmpResults.RawTokens.length < 2)
+		{
+			tmpResults.ExpressionParserLog.push(`ExpressionParser.tokenizeDirectiveMutation postprocessor received insufficient tokens to process directives.`);
+			this.log.warn(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+			return tmpResults.SolverDirectives;
+		}
+
+		// Enumerate each of the tmpResults.RawTokens to see if one of the values in the directiveTypeMap exists and is either at the beginning or after the assignment (= or ?=) operator
+		for (let i = 0; i < tmpResults.RawTokens.length; i++)
+		{
+			let tmpToken = tmpResults.RawTokens[i].toUpperCase();
+			if (tmpToken in this.directiveTypes)
+			{
+				// Check if it's at the beginning or after an assignment operator
+				// FIXME: This is hard coded assignment operators which is bad juju
+				if ((i === 0) || (tmpResults.RawTokens[i-1] === '=') || (tmpResults.RawTokens[i-1] === '?='))
+				{
+					// We have a directive!
+					tmpResults.SolverDirectives.Type = this.directiveTypes[tmpToken];
+
+					tmpResults.ExpressionParserLog.push(`ExpressionParser.tokenizeDirectiveMutation identified solver directive: ${tmpToken}`);
+					this.log.info(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+
+					// Extract the Directive name and everything else from it up until the : token
+					let tmpDirectiveTokenStartIndex = i;
+					let tmpDirectiveTokenEndIndex = -1;
+					for (let j = tmpDirectiveTokenStartIndex + 1; j < tmpResults.RawTokens.length; j++)
+					{
+						if (tmpResults.RawTokens[j] === ':')
+						{
+							tmpDirectiveTokenEndIndex = j;
+							break;
+						}
+					}
+
+					// If the directive token end is not in the expression we don't know what to do
+					if (tmpDirectiveTokenEndIndex === -1)
+					{
+						tmpResults.ExpressionParserLog.push(`ExpressionParser.tokenizeDirectiveMutation could not find the end of the directive token set for directive: ${tmpToken}`);
+						this.log.warn(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+						continue;
+					}
+
+					// Set the tmpResults.SolverDirectiveTokens to the slice of tokens that represent the directive
+					tmpResults.SolverDirectiveTokens = tmpResults.RawTokens.slice(tmpDirectiveTokenStartIndex, tmpDirectiveTokenEndIndex);
+
+					// Remove the directive tokens and the assignment to the left of it from the array of raw tokens
+					// the colonoscopy if you will
+					tmpResults.RawTokens.splice(0, tmpDirectiveTokenEndIndex + 1);
+
+					// Further parsing based on directive type could go here
+					// e.g. parseSeriesDirective for SERIES, etc.
+					switch(tmpToken)
+					{
+						case 'SERIES':
+							tmpResults.SolverDirectives = this.parseSeriesDirective(tmpResults.SolverDirectiveTokens);
+							break;
+						default:
+							// No further parsing needed
+							break;
+					}
+				}
+			}
+		}
+
+		return tmpResults.SolverDirectives;
+	}
+}
+
+module.exports = ExpressionTokenizerDirectiveMutation;

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ExpressionTokenizer.js

@@ -13,6 +13,7 @@ class ExpressionTokenizer extends libExpressionParserOperationBase
 		let tmpResults = (typeof(pResultObject) === 'object') ? pResultObject : { ExpressionParserLog: [] };
 
 		tmpResults.RawExpression = pExpression;
+		tmpResults.SolverDirectives = {};
 		tmpResults.RawTokens = [];
 		tmpResults.ExpressionParserLog = [];
 
@@ -203,6 +204,11 @@ class ExpressionTokenizer extends libExpressionParserOperationBase
 			tmpResults.RawTokens.push(tmpCurrentToken);
 		}
 
+		tmpResults.OriginalRawTokens = Array.from(tmpResults.RawTokens);
+
+		// Potentially mutate the tokens based on directives in the tokenized expression
+		this.TokenizerDirectiveMutation.parseDirectives(tmpResults);
+
 		return tmpResults.RawTokens;
 	}
 }