fable 3.0.17 → 3.0.20

package/dist/fable.js

@@ -1,3 +1,5 @@
+"use strict";
+
 (function (f) {
   if (typeof exports === "object" && typeof module !== "undefined") {
     module.exports = f();
@@ -264,7 +266,7 @@
           'use strict';
 
           var _setImmediate = typeof setImmediate === 'function' && setImmediate;
-          var fallback = function (fn) {
+          var fallback = function fallback(fn) {
             setTimeout(fn, 0);
           };
           module.exports = function setImmediate(fn) {
@@ -422,7 +424,7 @@
           super(pLogStreamSettings);
           this._ShowTimeStamps = this._Settings.hasOwnProperty('showtimestamps') ? this._Settings.showtimestamps == true : true;
           this._FormattedTimeStamps = this._Settings.hasOwnProperty('formattedtimestamps') ? this._Settings.formattedtimestamps == true : true;
-          this._ContextMessage = this._Settings.hasOwnProperty('Context') ? `(${this._Settings.Context})` : pFableLog._Settings.hasOwnProperty('Product') ? `(${pFableLog._Settings.Product})` : 'Unnamed_Log_Context';
+          this._ContextMessage = this._Settings.hasOwnProperty('Context') ? "(".concat(this._Settings.Context, ")") : pFableLog._Settings.hasOwnProperty('Product') ? "(".concat(pFableLog._Settings.Product, ")") : 'Unnamed_Log_Context';
 
           // Allow the user to decide what gets output to the console
           this._OutputLogLinesToConsole = this._Settings.hasOwnProperty('outputloglinestoconsole') ? this._Settings.outputloglinestoconsole : true;
@@ -431,7 +433,7 @@
           // Precompute the prefix for each level
           this.prefixCache = {};
           for (let i = 0; i <= this.levels.length; i++) {
-            this.prefixCache[this.levels[i]] = `[${this.levels[i]}] ${this._ContextMessage}: `;
+            this.prefixCache[this.levels[i]] = "[".concat(this.levels[i], "] ").concat(this._ContextMessage, ": ");
             if (this._ShowTimeStamps) {
               // If there is a timestamp we need a to prepend space before the prefixcache string, since the timestamp comes first
               this.prefixCache[this.levels[i]] = ' ' + this.prefixCache[this.levels[i]];
@@ -445,7 +447,7 @@
           } else if (this._ShowTimeStamps) {
             tmpTimeStamp = +new Date();
           }
-          let tmpLogLine = `${tmpTimeStamp}${this.prefixCache[pLevel]}${pLogText}`;
+          let tmpLogLine = "".concat(tmpTimeStamp).concat(this.prefixCache[pLevel]).concat(pLogText);
           if (this._OutputLogLinesToConsole) {
             console.log(tmpLogLine);
           }
@@ -472,7 +474,7 @@
           super(pLogStreamSettings, pFableLog);
 
           // If a path isn't provided for the logfile, it tries to use the ProductName or Context
-          this.logFileRawPath = this._Settings.hasOwnProperty('path') ? this._Settings.path : `./${this._ContextMessage}.log`;
+          this.logFileRawPath = this._Settings.hasOwnProperty('path') ? this._Settings.path : "./".concat(this._ContextMessage, ".log");
           this.logFilePath = libPath.normalize(this.logFileRawPath);
           this.logFileStreamOptions = this._Settings.hasOwnProperty('fileStreamoptions') ? this._Settings.fileStreamOptions : {
             "flags": "a",
@@ -519,9 +521,9 @@
             let tmpConstructedBufferOutputString = '';
             for (let i = 0; i < tmpLineStrings.length; i++) {
               // TODO: Windows Newline?   ....... yo no se!
-              tmpConstructedBufferOutputString += `${tmpLineStrings[i]}\n`;
+              tmpConstructedBufferOutputString += "".concat(tmpLineStrings[i], "\n");
               if (tmpObjectStrings[i] !== false) {
-                tmpConstructedBufferOutputString += `${tmpObjectStrings[i]}\n`;
+                tmpConstructedBufferOutputString += "".concat(tmpObjectStrings[i], "\n");
               }
             }
             if (!this.fileWriter.write(tmpConstructedBufferOutputString, 'utf8')) {
@@ -672,7 +674,7 @@
               level: 'info'
             }, this._StreamDefinitions[i]);
             if (!this._Providers.hasOwnProperty(tmpStreamDefinition.loggertype)) {
-              console.log(`Error initializing log stream: bad loggertype in stream definition ${JSON.stringify(tmpStreamDefinition)}`);
+              console.log("Error initializing log stream: bad loggertype in stream definition ".concat(JSON.stringify(tmpStreamDefinition)));
             } else {
               this.addLogger(new this._Providers[tmpStreamDefinition.loggertype](tmpStreamDefinition, this), tmpStreamDefinition.level);
             }
@@ -686,7 +688,7 @@
         logTime(pMessage, pDatum) {
           let tmpMessage = typeof pMessage !== 'undefined' ? pMessage : 'Time';
           let tmpTime = new Date();
-          this.info(`${tmpMessage} ${tmpTime} (epoch ${+tmpTime})`, pDatum);
+          this.info("".concat(tmpMessage, " ").concat(tmpTime, " (epoch ").concat(+tmpTime, ")"), pDatum);
         }
 
         // Get a timestamp
@@ -703,7 +705,7 @@
           let tmpMessage = typeof pMessage !== 'undefined' ? pMessage : 'Time Measurement';
           let tmpDatum = typeof pDatum === 'object' ? pDatum : {};
           let tmpEndTime = +new Date();
-          this.info(`${tmpMessage} logged at (epoch ${+tmpEndTime}) took (${pTimeDelta}ms)`, pDatum);
+          this.info("".concat(tmpMessage, " logged at (epoch ").concat(+tmpEndTime, ") took (").concat(pTimeDelta, "ms)"), pDatum);
         }
         logTimeDeltaHuman(pTimeDelta, pMessage, pDatum) {
           let tmpMessage = typeof pMessage !== 'undefined' ? pMessage : 'Time Measurement';
@@ -716,7 +718,7 @@
           tmpSeconds = tmpSeconds < 10 ? "0" + tmpSeconds : tmpSeconds;
           tmpMinutes = tmpMinutes < 10 ? "0" + tmpMinutes : tmpMinutes;
           tmpHours = tmpHours < 10 ? "0" + tmpHours : tmpHours;
-          this.info(`${tmpMessage} logged at (epoch ${+tmpEndTime}) took (${pTimeDelta}ms) or (${tmpHours}:${tmpMinutes}:${tmpSeconds}.${tmpMs})`, pDatum);
+          this.info("".concat(tmpMessage, " logged at (epoch ").concat(+tmpEndTime, ") took (").concat(pTimeDelta, "ms) or (").concat(tmpHours, ":").concat(tmpMinutes, ":").concat(tmpSeconds, ".").concat(tmpMs, ")"), pDatum);
         }
         logTimeDeltaRelative(pStartTime, pMessage, pDatum) {
           this.logTimeDelta(this.getTimeDelta(pStartTime), pMessage, pDatum);
@@ -1563,8 +1565,8 @@
       *
       * @description Process text streams, parsing out meta-template expressions.
       */
-      var libWordTree = require(`./WordTree.js`);
-      var libStringParser = require(`./StringParser.js`);
+      var libWordTree = require("./WordTree.js");
+      var libStringParser = require("./StringParser.js");
       class Precedent {
         /**
          * Precedent Constructor
@@ -2094,6 +2096,7 @@
       class FableOperation {
         constructor(pFable, pOperationName, pOperationHash) {
           this.fable = pFable;
+          this.name = pOperationName;
           this.state = JSON.parse(_OperationStatePrototype);
           this.state.Metadata.GUID = this.fable.getUUID();
           this.state.Metadata.Hash = this.state.GUID;
@@ -2111,13 +2114,13 @@
           return this;
         }
         writeOperationLog(pLogLevel, pLogText, pLogObject) {
-          this.state.Log.push(`${new Date().toUTCString()} [${pLogLevel}]: ${pLogText}`);
+          this.state.Log.push("".concat(new Date().toUTCString(), " [").concat(pLogLevel, "]: ").concat(pLogText));
           if (typeof pLogObject == 'object') {
             this.state.Log.push(JSON.stringify(pLogObject));
           }
         }
         writeOperationErrors(pLogText, pLogObject) {
-          this.state.Errors.push(`${pLogText}`);
+          this.state.Errors.push("".concat(pLogText));
           if (typeof pLogObject == 'object') {
             this.state.Errors.push(JSON.stringify(pLogObject));
           }
@@ -2152,6 +2155,89 @@
       module.exports = FableOperation;
     }, {}],
     36: [function (require, module, exports) {
+      const libFableServiceBase = require('./Fable-ServiceProviderBase.js');
+      class FableServiceTemplate extends libFableServiceBase {
+        // Underscore and lodash have a behavior, _.template, which compiles a
+        // string-based template with code snippets into simple executable pieces,
+        // with the added twist of returning a precompiled function ready to go.
+        //
+        // NOTE: This does not implement underscore escape expressions
+        // NOTE: This does not implement underscore magic browser variable assignment
+        //
+        // This is an implementation of that.
+        // TODO: Make this use precedent, add configuration, add debugging.
+        constructor(pFable, pOptions, pServiceHash) {
+          super(pFable, pOptions, pServiceHash);
+          this.serviceType = 'Template';
+
+          // These are the exact regex's used in lodash/underscore
+          // TODO: Switch this to precedent
+          this.Matchers = {
+            Evaluate: /<%([\s\S]+?)%>/g,
+            Interpolate: /<%=([\s\S]+?)%>/g,
+            Escaper: /\\|'|\r|\n|\t|\u2028|\u2029/g,
+            Unescaper: /\\(\\|'|r|n|t|u2028|u2029)/g,
+            // This is how underscore does it, so we are keeping it for now.
+            GuaranteedNonMatch: /.^/
+          };
+
+          // This is a helper for the escaper and unescaper functions.
+          // Right now we are going to keep what underscore is doing, but, not forever.
+          this.templateEscapes = {
+            '\\': '\\',
+            "'": "'",
+            'r': '\r',
+            '\r': 'r',
+            'n': '\n',
+            '\n': 'n',
+            't': '\t',
+            '\t': 't',
+            'u2028': '\u2028',
+            '\u2028': 'u2028',
+            'u2029': '\u2029',
+            '\u2029': 'u2029'
+          };
+
+          // This is defined as such to underscore that it is a dynamic programming
+          // function on this class.
+          this.renderFunction = false;
+          this.templateString = false;
+        }
+        renderTemplate(pData) {
+          return this.renderFunction(pData);
+        }
+        templateFunction(pData) {
+          let fRenderTemplateBound = this.renderTemplate.bind(this);
+          return fRenderTemplateBound;
+        }
+        buildTemplateFunction(pTemplateText, pData) {
+          // For now this is being kept in a weird form ... this is to mimic the old
+          // underscore code until this is rewritten using precedent.
+          this.TemplateSource = "__p+='" + pTemplateText.replace(this.Matchers.Escaper, pMatch => {
+            return "\\".concat(this.templateEscapes[pMatch]);
+          }).replace(this.Matchers.Interpolate || this.Matchers.GuaranteedNonMatch, (pMatch, pCode) => {
+            return "'+\n(".concat(decodeURIComponent(pCode), ")+\n'");
+          }).replace(this.Matchers.Evaluate || this.Matchers.GuaranteedNonMatch, (pMatch, pCode) => {
+            return "';\n".concat(decodeURIComponent(pCode), "\n;__p+='");
+          }) + "';\n";
+          this.TemplateSource = "with(pTemplateDataObject||{}){\n".concat(this.TemplateSource, "}\n");
+          this.TemplateSource = "var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n".concat(this.TemplateSource, "return __p;\n");
+          this.renderFunction = new Function('pTemplateDataObject', this.TemplateSource);
+          if (typeof pData != 'undefined') {
+            return this.renderFunction(pData);
+          }
+
+          // Provide the compiled function source as a convenience for build time
+          // precompilation.
+          this.TemplateSourceCompiled = 'function(obj){\n' + this.TemplateSource + '}';
+          return this.templateFunction();
+        }
+      }
+      module.exports = FableServiceTemplate;
+    }, {
+      "./Fable-ServiceProviderBase.js": 38
+    }],
+    37: [function (require, module, exports) {
       /**
       * Fable Application Services Management
       * @license MIT
@@ -2179,7 +2265,7 @@
 
           // Add the container for instantiated services to go in
           this.services[pServiceType] = {};
-          if (typeof pServiceClass == 'object' && pServiceClass.prototype instanceof libFableServiceBase) {
+          if (typeof pServiceClass == 'function' && pServiceClass.prototype instanceof libFableServiceBase) {
             // Add the class to the list of classes
             this.serviceClasses[pServiceType] = pServiceClass;
           } else {
@@ -2189,7 +2275,7 @@
         }
         instantiateServiceProvider(pServiceType, pOptions, pCustomServiceHash) {
           // Instantiate the service
-          let tmpService = new this.serviceClasses[pServiceType](this.fable, pOptions, pCustomServiceHash);
+          let tmpService = this.instantiateServiceProviderWithoutRegistration(pServiceType, pOptions, pCustomServiceHash);
 
           // Add the service to the service map
           this.services[pServiceType][tmpService.Hash] = tmpService;
@@ -2200,6 +2286,13 @@
           }
           return tmpService;
         }
+
+        // Create a service provider but don't register it to live forever in fable.services
+        instantiateServiceProviderWithoutRegistration(pServiceType, pOptions, pCustomServiceHash) {
+          // Instantiate the service
+          let tmpService = new this.serviceClasses[pServiceType](this.fable, pOptions, pCustomServiceHash);
+          return tmpService;
+        }
         setDefaultServiceInstantiation(pServiceType, pServiceHash) {
           if (this.services[pServiceType].hasOwnProperty(pServiceHash)) {
             this.defaultServices[pServiceType] = this.services[pServiceType][pServiceHash];
@@ -2207,19 +2300,13 @@
           }
           return false;
         }
-        getServiceByHash(pServiceHash) {
-          if (this.services.hasOwnProperty(pServiceHash)) {
-            return this.services[pServiceHash];
-          }
-          return false;
-        }
       }
       module.exports = FableService;
-      module.exports.FableServiceBase = libFableServiceBase;
+      module.exports.ServiceProviderBase = libFableServiceBase;
     }, {
-      "./Fable-ServiceProviderBase.js": 37
+      "./Fable-ServiceProviderBase.js": 38
     }],
-    37: [function (require, module, exports) {
+    38: [function (require, module, exports) {
       /**
       * Fable Service Base
       * @license MIT
@@ -2229,108 +2316,22 @@
       class FableServiceProviderBase {
         constructor(pFable, pOptions, pServiceHash) {
           this.fable = pFable;
-          this.options = pOptions;
+          this.options = typeof pOptions === 'object' ? pOptions : {};
           this.serviceType = 'Unknown';
           this.UUID = pFable.getUUID();
-          this.Hash = typeof pServiceHash === 'string' ? pServiceHash : `${this.UUID}`;
+          this.Hash = typeof pServiceHash === 'string' ? pServiceHash : "".concat(this.UUID);
         }
       }
       module.exports = FableServiceProviderBase;
     }, {}],
-    38: [function (require, module, exports) {
-      class FableUtility {
-        // Underscore and lodash have a behavior, _.template, which compiles a
-        // string-based template with code snippets into simple executable pieces,
-        // with the added twist of returning a precompiled function ready to go.
-        //
-        // NOTE: This does not implement underscore escape expressions
-        // NOTE: This does not implement underscore magic browser variable assignment
-        //
-        // This is an implementation of that.
-        // TODO: Make this use precedent, add configuration, add debugging.
-        constructor(pFable, pTemplateText) {
-          this.fable = pFable;
-
-          // These are the exact regex's used in lodash/underscore
-          // TODO: Switch this to precedent
-          this.Matchers = {
-            Evaluate: /<%([\s\S]+?)%>/g,
-            Interpolate: /<%=([\s\S]+?)%>/g,
-            Escaper: /\\|'|\r|\n|\t|\u2028|\u2029/g,
-            Unescaper: /\\(\\|'|r|n|t|u2028|u2029)/g,
-            // This is how underscore does it, so we are keeping it for now.
-            GuaranteedNonMatch: /.^/
-          };
-
-          // This is a helper for the escaper and unescaper functions.
-          // Right now we are going to keep what underscore is doing, but, not forever.
-          this.templateEscapes = {
-            '\\': '\\',
-            "'": "'",
-            'r': '\r',
-            '\r': 'r',
-            'n': '\n',
-            '\n': 'n',
-            't': '\t',
-            '\t': 't',
-            'u2028': '\u2028',
-            '\u2028': 'u2028',
-            'u2029': '\u2029',
-            '\u2029': 'u2029'
-          };
-
-          // This is defined as such to underscore that it is a dynamic programming
-          // function on this class.
-          this.renderFunction = () => {
-            return ``;
-          };
-        }
-
-        // Underscore and lodash have a behavior, _.extend, which merges objects.
-        // Now that es6 gives us this, use the native thingy.
-        extend(pDestinationObject, ...pSourceObjects) {
-          return Object.assign(pDestinationObject, ...pSourceObjects);
-        }
-        renderTemplate(pData) {
-          return this.renderFunction(pData);
-        }
-        templateFunction(pData) {
-          let fRenderTemplateBound = this.renderTemplate.bind(this);
-          return fRenderTemplateBound;
-        }
-        buildTemplateFunction(pTemplateText, pData) {
-          // For now this is being kept in a weird form ... this is to mimic the old
-          // underscore code until this is rewritten using precedent.
-          this.TemplateSource = "__p+='" + pTemplateText.replace(this.Matchers.Escaper, pMatch => {
-            return `\\${this.templateEscapes[pMatch]}`;
-          }).replace(this.Matchers.Interpolate || this.Matchers.GuaranteedNonMatch, (pMatch, pCode) => {
-            return `'+\n(${decodeURIComponent(pCode)})+\n'`;
-          }).replace(this.Matchers.Evaluate || this.Matchers.GuaranteedNonMatch, (pMatch, pCode) => {
-            return `';\n${decodeURIComponent(pCode)}\n;__p+='`;
-          }) + `';\n`;
-          this.TemplateSource = `with(pTemplateDataObject||{}){\n${this.TemplateSource}}\n`;
-          this.TemplateSource = `var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n${this.TemplateSource}return __p;\n`;
-          this.renderFunction = new Function('pTemplateDataObject', this.TemplateSource);
-          if (typeof pData != 'undefined') {
-            return this.renderFunction(pData);
-          }
-
-          // Provide the compiled function source as a convenience for build time
-          // precompilation.
-          this.TemplateSourceCompiled = 'function(obj){\n' + this.TemplateSource + '}';
-          return this.templateFunction();
-        }
-      }
-      module.exports = FableUtility;
-    }, {}],
     39: [function (require, module, exports) {
-      const libFableUtilityTemplate = require('./Fable-Utility-Template.js');
       // TODO: These are still pretty big -- consider the smaller polyfills
       const libAsyncWaterfall = require('async.waterfall');
-      const libAsyncEachLimit = require('async.eachLimit');
+      const libAsyncEachLimit = require('async.eachlimit');
       class FableUtility {
         constructor(pFable) {
           this.fable = pFable;
+          this.templates = {};
 
           // These two functions are used extensively throughout
           this.waterfall = libAsyncWaterfall;
@@ -2339,7 +2340,10 @@
 
         // Underscore and lodash have a behavior, _.extend, which merges objects.
         // Now that es6 gives us this, use the native thingy.
-        extend(pDestinationObject, ...pSourceObjects) {
+        extend(pDestinationObject) {
+          for (var _len = arguments.length, pSourceObjects = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+            pSourceObjects[_key - 1] = arguments[_key];
+          }
           return Object.assign(pDestinationObject, ...pSourceObjects);
         }
 
@@ -2347,10 +2351,17 @@
         // string-based template with code snippets into simple executable pieces,
         // with the added twist of returning a precompiled function ready to go.
         template(pTemplateText, pData) {
-          let tmpTemplate = new libFableUtilityTemplate(this.fable, pTemplateText);
+          let tmpTemplate = this.fable.serviceManager.instantiateServiceProviderWithoutRegistration('Template');
           return tmpTemplate.buildTemplateFunction(pTemplateText, pData);
         }
 
+        // Build a template function from a template hash, and, register it with the service provider
+        buildHashedTemplate(pTemplateHash, pTemplateText, pData) {
+          let tmpTemplate = this.fable.serviceManager.instantiateServiceProvider('Template', {}, pTemplateHash);
+          this.templates[pTemplateHash] = tmpTemplate.buildTemplateFunction(pTemplateText, pData);
+          return this.templates[pTemplateHash];
+        }
+
         // This is a safe, modern version of chunk from underscore
         // Algorithm pulled from a mix of these two polyfills:
         // https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_chunk
@@ -2372,8 +2383,7 @@
       }
       module.exports = FableUtility;
     }, {
-      "./Fable-Utility-Template.js": 38,
-      "async.eachLimit": 1,
+      "async.eachlimit": 1,
       "async.waterfall": 15
     }],
     40: [function (require, module, exports) {
@@ -2387,6 +2397,7 @@
       const libFableLog = require('fable-log');
       const libFableUtility = require('./Fable-Utility.js');
       const libFableServiceManager = require('./Fable-ServiceManager.js');
+      const libFableServiceTemplate = require('./Fable-Service-Template.js');
       const libFableOperation = require('./Fable-Operation.js');
       class Fable {
         constructor(pSettings) {
@@ -2409,6 +2420,9 @@
           // Location for Operation state
           this.Operations = {};
           this.serviceManager = new libFableServiceManager(this);
+          this.serviceManager.addServiceType('Template', libFableServiceTemplate);
+          this.services = this.serviceManager.services;
+          this.defaultServices = this.serviceManager.defaultServices;
         }
         get settings() {
           return this.settingsManager.settings;
@@ -2433,7 +2447,7 @@
           if (!this.Operations.hasOwnProperty(pOperationHash)) {
             return false;
           } else {
-            return this.pOperations[pOperationHash];
+            return this.Operations[pOperationHash];
           }
         }
       }
@@ -2449,7 +2463,8 @@
       module.exports.precedent = libFableSettings.precedent;
     }, {
       "./Fable-Operation.js": 35,
-      "./Fable-ServiceManager.js": 36,
+      "./Fable-Service-Template.js": 36,
+      "./Fable-ServiceManager.js": 37,
       "./Fable-Utility.js": 39,
       "fable-log": 22,
       "fable-settings": 25,